From 4fecd01ddd0b24a9b91af67f816bdf5b89db1c0c Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Fri, 10 Jun 2022 04:47:15 +0200
Subject: [PATCH 001/816] NEW Accountancy - Manage customer retained warranty

---
 htdocs/accountancy/admin/defaultaccounts.php |   3 +
 htdocs/accountancy/journal/sellsjournal.php  | 115 ++++++++++++++++++-
 htdocs/langs/en_US/accountancy.lang          |   1 +
 3 files changed, 116 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index 583b12368dc..da590e80562 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -84,6 +84,9 @@ $list_account[] = 'ACCOUNTING_VAT_PAY_ACCOUNT';
 if (!empty($conf->banque->enabled)) {
 	$list_account[] = 'ACCOUNTING_ACCOUNT_TRANSFER_CASH';
 }
+if (!empty($conf->global->INVOICE_USE_RETAINED_WARRANTY)) {
+	$list_account[] = 'ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY';
+}
 if (!empty($conf->don->enabled)) {
 	$list_account[] = 'DONATION_ACCOUNTINGACCOUNT';
 }
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 426bc6d7795..a36f67f55f0 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2011       Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2012       Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2013       Christophe Battarel     <christophe.battarel@altairis.fr>
- * Copyright (C) 2013-2021  Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2013-2022  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2013-2016  Florian Henry           <florian.henry@open-concept.pro>
  * Copyright (C) 2013-2016  Olivier Geffroy         <jeff@jeffinfo.com>
  * Copyright (C) 2014       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
@@ -105,7 +105,7 @@ if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))
 	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
 
-$sql = "SELECT f.rowid, f.ref, f.type, f.datef as df, f.ref_client, f.date_lim_reglement as dlr, f.close_code,";
+$sql = "SELECT f.rowid, f.ref, f.type, f.datef as df, f.ref_client, f.date_lim_reglement as dlr, f.close_code, f.retained_warranty,";
 $sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.total_tva, fd.total_localtax1, fd.total_localtax2, fd.tva_tx, fd.total_ttc, fd.situation_percent, fd.vat_src_code,";
 $sql .= " s.rowid as socid, s.nom as name, s.code_client, s.code_fournisseur,";
 if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
@@ -167,6 +167,7 @@ if ($result) {
 	$tabht = array();
 	$tabtva = array();
 	$def_tva = array();
+	$tabwarranty = array();
 	$tabttc = array();
 	$tablocaltax1 = array();
 	$tablocaltax2 = array();
@@ -247,7 +248,13 @@ if ($result) {
 			$tablocaltax2[$obj->rowid][$compta_localtax2] = 0;
 		}
 
-		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc * $situation_ratio;
+		$total_ttc = $obj->total_ttc * $situation_ratio;
+		if (!empty($conf->global->INVOICE_USE_RETAINED_WARRANTY) && $obj->retained_warranty > 0) {
+			$retained_warranty = (double)price2num($total_ttc * $obj->retained_warranty / 100, 'MT');
+			$tabwarranty[$obj->rowid][$compta_soc] += $retained_warranty;
+			$total_ttc -= $retained_warranty;
+		}
+		$tabttc[$obj->rowid][$compta_soc] += $total_ttc;
 		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht * $situation_ratio;
 		if (empty($line->tva_npr)) {
 			$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva * $situation_ratio; // We ignore line if VAT is a NPR
@@ -299,6 +306,10 @@ if ($action == 'writebookkeeping') {
 
 	$accountingaccountcustomer->fetch(null, $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER, true);
 
+	$accountingaccountcustomerwarranty = new AccountingAccount($db);
+
+	$accountingaccountcustomerwarranty->fetch(null, $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY, true);
+
 	foreach ($tabfac as $key => $val) {		// Loop on each invoice
 		$errorforline = 0;
 
@@ -345,6 +356,55 @@ if ($action == 'writebookkeeping') {
 			setEventMessages($langs->trans('ErrorInvoiceContainsLinesNotYetBounded', $val['ref']), null, 'errors');
 		}
 
+		// Warranty
+		if (!$errorforline) {
+			foreach ($tabwarranty[$key] as $k => $mt) {
+				$bookkeeping = new BookKeeping($db);
+				$bookkeeping->doc_date = $val["date"];
+				$bookkeeping->date_lim_reglement = $val["datereg"];
+				$bookkeeping->doc_ref = $val["ref"];
+				$bookkeeping->date_creation = $now;
+				$bookkeeping->doc_type = 'customer_invoice';
+				$bookkeeping->fk_doc = $key;
+				$bookkeeping->fk_docdet = 0; // Useless, can be several lines that are source of this record to add
+				$bookkeeping->thirdparty_code = $companystatic->code_client;
+
+				$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
+				$bookkeeping->subledger_label = $tabcompany[$key]['name'];
+
+				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY;
+				$bookkeeping->label_compte = $accountingaccountcustomerwarranty->label;
+
+				$bookkeeping->label_operation = dol_trunc($companystatic->name, 16).' - '.$invoicestatic->ref.' - '.$langs->trans("Retainedwarranty");
+				$bookkeeping->montant = $mt;
+				$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
+				$bookkeeping->debit = ($mt >= 0) ? $mt : 0;
+				$bookkeeping->credit = ($mt < 0) ? -$mt : 0;
+				$bookkeeping->code_journal = $journal;
+				$bookkeeping->journal_label = $langs->transnoentities($journal_label);
+				$bookkeeping->fk_user_author = $user->id;
+				$bookkeeping->entity = $conf->entity;
+
+				$totaldebit += $bookkeeping->debit;
+				$totalcredit += $bookkeeping->credit;
+
+				$result = $bookkeeping->create($user);
+				if ($result < 0) {
+					if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {	// Already exists
+						$error++;
+						$errorforline++;
+						$errorforinvoice[$key] = 'alreadyjournalized';
+						//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+					} else {
+						$error++;
+						$errorforline++;
+						$errorforinvoice[$key] = 'other';
+						setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+					}
+				}
+			}
+		}
+
 		// Thirdparty
 		if (!$errorforline) {
 			foreach ($tabttc[$key] as $k => $mt) {
@@ -627,6 +687,25 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 			continue;
 		}
 
+		// Warranty
+		foreach ($tabwarranty[$key] as $k => $mt) {
+			//if ($mt) {
+			print '"'.$key.'"'.$sep;
+			print '"'.$date.'"'.$sep;
+			print '"'.$val["ref"].'"'.$sep;
+			print '"'.utf8_decode(dol_trunc($companystatic->name, 32)).'"'.$sep;
+			print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
+			print '"'.length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY).'"'.$sep;
+			print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
+			print '"'.$langs->trans("Thirdparty").'"'.$sep;
+			print '"'.utf8_decode(dol_trunc($companystatic->name, 16)).' - '.$invoicestatic->ref.' - '.$langs->trans("Retainedwarranty").'"'.$sep;
+			print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
+			print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
+			print '"'.$journal.'"';
+			print "\n";
+			//}
+		}
+
 		// Third party
 		foreach ($tabttc[$key] as $k => $mt) {
 			//if ($mt) {
@@ -852,6 +931,36 @@ if (empty($action) || $action == 'view') {
 			print "</tr>";
 		}
 
+		// Warranty
+		foreach ($tabwarranty[$key] as $k => $mt) {
+			print '<tr class="oddeven">';
+			print "<!-- Thirdparty warranty -->";
+			print "<td>".$date."</td>";
+			print "<td>".$invoicestatic->getNomUrl(1)."</td>";
+			// Account
+			print "<td>";
+			$accountoshow = length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY);
+			if (($accountoshow == "") || $accountoshow == 'NotDefined') {
+				print '<span class="error">'.$langs->trans("MainAccountForCustomersNotDefined").'</span>';
+			} else {
+				print $accountoshow;
+			}
+			print '</td>';
+			// Subledger account
+			print "<td>";
+			$accountoshow = length_accounta($k);
+			if (($accountoshow == "") || $accountoshow == 'NotDefined') {
+				print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
+			} else {
+				print $accountoshow;
+			}
+			print '</td>';
+			print "<td>".$companystatic->getNomUrl(0, 'customer', 16).' - '.$invoicestatic->ref.' - '.$langs->trans("Retainedwarranty")."</td>";
+			print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
+			print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
+			print "</tr>";
+		}
+
 		// Third party
 		foreach ($tabttc[$key] as $k => $mt) {
 			print '<tr class="oddeven">';
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 0f85c4b1c33..8a6824f9eda 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -183,6 +183,7 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
 UseAuxiliaryAccountOnCustomerDeposit=Use sub-accounts on customer deposit lines
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)

From a1cec27540f190f2a1522a3392f8037d5f7bc554 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 10 Jun 2022 02:53:13 +0000
Subject: [PATCH 002/816] Fixing style errors.

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

diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index a36f67f55f0..cfa1f1d351f 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -250,7 +250,7 @@ if ($result) {
 
 		$total_ttc = $obj->total_ttc * $situation_ratio;
 		if (!empty($conf->global->INVOICE_USE_RETAINED_WARRANTY) && $obj->retained_warranty > 0) {
-			$retained_warranty = (double)price2num($total_ttc * $obj->retained_warranty / 100, 'MT');
+			$retained_warranty = (double) price2num($total_ttc * $obj->retained_warranty / 100, 'MT');
 			$tabwarranty[$obj->rowid][$compta_soc] += $retained_warranty;
 			$total_ttc -= $retained_warranty;
 		}

From 9ae40a2a02236e801e3bbe322068c6c736a98488 Mon Sep 17 00:00:00 2001
From: atm-florian <florian.mortgat@atm-consulting.fr>
Date: Tue, 14 Jun 2022 12:52:14 +0200
Subject: [PATCH 003/816] NEW: helper functions for dates + small demo case

---
 htdocs/core/lib/functions.lib.php | 31 ++++++++++++++++++++++++++
 htdocs/fourn/facture/list.php     | 36 ++++++-------------------------
 2 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 45bf99577d4..09a287200ba 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -11110,3 +11110,34 @@ function dolForgeCriteriaCallback($matches)
 
 	return $db->escape($operand).' '.$db->escape($operator)." ".$tmpescaped;
 }
+
+/**
+ * Helper function that combines values of a dolibarr DatePicker (such as Form::selectDate) for year, month, day (and
+ * optionally hour, minute, second) fields to return a timestamp.
+ *
+ * @param string $prefix Prefix used to build the date selector (for instance using Form::selectDate)
+ * @param bool $useHourTime If true, will also include hour, minute, second values from the HTTP request
+ * @param string $gm Passed to dol_mktime
+ * @return int|string  Date as a timestamp, '' or false if error
+ */
+function GETPOSTDATE($prefix, $useHourTime = false, $gm = 'auto') {
+	return dol_mktime($useHourTime ? (GETPOSTINT($prefix . 'hour')) : 0, $useHourTime ? (GETPOSTINT($prefix . 'minute')) : 0, $useHourTime ? (GETPOSTINT($prefix . 'second')) : 0, GETPOSTINT($prefix . 'month'), GETPOSTINT($prefix . 'day'), GETPOSTINT($prefix . 'year'), $gm);
+}
+
+/**
+ * Helper function that combines values of a dolibarr DatePicker (such as Form::selectDate) for year, month, day (and
+ * optionally hour, minute, second) fields to return a a portion of URL reproducing the values from the current HTTP
+ * request.
+ *
+ * @param string $prefix Prefix used to build the date selector (for instance using Form::selectDate)
+ * @param bool $useHourTime If true, will also include hour, minute, second values from the HTTP request
+ * @return string Portion of URL with query parameters for the specified date
+ */
+function buildParamDate($prefix, $useHourTime = false) {
+	$TParam = [$prefix . 'day' => GETPOST($prefix . 'day'), $prefix . 'month' => GETPOST($prefix . 'month'), $prefix . 'year' => GETPOST($prefix . 'year')];
+	if ($useHourTime) {
+		$TParam += [$prefix . 'hour' => GETPOST($prefix . 'hour'), $prefix . 'minute' => GETPOST($prefix . 'minute'), $prefix . 'second' => GETPOST($prefix . 'second')];
+	}
+
+	return '&' . http_build_query($TParam);
+}
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 70a7334196a..ec0d8ce7427 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -98,14 +98,8 @@ $search_country = GETPOST("search_country", 'int');
 $search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
 $search_user = GETPOST('search_user', 'int');
 $search_sale = GETPOST('search_sale', 'int');
-$search_date_startday = GETPOST('search_date_startday', 'int');
-$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
-$search_date_startyear = GETPOST('search_date_startyear', 'int');
-$search_date_endday = GETPOST('search_date_endday', 'int');
-$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
-$search_date_endyear = GETPOST('search_date_endyear', 'int');
-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
-$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
+$search_date_start = GETPOSTDATE('search_date_start', false, 'tzserver');
+$search_date_end = GETPOSTDATE('search_date_end', false, 'tzserver');
 $search_datelimit_startday = GETPOST('search_datelimit_startday', 'int');
 $search_datelimit_startmonth = GETPOST('search_datelimit_startmonth', 'int');
 $search_datelimit_startyear = GETPOST('search_datelimit_startyear', 'int');
@@ -274,12 +268,6 @@ if (empty($reshook)) {
 		$search_type = '';
 		$search_country = '';
 		$search_type_thirdparty = '';
-		$search_date_startday = '';
-		$search_date_startmonth = '';
-		$search_date_startyear = '';
-		$search_date_endday = '';
-		$search_date_endmonth = '';
-		$search_date_endyear = '';
 		$search_date_start = '';
 		$search_date_end = '';
 		$search_datelimit_startday = '';
@@ -706,23 +694,11 @@ if ($resql) {
 	if ($search_all) {
 		$param .= '&search_all='.urlencode($search_all);
 	}
-	if ($search_date_startday) {
-		$param .= '&search_date_startday='.urlencode($search_date_startday);
+	if ($search_date_start) {
+		$param .= buildParamDate('search_date_start', false);
 	}
-	if ($search_date_startmonth) {
-		$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
-	}
-	if ($search_date_startyear) {
-		$param .= '&search_date_startyear='.urlencode($search_date_startyear);
-	}
-	if ($search_date_endday) {
-		$param .= '&search_date_endday='.urlencode($search_date_endday);
-	}
-	if ($search_date_endmonth) {
-		$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
-	}
-	if ($search_date_endyear) {
-		$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+	if ($search_date_end) {
+		$param .= buildParamDate('search_date_end', false);
 	}
 	if ($search_datelimit_startday) {
 		$param .= '&search_datelimit_startday='.urlencode($search_datelimit_startday);

From e455997160c26ded69e30ab9eafbb148d2ae88e3 Mon Sep 17 00:00:00 2001
From: atm-florian <florian.mortgat@atm-consulting.fr>
Date: Tue, 14 Jun 2022 14:21:46 +0200
Subject: [PATCH 004/816] [minor] [stickler-ci] Opening brace should be on a
 new line

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 09a287200ba..f783c764f78 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -11120,7 +11120,8 @@ function dolForgeCriteriaCallback($matches)
  * @param string $gm Passed to dol_mktime
  * @return int|string  Date as a timestamp, '' or false if error
  */
-function GETPOSTDATE($prefix, $useHourTime = false, $gm = 'auto') {
+function GETPOSTDATE($prefix, $useHourTime = false, $gm = 'auto')
+{
 	return dol_mktime($useHourTime ? (GETPOSTINT($prefix . 'hour')) : 0, $useHourTime ? (GETPOSTINT($prefix . 'minute')) : 0, $useHourTime ? (GETPOSTINT($prefix . 'second')) : 0, GETPOSTINT($prefix . 'month'), GETPOSTINT($prefix . 'day'), GETPOSTINT($prefix . 'year'), $gm);
 }
 
@@ -11133,7 +11134,8 @@ function GETPOSTDATE($prefix, $useHourTime = false, $gm = 'auto') {
  * @param bool $useHourTime If true, will also include hour, minute, second values from the HTTP request
  * @return string Portion of URL with query parameters for the specified date
  */
-function buildParamDate($prefix, $useHourTime = false) {
+function buildParamDate($prefix, $useHourTime = false)
+{
 	$TParam = [$prefix . 'day' => GETPOST($prefix . 'day'), $prefix . 'month' => GETPOST($prefix . 'month'), $prefix . 'year' => GETPOST($prefix . 'year')];
 	if ($useHourTime) {
 		$TParam += [$prefix . 'hour' => GETPOST($prefix . 'hour'), $prefix . 'minute' => GETPOST($prefix . 'minute'), $prefix . 'second' => GETPOST($prefix . 'second')];

From b4e068dcdcd4fa55b78d38859b492e327dfb28f5 Mon Sep 17 00:00:00 2001
From: atm-florian <florian.mortgat@atm-consulting.fr>
Date: Tue, 14 Jun 2022 18:13:32 +0200
Subject: [PATCH 005/816] PR feedback: allow setting a specific hourtime

---
 htdocs/core/lib/functions.lib.php | 43 +++++++++++++++++++++++++------
 htdocs/fourn/facture/list.php     |  8 +++---
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f783c764f78..aa4d5947fbb 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -11116,13 +11116,29 @@ function dolForgeCriteriaCallback($matches)
  * optionally hour, minute, second) fields to return a timestamp.
  *
  * @param string $prefix Prefix used to build the date selector (for instance using Form::selectDate)
- * @param bool $useHourTime If true, will also include hour, minute, second values from the HTTP request
+ * @param string $hourTime  'getpost' to include hour, minute, second values from the HTTP request, 'XX:YY:ZZ' to set
+ *                             hour, minute, second respectively (for instance '23:59:59')
  * @param string $gm Passed to dol_mktime
  * @return int|string  Date as a timestamp, '' or false if error
  */
-function GETPOSTDATE($prefix, $useHourTime = false, $gm = 'auto')
+function GETPOSTDATE($prefix, $hourTime = '', $gm = 'auto')
 {
-	return dol_mktime($useHourTime ? (GETPOSTINT($prefix . 'hour')) : 0, $useHourTime ? (GETPOSTINT($prefix . 'minute')) : 0, $useHourTime ? (GETPOSTINT($prefix . 'second')) : 0, GETPOSTINT($prefix . 'month'), GETPOSTINT($prefix . 'day'), GETPOSTINT($prefix . 'year'), $gm);
+	if ($hourTime === 'getpost') {
+		$hour   = GETPOSTINT($prefix . 'hour');
+		$minute = GETPOSTINT($prefix . 'minute');
+		$second = GETPOSTINT($prefix . 'second');
+	} elseif (preg_match('/^(\d\d):(\d\d):(\d\d)$/', $hourTime, $m)) {
+		$hour   = (int)$m[1];
+		$minute = (int)$m[2];
+		$second = (int)$m[3];
+	} else {
+		$hour = $minute = $second = 0;
+	}
+	// normalize out of range values
+	$hour = min($hour, 23);
+	$minute = min($minute, 59);
+	$second = min($second, 59);
+	return dol_mktime($hour, $minute, $second, GETPOSTINT($prefix . 'month'), GETPOSTINT($prefix . 'day'), GETPOSTINT($prefix . 'year'), $gm);
 }
 
 /**
@@ -11131,14 +11147,25 @@ function GETPOSTDATE($prefix, $useHourTime = false, $gm = 'auto')
  * request.
  *
  * @param string $prefix Prefix used to build the date selector (for instance using Form::selectDate)
- * @param bool $useHourTime If true, will also include hour, minute, second values from the HTTP request
+ * @param int $timestamp If null, the timestamp will be created from request data
+ * @param bool $hourTime If timestamp is null, will be passed to GETPOSTDATE to construct the timestamp
+ * @param bool $gm If timestamp is null, will be passed to GETPOSTDATE to construct the timestamp
  * @return string Portion of URL with query parameters for the specified date
  */
-function buildParamDate($prefix, $useHourTime = false)
+function buildParamDate($prefix, $timestamp = null, $hourTime = '', $gm = 'auto')
 {
-	$TParam = [$prefix . 'day' => GETPOST($prefix . 'day'), $prefix . 'month' => GETPOST($prefix . 'month'), $prefix . 'year' => GETPOST($prefix . 'year')];
-	if ($useHourTime) {
-		$TParam += [$prefix . 'hour' => GETPOST($prefix . 'hour'), $prefix . 'minute' => GETPOST($prefix . 'minute'), $prefix . 'second' => GETPOST($prefix . 'second')];
+	if ($timestamp === null) $timestamp = GETPOSTDATE($prefix, $hourTime, $gm);
+	$TParam = array(
+		$prefix . 'day'   => intval(dol_print_date($timestamp, '%d')),
+		$prefix . 'month' => intval(dol_print_date($timestamp, '%m')),
+		$prefix . 'year'  => intval(dol_print_date($timestamp, '%Y')),
+	);
+	if ($hourTime === 'getpost' || ($timestamp !== null && dol_print_date($timestamp, '%H:%M:%S') !== '00:00:00')) {
+		$TParam = array_merge($TParam, array(
+			$prefix . 'hour'   => intval(dol_print_date($timestamp, '%H')),
+			$prefix . 'minute' => intval(dol_print_date($timestamp, '%M')),
+			$prefix . 'second' => intval(dol_print_date($timestamp, '%S'))
+		));
 	}
 
 	return '&' . http_build_query($TParam);
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index ec0d8ce7427..e63c8794aad 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -98,8 +98,8 @@ $search_country = GETPOST("search_country", 'int');
 $search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
 $search_user = GETPOST('search_user', 'int');
 $search_sale = GETPOST('search_sale', 'int');
-$search_date_start = GETPOSTDATE('search_date_start', false, 'tzserver');
-$search_date_end = GETPOSTDATE('search_date_end', false, 'tzserver');
+$search_date_start = GETPOSTDATE('search_date_start', '', 'tzserver');
+$search_date_end = GETPOSTDATE('search_date_end', '23:59:59', 'tzserver');
 $search_datelimit_startday = GETPOST('search_datelimit_startday', 'int');
 $search_datelimit_startmonth = GETPOST('search_datelimit_startmonth', 'int');
 $search_datelimit_startyear = GETPOST('search_datelimit_startyear', 'int');
@@ -695,10 +695,10 @@ if ($resql) {
 		$param .= '&search_all='.urlencode($search_all);
 	}
 	if ($search_date_start) {
-		$param .= buildParamDate('search_date_start', false);
+		$param .= buildParamDate('search_date_start', null, '', 'tzserver');
 	}
 	if ($search_date_end) {
-		$param .= buildParamDate('search_date_end', false);
+		$param .= buildParamDate('search_date_end', null, '', 'tzserver');
 	}
 	if ($search_datelimit_startday) {
 		$param .= '&search_datelimit_startday='.urlencode($search_datelimit_startday);

From d4b19ed8a36b45c534ba8de3721281ad88363a4f Mon Sep 17 00:00:00 2001
From: atm-florian <florian.mortgat@atm-consulting.fr>
Date: Wed, 15 Jun 2022 08:46:54 +0200
Subject: [PATCH 006/816] [minor] formatting issues

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index aa4d5947fbb..ecb45a33280 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -11117,7 +11117,7 @@ function dolForgeCriteriaCallback($matches)
  *
  * @param string $prefix Prefix used to build the date selector (for instance using Form::selectDate)
  * @param string $hourTime  'getpost' to include hour, minute, second values from the HTTP request, 'XX:YY:ZZ' to set
- *                             hour, minute, second respectively (for instance '23:59:59')
+ *                          hour, minute, second respectively (for instance '23:59:59')
  * @param string $gm Passed to dol_mktime
  * @return int|string  Date as a timestamp, '' or false if error
  */
@@ -11128,9 +11128,9 @@ function GETPOSTDATE($prefix, $hourTime = '', $gm = 'auto')
 		$minute = GETPOSTINT($prefix . 'minute');
 		$second = GETPOSTINT($prefix . 'second');
 	} elseif (preg_match('/^(\d\d):(\d\d):(\d\d)$/', $hourTime, $m)) {
-		$hour   = (int)$m[1];
-		$minute = (int)$m[2];
-		$second = (int)$m[3];
+		$hour   = intval($m[1]);
+		$minute = intval($m[2]);
+		$second = intval($m[3]);
 	} else {
 		$hour = $minute = $second = 0;
 	}

From 1414f72794c6850bb950f016b02f2559069d9e57 Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Wed, 13 Jul 2022 16:37:50 +0200
Subject: [PATCH 007/816] NEW color in action list

---
 htdocs/admin/agenda_other.php | 88 +++++++++++++++++++++++++++++++++--
 htdocs/comm/action/list.php   | 32 ++++++++++++-
 2 files changed, 116 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 1014d40de50..3f976efc784 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -53,6 +53,9 @@ $type = 'action';
  *	Actions
  */
 
+$error = 0;
+$errors = array();
+
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 $reg = array();
@@ -109,7 +112,36 @@ if ($action == 'set') {
 	} else {
 		setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 	}
-} elseif ($action == 'specimen') {  // For orders
+
+} elseif ($action == 'setcolors') {
+	$event_color = preg_replace('/[^0-9a-f#]/i', '', (string) GETPOST('event_past_color', 'alphanohtml'));
+	$res = dolibarr_set_const($db, 'AGENDA_EVENT_PAST_COLOR', $event_color, 'chaine', 0, '', $conf->entity);
+	if (!$res > 0) {
+		$error++;
+		$errors[] = $db->lasterror();
+	}
+
+	$event_color = preg_replace('/[^0-9a-f#]/i', '', (string) GETPOST('event_progress_color', 'alphanohtml'));
+	$res = dolibarr_set_const($db, 'AGENDA_EVENT_PROGRESS_COLOR', $event_color, 'chaine', 0, '', $conf->entity);
+	if (!$res > 0) {
+		$error++;
+		$errors[] = $db->lasterror();
+	}
+
+	$event_color = preg_replace('/[^0-9a-f#]/i', '', (string) GETPOST('event_future_color', 'alphanohtml'));
+	$res = dolibarr_set_const($db, 'AGENDA_EVENT_FUTURE_COLOR', $event_color, 'chaine', 0, '', $conf->entity);
+	if (!$res > 0) {
+		$error++;
+		$errors[] = $db->lasterror();
+	}
+
+	if ($error) {
+		setEventMessages('', $errors, 'errors');
+	} else {
+		setEventMessage($langs->trans('SetupSaved'));
+	}
+}
+elseif ($action == 'specimen') {  // For orders
 	$modele = GETPOST('module', 'alpha');
 
 	$commande = new CommandeFournisseur($db);
@@ -192,9 +224,10 @@ print dol_get_fiche_head($head, 'other', $langs->trans("Agenda"), -1, 'action');
 
 
 /*
- *  Documents models for supplier orders
+ *  Miscellaneous
  */
 
+print load_fiche_titre($langs->trans('Miscellaneous'), '', '');
 
 // Define array def of models
 $def = array();
@@ -394,7 +427,54 @@ print '</td></tr>'."\n";
 
 print '</table>';
 
-print dol_get_fiche_end();
+print $form->buttonsSaveCancel("Save", '');
+
+print '</form>';
+
+
+/*
+ * User interface (colors)
+ */
+
+print load_fiche_titre($langs->trans('UserInterface'), '', '');
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+$formother = new FormOther($db);
+
+print '<form action="'.$_SERVER["PHP_SELF"].'" name="form_colors">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="setcolors">';
+
+print '<table class="noborder allwidth">'."\n";
+print '<tr class="liste_titre">'."\n";
+print '<td>'.$langs->trans("Parameters").'</td>'."\n";
+print '<td class="center">&nbsp;</td>'."\n";
+print '<td class="right">'.$langs->trans("Value").'</td>'."\n";
+print '</tr>'."\n";
+
+// AGENDA_EVENT_PAST_COLOR
+print '<tr class="oddeven">'."\n";
+print '<td>'.$langs->trans('AGENDA_EVENT_PAST_COLOR').'</td>'."\n";
+print '<td class="center">&nbsp;</td>'."\n";
+print '<td class="right">'."\n";
+print $formother->selectColor($conf->global->AGENDA_EVENT_PAST_COLOR, 'event_past_color');
+print '</td></tr>'."\n";
+// AGENDA_EVENT_PROGRESS_COLOR
+print '<tr class="oddeven">'."\n";
+print '<td>'.$langs->trans('AGENDA_EVENT_PROGRESS_COLOR').'</td>'."\n";
+print '<td class="center">&nbsp;</td>'."\n";
+print '<td class="right">'."\n";
+print $formother->selectColor($conf->global->AGENDA_EVENT_PROGRESS_COLOR, 'event_progress_color');
+print '</td></tr>'."\n";
+// AGENDA_EVENT_FUTURE_COLOR
+print '<tr class="oddeven">'."\n";
+print '<td>'.$langs->trans('AGENDA_EVENT_FUTURE_COLOR').'</td>'."\n";
+print '<td class="center">&nbsp;</td>'."\n";
+print '<td class="right">'."\n";
+print $formother->selectColor($conf->global->AGENDA_EVENT_FUTURE_COLOR, 'event_future_color');
+print '</td></tr>'."\n";
+
+print '</table>';
 
 print $form->buttonsSaveCancel("Save", '');
 
@@ -402,6 +482,8 @@ print '</form>';
 
 print "<br>";
 
+print dol_get_fiche_end();
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index dd877e903e4..0dadd28ff9e 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -889,6 +889,7 @@ $i = 0;
 //$savnbfield = $totalarray['nbfield'];
 //$totalarray['nbfield'] = 0;
 $imaxinloop = ($limit ? min($num, $limit) : $num);
+$today_start_date_time = dol_now();
 while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
@@ -923,7 +924,36 @@ while ($i < $imaxinloop) {
 		$actionstatic->fetchResources();
 	}
 
-	print '<tr class="oddeven">';
+	// get event color
+	$event_color = '';
+	$event_more_class = '';
+	$event_start_date_time = $actionstatic->datep;
+	if ($obj->fulldayevent) {
+		$today_start_date_time = dol_mktime(0, 0, 0, date('m', $today_start_date_time), date('d', $today_start_date_time), date('Y', $today_start_date_time));
+	}
+	if ($event_start_date_time > $today_start_date_time) {
+		// future event
+		$event_color = $conf->global->AGENDA_EVENT_FUTURE_COLOR;
+		$event_more_class = 'event-future';
+	} else {
+		// check event end date
+		$event_end_date_time = $db->jdate($obj->dp2);
+		if ($event_end_date_time != null && $event_end_date_time < $today_start_date_time) {
+			// past event
+			$event_color = $conf->global->AGENDA_EVENT_PAST_COLOR;
+			$event_more_class = 'event-past';
+		} elseif ($event_end_date_time == null && $event_start_date_time < $today_start_date_time) {
+			// past event
+			$event_color = $conf->global->AGENDA_EVENT_PAST_COLOR;
+			$event_more_class = 'event-past';
+		} else {
+			// today event
+			$event_color = $conf->global->AGENDA_EVENT_PROGRESS_COLOR;
+			$event_more_class = 'event-progress';
+		}
+	}
+
+	print '<tr class="oddeven' . ($event_more_class != '' ? ' '.$event_more_class : '') . '"' . ($event_color != '' ? ' style="background: #'.$event_color.';"' : '') . '>';
 
 	// Ref
 	if (!empty($arrayfields['a.id']['checked'])) {

From cda6e9184df96afe1d4fb54beec9aae1ef12c5cc Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Wed, 13 Jul 2022 16:52:57 +0200
Subject: [PATCH 008/816] NEW color in action list and translated

---
 htdocs/admin/agenda_other.php | 10 +++++-----
 htdocs/comm/action/list.php   |  6 +++---
 htdocs/langs/en_US/admin.lang |  5 ++++-
 htdocs/langs/fr_FR/admin.lang |  5 ++++-
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 3f976efc784..08858252032 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -121,8 +121,8 @@ if ($action == 'set') {
 		$errors[] = $db->lasterror();
 	}
 
-	$event_color = preg_replace('/[^0-9a-f#]/i', '', (string) GETPOST('event_progress_color', 'alphanohtml'));
-	$res = dolibarr_set_const($db, 'AGENDA_EVENT_PROGRESS_COLOR', $event_color, 'chaine', 0, '', $conf->entity);
+	$event_color = preg_replace('/[^0-9a-f#]/i', '', (string) GETPOST('event_current_color', 'alphanohtml'));
+	$res = dolibarr_set_const($db, 'AGENDA_EVENT_CURRENT_COLOR', $event_color, 'chaine', 0, '', $conf->entity);
 	if (!$res > 0) {
 		$error++;
 		$errors[] = $db->lasterror();
@@ -459,12 +459,12 @@ print '<td class="center">&nbsp;</td>'."\n";
 print '<td class="right">'."\n";
 print $formother->selectColor($conf->global->AGENDA_EVENT_PAST_COLOR, 'event_past_color');
 print '</td></tr>'."\n";
-// AGENDA_EVENT_PROGRESS_COLOR
+// AGENDA_EVENT_CURRENT_COLOR
 print '<tr class="oddeven">'."\n";
-print '<td>'.$langs->trans('AGENDA_EVENT_PROGRESS_COLOR').'</td>'."\n";
+print '<td>'.$langs->trans('AGENDA_EVENT_CURRENT_COLOR').'</td>'."\n";
 print '<td class="center">&nbsp;</td>'."\n";
 print '<td class="right">'."\n";
-print $formother->selectColor($conf->global->AGENDA_EVENT_PROGRESS_COLOR, 'event_progress_color');
+print $formother->selectColor($conf->global->AGENDA_EVENT_CURRENT_COLOR, 'event_current_color');
 print '</td></tr>'."\n";
 // AGENDA_EVENT_FUTURE_COLOR
 print '<tr class="oddeven">'."\n";
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 0dadd28ff9e..ec42c0257af 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -947,9 +947,9 @@ while ($i < $imaxinloop) {
 			$event_color = $conf->global->AGENDA_EVENT_PAST_COLOR;
 			$event_more_class = 'event-past';
 		} else {
-			// today event
-			$event_color = $conf->global->AGENDA_EVENT_PROGRESS_COLOR;
-			$event_more_class = 'event-progress';
+			// current event
+			$event_color = $conf->global->AGENDA_EVENT_CURRENT_COLOR;
+			$event_more_class = 'event-current';
 		}
 	}
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 813c7a4faa0..07cd5da86a9 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1806,6 +1806,9 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
+AGENDA_EVENT_PAST_COLOR=Past event color
+AGENDA_EVENT_CURRENT_COLOR=Current event color
+AGENDA_EVENT_FUTURE_COLOR=Future event color
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -2284,4 +2287,4 @@ AlwaysEnabled=Always Enabled
 DoesNotWorkWithAllThemes=Will not work with all themes
 NoName=No name
 ShowAdvancedOptions= Show advanced options
-HideAdvancedoptions= Hide advanced options
\ No newline at end of file
+HideAdvancedoptions= Hide advanced options
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 3c653717801..8c9424546e9 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -1806,6 +1806,9 @@ AGENDA_USE_EVENT_TYPE=Utiliser les types d'événements (gérés dans le menu Co
 AGENDA_USE_EVENT_TYPE_DEFAULT=Configurez automatiquement cette valeur par défaut pour le type d'événement dans le formulaire de création d'événement.
 AGENDA_DEFAULT_FILTER_TYPE=Positionner automatiquement ce type d'événement dans le filtre de recherche de la vue agenda
 AGENDA_DEFAULT_FILTER_STATUS=Positionner automatiquement ce statut d'événement dans le filtre de recherche de la vue agenda
+AGENDA_EVENT_PAST_COLOR=Couleur de l'événement passé
+AGENDA_EVENT_CURRENT_COLOR=Couleur de l'événement en cours
+AGENDA_EVENT_FUTURE_COLOR=Couleur de l'événement futur
 AGENDA_DEFAULT_VIEW=Quel onglet voulez-vous voir ouvrir par défaut quand on choisit le menu Agenda
 AGENDA_REMINDER_BROWSER=Activer le rappel d'événement <b> sur le navigateur de l'utilisateur </b> (lorsque la date de l'événement est atteinte, une popup est affichée sur la navigateur. Chaque utilisateur peut désactiver de telles notification depuis la configuration des notifications de son navigateur)
 AGENDA_REMINDER_BROWSER_SOUND=Activer les notifications sonores.
@@ -2267,4 +2270,4 @@ DarkThemeMode=Mode thème sombre
 AlwaysDisabled=Toujours désactivé
 AccordingToBrowser=Selon le navigateur
 AlwaysEnabled=Toujours activé
-DoesNotWorkWithAllThemes=Ne fonctionne pas avec tous les thèmes
\ No newline at end of file
+DoesNotWorkWithAllThemes=Ne fonctionne pas avec tous les thèmes

From 0a82efce07b3d28a396995d25d5a2a32e3b8f0c3 Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Wed, 13 Jul 2022 17:30:08 +0200
Subject: [PATCH 009/816] FIX reload stickler-ci


From f69d5924498cc1e1eaed24f48eea42d39a1fb23f Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Wed, 13 Jul 2022 17:38:18 +0200
Subject: [PATCH 010/816] FIX stickler-ci

---
 htdocs/admin/agenda_other.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 08858252032..7c2c6640277 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -112,7 +112,6 @@ if ($action == 'set') {
 	} else {
 		setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 	}
-
 } elseif ($action == 'setcolors') {
 	$event_color = preg_replace('/[^0-9a-f#]/i', '', (string) GETPOST('event_past_color', 'alphanohtml'));
 	$res = dolibarr_set_const($db, 'AGENDA_EVENT_PAST_COLOR', $event_color, 'chaine', 0, '', $conf->entity);
@@ -140,8 +139,7 @@ if ($action == 'set') {
 	} else {
 		setEventMessage($langs->trans('SetupSaved'));
 	}
-}
-elseif ($action == 'specimen') {  // For orders
+} elseif ($action == 'specimen') {  // For orders
 	$modele = GETPOST('module', 'alpha');
 
 	$commande = new CommandeFournisseur($db);

From f40ab59b37df0a312a58608854fc654dc70ca042 Mon Sep 17 00:00:00 2001
From: GregM <gregory.maza@atm-consulting.fr>
Date: Tue, 19 Jul 2022 16:08:38 +0200
Subject: [PATCH 011/816] FIX contacts disabled are not returned on create
 invoice

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

diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index bb3f2ae035d..ce74f82b412 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -1776,10 +1776,13 @@ class Contact extends CommonObject
 		$sql = "SELECT sc.fk_socpeople as id, sc.fk_c_type_contact";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";
 		$sql .= ", ".MAIN_DB_PREFIX."societe_contacts sc";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."socpeople sp";
+		$sql .= " ON sc.fk_socpeople = sp.rowid";
 		$sql .= " WHERE sc.fk_soc =".((int) $this->socid);
 		$sql .= " AND sc.fk_c_type_contact=tc.rowid";
 		$sql .= " AND tc.element = '".$this->db->escape($element)."'";
 		$sql .= " AND tc.active = 1";
+		$sql .= " AND sp.statut = 1";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);

From 161958d34613d1bcc9ffb30f0f61b9ec440ac957 Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Thu, 21 Jul 2022 10:56:03 +0200
Subject: [PATCH 012/816] NEW color for start date and owner

---
 htdocs/comm/action/list.php | 48 +++++++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 12 deletions(-)

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index ec42c0257af..096771c9ea7 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -890,6 +890,7 @@ $i = 0;
 //$totalarray['nbfield'] = 0;
 $imaxinloop = ($limit ? min($num, $limit) : $num);
 $today_start_date_time = dol_now();
+$cache_user_list = array();
 while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
@@ -924,36 +925,54 @@ while ($i < $imaxinloop) {
 		$actionstatic->fetchResources();
 	}
 
-	// get event color
-	$event_color = '';
+	// cache of user list (owners)
+	if ($obj->fk_user_action > 0 && !isset($cache_user_list[$obj->fk_user_action])) {
+		$res = $userstatic->fetch($obj->fk_user_action);
+		if ($res > 0) {
+			$cache_user_list[$obj->fk_user_action] = $userstatic;
+		}
+	}
+
+	// get event style for user owner
+	$event_owner_style = '';
+	// We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
+	if ($cache_user_list[$obj->fk_user_action]->color != '') {
+		$event_owner_style .= 'border-left: #' . $cache_user_list[$obj->fk_user_action]->color . ' 5px solid;';
+	}
+
+	// get event style for start date
 	$event_more_class = '';
+	$event_start_date_style = '';
 	$event_start_date_time = $actionstatic->datep;
 	if ($obj->fulldayevent) {
 		$today_start_date_time = dol_mktime(0, 0, 0, date('m', $today_start_date_time), date('d', $today_start_date_time), date('Y', $today_start_date_time));
 	}
 	if ($event_start_date_time > $today_start_date_time) {
 		// future event
-		$event_color = $conf->global->AGENDA_EVENT_FUTURE_COLOR;
 		$event_more_class = 'event-future';
+		$event_start_date_color = $conf->global->AGENDA_EVENT_FUTURE_COLOR;
 	} else {
 		// check event end date
 		$event_end_date_time = $db->jdate($obj->dp2);
 		if ($event_end_date_time != null && $event_end_date_time < $today_start_date_time) {
 			// past event
-			$event_color = $conf->global->AGENDA_EVENT_PAST_COLOR;
 			$event_more_class = 'event-past';
+			$event_start_date_color = $conf->global->AGENDA_EVENT_PAST_COLOR;
 		} elseif ($event_end_date_time == null && $event_start_date_time < $today_start_date_time) {
 			// past event
-			$event_color = $conf->global->AGENDA_EVENT_PAST_COLOR;
 			$event_more_class = 'event-past';
+			$event_start_date_color = $conf->global->AGENDA_EVENT_PAST_COLOR;
 		} else {
 			// current event
-			$event_color = $conf->global->AGENDA_EVENT_CURRENT_COLOR;
 			$event_more_class = 'event-current';
+			$event_start_date_color = $conf->global->AGENDA_EVENT_CURRENT_COLOR;
 		}
 	}
+	if ($event_start_date_color != '') {
+		$event_start_date_style .= 'background: #' . $event_start_date_color . ';';
+	}
 
-	print '<tr class="oddeven' . ($event_more_class != '' ? ' '.$event_more_class : '') . '"' . ($event_color != '' ? ' style="background: #'.$event_color.';"' : '') . '>';
+	print '<tr class="oddeven' . ($event_more_class != '' ? ' '.$event_more_class : '') . '"' . '>';
 
 	// Ref
 	if (!empty($arrayfields['a.id']['checked'])) {
@@ -964,10 +983,15 @@ while ($i < $imaxinloop) {
 
 	// User owner
 	if (!empty($arrayfields['owner']['checked'])) {
-		print '<td class="tdoverflowmax150">'; // With edge and chrome the td overflow is not supported correctly when content is not full text.
-		if ($obj->fk_user_action > 0) {
-			$userstatic->fetch($obj->fk_user_action);
-			print $userstatic->getNomUrl(-1);
+		print '<td class="tdoverflowmax150"' . ($event_owner_style != '' ? ' style="'.$event_owner_style.'"' : '') . '>'; // With edge and chrome the td overflow is not supported correctly when content is not full text.
+		if ($obj->fk_user_action > 0 && !isset($cache_user_list[$obj->fk_user_action])) {
+			$res = $userstatic->fetch($obj->fk_user_action);
+			if ($res > 0) {
+				$cache_user_list[$obj->fk_user_action] = $userstatic;
+			}
+		}
+		if (isset($cache_user_list[$obj->fk_user_action])) {
+			print $cache_user_list[$obj->fk_user_action]->getNomUrl(-1);
 		} else {
 			print '&nbsp;';
 		}
@@ -1015,7 +1039,7 @@ while ($i < $imaxinloop) {
 
 	// Start date
 	if (!empty($arrayfields['a.datep']['checked'])) {
-		print '<td class="center nowraponall">';
+		print '<td class="center nowraponall"' . ($event_start_date_style != '' ? ' style="'.$event_start_date_style.'"' : '') . '>';
 		if (empty($obj->fulldayevent)) {
 			print dol_print_date($db->jdate($obj->dp), $formatToUse, 'tzuserrel');
 		} else {

From 993812dc70d6e96118326e283054f8014fca76ec Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Thu, 21 Jul 2022 11:22:53 +0200
Subject: [PATCH 013/816] FIX stickler-ci

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

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 096771c9ea7..627b1088afe 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -972,7 +972,7 @@ while ($i < $imaxinloop) {
 		$event_start_date_style .= 'background: #' . $event_start_date_color . ';';
 	}
 
-	print '<tr class="oddeven' . ($event_more_class != '' ? ' '.$event_more_class : '') . '"' . '>';
+	print '<tr class="oddeven' . ($event_more_class != '' ? ' '.$event_more_class : '') . '">';
 
 	// Ref
 	if (!empty($arrayfields['a.id']['checked'])) {

From 4d59fd2679a6854994a967924e17f9a7cadb5cae Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Tue, 26 Jul 2022 16:36:28 +0200
Subject: [PATCH 014/816] FIX reset today event time

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

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 627b1088afe..dba1adecf08 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -889,7 +889,6 @@ $i = 0;
 //$savnbfield = $totalarray['nbfield'];
 //$totalarray['nbfield'] = 0;
 $imaxinloop = ($limit ? min($num, $limit) : $num);
-$today_start_date_time = dol_now();
 $cache_user_list = array();
 while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
@@ -945,7 +944,9 @@ while ($i < $imaxinloop) {
 	$event_start_date_style = '';
 	$event_start_date_time = $actionstatic->datep;
 	if ($obj->fulldayevent) {
-		$today_start_date_time = dol_mktime(0, 0, 0, date('m', $today_start_date_time), date('d', $today_start_date_time), date('Y', $today_start_date_time));
+		$today_start_date_time = dol_mktime(0, 0, 0, date('m', $now), date('d', $now), date('Y', $now));
+	} else {
+		$today_start_date_time = $now;
 	}
 	if ($event_start_date_time > $today_start_date_time) {
 		// future event

From 62b70b37d353f3a4dc28a5636ecada25716afaab Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Wed, 27 Jul 2022 08:32:46 +0200
Subject: [PATCH 015/816] NEW set today start time at begining

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

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index dba1adecf08..674348d6158 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -877,6 +877,7 @@ print "</tr>\n";
 
 $now = dol_now();
 $delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;
+$today_start_time = dol_mktime(0, 0, 0, date('m', $now), date('d', $now), date('Y', $now));
 
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
 $caction = new CActionComm($db);
@@ -943,8 +944,8 @@ while ($i < $imaxinloop) {
 	$event_more_class = '';
 	$event_start_date_style = '';
 	$event_start_date_time = $actionstatic->datep;
-	if ($obj->fulldayevent) {
-		$today_start_date_time = dol_mktime(0, 0, 0, date('m', $now), date('d', $now), date('Y', $now));
+	if ($obj->fulldayevent == 1) {
+		$today_start_date_time = $today_start_time;
 	} else {
 		$today_start_date_time = $now;
 	}

From 7a8006c0a0f02941a286301ac4129c54f0e90ac2 Mon Sep 17 00:00:00 2001
From: BB2A Anthony Berton <bertonanthony@gmail.com>
Date: Wed, 27 Jul 2022 14:40:45 +0200
Subject: [PATCH 016/816] init

---
 htdocs/commande/list.php       | 179 ++++++++++++++++++++++++++++++++-
 htdocs/langs/en_US/orders.lang |   1 +
 2 files changed, 179 insertions(+), 1 deletion(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 264613ac597..00470b13afc 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -71,6 +71,15 @@ $search_dateorder_end = dol_mktime(23, 59, 59, GETPOST('search_dateorder_end_mon
 $search_datedelivery_start = dol_mktime(0, 0, 0, GETPOST('search_datedelivery_start_month', 'int'), GETPOST('search_datedelivery_start_day', 'int'), GETPOST('search_datedelivery_start_year', 'int'));
 $search_datedelivery_end = dol_mktime(23, 59, 59, GETPOST('search_datedelivery_end_month', 'int'), GETPOST('search_datedelivery_end_day', 'int'), GETPOST('search_datedelivery_end_year', 'int'));
 $search_product_category = GETPOST('search_product_category', 'int');
+/*
+// Détail commande
+*/
+$search_refProduct = GETPOST('search_refProduct', 'alpha');
+$search_descProduct = GETPOST('search_descProduct', 'alpha');
+$check_orderdetail = GETPOST('check_orderdetail', 'alpha');
+/*
+// Détail commande fin
+*/
 $search_ref = GETPOST('search_ref', 'alpha') != '' ?GETPOST('search_ref', 'alpha') : GETPOST('sref', 'alpha');
 $search_ref_customer = GETPOST('search_ref_customer', 'alpha');
 $search_company = GETPOST('search_company', 'alpha');
@@ -204,6 +213,17 @@ $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)
 );
+/*
+	// Détail commande fin
+	*/
+if (!empty($check_orderdetail)) {
+	$arrayfields['cdet.qty'] = array('label'=>'QtyOrdered', 'checked'=>1, 'position'=>1);
+	$arrayfields['pr.desc'] = array('label'=>'ProductDescription', 'checked'=>1, 'position'=>1);
+	$arrayfields['pr.ref'] = array('label'=>'ProductRef', 'checked'=>1, 'position'=>1);
+}
+	/*
+	// Détail commande fin
+	*/
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
@@ -789,6 +809,16 @@ $sql .= ' p.rowid as project_id, p.ref as project_ref, p.title as project_label,
 $sql .= ' u.login, u.lastname, u.firstname, u.email as user_email, u.statut as user_statut, u.entity, u.photo, u.office_phone, u.office_fax, u.user_mobile, u.job, u.gender,';
 $sql .= ' c.fk_cond_reglement,c.deposit_percent,c.fk_mode_reglement,c.fk_shipping_method,';
 $sql .= ' c.fk_input_reason, c.import_key';
+/*
+// Détail commande
+*/
+if (!empty($check_orderdetail)) {
+	$sql .= ', cdet.description, cdet.qty, ';
+	$sql .= ' pr.rowid as product_rowid, pr.ref as product_ref, pr.label as product_label, pr.barcode as product_barcode, pr.tobatch as product_batch, pr.tosell as product_status, pr.tobuy as product_status_buy';
+}
+/*
+// Détail commande fin
+*/
 if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
 	$sql .= ", cc.fk_categorie, cc.fk_soc";
 }
@@ -809,7 +839,19 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid =
 if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
 }
-$sql .= ', '.MAIN_DB_PREFIX.'commande as c';
+/*
+// Détail commande
+*/
+if (!empty($check_orderdetail)) {
+	$sql .= ', '.MAIN_DB_PREFIX.'commandedet as cdet';
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commande as c ON cdet.fk_commande=c.rowid';
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as pr ON pr.rowid=cdet.fk_product';
+} else {
+	$sql .= ', '.MAIN_DB_PREFIX.'commande as c';
+}
+/*
+// Détail commande fin
+*/
 if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_extrafields as ef on (c.rowid = ef.fk_object)";
 }
@@ -1310,6 +1352,13 @@ if ($resql) {
 		print '</div>';
 		print '<br>';
 	}
+	/*
+	// Détail commande
+	*/
+	print '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_orderdetail" name="check_orderdetail" class="check_orderdetail"'.($check_orderdetail ? ' checked' : '').'><label for="check_orderdetail"> <span class="check_orderdetail_text">'.$langs->trans("OrderShowDetail").'</span></label> &nbsp; </div>';
+	/*
+	// Détail commande fin
+	*/
 
 	if ($sall) {
 		foreach ($fieldstosearchall as $key => $val) {
@@ -1391,6 +1440,27 @@ if ($resql) {
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre_filter">';
+	/*
+	// Détail commande
+	*/
+	if (!empty($arrayfields['pr.ref']['checked'])) {
+		print '<td class="liste_titre">';
+		print '<input class="flat" size="6" type="text" name="search_refProduct" value="'.dol_escape_htmltag($search_refProduct).'">';
+		print '</td>';
+	}
+	// Product Description
+	if (!empty($arrayfields['pr.desc']['checked'])) {
+		print '<td class="liste_titre">';
+		print '<input class="flat" size="6" type="text" name="search_descProduct" value="'.dol_escape_htmltag($search_descProduct).'">';
+		print '</td>';
+	}
+	// Product QtyOrdered
+	if (!empty($arrayfields['cdet.qty']['checked'])) {
+		print '<td class="liste_titre"></td>';
+	}
+	/*
+	// Détail commande fin
+	*/
 	// Ref
 	if (!empty($arrayfields['c.ref']['checked'])) {
 		print '<td class="liste_titre">';
@@ -1652,6 +1722,22 @@ if ($resql) {
 
 	// Fields title
 	print '<tr class="liste_titre">';
+
+	/*
+	// Détail commande
+	*/
+	if (!empty($arrayfields['pr.ref']['checked'])) {
+		print_liste_field_titre($arrayfields['pr.ref']['label'], $_SERVER["PHP_SELF"], 'pr.ref', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['pr.desc']['checked'])) {
+		print_liste_field_titre($arrayfields['pr.desc']['label'], $_SERVER["PHP_SELF"], 'pr.desc', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['cdet.qty']['checked'])) {
+		print_liste_field_titre($arrayfields['cdet.qty']['label'], $_SERVER["PHP_SELF"], 'cdet.qty', '', $param, '', $sortfield, $sortorder);
+	}
+	/*
+	// Détail commande fin
+	*/
 	if (!empty($arrayfields['c.ref']['checked'])) {
 		print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], 'c.ref', '', $param, '', $sortfield, $sortorder);
 	}
@@ -1820,6 +1906,14 @@ if ($resql) {
 	}
 	$total_ht = 0;
 	$total_margin = 0;
+	/*
+	// Détail commande
+	*/
+	$totalqty = 0;
+	/*
+	// Détail commande fin
+	*/
+
 
 	$imaxinloop = ($limit ? min($num, $limit) : $num);
 	$last_num = min($num, $limit);
@@ -1872,9 +1966,92 @@ if ($resql) {
 			$total_ht += $obj->total_ht;
 			$total_margin += $marginInfo['total_margin'];
 		}
+		/*
+		// Détail commande
+		*//*
+		if (isset($refpre) && $obj->product_ref != $refpre) {
+			print '<tr class="liste_total">';
+			$i = 0;
+			// var_dump($totalarray);
+			while ($i < $totalarray['nbfield']) {
+				$i++;
+				if (!empty($totalarray['pos'][$i]) && $totalarray['pos'][$i] == 'cdet.qty') {
+					print '<td class="nowrap tdoverflowmax200">'.$totalqty.'</td>';
+				} elseif ($i == 1) {
+					print '<td>';
+					if (is_object($form)) {
+						print $form->textwithpicto($langs->trans("Total"), $langs->transnoentitiesnoconv("Totalforthispage"));
+					} else {
+						print $langs->trans("Totalforthispage");
+					}
+					print '</td>';
+				} else {
+					print '<td></td>';
+				}
+			}
+			print '</tr>';
+			$totalqty = $obj->qty;
+			//include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+		} else {
+			$totalqty = $totalqty + $obj->qty;
+		}
+		$refpre = isset($obj->product_ref) ? $obj->product_ref : '';
+		/*
+		// Détail commande fin
+		*/
 
 		print '<tr class="oddeven">';
 
+		/*
+		// Détail commande
+		*/
+		// Product Ref
+		if (!empty($arrayfields['pr.ref']['checked'])) {
+			if (!empty($obj->product_rowid)) {
+				$generic_product->id = $obj->product_rowid;
+				$generic_product->ref = $obj->product_ref;
+				$generic_product->label = $obj->product_label;
+				$generic_product->status = $obj->product_status;
+				$generic_product->status_buy = $obj->product_status_buy;
+				$generic_product->status_batch = $obj->product_batch;
+				$generic_product->barcode = $obj->product_barcode;
+				print '<td class="nowrap tdoverflowmax200">'.$generic_product->getNomUrl(1).'</td>';
+			} else {
+				print '<td class="nowrap tdoverflowmax200">Ligne libre</td>';
+			}
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Product Description
+		if (!empty($arrayfields['pr.desc']['checked'])) {
+			// print '<td class="nowrap tdoverflowmax200">'.$obj->description.'</td>';
+			!empty($obj->product_label) ? $labelproduct = $obj->product_label : $labelproduct = $obj->description;
+			print '<td class="nowrap tdoverflowmax200">'.dol_escape_htmltag($labelproduct).'</td>';
+
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Product QtyOrdered
+		if (!empty($arrayfields['cdet.qty']['checked'])) {
+			print '<td class="nowrap tdoverflowmax200">'.$obj->qty.'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'cdet.qty';
+			}
+			if (isset($totalarray['val']['cdet.qty'])) {
+				$totalarray['val']['cdet.qty'] += $obj->qty;
+			} else {
+				$totalarray['val']['cdet.qty'] = $obj->qty;
+			}
+		}
+		/*
+		// Détail commande fin
+		*/
 		// Ref
 		if (!empty($arrayfields['c.ref']['checked'])) {
 			print '<td class="nowraponall">';
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index a4261f8e62c..acb880fa4f3 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -130,6 +130,7 @@ SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Other orders
 SupplierOrderValidatedAndApproved=Supplier order is validated and approved : %s
 SupplierOrderValidated=Supplier order is validated : %s
+OrderShowDetail=Show order detail
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up sales order
 TypeContact_commande_internal_SHIPPING=Representative following-up shipping

From 0e796a2a02a3a4ff21ac30db67cdaf1c45d016f9 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Wed, 27 Jul 2022 15:35:35 +0200
Subject: [PATCH 017/816] Clean

---
 htdocs/commande/list.php | 97 ++++++----------------------------------
 1 file changed, 14 insertions(+), 83 deletions(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index c58cc12a21c..00e87be1411 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2016-2021  Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2018       Charlene Benke	        <charlie@patas-monkey.com>
- * Copyright (C) 2021	   	Anthony Berton			<anthony.berton@bb2a.fr>
+ * Copyright (C) 2021-2022 	Anthony Berton			<anthony.berton@bb2a.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -71,15 +71,12 @@ $search_dateorder_end = dol_mktime(23, 59, 59, GETPOST('search_dateorder_end_mon
 $search_datedelivery_start = dol_mktime(0, 0, 0, GETPOST('search_datedelivery_start_month', 'int'), GETPOST('search_datedelivery_start_day', 'int'), GETPOST('search_datedelivery_start_year', 'int'));
 $search_datedelivery_end = dol_mktime(23, 59, 59, GETPOST('search_datedelivery_end_month', 'int'), GETPOST('search_datedelivery_end_day', 'int'), GETPOST('search_datedelivery_end_year', 'int'));
 $search_product_category = GETPOST('search_product_category', 'int');
-/*
+
 // Détail commande
-*/
 $search_refProduct = GETPOST('search_refProduct', 'alpha');
 $search_descProduct = GETPOST('search_descProduct', 'alpha');
 $check_orderdetail = GETPOST('check_orderdetail', 'alpha');
-/*
-// Détail commande fin
-*/
+
 $search_ref = GETPOST('search_ref', 'alpha') != '' ?GETPOST('search_ref', 'alpha') : GETPOST('sref', 'alpha');
 $search_ref_customer = GETPOST('search_ref_customer', 'alpha');
 $search_company = GETPOST('search_company', 'alpha');
@@ -213,17 +210,14 @@ $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)
 );
-/*
-	// Détail commande fin
-	*/
+
+// Détail commande
 if (!empty($check_orderdetail)) {
 	$arrayfields['cdet.qty'] = array('label'=>'QtyOrdered', 'checked'=>1, 'position'=>1);
 	$arrayfields['pr.desc'] = array('label'=>'ProductDescription', 'checked'=>1, 'position'=>1);
 	$arrayfields['pr.ref'] = array('label'=>'ProductRef', 'checked'=>1, 'position'=>1);
 }
-	/*
-	// Détail commande fin
-	*/
+
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
@@ -812,16 +806,13 @@ $sql .= ' p.rowid as project_id, p.ref as project_ref, p.title as project_label,
 $sql .= ' u.login, u.lastname, u.firstname, u.email as user_email, u.statut as user_statut, u.entity, u.photo, u.office_phone, u.office_fax, u.user_mobile, u.job, u.gender,';
 $sql .= ' c.fk_cond_reglement,c.deposit_percent,c.fk_mode_reglement,c.fk_shipping_method,';
 $sql .= ' c.fk_input_reason, c.import_key';
-/*
+
 // Détail commande
-*/
 if (!empty($check_orderdetail)) {
 	$sql .= ', cdet.description, cdet.qty, ';
 	$sql .= ' pr.rowid as product_rowid, pr.ref as product_ref, pr.label as product_label, pr.barcode as product_barcode, pr.tobatch as product_batch, pr.tosell as product_status, pr.tobuy as product_status_buy';
 }
-/*
-// Détail commande fin
-*/
+
 if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
 	$sql .= ", cc.fk_categorie, cc.fk_soc";
 }
@@ -842,9 +833,8 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid =
 if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
 }
-/*
+
 // Détail commande
-*/
 if (!empty($check_orderdetail)) {
 	$sql .= ', '.MAIN_DB_PREFIX.'commandedet as cdet';
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commande as c ON cdet.fk_commande=c.rowid';
@@ -852,9 +842,7 @@ if (!empty($check_orderdetail)) {
 } else {
 	$sql .= ', '.MAIN_DB_PREFIX.'commande as c';
 }
-/*
-// Détail commande fin
-*/
+
 if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_extrafields as ef on (c.rowid = ef.fk_object)";
 }
@@ -1355,13 +1343,10 @@ if ($resql) {
 		print '</div>';
 		print '<br>';
 	}
-	/*
+	
 	// Détail commande
-	*/
 	print '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_orderdetail" name="check_orderdetail" class="check_orderdetail"'.($check_orderdetail ? ' checked' : '').'><label for="check_orderdetail"> <span class="check_orderdetail_text">'.$langs->trans("OrderShowDetail").'</span></label> &nbsp; </div>';
-	/*
-	// Détail commande fin
-	*/
+
 
 	if ($sall) {
 		foreach ($fieldstosearchall as $key => $val) {
@@ -1444,9 +1429,7 @@ if ($resql) {
 
 	print '<tr class="liste_titre_filter">';
 
-	/*
-	// Détail commande
-	*/
+// Détail commande
 	if (!empty($arrayfields['pr.ref']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input class="flat" size="6" type="text" name="search_refProduct" value="'.dol_escape_htmltag($search_refProduct).'">';
@@ -1462,9 +1445,6 @@ if ($resql) {
 	if (!empty($arrayfields['cdet.qty']['checked'])) {
 		print '<td class="liste_titre"></td>';
 	}
-	/*
-	// Détail commande fin
-	*/
 
 	// Action column
 	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
@@ -1737,9 +1717,7 @@ if ($resql) {
 	// Fields title
 	print '<tr class="liste_titre">';
 
-	/*
 	// Détail commande
-	*/
 	if (!empty($arrayfields['pr.ref']['checked'])) {
 		print_liste_field_titre($arrayfields['pr.ref']['label'], $_SERVER["PHP_SELF"], 'pr.ref', '', $param, '', $sortfield, $sortorder);
 	}
@@ -1749,9 +1727,6 @@ if ($resql) {
 	if (!empty($arrayfields['cdet.qty']['checked'])) {
 		print_liste_field_titre($arrayfields['cdet.qty']['label'], $_SERVER["PHP_SELF"], 'cdet.qty', '', $param, '', $sortfield, $sortorder);
 	}
-	/*
-	// Détail commande fin
-	*/
 
 	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
 		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ');
@@ -1927,14 +1902,9 @@ if ($resql) {
 	}
 	$total_ht = 0;
 	$total_margin = 0;
-	/*
+	
 	// Détail commande
-	*/
 	$totalqty = 0;
-	/*
-	// Détail commande fin
-	*/
-
 
 	$imaxinloop = ($limit ? min($num, $limit) : $num);
 	$last_num = min($num, $limit);
@@ -1987,46 +1957,10 @@ if ($resql) {
 			$total_ht += $obj->total_ht;
 			$total_margin += $marginInfo['total_margin'];
 		}
-		/*
-		// Détail commande
-		*//*
-		if (isset($refpre) && $obj->product_ref != $refpre) {
-			print '<tr class="liste_total">';
-			$i = 0;
-			// var_dump($totalarray);
-			while ($i < $totalarray['nbfield']) {
-				$i++;
-				if (!empty($totalarray['pos'][$i]) && $totalarray['pos'][$i] == 'cdet.qty') {
-					print '<td class="nowrap tdoverflowmax200">'.$totalqty.'</td>';
-				} elseif ($i == 1) {
-					print '<td>';
-					if (is_object($form)) {
-						print $form->textwithpicto($langs->trans("Total"), $langs->transnoentitiesnoconv("Totalforthispage"));
-					} else {
-						print $langs->trans("Totalforthispage");
-					}
-					print '</td>';
-				} else {
-					print '<td></td>';
-				}
-			}
-			print '</tr>';
-			$totalqty = $obj->qty;
-			//include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
-
-		} else {
-			$totalqty = $totalqty + $obj->qty;
-		}
-		$refpre = isset($obj->product_ref) ? $obj->product_ref : '';
-		/*
-		// Détail commande fin
-		*/
 
 		print '<tr class="oddeven">';
 
-		/*
 		// Détail commande
-		*/
 		// Product Ref
 		if (!empty($arrayfields['pr.ref']['checked'])) {
 			if (!empty($obj->product_rowid)) {
@@ -2070,9 +2004,6 @@ if ($resql) {
 				$totalarray['val']['cdet.qty'] = $obj->qty;
 			}
 		}
-		/*
-		// Détail commande fin
-		*/
 
 		// Action column
 		if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {

From 887d30e1b46b72c54972d84f205ea76716a51021 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Wed, 27 Jul 2022 16:01:45 +0200
Subject: [PATCH 018/816] Add option ORDER_ADD_OPTION_SHOW_DETAIL_LIST

---
 htdocs/commande/list.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 00e87be1411..02ac878ecee 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1345,8 +1345,9 @@ if ($resql) {
 	}
 	
 	// Détail commande
-	print '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_orderdetail" name="check_orderdetail" class="check_orderdetail"'.($check_orderdetail ? ' checked' : '').'><label for="check_orderdetail"> <span class="check_orderdetail_text">'.$langs->trans("OrderShowDetail").'</span></label> &nbsp; </div>';
-
+	if (!empty($conf->global->ORDER_ADD_OPTION_SHOW_DETAIL_LIST)){
+		print '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_orderdetail" name="check_orderdetail" class="check_orderdetail"'.($check_orderdetail ? ' checked' : '').'><label for="check_orderdetail"> <span class="check_orderdetail_text">'.$langs->trans("OrderShowDetail").'</span></label> &nbsp; </div>';
+	}
 
 	if ($sall) {
 		foreach ($fieldstosearchall as $key => $val) {
@@ -1429,7 +1430,7 @@ if ($resql) {
 
 	print '<tr class="liste_titre_filter">';
 
-// Détail commande
+	// Détail commande
 	if (!empty($arrayfields['pr.ref']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input class="flat" size="6" type="text" name="search_refProduct" value="'.dol_escape_htmltag($search_refProduct).'">';

From 7df1f876f51aca06b1e747abb0bf05c2b8ed2095 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Wed, 27 Jul 2022 16:02:27 +0200
Subject: [PATCH 019/816] Add removefilter

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

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 02ac878ecee..b6490def16a 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -253,6 +253,8 @@ if (empty($reshook)) {
 		$search_user = '';
 		$search_sale = '';
 		$search_product_category = '';
+		$search_refProduct = '';
+		$search_descProduct = '';
 		$search_ref = '';
 		$search_ref_customer = '';
 		$search_company = '';

From 5f3dc1b01fd1a4526b6b04f5588a3643d1d95f30 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Wed, 27 Jul 2022 16:11:16 +0200
Subject: [PATCH 020/816] Add search in sql

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

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index b6490def16a..882c56ca033 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -882,6 +882,13 @@ if ($socid > 0) {
 if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
+if ($search_refProduct) {
+	$sql .= natural_search('pr.ref', $search_refProduct);
+}
+if ($search_descProduct) {
+	$sql .= natural_search('pr.label', $search_descProduct);
+	$sql .= natural_search('cdet.description', $search_descProduct);
+}
 if ($search_ref) {
 	$sql .= natural_search('c.ref', $search_ref);
 }

From 7740c81f3b55fff507b733c6daa32cc71962f1be Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 27 Jul 2022 14:38:59 +0000
Subject: [PATCH 021/816] Fixing style errors.

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

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 882c56ca033..1c5499e6e8c 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1352,9 +1352,9 @@ if ($resql) {
 		print '</div>';
 		print '<br>';
 	}
-	
+
 	// Détail commande
-	if (!empty($conf->global->ORDER_ADD_OPTION_SHOW_DETAIL_LIST)){
+	if (!empty($conf->global->ORDER_ADD_OPTION_SHOW_DETAIL_LIST)) {
 		print '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_orderdetail" name="check_orderdetail" class="check_orderdetail"'.($check_orderdetail ? ' checked' : '').'><label for="check_orderdetail"> <span class="check_orderdetail_text">'.$langs->trans("OrderShowDetail").'</span></label> &nbsp; </div>';
 	}
 
@@ -1912,7 +1912,7 @@ if ($resql) {
 	}
 	$total_ht = 0;
 	$total_margin = 0;
-	
+
 	// Détail commande
 	$totalqty = 0;
 

From 716adb103fc7a67a1ad18f7b5b883b09215eb4ab Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Wed, 27 Jul 2022 16:52:48 +0200
Subject: [PATCH 022/816] FIX - Error with MAIN_CHECKBOX_LEFT_COLUMN

---
 htdocs/commande/list.php | 49 ++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 882c56ca033..a8d96597cc7 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1439,6 +1439,14 @@ if ($resql) {
 
 	print '<tr class="liste_titre_filter">';
 
+	// Action column
+	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print '<td class="liste_titre" align="middle">';
+		$searchpicto = $form->showFilterButtons('left');
+		print $searchpicto;
+		print '</td>';
+	}
+
 	// Détail commande
 	if (!empty($arrayfields['pr.ref']['checked'])) {
 		print '<td class="liste_titre">';
@@ -1456,14 +1464,6 @@ if ($resql) {
 		print '<td class="liste_titre"></td>';
 	}
 
-	// Action column
-	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
-		print '<td class="liste_titre" align="middle">';
-		$searchpicto = $form->showFilterButtons('left');
-		print $searchpicto;
-		print '</td>';
-	}
-
 	// Ref
 	if (!empty($arrayfields['c.ref']['checked'])) {
 		print '<td class="liste_titre">';
@@ -1727,8 +1727,13 @@ if ($resql) {
 	// Fields title
 	print '<tr class="liste_titre">';
 
+	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ');
+	}
+
 	// Détail commande
 	if (!empty($arrayfields['pr.ref']['checked'])) {
+		var_dump($_SERVER["PHP_SELF"]);
 		print_liste_field_titre($arrayfields['pr.ref']['label'], $_SERVER["PHP_SELF"], 'pr.ref', '', $param, '', $sortfield, $sortorder);
 	}
 	if (!empty($arrayfields['pr.desc']['checked'])) {
@@ -1738,10 +1743,6 @@ if ($resql) {
 		print_liste_field_titre($arrayfields['cdet.qty']['label'], $_SERVER["PHP_SELF"], 'cdet.qty', '', $param, '', $sortfield, $sortorder);
 	}
 
-	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
-		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ');
-	}
-
 	if (!empty($arrayfields['c.ref']['checked'])) {
 		print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], 'c.ref', '', $param, '', $sortfield, $sortorder);
 	}
@@ -1970,6 +1971,18 @@ if ($resql) {
 
 		print '<tr class="oddeven">';
 
+		// Action column
+		if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($obj->rowid, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+		}
+
 		// Détail commande
 		// Product Ref
 		if (!empty($arrayfields['pr.ref']['checked'])) {
@@ -2015,18 +2028,6 @@ if ($resql) {
 			}
 		}
 
-		// Action column
-		if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
-			print '<td class="nowrap center">';
-			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-				$selected = 0;
-				if (in_array($obj->rowid, $arrayofselected)) {
-					$selected = 1;
-				}
-				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
-			}
-		}
-
 		// Ref
 		if (!empty($arrayfields['c.ref']['checked'])) {
 			print '<td class="nowraponall">';

From 8dfb4288ecb950004147bc2c47f12f42bbcd262f Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Wed, 27 Jul 2022 17:27:05 +0200
Subject: [PATCH 023/816] Clean

---
 htdocs/commande/list.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 47d139c696a..ac1885b03af 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1733,7 +1733,6 @@ if ($resql) {
 
 	// Détail commande
 	if (!empty($arrayfields['pr.ref']['checked'])) {
-		var_dump($_SERVER["PHP_SELF"]);
 		print_liste_field_titre($arrayfields['pr.ref']['label'], $_SERVER["PHP_SELF"], 'pr.ref', '', $param, '', $sortfield, $sortorder);
 	}
 	if (!empty($arrayfields['pr.desc']['checked'])) {

From 1769530cfd5837fb4b163197d742ba8ce15bbe99 Mon Sep 17 00:00:00 2001
From: Antonio <antonio.hurtado1993@gmail.com>
Date: Sat, 30 Jul 2022 12:12:19 -0500
Subject: [PATCH 024/816]  agregar un mensaje de error traducido al espanol

---
 htdocs/public/error-401.php | 5 +++++
 htdocs/public/error-404.php | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/htdocs/public/error-401.php b/htdocs/public/error-401.php
index 3d453cd30e5..a160535ff10 100644
--- a/htdocs/public/error-401.php
+++ b/htdocs/public/error-401.php
@@ -20,6 +20,11 @@
 	<br>
 	Sorry. You are not allowed to access this resource.
 
+	<br>
+	<br>
+	
+	No esta autorizado para acceder a este recurso.
+
 	<br>
 	<?php print isset($_SERVER["HTTP_REFERER"]) ? 'You come from '.htmlentities($_SERVER["HTTP_REFERER"], ENT_COMPAT, 'UTF-8').'.' : ''; ?>
 
diff --git a/htdocs/public/error-404.php b/htdocs/public/error-404.php
index c964e49cd85..84832100026 100644
--- a/htdocs/public/error-404.php
+++ b/htdocs/public/error-404.php
@@ -20,6 +20,10 @@
 	<br>
 	You requested a website or a page that does not exists.
 
+	<br>
+	<br>
+	la pagina o el recurso solicitado no existe.
+
 	<br>
 	<?php print isset($_SERVER["HTTP_REFERER"]) ? 'You come from '.htmlentities($_SERVER["HTTP_REFERER"], ENT_COMPAT, 'UTF-8').'.' : ''; ?>
 

From dac8613c396edb0f815ee9794469300c96d92abe Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Tue, 23 Aug 2022 10:46:09 +0200
Subject: [PATCH 025/816] Add new file

---
 htdocs/commande/list.php      |   96 +-
 htdocs/commande/list_line.php | 2660 +++++++++++++++++++++++++++++++++
 2 files changed, 2671 insertions(+), 85 deletions(-)
 create mode 100644 htdocs/commande/list_line.php

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index ac1885b03af..1b74238db1c 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2016-2021  Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2018       Charlene Benke	        <charlie@patas-monkey.com>
- * Copyright (C) 2021-2022 	Anthony Berton			<anthony.berton@bb2a.fr>
+ * Copyright (C) 2021		Anthony Berton			<anthony.berton@bb2a.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -72,10 +72,7 @@ $search_datedelivery_start = dol_mktime(0, 0, 0, GETPOST('search_datedelivery_st
 $search_datedelivery_end = dol_mktime(23, 59, 59, GETPOST('search_datedelivery_end_month', 'int'), GETPOST('search_datedelivery_end_day', 'int'), GETPOST('search_datedelivery_end_year', 'int'));
 $search_product_category = GETPOST('search_product_category', 'int');
 
-// Détail commande
-$search_refProduct = GETPOST('search_refProduct', 'alpha');
-$search_descProduct = GETPOST('search_descProduct', 'alpha');
-$check_orderdetail = GETPOST('check_orderdetail', 'alpha');
+
 
 $search_ref = GETPOST('search_ref', 'alpha') != '' ?GETPOST('search_ref', 'alpha') : GETPOST('sref', 'alpha');
 $search_ref_customer = GETPOST('search_ref_customer', 'alpha');
@@ -211,12 +208,7 @@ $arrayfields = array(
 	'c.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000)
 );
 
-// Détail commande
-if (!empty($check_orderdetail)) {
-	$arrayfields['cdet.qty'] = array('label'=>'QtyOrdered', 'checked'=>1, 'position'=>1);
-	$arrayfields['pr.desc'] = array('label'=>'ProductDescription', 'checked'=>1, 'position'=>1);
-	$arrayfields['pr.ref'] = array('label'=>'ProductRef', 'checked'=>1, 'position'=>1);
-}
+
 
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -809,11 +801,7 @@ $sql .= ' u.login, u.lastname, u.firstname, u.email as user_email, u.statut as u
 $sql .= ' c.fk_cond_reglement,c.deposit_percent,c.fk_mode_reglement,c.fk_shipping_method,';
 $sql .= ' c.fk_input_reason, c.import_key';
 
-// Détail commande
-if (!empty($check_orderdetail)) {
-	$sql .= ', cdet.description, cdet.qty, ';
-	$sql .= ' pr.rowid as product_rowid, pr.ref as product_ref, pr.label as product_label, pr.barcode as product_barcode, pr.tobatch as product_batch, pr.tosell as product_status, pr.tobuy as product_status_buy';
-}
+
 
 if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
 	$sql .= ", cc.fk_categorie, cc.fk_soc";
@@ -836,14 +824,9 @@ if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
 }
 
-// Détail commande
-if (!empty($check_orderdetail)) {
-	$sql .= ', '.MAIN_DB_PREFIX.'commandedet as cdet';
-	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commande as c ON cdet.fk_commande=c.rowid';
-	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as pr ON pr.rowid=cdet.fk_product';
-} else {
-	$sql .= ', '.MAIN_DB_PREFIX.'commande as c';
-}
+
+$sql .= ', '.MAIN_DB_PREFIX.'commande as c';
+
 
 if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_extrafields as ef on (c.rowid = ef.fk_object)";
@@ -1353,10 +1336,7 @@ if ($resql) {
 		print '<br>';
 	}
 
-	// Détail commande
-	if (!empty($conf->global->ORDER_ADD_OPTION_SHOW_DETAIL_LIST)) {
-		print '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_orderdetail" name="check_orderdetail" class="check_orderdetail"'.($check_orderdetail ? ' checked' : '').'><label for="check_orderdetail"> <span class="check_orderdetail_text">'.$langs->trans("OrderShowDetail").'</span></label> &nbsp; </div>';
-	}
+
 
 	if ($sall) {
 		foreach ($fieldstosearchall as $key => $val) {
@@ -1447,12 +1427,7 @@ if ($resql) {
 		print '</td>';
 	}
 
-	// Détail commande
-	if (!empty($arrayfields['pr.ref']['checked'])) {
-		print '<td class="liste_titre">';
-		print '<input class="flat" size="6" type="text" name="search_refProduct" value="'.dol_escape_htmltag($search_refProduct).'">';
-		print '</td>';
-	}
+
 	// Product Description
 	if (!empty($arrayfields['pr.desc']['checked'])) {
 		print '<td class="liste_titre">';
@@ -1731,10 +1706,7 @@ if ($resql) {
 		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ');
 	}
 
-	// Détail commande
-	if (!empty($arrayfields['pr.ref']['checked'])) {
-		print_liste_field_titre($arrayfields['pr.ref']['label'], $_SERVER["PHP_SELF"], 'pr.ref', '', $param, '', $sortfield, $sortorder);
-	}
+
 	if (!empty($arrayfields['pr.desc']['checked'])) {
 		print_liste_field_titre($arrayfields['pr.desc']['label'], $_SERVER["PHP_SELF"], 'pr.desc', '', $param, '', $sortfield, $sortorder);
 	}
@@ -1913,8 +1885,7 @@ if ($resql) {
 	$total_ht = 0;
 	$total_margin = 0;
 
-	// Détail commande
-	$totalqty = 0;
+
 
 	$imaxinloop = ($limit ? min($num, $limit) : $num);
 	$last_num = min($num, $limit);
@@ -1982,51 +1953,6 @@ if ($resql) {
 			}
 		}
 
-		// Détail commande
-		// Product Ref
-		if (!empty($arrayfields['pr.ref']['checked'])) {
-			if (!empty($obj->product_rowid)) {
-				$generic_product->id = $obj->product_rowid;
-				$generic_product->ref = $obj->product_ref;
-				$generic_product->label = $obj->product_label;
-				$generic_product->status = $obj->product_status;
-				$generic_product->status_buy = $obj->product_status_buy;
-				$generic_product->status_batch = $obj->product_batch;
-				$generic_product->barcode = $obj->product_barcode;
-				print '<td class="nowrap tdoverflowmax200">'.$generic_product->getNomUrl(1).'</td>';
-			} else {
-				print '<td class="nowrap tdoverflowmax200">Ligne libre</td>';
-			}
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Product Description
-		if (!empty($arrayfields['pr.desc']['checked'])) {
-			// print '<td class="nowrap tdoverflowmax200">'.$obj->description.'</td>';
-			!empty($obj->product_label) ? $labelproduct = $obj->product_label : $labelproduct = $obj->description;
-			print '<td class="nowrap tdoverflowmax200">'.dol_escape_htmltag($labelproduct).'</td>';
-
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Product QtyOrdered
-		if (!empty($arrayfields['cdet.qty']['checked'])) {
-			print '<td class="nowrap tdoverflowmax200">'.$obj->qty.'</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'cdet.qty';
-			}
-			if (isset($totalarray['val']['cdet.qty'])) {
-				$totalarray['val']['cdet.qty'] += $obj->qty;
-			} else {
-				$totalarray['val']['cdet.qty'] = $obj->qty;
-			}
-		}
-
 		// Ref
 		if (!empty($arrayfields['c.ref']['checked'])) {
 			print '<td class="nowraponall">';
diff --git a/htdocs/commande/list_line.php b/htdocs/commande/list_line.php
new file mode 100644
index 00000000000..ac1885b03af
--- /dev/null
+++ b/htdocs/commande/list_line.php
@@ -0,0 +1,2660 @@
+<?php
+/* Copyright (C) 2001-2005  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2019  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005       Marc Barilley / Ocebo   <marc@ocebo.com>
+ * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2012       Juanjo Menent           <jmenent@2byte.es>
+ * Copyright (C) 2013       Christophe Battarel     <christophe.battarel@altairis.fr>
+ * Copyright (C) 2013       Cédric Salvador         <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2015-2018  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
+ * Copyright (C) 2016-2021  Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2018       Charlene Benke	        <charlie@patas-monkey.com>
+ * Copyright (C) 2021-2022 	Anthony Berton			<anthony.berton@bb2a.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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/commande/list.php
+ *	\ingroup    commande
+ *	\brief      Page to list orders
+ */
+
+require '../main.inc.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/class/discount.class.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)) {
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php';
+}
+require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("orders", 'sendings', 'deliveries', 'companies', 'compta', 'bills', 'stocks', 'products'));
+
+$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') : 'orderlist';
+
+$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'));
+}
+$search_datecloture_end = GETPOST('search_datecloture_end', 'int');
+if (empty($search_datecloture_end)) {
+	$search_datecloture_end = dol_mktime(23, 59, 59, GETPOST('search_datecloture_endmonth', 'int'), GETPOST('search_datecloture_endday', 'int'), GETPOST('search_datecloture_endyear', 'int'));
+}
+$search_dateorder_start = dol_mktime(0, 0, 0, GETPOST('search_dateorder_start_month', 'int'), GETPOST('search_dateorder_start_day', 'int'), GETPOST('search_dateorder_start_year', 'int'));
+$search_dateorder_end = dol_mktime(23, 59, 59, GETPOST('search_dateorder_end_month', 'int'), GETPOST('search_dateorder_end_day', 'int'), GETPOST('search_dateorder_end_year', 'int'));
+$search_datedelivery_start = dol_mktime(0, 0, 0, GETPOST('search_datedelivery_start_month', 'int'), GETPOST('search_datedelivery_start_day', 'int'), GETPOST('search_datedelivery_start_year', 'int'));
+$search_datedelivery_end = dol_mktime(23, 59, 59, GETPOST('search_datedelivery_end_month', 'int'), GETPOST('search_datedelivery_end_day', 'int'), GETPOST('search_datedelivery_end_year', 'int'));
+$search_product_category = GETPOST('search_product_category', 'int');
+
+// Détail commande
+$search_refProduct = GETPOST('search_refProduct', 'alpha');
+$search_descProduct = GETPOST('search_descProduct', 'alpha');
+$check_orderdetail = GETPOST('check_orderdetail', 'alpha');
+
+$search_ref = GETPOST('search_ref', 'alpha') != '' ?GETPOST('search_ref', 'alpha') : GETPOST('sref', 'alpha');
+$search_ref_customer = GETPOST('search_ref_customer', 'alpha');
+$search_company = GETPOST('search_company', 'alpha');
+$search_company_alias = GETPOST('search_company_alias', 'alpha');
+$search_town = GETPOST('search_town', 'alpha');
+$search_zip = GETPOST('search_zip', 'alpha');
+$search_state = GETPOST("search_state", 'alpha');
+$search_country = GETPOST("search_country", 'int');
+$search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
+$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$socid = GETPOST('socid', 'int');
+$search_user = GETPOST('search_user', 'int');
+$search_sale = GETPOST('search_sale', 'int');
+$search_total_ht = GETPOST('search_total_ht', 'alpha');
+$search_total_vat = GETPOST('search_total_vat', 'alpha');
+$search_total_ttc = GETPOST('search_total_ttc', 'alpha');
+$search_warehouse = GETPOST('search_warehouse', 'int');
+$search_multicurrency_code = GETPOST('search_multicurrency_code', 'alpha');
+$search_multicurrency_tx = GETPOST('search_multicurrency_tx', 'alpha');
+$search_multicurrency_montant_ht = GETPOST('search_multicurrency_montant_ht', 'alpha');
+$search_multicurrency_montant_vat = GETPOST('search_multicurrency_montant_vat', 'alpha');
+$search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha');
+$search_login = GETPOST('search_login', 'alpha');
+$search_categ_cus = GETPOST("search_categ_cus", 'int');
+$optioncss = GETPOST('optioncss', 'alpha');
+$search_billed = GETPOSTISSET('search_billed') ? GETPOST('search_billed', 'int') : GETPOST('billed', 'int');
+$search_status = GETPOST('search_status', 'int');
+$search_btn = GETPOST('button_search', 'alpha');
+$search_remove_btn = GETPOST('button_removefilter', 'alpha');
+$search_project_ref = GETPOST('search_project_ref', 'alpha');
+$search_project = GETPOST('search_project', 'alpha');
+$search_shippable = GETPOST('search_shippable', 'aZ09');
+$search_fk_cond_reglement = GETPOST("search_fk_cond_reglement", 'int');
+$search_fk_shipping_method = GETPOST("search_fk_shipping_method", 'int');
+$search_fk_mode_reglement = GETPOST("search_fk_mode_reglement", 'int');
+$search_fk_input_reason = GETPOST("search_fk_input_reason", 'int');
+
+// Security check
+$id = (GETPOST('orderid') ?GETPOST('orderid', 'int') : GETPOST('id', 'int'));
+if ($user->socid) {
+	$socid = $user->socid;
+}
+$result = restrictedArea($user, 'commande', $id, '');
+
+$diroutputmassaction = $conf->commande->multidir_output[$conf->entity].'/temp/massgeneration/'.$user->id;
+
+// Load variable for pagination
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1 or if we click on clear filters
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortfield) {
+	$sortfield = 'c.ref';
+}
+if (!$sortorder) {
+	$sortorder = 'DESC';
+}
+
+$show_shippable_command = GETPOST('show_shippable_command', 'aZ09');
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$object = new Commande($db);
+$hookmanager->initHooks(array('orderlist'));
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array(
+	'c.ref'=>'Ref',
+	'c.ref_client'=>'RefCustomerOrder',
+	'pd.description'=>'Description',
+	's.nom'=>"ThirdParty",
+	's.name_alias'=>"AliasNameShort",
+	's.zip'=>"Zip",
+	's.town'=>"Town",
+	'c.note_public'=>'NotePublic',
+);
+if (empty($user->socid)) {
+	$fieldstosearchall["c.note_private"] = "NotePrivate";
+}
+
+$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),
+	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1, 'position'=>30),
+	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>-1, 'position'=>31),
+	's.town'=>array('label'=>"Town", 'checked'=>-1, 'position'=>35),
+	's.zip'=>array('label'=>"Zip", 'checked'=>-1, 'position'=>40),
+	'state.nom'=>array('label'=>"StateShort", 'checked'=>0, 'position'=>45),
+	'country.code_iso'=>array('label'=>"Country", 'checked'=>0, 'position'=>50),
+	'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers, 'position'=>55),
+	'c.date_commande'=>array('label'=>"OrderDateShort", 'checked'=>1, 'position'=>60),
+	'c.date_delivery'=>array('label'=>"DateDeliveryPlanned", 'checked'=>1, 'enabled'=>empty($conf->global->ORDER_DISABLE_DELIVERY_DATE), 'position'=>65),
+	'c.fk_shipping_method'=>array('label'=>"SendingMethod", 'checked'=>-1, 'position'=>66 , 'enabled'=>!empty($conf->expedition->enabled)),
+	'c.fk_cond_reglement'=>array('label'=>"PaymentConditionsShort", 'checked'=>-1, 'position'=>67),
+	'c.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>-1, 'position'=>68),
+	'c.fk_input_reason'=>array('label'=>"Channel", 'checked'=>-1, 'position'=>69),
+	'c.total_ht'=>array('label'=>"AmountHT", 'checked'=>1, 'position'=>75),
+	'c.total_vat'=>array('label'=>"AmountVAT", 'checked'=>0, 'position'=>80),
+	'c.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0, 'position'=>85),
+	'c.multicurrency_code'=>array('label'=>'Currency', 'checked'=>0, 'enabled'=>(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),
+	'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)),
+	'total_margin' => array('label' => 'Margin', 'checked' => 0, 'position' => 301, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous ? 0 : 1)),
+	'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous || empty($conf->global->DISPLAY_MARGIN_RATES) ? 0 : 1)),
+	'total_mark_rate' => array('label' => 'MarkRate', 'checked' => 0, 'position' => 303, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous || empty($conf->global->DISPLAY_MARK_RATES) ? 0 : 1)),
+	'c.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>120),
+	'c.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>125),
+	'c.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>130),
+	'c.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PUBLIC_NOTES)), 'position'=>135),
+	'c.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PRIVATE_NOTES)), 'position'=>140),
+	'shippable'=>array('label'=>"Shippable", 'checked'=>1,'enabled'=>(!empty($conf->expedition->enabled)), 'position'=>990),
+	'c.facture'=>array('label'=>"Billed", 'checked'=>1, 'enabled'=>(empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)), 'position'=>995),
+	'c.import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>999),
+	'c.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000)
+);
+
+// Détail commande
+if (!empty($check_orderdetail)) {
+	$arrayfields['cdet.qty'] = array('label'=>'QtyOrdered', 'checked'=>1, 'position'=>1);
+	$arrayfields['pr.desc'] = array('label'=>'ProductDescription', 'checked'=>1, 'position'=>1);
+	$arrayfields['pr.ref'] = array('label'=>'ProductRef', 'checked'=>1, 'position'=>1);
+}
+
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
+$object->fields = dol_sort_array($object->fields, 'position');
+$arrayfields = dol_sort_array($arrayfields, 'position');
+
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') {
+	$massaction = '';
+}
+
+$parameters = array('socid'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+if (empty($reshook)) {
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+		$search_categ = '';
+		$search_user = '';
+		$search_sale = '';
+		$search_product_category = '';
+		$search_refProduct = '';
+		$search_descProduct = '';
+		$search_ref = '';
+		$search_ref_customer = '';
+		$search_company = '';
+		$search_company_alias = '';
+		$search_town = '';
+		$search_zip = "";
+		$search_state = "";
+		$search_type = '';
+		$search_country = '';
+		$search_type_thirdparty = '';
+		$search_total_ht = '';
+		$search_total_vat = '';
+		$search_total_ttc = '';
+		$search_warehouse = '';
+		$search_multicurrency_code = '';
+		$search_multicurrency_tx = '';
+		$search_multicurrency_montant_ht = '';
+		$search_multicurrency_montant_vat = '';
+		$search_multicurrency_montant_ttc = '';
+		$search_login = '';
+		$search_dateorder_start = '';
+		$search_dateorder_end = '';
+		$search_datedelivery_start = '';
+		$search_datedelivery_end = '';
+		$search_project_ref = '';
+		$search_project = '';
+		$search_status = '';
+		$search_billed = '';
+		$toselect = array();
+		$search_array_options = array();
+		$search_categ_cus = 0;
+		$search_datecloture_start = '';
+		$search_datecloture_end = '';
+		$search_fk_cond_reglement = '';
+		$search_fk_shipping_method = '';
+		$search_fk_mode_reglement = '';
+		$search_fk_input_reason = '';
+	}
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
+	 || GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
+	}
+
+	// Mass actions
+	$objectclass = 'Commande';
+	$objectlabel = 'Orders';
+	$permissiontoread = $user->rights->commande->lire;
+	$permissiontoadd = $user->rights->commande->creer;
+	$permissiontodelete = $user->rights->commande->supprimer;
+	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+		$permissiontovalidate = $user->rights->commande->order_advance->validate;
+		$permissiontoclose = $user->rights->commande->order_advance->close;
+		$permissiontocancel = $user->rights->commande->order_advance->annuler;
+		$permissiontosendbymail = $user->rights->commande->order_advance->send;
+	} else {
+		$permissiontovalidate = $user->rights->commande->creer;
+		$permissiontoclose = $user->rights->commande->creer;
+		$permissiontocancel = $user->rights->commande->creer;
+		$permissiontosendbymail = $user->rights->commande->creer;
+	}
+	$uploaddir = $conf->commande->multidir_output[$conf->entity];
+	$triggersendname = 'ORDER_SENTBYMAIL';
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+
+	if ($massaction == 'confirm_createbills') {   // Create bills from orders.
+		$orders = GETPOST('toselect', 'array');
+		$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
+		$validate_invoices = GETPOST('validate_invoices', 'int');
+
+		$errors = array();
+
+		$TFact = array();
+		$TFactThird = array();
+		$TFactThirdNbLines = array();
+
+		$nb_bills_created = 0;
+		$lastid= 0;
+		$lastref = '';
+
+		$db->begin();
+
+		$nbOrders = is_array($orders) ? count($orders) : 1;
+
+		foreach ($orders as $id_order) {
+			$cmd = new Commande($db);
+			if ($cmd->fetch($id_order) <= 0) {
+				continue;
+			}
+			$cmd->fetch_thirdparty();
+
+			$objecttmp = new Facture($db);
+			if (!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) {
+				// If option "one bill per third" is set, and an invoice for this thirdparty was already created, we re-use it.
+				$objecttmp = $TFactThird[$cmd->socid];
+			} else {
+				// If we want one invoice per order or if there is no first invoice yet for this thirdparty.
+				$objecttmp->socid = $cmd->socid;
+				$objecttmp->thirdparty = $cmd->thirdparty;
+
+				$objecttmp->type = $objecttmp::TYPE_STANDARD;
+				$objecttmp->cond_reglement_id = !empty($cmd->cond_reglement_id) ? $cmd->cond_reglement_id : $cmd->thirdparty->cond_reglement_id;
+				$objecttmp->mode_reglement_id = !empty($cmd->mode_reglement_id) ? $cmd->mode_reglement_id : $cmd->thirdparty->mode_reglement_id;
+
+				$objecttmp->fk_project = $cmd->fk_project;
+				$objecttmp->multicurrency_code = $cmd->multicurrency_code;
+				if (empty($createbills_onebythird)) {
+					$objecttmp->ref_client = $cmd->ref_client;
+				}
+
+				$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+				if (empty($datefacture)) {
+					$datefacture = dol_now();
+				}
+
+				$objecttmp->date = $datefacture;
+				$objecttmp->origin    = 'commande';
+				$objecttmp->origin_id = $id_order;
+
+				$objecttmp->array_options = $cmd->array_options; // Copy extrafields
+
+				$res = $objecttmp->create($user);
+
+				if ($res > 0) {
+					$nb_bills_created++;
+					$lastref = $objecttmp->ref;
+					$lastid = $objecttmp->id;
+
+					$TFactThird[$cmd->socid] = $objecttmp;
+					$TFactThirdNbLines[$cmd->socid] = 0; //init nblines to have lines ordered by expedition and rang
+				} else {
+					$langs->load("errors");
+					$errors[] = $cmd->ref.' : '.$langs->trans($objecttmp->errors[0]);
+					$error++;
+				}
+			}
+
+			if ($objecttmp->id > 0) {
+				$res = $objecttmp->add_object_linked($objecttmp->origin, $id_order);
+
+				if ($res == 0) {
+					$errors[] = $cmd->ref.' : '.$langs->trans($objecttmp->errors[0]);
+					$error++;
+				}
+
+				if (!$error) {
+					$lines = $cmd->lines;
+					if (empty($lines) && method_exists($cmd, 'fetch_lines')) {
+						$cmd->fetch_lines();
+						$lines = $cmd->lines;
+					}
+
+					$fk_parent_line = 0;
+					$num = count($lines);
+
+					for ($i = 0; $i < $num; $i++) {
+						$desc = ($lines[$i]->desc ? $lines[$i]->desc : '');
+						// If we build one invoice for several orders, we must put the ref of order on the invoice line
+						if (!empty($createbills_onebythird)) {
+							$desc = dol_concatdesc($desc, $langs->trans("Order").' '.$cmd->ref.' - '.dol_print_date($cmd->date, 'day'));
+						}
+
+						if ($lines[$i]->subprice < 0) {
+							// Negative line, we create a discount line
+							$discount = new DiscountAbsolute($db);
+							$discount->fk_soc = $objecttmp->socid;
+							$discount->amount_ht = abs($lines[$i]->total_ht);
+							$discount->amount_tva = abs($lines[$i]->total_tva);
+							$discount->amount_ttc = abs($lines[$i]->total_ttc);
+							$discount->tva_tx = $lines[$i]->tva_tx;
+							$discount->fk_user = $user->id;
+							$discount->description = $desc;
+							$discountid = $discount->create($user);
+							if ($discountid > 0) {
+								$result = $objecttmp->insert_discount($discountid);
+								//$result=$discount->link_to_invoice($lineid,$id);
+							} else {
+								setEventMessages($discount->error, $discount->errors, 'errors');
+								$error++;
+								break;
+							}
+						} else {
+							// Positive line
+							$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
+							// Date start
+							$date_start = false;
+							if ($lines[$i]->date_debut_prevue) {
+								$date_start = $lines[$i]->date_debut_prevue;
+							}
+							if ($lines[$i]->date_debut_reel) {
+								$date_start = $lines[$i]->date_debut_reel;
+							}
+							if ($lines[$i]->date_start) {
+								$date_start = $lines[$i]->date_start;
+							}
+							//Date end
+							$date_end = false;
+							if ($lines[$i]->date_fin_prevue) {
+								$date_end = $lines[$i]->date_fin_prevue;
+							}
+							if ($lines[$i]->date_fin_reel) {
+								$date_end = $lines[$i]->date_fin_reel;
+							}
+							if ($lines[$i]->date_end) {
+								$date_end = $lines[$i]->date_end;
+							}
+							// Reset fk_parent_line for no child products and special product
+							if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9) {
+								$fk_parent_line = 0;
+							}
+
+							// Extrafields
+							if (method_exists($lines[$i], 'fetch_optionals')) {
+								$lines[$i]->fetch_optionals();
+								$array_options = $lines[$i]->array_options;
+							}
+
+							$objecttmp->context['createfromclone'];
+
+							$rang = ($nbOrders > 1) ? -1 : $lines[$i]->rang;
+							//there may already be rows from previous orders
+							if (!empty($createbills_onebythird)) {
+								$rang = $TFactThirdNbLines[$cmd->socid];
+							}
+
+							$result = $objecttmp->addline(
+								$desc,
+								$lines[$i]->subprice,
+								$lines[$i]->qty,
+								$lines[$i]->tva_tx,
+								$lines[$i]->localtax1_tx,
+								$lines[$i]->localtax2_tx,
+								$lines[$i]->fk_product,
+								$lines[$i]->remise_percent,
+								$date_start,
+								$date_end,
+								0,
+								$lines[$i]->info_bits,
+								$lines[$i]->fk_remise_except,
+								'HT',
+								0,
+								$product_type,
+								$rang,
+								$lines[$i]->special_code,
+								$objecttmp->origin,
+								$lines[$i]->rowid,
+								$fk_parent_line,
+								$lines[$i]->fk_fournprice,
+								$lines[$i]->pa_ht,
+								$lines[$i]->label,
+								$array_options,
+								100,
+								0,
+								$lines[$i]->fk_unit
+							);
+							if ($result > 0) {
+								$lineid = $result;
+								if (!empty($createbills_onebythird)) //increment rang to keep order
+									$TFactThirdNbLines[$rcp->socid]++;
+							} else {
+								$lineid = 0;
+								$error++;
+								break;
+							}
+							// Defined the new fk_parent_line
+							if ($result > 0 && $lines[$i]->product_type == 9) {
+								$fk_parent_line = $result;
+							}
+						}
+					}
+				}
+			}
+
+			//$cmd->classifyBilled($user);        // Disabled. This behavior must be set or not using the workflow module.
+
+			if (!empty($createbills_onebythird) && empty($TFactThird[$cmd->socid])) {
+				$TFactThird[$cmd->socid] = $objecttmp;
+			} else {
+				$TFact[$objecttmp->id] = $objecttmp;
+			}
+		}
+
+		// Build doc with all invoices
+		$TAllFact = empty($createbills_onebythird) ? $TFact : $TFactThird;
+		$toselect = array();
+
+		if (!$error && $validate_invoices) {
+			$massaction = $action = 'builddoc';
+
+			foreach ($TAllFact as &$objecttmp) {
+				$result = $objecttmp->validate($user);
+				if ($result <= 0) {
+					$error++;
+					setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+					break;
+				}
+
+				$id = $objecttmp->id; // For builddoc action
+
+				// Builddoc
+				$donotredirect = 1;
+				$upload_dir = $conf->facture->dir_output;
+				$permissiontoadd = $user->rights->facture->creer;
+
+				// Call action to build doc
+				$savobject = $object;
+				$object = $objecttmp;
+				include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+				$object = $savobject;
+			}
+
+			$massaction = $action = 'confirm_createbills';
+		}
+
+		if (!$error) {
+			$db->commit();
+
+			if ($nb_bills_created == 1) {
+				$texttoshow = $langs->trans('BillXCreated', '{s1}');
+				$texttoshow = str_replace('{s1}', '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?id='.urlencode($lastid).'">'.$lastref.'</a>', $texttoshow);
+				setEventMessages($texttoshow, null, 'mesgs');
+			} else {
+				setEventMessages($langs->trans('BillCreated', $nb_bills_created), null, 'mesgs');
+			}
+
+			// Make a redirect to avoid to bill twice if we make a refresh or back
+			$param = '';
+			if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+				$param .= '&contextpage='.urlencode($contextpage);
+			}
+			if ($limit > 0 && $limit != $conf->liste_limit) {
+				$param .= '&limit='.urlencode($limit);
+			}
+			if ($sall) {
+				$param .= '&sall='.urlencode($sall);
+			}
+			if ($socid > 0) {
+				$param .= '&socid='.urlencode($socid);
+			}
+			if ($search_status != '') {
+				$param .= '&search_status='.urlencode($search_status);
+			}
+			if ($search_orderday) {
+				$param .= '&search_orderday='.urlencode($search_orderday);
+			}
+			if ($search_ordermonth) {
+				$param .= '&search_ordermonth='.urlencode($search_ordermonth);
+			}
+			if ($search_orderyear) {
+				$param .= '&search_orderyear='.urlencode($search_orderyear);
+			}
+			if ($search_deliveryday) {
+				$param .= '&search_deliveryday='.urlencode($search_deliveryday);
+			}
+			if ($search_deliverymonth) {
+				$param .= '&search_deliverymonth='.urlencode($search_deliverymonth);
+			}
+			if ($search_deliveryyear) {
+				$param .= '&search_deliveryyear='.urlencode($search_deliveryyear);
+			}
+			if ($search_ref) {
+				$param .= '&search_ref='.urlencode($search_ref);
+			}
+			if ($search_company) {
+				$param .= '&search_company='.urlencode($search_company);
+			}
+			if ($search_ref_customer) {
+				$param .= '&search_ref_customer='.urlencode($search_ref_customer);
+			}
+			if ($search_user > 0) {
+				$param .= '&search_user='.urlencode($search_user);
+			}
+			if ($search_sale > 0) {
+				$param .= '&search_sale='.urlencode($search_sale);
+			}
+			if ($search_total_ht != '') {
+				$param .= '&search_total_ht='.urlencode($search_total_ht);
+			}
+			if ($search_total_vat != '') {
+				$param .= '&search_total_vat='.urlencode($search_total_vat);
+			}
+			if ($search_total_ttc != '') {
+				$param .= '&search_total_ttc='.urlencode($search_total_ttc);
+			}
+			if ($search_project_ref >= 0) {
+				$param .= "&search_project_ref=".urlencode($search_project_ref);
+			}
+			if ($show_files) {
+				$param .= '&show_files='.urlencode($show_files);
+			}
+			if ($optioncss != '') {
+				$param .= '&optioncss='.urlencode($optioncss);
+			}
+			if ($billed != '') {
+				$param .= '&billed='.urlencode($billed);
+			}
+
+			header("Location: ".$_SERVER['PHP_SELF'].'?'.$param);
+			exit;
+		} else {
+			$db->rollback();
+
+			$action = 'create';
+			$_GET["origin"] = $_POST["origin"];
+			$_GET["originid"] = $_POST["originid"];
+			if (!empty($errors)) {
+				setEventMessages(null, $errors, 'errors');
+			} else {
+				setEventMessages("Error", null, 'errors');
+			}
+			$error++;
+		}
+	}
+}
+if ($action == 'validate' && $permissiontoadd) {
+	if (GETPOST('confirm') == 'yes') {
+		$objecttmp = new $objectclass($db);
+		$db->begin();
+		$error = 0;
+		foreach ($toselect as $checked) {
+			if ($objecttmp->fetch($checked)) {
+				if ($objecttmp->statut == 0) {
+					if (!empty($objecttmp->fk_warehouse)) {
+						$idwarehouse = $objecttmp->fk_warehouse;
+					} else {
+						$idwarehouse = 0;
+					}
+					if ($objecttmp->valid($user, $idwarehouse)) {
+						setEventMessage($langs->trans('hasBeenValidated', $objecttmp->ref), 'mesgs');
+					} else {
+						setEventMessage($objecttmp->error, $objecttmp->errors, 'errors');
+						$error++;
+					}
+				} else {
+					$langs->load("errors");
+					setEventMessage($langs->trans('ErrorIsNotADraft', $objecttmp->ref), 'errors');
+					$error++;
+				}
+			} else {
+				dol_print_error($db);
+				$error++;
+			}
+		}
+		if ($error) {
+			$db->rollback();
+		} else {
+			$db->commit();
+		}
+	}
+}
+if ($action == 'shipped' && $permissiontoadd) {
+	if (GETPOST('confirm') == 'yes') {
+		$objecttmp = new $objectclass($db);
+		$db->begin();
+		$error = 0;
+		foreach ($toselect as $checked) {
+			if ($objecttmp->fetch($checked)) {
+				if ($objecttmp->statut == 1 || $objecttmp->statut == 2) {
+					if ($objecttmp->cloture($user)) {
+						setEventMessage($langs->trans('PassedInClosedStatus', $objecttmp->ref), 'mesgs');
+					} else {
+						setEventMessage($langs->trans('CantBeClosed'), 'errors');
+						$error++;
+					}
+				} else {
+					$langs->load("errors");
+					setEventMessage($langs->trans('ErrorIsNotADraft', $objecttmp->ref), 'errors');
+					$error++;
+				}
+			} else {
+				dol_print_error($db);
+				$error++;
+			}
+		}
+		if ($error) {
+			$db->rollback();
+		} else {
+			$db->commit();
+		}
+	}
+}
+// Closed records
+if (!$error && $massaction === 'setbilled' && $permissiontoclose) {
+	$db->begin();
+
+	$objecttmp = new $objectclass($db);
+	$nbok = 0;
+	foreach ($toselect as $toselectid) {
+		$result = $objecttmp->fetch($toselectid);
+		if ($result > 0) {
+			$result = $objecttmp->classifyBilled($user, 0);
+			if ($result <= 0) {
+				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+				$error++;
+				break;
+			} else {
+				$nbok++;
+			}
+		} else {
+			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+			$error++;
+			break;
+		}
+	}
+
+	if (!$error) {
+		if ($nbok > 1) {
+			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+		}
+		$db->commit();
+	} else {
+		$db->rollback();
+	}
+}
+
+/*
+ * View
+ */
+
+$now = dol_now();
+
+$form = new Form($db);
+$formother = new FormOther($db);
+$formfile = new FormFile($db);
+$formmargin = null;
+if (!empty($conf->margin->enabled)) {
+	$formmargin = new FormMargin($db);
+}
+$companystatic = new Societe($db);
+$formcompany = new FormCompany($db);
+$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) {
+	$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 .= " typent.code as typent_code,";
+$sql .= " state.code_departement as state_code, state.nom as state_name,";
+$sql .= " country.code as country_code,";
+$sql .= ' c.rowid, c.ref, c.total_ht, c.total_tva, c.total_ttc, c.ref_client, c.fk_user_author,';
+$sql .= ' c.fk_multicurrency, c.multicurrency_code, c.multicurrency_tx, c.multicurrency_total_ht, c.multicurrency_total_tva as multicurrency_total_vat, c.multicurrency_total_ttc,';
+$sql .= ' c.date_valid, c.date_commande, c.note_public, c.note_private, c.date_livraison as date_delivery, c.fk_statut, c.facture as billed,';
+$sql .= ' c.date_creation as date_creation, c.tms as date_update, c.date_cloture as date_cloture,';
+$sql .= ' p.rowid as project_id, p.ref as project_ref, p.title as project_label,';
+$sql .= ' u.login, u.lastname, u.firstname, u.email as user_email, u.statut as user_statut, u.entity, u.photo, u.office_phone, u.office_fax, u.user_mobile, u.job, u.gender,';
+$sql .= ' c.fk_cond_reglement,c.deposit_percent,c.fk_mode_reglement,c.fk_shipping_method,';
+$sql .= ' c.fk_input_reason, c.import_key';
+
+// Détail commande
+if (!empty($check_orderdetail)) {
+	$sql .= ', cdet.description, cdet.qty, ';
+	$sql .= ' pr.rowid as product_rowid, pr.ref as product_ref, pr.label as product_label, pr.barcode as product_barcode, pr.tobatch as product_batch, pr.tosell as product_status, pr.tobuy as product_status_buy';
+}
+
+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
+$sql .= $hookmanager->resPrint;
+$sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
+if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
+}
+
+// Détail commande
+if (!empty($check_orderdetail)) {
+	$sql .= ', '.MAIN_DB_PREFIX.'commandedet as cdet';
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commande as c ON cdet.fk_commande=c.rowid';
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as pr ON pr.rowid=cdet.fk_product';
+} else {
+	$sql .= ', '.MAIN_DB_PREFIX.'commande as c';
+}
+
+if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_extrafields as ef on (c.rowid = ef.fk_object)";
+}
+if ($sall || $search_product_category > 0) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commandedet as pd ON c.rowid=pd.fk_commande';
+}
+if ($search_product_category > 0) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
+}
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = c.fk_projet";
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON c.fk_user_author = u.rowid';
+
+// We'll need this table joined to the select in order to filter by sale
+if ($search_sale > 0 || (empty($user->rights->societe->client->voir) && !$socid)) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
+if ($search_user > 0) {
+	$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
+	$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
+}
+
+// Add table from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+
+$sql .= ' WHERE c.fk_soc = s.rowid';
+$sql .= ' AND c.entity IN ('.getEntity('commande').')';
+if ($search_product_category > 0) {
+	$sql .= " AND cp.fk_categorie = ".((int) $search_product_category);
+}
+if ($socid > 0) {
+	$sql .= ' AND s.rowid = '.((int) $socid);
+}
+if (empty($user->rights->societe->client->voir) && !$socid) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
+}
+if ($search_refProduct) {
+	$sql .= natural_search('pr.ref', $search_refProduct);
+}
+if ($search_descProduct) {
+	$sql .= natural_search('pr.label', $search_descProduct);
+	$sql .= natural_search('cdet.description', $search_descProduct);
+}
+if ($search_ref) {
+	$sql .= natural_search('c.ref', $search_ref);
+}
+if ($search_ref_customer) {
+	$sql .= natural_search('c.ref_client', $search_ref_customer);
+}
+if ($sall) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
+}
+if ($search_billed != '' && $search_billed >= 0) {
+	$sql .= ' AND c.facture = '.((int) $search_billed);
+}
+if ($search_status <> '') {
+	if ($search_status <= 3 && $search_status >= -1) {	// status from -1 to 3 are real status (other are virtual combination)
+		if ($search_status == 1 && empty($conf->expedition->enabled)) {
+			$sql .= ' AND c.fk_statut IN (1,2)'; // If module expedition disabled, we include order with status 'sending in process' into 'validated'
+		} else {
+			$sql .= ' AND c.fk_statut = '.((int) $search_status); // brouillon, validee, en cours, annulee
+		}
+	}
+	if ($search_status == -2) {	// To process
+		//$sql.= ' AND c.fk_statut IN (1,2,3) AND c.facture = 0';
+		$sql .= " AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))"; // If status is 2 and facture=1, it must be selected
+	}
+	if ($search_status == -3) {	// To bill
+		//$sql.= ' AND c.fk_statut in (1,2,3)';
+		//$sql.= ' AND c.facture = 0'; // invoice not created
+		$sql .= ' AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))'; // validated, in process or closed but not billed
+	}
+	if ($search_status == -4) {	//  "validate and in progress"
+		$sql .= ' AND (c.fk_statut IN (1,2))'; // validated, in process
+	}
+}
+
+if ($search_datecloture_start) {
+	$sql .= " AND c.date_cloture >= '".$db->idate($search_datecloture_start)."'";
+}
+if ($search_datecloture_end) {
+	$sql .= " AND c.date_cloture <= '".$db->idate($search_datecloture_end)."'";
+}
+if ($search_dateorder_start) {
+	$sql .= " AND c.date_commande >= '".$db->idate($search_dateorder_start)."'";
+}
+if ($search_dateorder_end) {
+	$sql .= " AND c.date_commande <= '".$db->idate($search_dateorder_end)."'";
+}
+if ($search_datedelivery_start) {
+	$sql .= " AND c.date_livraison >= '".$db->idate($search_datedelivery_start)."'";
+}
+if ($search_datedelivery_end) {
+	$sql .= " AND c.date_livraison <= '".$db->idate($search_datedelivery_end)."'";
+}
+if ($search_town) {
+	$sql .= natural_search('s.town', $search_town);
+}
+if ($search_zip) {
+	$sql .= natural_search("s.zip", $search_zip);
+}
+if ($search_state) {
+	$sql .= natural_search("state.nom", $search_state);
+}
+if ($search_country) {
+	$sql .= " AND s.fk_pays IN (".$db->sanitize($search_country).')';
+}
+if ($search_type_thirdparty && $search_type_thirdparty != '-1') {
+	$sql .= " AND s.fk_typent IN (".$db->sanitize($search_type_thirdparty).')';
+}
+if ($search_company) {
+	$sql .= natural_search('s.nom', $search_company);
+}
+if ($search_company_alias) {
+	$sql .= natural_search('s.name_alias', $search_company_alias);
+}
+if ($search_sale > 0) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $search_sale);
+}
+if ($search_user > 0) {
+	$sql .= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='commande' AND tc.source='internal' AND ec.element_id = c.rowid AND ec.fk_socpeople = ".((int) $search_user);
+}
+if ($search_total_ht != '') {
+	$sql .= natural_search('c.total_ht', $search_total_ht, 1);
+}
+if ($search_total_vat != '') {
+	$sql .= natural_search('c.total_tva', $search_total_vat, 1);
+}
+if ($search_total_ttc != '') {
+	$sql .= natural_search('c.total_ttc', $search_total_ttc, 1);
+}
+if ($search_warehouse != '' && $search_warehouse > 0) {
+	$sql .= natural_search('c.fk_warehouse', $search_warehouse, 1);
+}
+if ($search_multicurrency_code != '') {
+	$sql .= " AND c.multicurrency_code = '".$db->escape($search_multicurrency_code)."'";
+}
+if ($search_multicurrency_tx != '') {
+	$sql .= natural_search('c.multicurrency_tx', $search_multicurrency_tx, 1);
+}
+if ($search_multicurrency_montant_ht != '') {
+	$sql .= natural_search('c.multicurrency_total_ht', $search_multicurrency_montant_ht, 1);
+}
+if ($search_multicurrency_montant_vat != '') {
+	$sql .= natural_search('c.multicurrency_total_tva', $search_multicurrency_montant_vat, 1);
+}
+if ($search_multicurrency_montant_ttc != '') {
+	$sql .= natural_search('c.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);
+}
+if ($search_login) {
+	$sql .= natural_search(array("u.login", "u.firstname", "u.lastname"), $search_login);
+}
+if ($search_project_ref != '') {
+	$sql .= natural_search("p.ref", $search_project_ref);
+}
+if ($search_project != '') {
+	$sql .= natural_search("p.title", $search_project);
+}
+if ($search_categ_cus > 0) {
+	$sql .= " AND cc.fk_categorie = ".((int) $search_categ_cus);
+}
+if ($search_categ_cus == -2) {
+	$sql .= " AND cc.fk_categorie IS NULL";
+}
+if ($search_fk_cond_reglement > 0) {
+	$sql .= " AND c.fk_cond_reglement = ".((int) $search_fk_cond_reglement);
+}
+if ($search_fk_shipping_method > 0) {
+	$sql .= " AND c.fk_shipping_method = ".((int) $search_fk_shipping_method);
+}
+if ($search_fk_mode_reglement > 0) {
+	$sql .= " AND c.fk_mode_reglement = ".((int) $search_fk_mode_reglement);
+}
+if ($search_fk_input_reason > 0) {
+	$sql .= " AND c.fk_input_reason = ".((int) $search_fk_input_reason);
+}
+
+// Add where from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
+// Add where from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+
+// Add HAVING from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListHaving', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= empty($hookmanager->resPrint) ? "" : " HAVING 1=1 ".$hookmanager->resPrint;
+
+$sql .= $db->order($sortfield, $sortorder);
+
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+
+	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
+		$page = 0;
+		$offset = 0;
+	}
+}
+
+$sql .= $db->plimit($limit + 1, $offset);
+//print $sql;
+
+$resql = $db->query($sql);
+if ($resql) {
+	if ($socid > 0) {
+		$soc = new Societe($db);
+		$soc->fetch($socid);
+		$title = $langs->trans('CustomersOrders').' - '.$soc->name;
+		if (empty($search_company)) {
+			$search_company = $soc->name;
+		}
+	} else {
+		$title = $langs->trans('CustomersOrders');
+	}
+	if (strval($search_status) == '0') {
+		$title .= ' - '.$langs->trans('StatusOrderDraftShort');
+	}
+	if ($search_status == 1) {
+		$title .= ' - '.$langs->trans('StatusOrderValidatedShort');
+	}
+	if ($search_status == 2) {
+		$title .= ' - '.$langs->trans('StatusOrderSentShort');
+	}
+	if ($search_status == 3) {
+		$title .= ' - '.$langs->trans('StatusOrderToBillShort');
+	}
+	if ($search_status == -1) {
+		$title .= ' - '.$langs->trans('StatusOrderCanceledShort');
+	}
+	if ($search_status == -2) {
+		$title .= ' - '.$langs->trans('StatusOrderToProcessShort');
+	}
+	if ($search_status == -3) {
+		$title .= ' - '.$langs->trans('StatusOrderValidated').', '.(empty($conf->expedition->enabled) ? '' : $langs->trans("StatusOrderSent").', ').$langs->trans('StatusOrderToBill');
+	}
+	if ($search_status == -4) {
+		$title .= ' - '.$langs->trans("StatusOrderValidatedShort").'+'.$langs->trans("StatusOrderSentShort");
+	}
+
+	$num = $db->num_rows($resql);
+
+	$arrayofselected = is_array($toselect) ? $toselect : array();
+
+	if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall) {
+		$obj = $db->fetch_object($resql);
+		$id = $obj->rowid;
+		header("Location: ".DOL_URL_ROOT.'/commande/card.php?id='.$id);
+		exit;
+	}
+
+	llxHeader('', $title, $help_url);
+
+	$param = '';
+
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+		$param .= '&contextpage='.urlencode($contextpage);
+	}
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit='.urlencode($limit);
+	}
+	if ($sall) {
+		$param .= '&sall='.urlencode($sall);
+	}
+	if ($socid > 0) {
+		$param .= '&socid='.urlencode($socid);
+	}
+	if ($search_status != '') {
+		$param .= '&search_status='.urlencode($search_status);
+	}
+	if ($search_datecloture_start) {
+		$param .= '&search_datecloture_startday='.dol_print_date($search_datecloture_start, '%d').'&search_datecloture_startmonth='.dol_print_date($search_datecloture_start, '%m').'&search_datecloture_startyear='.dol_print_date($search_datecloture_start, '%Y');
+	}
+	if ($search_datecloture_end) {
+		$param .= '&search_datecloture_endday='.dol_print_date($search_datecloture_end, '%d').'&search_datecloture_endmonth='.dol_print_date($search_datecloture_end, '%m').'&search_datecloture_endyear='.dol_print_date($search_datecloture_end, '%Y');
+	}
+	if ($search_dateorder_start) {
+		$param .= '&search_dateorder_start_day='.dol_print_date($search_dateorder_start, '%d').'&search_dateorder_start_month='.dol_print_date($search_dateorder_start, '%m').'&search_dateorder_start_year='.dol_print_date($search_dateorder_start, '%Y');
+	}
+	if ($search_dateorder_end) {
+		$param .= '&search_dateorder_end_day='.dol_print_date($search_dateorder_end, '%d').'&search_dateorder_end_month='.dol_print_date($search_dateorder_end, '%m').'&search_dateorder_end_year='.dol_print_date($search_dateorder_end, '%Y');
+	}
+	if ($search_datedelivery_start) {
+		$param .= '&search_datedelivery_start_day='.dol_print_date($search_datedelivery_start, '%d').'&search_datedelivery_start_month='.dol_print_date($search_datedelivery_start, '%m').'&search_datedelivery_start_year='.dol_print_date($search_datedelivery_start, '%Y');
+	}
+	if ($search_datedelivery_end) {
+		$param .= '&search_datedelivery_end_day='.dol_print_date($search_datedelivery_end, '%d').'&search_datedelivery_end_month='.dol_print_date($search_datedelivery_end, '%m').'&search_datedelivery_end_year='.dol_print_date($search_datedelivery_end, '%Y');
+	}
+	if ($search_ref) {
+		$param .= '&search_ref='.urlencode($search_ref);
+	}
+	if ($search_company) {
+		$param .= '&search_company='.urlencode($search_company);
+	}
+	if ($search_company_alias) {
+		$param .= '&search_company_alias='.urlencode($search_company_alias);
+	}
+	if ($search_ref_customer) {
+		$param .= '&search_ref_customer='.urlencode($search_ref_customer);
+	}
+	if ($search_user > 0) {
+		$param .= '&search_user='.urlencode($search_user);
+	}
+	if ($search_sale > 0) {
+		$param .= '&search_sale='.urlencode($search_sale);
+	}
+	if ($search_total_ht != '') {
+		$param .= '&search_total_ht='.urlencode($search_total_ht);
+	}
+	if ($search_total_vat != '') {
+		$param .= '&search_total_vat='.urlencode($search_total_vat);
+	}
+	if ($search_total_ttc != '') {
+		$param .= '&search_total_ttc='.urlencode($search_total_ttc);
+	}
+	if ($search_warehouse != '') {
+		$param .= '&search_warehouse='.urlencode($search_warehouse);
+	}
+	if ($search_login) {
+		$param .= '&search_login='.urlencode($search_login);
+	}
+	if ($search_multicurrency_code != '') {
+		$param .= '&search_multicurrency_code='.urlencode($search_multicurrency_code);
+	}
+	if ($search_multicurrency_tx != '') {
+		$param .= '&search_multicurrency_tx='.urlencode($search_multicurrency_tx);
+	}
+	if ($search_multicurrency_montant_ht != '') {
+		$param .= '&search_multicurrency_montant_ht='.urlencode($search_multicurrency_montant_ht);
+	}
+	if ($search_multicurrency_montant_vat != '') {
+		$param .= '&search_multicurrency_montant_vat='.urlencode($search_multicurrency_montant_vat);
+	}
+	if ($search_multicurrency_montant_ttc != '') {
+		$param .= '&search_multicurrency_montant_ttc='.urlencode($search_multicurrency_montant_ttc);
+	}
+	if ($search_project_ref >= 0) {
+		$param .= "&search_project_ref=".urlencode($search_project_ref);
+	}
+	if ($search_town != '') {
+		$param .= '&search_town='.urlencode($search_town);
+	}
+	if ($search_zip != '') {
+		$param .= '&search_zip='.urlencode($search_zip);
+	}
+	if ($search_state != '') {
+		$param .= '&search_state='.urlencode($search_state);
+	}
+	if ($search_country != '') {
+		$param .= '&search_country='.urlencode($search_country);
+	}
+	if ($search_type_thirdparty && $search_type_thirdparty != '-1') {
+		$param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
+	}
+	if ($search_product_category != '') {
+		$param .= '&search_product_category='.urlencode($search_product_category);
+	}
+	if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
+		$param .= '&search_categ_cus='.urlencode($search_categ_cus);
+	}
+	if ($show_files) {
+		$param .= '&show_files='.urlencode($show_files);
+	}
+	if ($optioncss != '') {
+		$param .= '&optioncss='.urlencode($optioncss);
+	}
+	if ($search_billed != '') {
+		$param .= '&search_billed='.urlencode($search_billed);
+	}
+	if ($search_fk_cond_reglement > 0) {
+		$param .= '&search_fk_cond_reglement='.urlencode($search_fk_cond_reglement);
+	}
+	if ($search_fk_shipping_method > 0) {
+		$param .= '&search_fk_shipping_method='.urlencode($search_fk_shipping_method);
+	}
+	if ($search_fk_mode_reglement > 0) {
+		$param .= '&search_fk_mode_reglement='.urlencode($search_fk_mode_reglement);
+	}
+	if ($search_fk_input_reason > 0) {
+		$param .= '&search_fk_input_reason='.urlencode($search_fk_input_reason);
+	}
+
+	// Add $param from extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+
+	// Add $param from hooks
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
+	$param .= $hookmanager->resPrint;
+
+	// List of mass actions available
+	$arrayofmassactions = array(
+		'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
+		'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
+	);
+	if ($permissiontovalidate) {
+		$arrayofmassactions['prevalidate'] = img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate");
+	}
+	if ($permissiontosendbymail) {
+		$arrayofmassactions['presend'] = img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail");
+	}
+	if ($permissiontoclose) {
+		$arrayofmassactions['preshipped'] = img_picto('', 'dollyrevert', 'class="pictofixedwidth"').$langs->trans("ClassifyShipped");
+	}
+	if ($permissiontocancel) {
+		$arrayofmassactions['cancelorders'] = img_picto('', 'close_title', 'class="pictofixedwidth"').$langs->trans("Cancel");
+	}
+	if (!empty($conf->invoice->enabled) && $user->rights->facture->creer) {
+		$arrayofmassactions['createbills'] = img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("CreateInvoiceForThisCustomer");
+	}
+	if ($permissiontoclose) {
+		$arrayofmassactions['setbilled'] = img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("ClassifyBilled");
+	}
+	if ($permissiontodelete) {
+		$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
+	}
+	if (in_array($massaction, array('presend', 'predelete', 'createbills'))) {
+		$arrayofmassactions = array();
+	}
+	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+
+	$url = DOL_URL_ROOT.'/commande/card.php?action=create';
+	if (!empty($socid)) {
+		$url .= '&socid='.$socid;
+	}
+	$newcardbutton = dolGetButtonTitle($langs->trans('NewOrder'), '', 'fa fa-plus-circle', $url, '', $contextpage == 'orderlist' && $permissiontoadd);
+
+	// Lines of title fields
+	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+	if ($optioncss != '') {
+		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	}
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="action" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+	print '<input type="hidden" name="search_status" value="'.$search_status.'">';
+	print '<input type="hidden" name="socid" value="'.$socid.'">';
+
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'order', 0, $newcardbutton, '', $limit, 0, 0, 1);
+
+	$topicmail = "SendOrderRef";
+	$modelmail = "order_send";
+	$objecttmp = new Commande($db);
+	$trackid = 'ord'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+
+	if ($massaction == 'prevalidate') {
+		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassValidation"), $langs->trans("ConfirmMassValidationQuestion"), "validate", null, '', 0, 200, 500, 1);
+	}
+	if ($massaction == 'preshipped') {
+		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("CloseOrder"), $langs->trans("ConfirmCloseOrder"), "shipped", null, '', 0, 200, 500, 1);
+	}
+
+	if ($massaction == 'createbills') {
+		print '<input type="hidden" name="massaction" value="confirm_createbills">';
+
+		print '<table class="noborder" width="100%" >';
+		print '<tr>';
+		print '<td class="titlefield">';
+		print $langs->trans('DateInvoice');
+		print '</td>';
+		print '<td>';
+		print $form->selectDate('', '', '', '', '', '', 1, 1);
+		print '</td>';
+		print '</tr>';
+		print '<tr>';
+		print '<td>';
+		print $langs->trans('CreateOneBillByThird');
+		print '</td>';
+		print '<td>';
+		print $form->selectyesno('createbills_onebythird', '', 1);
+		print '</td>';
+		print '</tr>';
+		print '<tr>';
+		print '<td>';
+		print $langs->trans('ValidateInvoices');
+		print '</td>';
+		print '<td>';
+		if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
+			print $form->selectyesno('validate_invoices', 0, 1, 1);
+			print ' ('.$langs->trans("AutoValidationNotPossibleWhenStockIsDecreasedOnInvoiceValidation").')';
+		} else {
+			print $form->selectyesno('validate_invoices', 0, 1);
+		}
+		if (!empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER)) {
+			print ' &nbsp; &nbsp; <span class="opacitymedium">'.$langs->trans("IfValidateInvoiceIsNoOrderStayUnbilled").'</span>';
+		} else {
+			print ' &nbsp; &nbsp; <span class="opacitymedium">'.$langs->trans("OptionToSetOrderBilledNotEnabled").'</span>';
+		}
+		print '</td>';
+		print '</tr>';
+		print '</table>';
+
+		print '<br>';
+		print '<div class="center">';
+		print '<input type="submit" class="button" id="createbills" name="createbills" value="'.$langs->trans('CreateInvoiceForThisCustomer').'">  ';
+		print '<input type="submit" class="button button-cancel" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+		print '</div>';
+		print '<br>';
+	}
+
+	// Détail commande
+	if (!empty($conf->global->ORDER_ADD_OPTION_SHOW_DETAIL_LIST)) {
+		print '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_orderdetail" name="check_orderdetail" class="check_orderdetail"'.($check_orderdetail ? ' checked' : '').'><label for="check_orderdetail"> <span class="check_orderdetail_text">'.$langs->trans("OrderShowDetail").'</span></label> &nbsp; </div>';
+	}
+
+	if ($sall) {
+		foreach ($fieldstosearchall as $key => $val) {
+			$fieldstosearchall[$key] = $langs->trans($val);
+		}
+		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
+	}
+
+	$moreforfilter = '';
+
+	// If the user can view prospects other than his'
+	if ($user->rights->user->user->lire) {
+		$langs->load("commercial");
+		$moreforfilter .= '<div class="divsearchfield">';
+		$tmptitle = $langs->trans('ThirdPartiesOfSaleRepresentative');
+		$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $tmptitle, 'maxwidth250 widthcentpercentminusx');
+		$moreforfilter .= '</div>';
+	}
+	// If the user can view other users
+	if ($user->rights->user->user->lire) {
+		$moreforfilter .= '<div class="divsearchfield">';
+		$tmptitle = $langs->trans('LinkedToSpecificUsers');
+		$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250 widthcentpercentminusx');
+		$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)) {
+		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+		$moreforfilter .= '<div class="divsearchfield">';
+		$tmptitle = $langs->trans('IncludingProductWithTag');
+		$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
+		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300 widthcentpercentminusx', 1);
+		$moreforfilter .= '</div>';
+	}
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+		$moreforfilter .= '<div class="divsearchfield">';
+		$tmptitle = $langs->trans('CustomersProspectsCategoriesShort');
+		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $tmptitle, 'maxwidth300 widthcentpercentminusx');
+		$moreforfilter .= '</div>';
+	}
+	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);
+		$moreforfilter .= '<div class="divsearchfield">';
+		$tmptitle = $langs->trans('Warehouse');
+		$moreforfilter .= img_picto($tmptitle, 'stock', 'class="pictofixedwidth"').$formproduct->selectWarehouses($search_warehouse, 'search_warehouse', '', 1, 0, 0, $tmptitle, 0, 0, array(), 'maxwidth250 widthcentpercentminusx');
+		$moreforfilter .= '</div>';
+	}
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+	if (empty($reshook)) {
+		$moreforfilter .= $hookmanager->resPrint;
+	} else {
+		$moreforfilter = $hookmanager->resPrint;
+	}
+
+	if (!empty($moreforfilter)) {
+		print '<div class="liste_titre liste_titre_bydiv centpercent">';
+		print $moreforfilter;
+		print '</div>';
+	}
+
+	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+
+	if (GETPOST('autoselectall', 'int')) {
+		$selectedfields .= '<script>';
+		$selectedfields .= '   $(document).ready(function() {';
+		$selectedfields .= '        console.log("Autoclick on checkforselects");';
+		$selectedfields .= '   		$("#checkforselects").click();';
+		$selectedfields .= '        $("#massaction").val("createbills").change();';
+		$selectedfields .= '   });';
+		$selectedfields .= '</script>';
+	}
+
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+
+	print '<tr class="liste_titre_filter">';
+
+	// Action column
+	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print '<td class="liste_titre" align="middle">';
+		$searchpicto = $form->showFilterButtons('left');
+		print $searchpicto;
+		print '</td>';
+	}
+
+	// Détail commande
+	if (!empty($arrayfields['pr.ref']['checked'])) {
+		print '<td class="liste_titre">';
+		print '<input class="flat" size="6" type="text" name="search_refProduct" value="'.dol_escape_htmltag($search_refProduct).'">';
+		print '</td>';
+	}
+	// Product Description
+	if (!empty($arrayfields['pr.desc']['checked'])) {
+		print '<td class="liste_titre">';
+		print '<input class="flat" size="6" type="text" name="search_descProduct" value="'.dol_escape_htmltag($search_descProduct).'">';
+		print '</td>';
+	}
+	// Product QtyOrdered
+	if (!empty($arrayfields['cdet.qty']['checked'])) {
+		print '<td class="liste_titre"></td>';
+	}
+
+	// Ref
+	if (!empty($arrayfields['c.ref']['checked'])) {
+		print '<td class="liste_titre">';
+		print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+		print '</td>';
+	}
+	// Ref customer
+	if (!empty($arrayfields['c.ref_client']['checked'])) {
+		print '<td class="liste_titre" align="left">';
+		print '<input class="flat" type="text" size="6" name="search_ref_customer" value="'.dol_escape_htmltag($search_ref_customer).'">';
+		print '</td>';
+	}
+	// Project ref
+	if (!empty($arrayfields['p.ref']['checked'])) {
+		print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>';
+	}
+	// Project title
+	if (!empty($arrayfields['p.title']['checked'])) {
+		print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_project" value="'.dol_escape_htmltag($search_project).'"></td>';
+	}
+	// Thirpdarty
+	if (!empty($arrayfields['s.nom']['checked'])) {
+		print '<td class="liste_titre" align="left">';
+		print '<input class="flat maxwidth100" type="text" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
+		print '</td>';
+	}
+	// Alias
+	if (!empty($arrayfields['s.name_alias']['checked'])) {
+		print '<td class="liste_titre" align="left">';
+		print '<input class="flat maxwidth100" type="text" name="search_company_alias" value="'.dol_escape_htmltag($search_company_alias).'">';
+		print '</td>';
+	}
+	// Town
+	if (!empty($arrayfields['s.town']['checked'])) {
+		print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_town" value="'.dol_escape_htmltag($search_town).'"></td>';
+	}
+	// Zip
+	if (!empty($arrayfields['s.zip']['checked'])) {
+		print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="'.dol_escape_htmltag($search_zip).'"></td>';
+	}
+	// State
+	if (!empty($arrayfields['state.nom']['checked'])) {
+		print '<td class="liste_titre">';
+		print '<input class="flat" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
+		print '</td>';
+	}
+	// Country
+	if (!empty($arrayfields['country.code_iso']['checked'])) {
+		print '<td class="liste_titre" align="center">';
+		print $form->select_country($search_country, 'search_country', '', 0, 'minwidth100imp maxwidth100');
+		print '</td>';
+	}
+	// Company type
+	if (!empty($arrayfields['typent.code']['checked'])) {
+		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
+		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
+		print '</td>';
+	}
+	// Date order
+	if (!empty($arrayfields['c.date_commande']['checked'])) {
+		print '<td class="liste_titre center">';
+		print '<div class="nowrap">';
+		print $form->selectDate($search_dateorder_start ? $search_dateorder_start : -1, 'search_dateorder_start_', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+		print '</div>';
+		print '<div class="nowrap">';
+		print $form->selectDate($search_dateorder_end ? $search_dateorder_end : -1, 'search_dateorder_end_', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+		print '</div>';
+		print '</td>';
+	}
+	if (!empty($arrayfields['c.date_delivery']['checked'])) {
+		print '<td class="liste_titre center">';
+		print '<div class="nowrap">';
+		print $form->selectDate($search_datedelivery_start ? $search_datedelivery_start : -1, 'search_datedelivery_start_', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+		print '</div>';
+		print '<div class="nowrap">';
+		print $form->selectDate($search_datedelivery_end ? $search_datedelivery_end : -1, 'search_datedelivery_end_', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+		print '</div>';
+		print '</td>';
+	}
+	// Shipping Method
+	if (!empty($arrayfields['c.fk_shipping_method']['checked'])) {
+		print '<td class="liste_titre">';
+		$form->selectShippingMethod($search_fk_shipping_method, 'search_fk_shipping_method', '', 1, '', 1);
+		print '</td>';
+	}
+	// 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 '</td>';
+	}
+	// 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 '</td>';
+	}
+	// Channel
+	if (!empty($arrayfields['c.fk_input_reason']['checked'])) {
+		print '<td class="liste_titre">';
+		$form->selectInputReason($search_fk_input_reason, 'search_fk_input_reason', '', 1, '', 1);
+		print '</td>';
+	}
+	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>';
+	}
+	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>';
+	}
+	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>';
+	}
+	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>';
+	}
+	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>';
+	}
+	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>';
+	}
+	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>';
+	}
+	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>';
+	}
+	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>';
+	}
+	if (!empty($arrayfields['sale_representative']['checked'])) {
+		print '<td class="liste_titre"></td>';
+	}
+	if (!empty($arrayfields['total_pa']['checked'])) {
+		print '<td class="liste_titre right">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['total_margin']['checked'])) {
+		print '<td class="liste_titre right">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['total_margin_rate']['checked'])) {
+		print '<td class="liste_titre right">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['total_mark_rate']['checked'])) {
+		print '<td class="liste_titre right">';
+		print '</td>';
+	}
+	// Extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
+	// Fields from hook
+	$parameters = array('arrayfields'=>$arrayfields);
+	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // 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">';
+		print '</td>';
+	}
+	// Date modification
+	if (!empty($arrayfields['c.tms']['checked'])) {
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
+	// Date cloture
+	if (!empty($arrayfields['c.date_cloture']['checked'])) {
+		print '<td class="liste_titre center">';
+		print '<div class="nowrap">';
+		print $form->selectDate($search_datecloture_start ? $search_datecloture_start : -1, 'search_datecloture_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+		print '</div>';
+		print '<div class="nowrap">';
+		print $form->selectDate($search_datecloture_end ? $search_datecloture_end : -1, 'search_datecloture_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+		print '</div>';
+		print '</td>';
+	}
+	// Note public
+	if (!empty($arrayfields['c.note_public']['checked'])) {
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
+	// Note private
+	if (!empty($arrayfields['c.note_private']['checked'])) {
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
+	// Shippable
+	if (!empty($arrayfields['shippable']['checked'])) {
+		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
+		//print $form->selectyesno('search_shippable', $search_shippable, 1, 0, 1, 1);
+		if (!empty($conf->global->ORDER_SHIPABLE_STATUS_DISABLED_BY_DEFAULT)) {
+			print '<input type="checkbox" name="show_shippable_command" value="1"'.($show_shippable_command ? ' checked' : '').'>';
+			print $langs->trans('ShowShippableStatus');
+		} else {
+			$show_shippable_command = 1;
+		}
+		print '</td>';
+	}
+	// Status billed
+	if (!empty($arrayfields['c.facture']['checked'])) {
+		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
+		print $form->selectyesno('search_billed', $search_billed, 1, 0, 1, 1);
+		print '</td>';
+	}
+	// Import key
+	if (!empty($arrayfields['c.import_key']['checked'])) {
+		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
+		print '</td>';
+	}
+	// Status
+	if (!empty($arrayfields['c.fk_statut']['checked'])) {
+		print '<td class="liste_titre maxwidthonsmartphone center">';
+		$liststatus = array(
+			Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraftShort"),
+			Commande::STATUS_VALIDATED=>$langs->trans("StatusOrderValidated"),
+			Commande::STATUS_SHIPMENTONPROCESS=>$langs->trans("StatusOrderSentShort"),
+			Commande::STATUS_CLOSED=>$langs->trans("StatusOrderDelivered"),
+			-3=>$langs->trans("StatusOrderValidatedShort").'+'.$langs->trans("StatusOrderSentShort").'+'.$langs->trans("StatusOrderDelivered"),
+			-2=>$langs->trans("StatusOrderValidatedShort").'+'.$langs->trans("StatusOrderSentShort"),
+			Commande::STATUS_CANCELED=>$langs->trans("StatusOrderCanceledShort")
+		);
+		print $form->selectarray('search_status', $liststatus, $search_status, -5, 0, 0, '', 0, 0, 0, '', 'maxwidth125', 1);
+		print '</td>';
+	}
+	// Action column
+	if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print '<td class="liste_titre" align="middle">';
+		$searchpicto = $form->showFilterButtons();
+		print $searchpicto;
+		print '</td>';
+	}
+	print "</tr>\n";
+
+	// Fields title
+	print '<tr class="liste_titre">';
+
+	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ');
+	}
+
+	// Détail commande
+	if (!empty($arrayfields['pr.ref']['checked'])) {
+		print_liste_field_titre($arrayfields['pr.ref']['label'], $_SERVER["PHP_SELF"], 'pr.ref', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['pr.desc']['checked'])) {
+		print_liste_field_titre($arrayfields['pr.desc']['label'], $_SERVER["PHP_SELF"], 'pr.desc', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['cdet.qty']['checked'])) {
+		print_liste_field_titre($arrayfields['cdet.qty']['label'], $_SERVER["PHP_SELF"], 'cdet.qty', '', $param, '', $sortfield, $sortorder);
+	}
+
+	if (!empty($arrayfields['c.ref']['checked'])) {
+		print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], 'c.ref', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['c.ref_client']['checked'])) {
+		print_liste_field_titre($arrayfields['c.ref_client']['label'], $_SERVER["PHP_SELF"], 'c.ref_client', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.ref']['checked'])) {
+		print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.title']['checked'])) {
+		print_liste_field_titre($arrayfields['p.title']['label'], $_SERVER["PHP_SELF"], "p.title", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['s.nom']['checked'])) {
+		print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], 's.nom', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['s.name_alias']['checked'])) {
+		print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER["PHP_SELF"], 's.name_alias', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['s.town']['checked'])) {
+		print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['s.zip']['checked'])) {
+		print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $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['country.code_iso']['checked'])) {
+		print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['typent.code']['checked'])) {
+		print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['c.date_commande']['checked'])) {
+		print_liste_field_titre($arrayfields['c.date_commande']['label'], $_SERVER["PHP_SELF"], 'c.date_commande', '', $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['c.date_delivery']['checked'])) {
+		print_liste_field_titre($arrayfields['c.date_delivery']['label'], $_SERVER["PHP_SELF"], 'c.date_livraison', '', $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['c.fk_shipping_method']['checked'])) {
+		print_liste_field_titre($arrayfields['c.fk_shipping_method']['label'], $_SERVER["PHP_SELF"], "c.fk_shipping_method", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['c.fk_cond_reglement']['checked'])) {
+		print_liste_field_titre($arrayfields['c.fk_cond_reglement']['label'], $_SERVER["PHP_SELF"], "c.fk_cond_reglement", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['c.fk_mode_reglement']['checked'])) {
+		print_liste_field_titre($arrayfields['c.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "c.fk_mode_reglement", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['c.fk_input_reason']['checked'])) {
+		print_liste_field_titre($arrayfields['c.fk_input_reason']['label'], $_SERVER["PHP_SELF"], "c.fk_input_reason", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['c.total_ht']['checked'])) {
+		print_liste_field_titre($arrayfields['c.total_ht']['label'], $_SERVER["PHP_SELF"], 'c.total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['c.total_vat']['checked'])) {
+		print_liste_field_titre($arrayfields['c.total_vat']['label'], $_SERVER["PHP_SELF"], 'c.total_tva', '', $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['c.total_ttc']['checked'])) {
+		print_liste_field_titre($arrayfields['c.total_ttc']['label'], $_SERVER["PHP_SELF"], 'c.total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['c.multicurrency_code']['checked'])) {
+		print_liste_field_titre($arrayfields['c.multicurrency_code']['label'], $_SERVER['PHP_SELF'], 'c.multicurrency_code', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['c.multicurrency_tx']['checked'])) {
+		print_liste_field_titre($arrayfields['c.multicurrency_tx']['label'], $_SERVER['PHP_SELF'], 'c.multicurrency_tx', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['c.multicurrency_total_ht']['checked'])) {
+		print_liste_field_titre($arrayfields['c.multicurrency_total_ht']['label'], $_SERVER['PHP_SELF'], 'c.multicurrency_total_ht', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['c.multicurrency_total_vat']['checked'])) {
+		print_liste_field_titre($arrayfields['c.multicurrency_total_vat']['label'], $_SERVER['PHP_SELF'], 'c.multicurrency_total_tva', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['c.multicurrency_total_ttc']['checked'])) {
+		print_liste_field_titre($arrayfields['c.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'c.multicurrency_total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['u.login']['checked'])) {
+		print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['sale_representative']['checked'])) {
+		print_liste_field_titre($arrayfields['sale_representative']['label'], $_SERVER["PHP_SELF"], "", "", "$param", '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['total_pa']['checked'])) {
+		print_liste_field_titre($arrayfields['total_pa']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['total_margin']['checked'])) {
+		print_liste_field_titre($arrayfields['total_margin']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['total_margin_rate']['checked'])) {
+		print_liste_field_titre($arrayfields['total_margin_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['total_mark_rate']['checked'])) {
+		print_liste_field_titre($arrayfields['total_mark_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+
+	$totalarray = array(
+		'nbfield' => 0,
+		'val' => array(
+			'c.total_ht' => 0,
+			'c.total_tva' => 0,
+			'c.total_ttc' => 0,
+		),
+		'pos' => array(),
+	);
+	// Extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+	// Hook fields
+	$parameters = array(
+		'arrayfields' => $arrayfields,
+		'param' => $param,
+		'sortfield' => $sortfield,
+		'sortorder' => $sortorder,
+		'totalarray' => &$totalarray,
+	);
+	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	if (!empty($arrayfields['c.datec']['checked'])) {
+		print_liste_field_titre($arrayfields['c.datec']['label'], $_SERVER["PHP_SELF"], "c.date_creation", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
+	if (!empty($arrayfields['c.tms']['checked'])) {
+		print_liste_field_titre($arrayfields['c.tms']['label'], $_SERVER["PHP_SELF"], "c.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
+	if (!empty($arrayfields['c.date_cloture']['checked'])) {
+		print_liste_field_titre($arrayfields['c.date_cloture']['label'], $_SERVER["PHP_SELF"], "c.date_cloture", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
+	if (!empty($arrayfields['c.note_public']['checked'])) {
+		print_liste_field_titre($arrayfields['c.note_public']['label'], $_SERVER["PHP_SELF"], "c.note_public", "", $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['c.note_private']['checked'])) {
+		print_liste_field_titre($arrayfields['c.note_private']['label'], $_SERVER["PHP_SELF"], "c.note_private", "", $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['shippable']['checked'])) {
+		print_liste_field_titre($arrayfields['shippable']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['c.facture']['checked'])) {
+		print_liste_field_titre($arrayfields['c.facture']['label'], $_SERVER["PHP_SELF"], 'c.facture', '', $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['c.import_key']['checked'])) {
+		print_liste_field_titre($arrayfields['c.import_key']['label'], $_SERVER["PHP_SELF"], "c.import_key", "", $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['c.fk_statut']['checked'])) {
+		print_liste_field_titre($arrayfields['c.fk_statut']['label'], $_SERVER["PHP_SELF"], "c.fk_statut", "", $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ');
+	}
+	print '</tr>'."\n";
+
+	$total = 0;
+	$subtotal = 0;
+	$productstat_cache = array();
+	$productstat_cachevirtual = array();
+	$getNomUrl_cache = array();
+
+	$generic_commande = new Commande($db);
+	$generic_product = new Product($db);
+	$userstatic = new User($db);
+	$i = 0;
+
+	$with_margin_info = false;
+	if (!empty($conf->margin->enabled) && (
+			!empty($arrayfields['total_pa']['checked'])
+			|| !empty($arrayfields['total_margin']['checked'])
+			|| !empty($arrayfields['total_margin_rate']['checked'])
+			|| !empty($arrayfields['total_mark_rate']['checked'])
+		)
+	) {
+		$with_margin_info = true;
+	}
+	$total_ht = 0;
+	$total_margin = 0;
+
+	// Détail commande
+	$totalqty = 0;
+
+	$imaxinloop = ($limit ? min($num, $limit) : $num);
+	$last_num = min($num, $limit);
+	while ($i < $imaxinloop) {
+		$obj = $db->fetch_object($resql);
+
+		$notshippable = 0;
+		$warning = 0;
+		$text_info = '';
+		$text_warning = '';
+		$nbprod = 0;
+
+		$companystatic->id = $obj->socid;
+		$companystatic->name = $obj->name;
+		$companystatic->name_alias = $obj->alias;
+		$companystatic->client = $obj->client;
+		$companystatic->code_client = $obj->code_client;
+		$companystatic->email = $obj->email;
+		$companystatic->phone = $obj->phone;
+		$companystatic->address = $obj->address;
+		$companystatic->zip = $obj->zip;
+		$companystatic->town = $obj->town;
+		$companystatic->country_code = $obj->country_code;
+		if (!isset($getNomUrl_cache[$obj->socid])) {
+			$getNomUrl_cache[$obj->socid] = $companystatic->getNomUrl(1, 'customer');
+		}
+
+		$generic_commande->id = $obj->rowid;
+		$generic_commande->ref = $obj->ref;
+		$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;
+		$generic_commande->total_tva = $obj->total_tva;
+		$generic_commande->total_ttc = $obj->total_ttc;
+		$generic_commande->note_public = $obj->note_public;
+		$generic_commande->note_private = $obj->note_private;
+
+		$projectstatic->id = $obj->project_id;
+		$projectstatic->ref = $obj->project_ref;
+		$projectstatic->title = $obj->project_label;
+
+		$marginInfo = array();
+		if ($with_margin_info === true) {
+			$generic_commande->fetch_lines();
+			$marginInfo = $formmargin->getMarginInfosArray($generic_commande);
+			$total_ht += $obj->total_ht;
+			$total_margin += $marginInfo['total_margin'];
+		}
+
+		print '<tr class="oddeven">';
+
+		// Action column
+		if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($obj->rowid, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+		}
+
+		// Détail commande
+		// Product Ref
+		if (!empty($arrayfields['pr.ref']['checked'])) {
+			if (!empty($obj->product_rowid)) {
+				$generic_product->id = $obj->product_rowid;
+				$generic_product->ref = $obj->product_ref;
+				$generic_product->label = $obj->product_label;
+				$generic_product->status = $obj->product_status;
+				$generic_product->status_buy = $obj->product_status_buy;
+				$generic_product->status_batch = $obj->product_batch;
+				$generic_product->barcode = $obj->product_barcode;
+				print '<td class="nowrap tdoverflowmax200">'.$generic_product->getNomUrl(1).'</td>';
+			} else {
+				print '<td class="nowrap tdoverflowmax200">Ligne libre</td>';
+			}
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Product Description
+		if (!empty($arrayfields['pr.desc']['checked'])) {
+			// print '<td class="nowrap tdoverflowmax200">'.$obj->description.'</td>';
+			!empty($obj->product_label) ? $labelproduct = $obj->product_label : $labelproduct = $obj->description;
+			print '<td class="nowrap tdoverflowmax200">'.dol_escape_htmltag($labelproduct).'</td>';
+
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Product QtyOrdered
+		if (!empty($arrayfields['cdet.qty']['checked'])) {
+			print '<td class="nowrap tdoverflowmax200">'.$obj->qty.'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'cdet.qty';
+			}
+			if (isset($totalarray['val']['cdet.qty'])) {
+				$totalarray['val']['cdet.qty'] += $obj->qty;
+			} else {
+				$totalarray['val']['cdet.qty'] = $obj->qty;
+			}
+		}
+
+		// Ref
+		if (!empty($arrayfields['c.ref']['checked'])) {
+			print '<td class="nowraponall">';
+			print $generic_commande->getNomUrl(1, ($search_status != 2 ? 0 : $obj->fk_statut), 0, 0, 0, 1, 1);
+
+			$filename = dol_sanitizeFileName($obj->ref);
+			$filedir = $conf->commande->multidir_output[$conf->entity].'/'.dol_sanitizeFileName($obj->ref);
+			$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
+			print $formfile->getDocumentsLink($generic_commande->element, $filename, $filedir);
+
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Ref customer
+		if (!empty($arrayfields['c.ref_client']['checked'])) {
+			print '<td class="nowrap tdoverflowmax200">'.$obj->ref_client.'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Project ref
+		if (!empty($arrayfields['p.ref']['checked'])) {
+			print '<td class="nowrap">';
+			if ($obj->project_id > 0) {
+				print $projectstatic->getNomUrl(1);
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Project label
+		if (!empty($arrayfields['p.title']['checked'])) {
+			print '<td class="nowrap">';
+			if ($obj->project_id > 0) {
+				print $projectstatic->title;
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Third party
+		if (!empty($arrayfields['s.nom']['checked'])) {
+			print '<td class="tdoverflowmax200">';
+			print $getNomUrl_cache[$obj->socid];
+
+			// If module invoices enabled and user with invoice creation permissions
+			if (isModEnabled('facture') && !empty($conf->global->ORDER_BILLING_ALL_CUSTOMER)) {
+				if ($user->rights->facture->creer) {
+					if (($obj->fk_statut > 0 && $obj->fk_statut < 3) || ($obj->fk_statut == 3 && $obj->billed == 0)) {
+						print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$companystatic->id.'&search_billed=0&autoselectall=1">';
+						print img_picto($langs->trans("CreateInvoiceForThisCustomer").' : '.$companystatic->name, 'object_bill', 'hideonsmartphone').'</a>';
+					}
+				}
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Alias name
+		if (!empty($arrayfields['s.name_alias']['checked'])) {
+			print '<td class="nocellnopadd">';
+			print $obj->alias;
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Town
+		if (!empty($arrayfields['s.town']['checked'])) {
+			print '<td class="nocellnopadd">';
+			print $obj->town;
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Zip
+		if (!empty($arrayfields['s.zip']['checked'])) {
+			print '<td class="nocellnopadd">';
+			print $obj->zip;
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// State
+		if (!empty($arrayfields['state.nom']['checked'])) {
+			print "<td>".$obj->state_name."</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Country
+		if (!empty($arrayfields['country.code_iso']['checked'])) {
+			print '<td class="center">';
+			$tmparray = getCountry($obj->fk_pays, 'all');
+			print $tmparray['label'];
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Type ent
+		if (!empty($arrayfields['typent.code']['checked'])) {
+			print '<td class="center">';
+			if (empty($typenArray)) {
+				$typenArray = $formcompany->typent_array(1);
+			}
+			print $typenArray[$obj->typent_code];
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Order date
+		if (!empty($arrayfields['c.date_commande']['checked'])) {
+			print '<td class="center">';
+			print dol_print_date($db->jdate($obj->date_commande), 'day');
+			// Warning late icon and note
+			if ($generic_commande->hasDelay()) {
+				print img_picto($langs->trans("Late").' : '.$generic_commande->showDelay(), "warning");
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Plannned date of delivery
+		if (!empty($arrayfields['c.date_delivery']['checked'])) {
+			print '<td class="center">';
+			print dol_print_date($db->jdate($obj->date_delivery), 'dayhour');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Shipping Method
+		if (!empty($arrayfields['c.fk_shipping_method']['checked'])) {
+			print '<td>';
+			$form->formSelectShippingMethod('', $obj->fk_shipping_method, 'none', 1);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Payment terms
+		if (!empty($arrayfields['c.fk_cond_reglement']['checked'])) {
+			print '<td>';
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none', 0, '', 1, $obj->deposit_percent);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Payment mode
+		if (!empty($arrayfields['c.fk_mode_reglement']['checked'])) {
+			print '<td>';
+			$form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Channel
+		if (!empty($arrayfields['c.fk_input_reason']['checked'])) {
+			print '<td>';
+			$form->formInputReason($_SERVER['PHP_SELF'], $obj->fk_input_reason, 'none', '');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Amount HT
+		if (!empty($arrayfields['c.total_ht']['checked'])) {
+			  print '<td class="nowrap right"><span class="amount">'.price($obj->total_ht)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'c.total_ht';
+			}
+			if (isset($totalarray['val']['c.total_ht'])) {
+				$totalarray['val']['c.total_ht'] += $obj->total_ht;
+			} else {
+				$totalarray['val']['c.total_ht'] = $obj->total_ht;
+			}
+		}
+		// Amount VAT
+		if (!empty($arrayfields['c.total_vat']['checked'])) {
+			print '<td class="nowrap right"><span class="amount">'.price($obj->total_tva)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'c.total_tva';
+			}
+			$totalarray['val']['c.total_tva'] += $obj->total_tva;
+		}
+		// Amount TTC
+		if (!empty($arrayfields['c.total_ttc']['checked'])) {
+			print '<td class="nowrap right"><span class="amount">'.price($obj->total_ttc)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'c.total_ttc';
+			}
+			$totalarray['val']['c.total_ttc'] += $obj->total_ttc;
+		}
+
+		// Currency
+		if (!empty($arrayfields['c.multicurrency_code']['checked'])) {
+			  print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Currency rate
+		if (!empty($arrayfields['c.multicurrency_tx']['checked'])) {
+			  print '<td class="nowrap">';
+			  $form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
+			  print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Amount HT
+		if (!empty($arrayfields['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
+		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
+		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) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		$userstatic->id = $obj->fk_user_author;
+		$userstatic->login = $obj->login;
+		$userstatic->lastname = $obj->lastname;
+		$userstatic->firstname = $obj->firstname;
+		$userstatic->email = $obj->user_email;
+		$userstatic->statut = $obj->user_statut;
+		$userstatic->entity = $obj->entity;
+		$userstatic->photo = $obj->photo;
+		$userstatic->office_phone = $obj->office_phone;
+		$userstatic->office_fax = $obj->office_fax;
+		$userstatic->user_mobile = $obj->user_mobile;
+		$userstatic->job = $obj->job;
+		$userstatic->gender = $obj->gender;
+
+		// Author
+		if (!empty($arrayfields['u.login']['checked'])) {
+			print '<td class="tdoverflowmax200">';
+			if ($userstatic->id) {
+				print $userstatic->getNomUrl(-1);
+			} else {
+				print '&nbsp;';
+			}
+			print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		if (!empty($arrayfields['sale_representative']['checked'])) {
+			// Sales representatives
+			print '<td>';
+			if ($obj->socid > 0) {
+				$listsalesrepresentatives = $companystatic->getSalesRepresentatives($user);
+				if ($listsalesrepresentatives < 0) {
+					dol_print_error($db);
+				}
+				$nbofsalesrepresentative = count($listsalesrepresentatives);
+				if ($nbofsalesrepresentative > 6) {
+					// We print only number
+					print $nbofsalesrepresentative;
+				} elseif ($nbofsalesrepresentative > 0) {
+					$j = 0;
+					foreach ($listsalesrepresentatives as $val) {
+						$userstatic->id = $val['id'];
+						$userstatic->lastname = $val['lastname'];
+						$userstatic->firstname = $val['firstname'];
+						$userstatic->email = $val['email'];
+						$userstatic->statut = $val['statut'];
+						$userstatic->entity = $val['entity'];
+						$userstatic->photo = $val['photo'];
+						$userstatic->login = $val['login'];
+						$userstatic->office_phone = $val['office_phone'];
+						$userstatic->office_fax = $val['office_fax'];
+						$userstatic->user_mobile = $val['user_mobile'];
+						$userstatic->job = $val['job'];
+						$userstatic->gender = $val['gender'];
+						//print '<div class="float">':
+						print ($nbofsalesrepresentative < 2) ? $userstatic->getNomUrl(-1, '', 0, 0, 12) : $userstatic->getNomUrl(-2);
+						$j++;
+						if ($j < $nbofsalesrepresentative) {
+							print ' ';
+						}
+						//print '</div>';
+					}
+				}
+				//else print $langs->trans("NoSalesRepresentativeAffected");
+			} else {
+				print '&nbsp;';
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Total buying or cost price
+		if (!empty($arrayfields['total_pa']['checked'])) {
+			print '<td class="right nowrap">'.price($marginInfo['pa_total']).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Total margin
+		if (!empty($arrayfields['total_margin']['checked'])) {
+			print '<td class="right nowrap">'.price($marginInfo['total_margin']).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'total_margin';
+			}
+			$totalarray['val']['total_margin'] += $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>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Total mark rate
+		if (!empty($arrayfields['total_mark_rate']['checked'])) {
+			print '<td class="right nowrap">'.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'total_mark_rate';
+			}
+			if ($i >= $last_num - 1) {
+				if (!empty($total_ht)) {
+					$totalarray['val']['total_mark_rate'] = price2num($total_margin * 100 / $total_ht, 'MT');
+				} else {
+					$totalarray['val']['total_mark_rate'] = '';
+				}
+			}
+		}
+
+		// Extra fields
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+		// Fields from hook
+		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+
+		// Date creation
+		if (!empty($arrayfields['c.datec']['checked'])) {
+			print '<td align="center" class="nowrap">';
+			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Date modification
+		if (!empty($arrayfields['c.tms']['checked'])) {
+			print '<td align="center" class="nowrap">';
+			print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Date cloture
+		if (!empty($arrayfields['c.date_cloture']['checked'])) {
+			print '<td align="center" class="nowrap">';
+			print dol_print_date($db->jdate($obj->date_cloture), 'dayhour', 'tzuser');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Note public
+		if (!empty($arrayfields['c.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['c.note_private']['checked'])) {
+			print '<td class="center">';
+			print dol_string_nohtmltag($obj->note_private);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Show shippable Icon (this creates subloops, so may be slow)
+		if (!empty($arrayfields['shippable']['checked'])) {
+			print '<td class="center">';
+			if (!empty($show_shippable_command) && !empty($conf->stock->enabled)) {
+				if (($obj->fk_statut > $generic_commande::STATUS_DRAFT) && ($obj->fk_statut < $generic_commande::STATUS_CLOSED)) {
+					$generic_commande->getLinesArray(); 	// Load array ->lines
+					$generic_commande->loadExpeditions();	// Load array ->expeditions
+
+					$numlines = count($generic_commande->lines); // Loop on each line of order
+					for ($lig = 0; $lig < $numlines; $lig++) {
+						if (isset($generic_commande->expeditions[$generic_commande->lines[$lig]->id])) {
+							$reliquat =  $generic_commande->lines[$lig]->qty - $generic_commande->expeditions[$generic_commande->lines[$lig]->id];
+						} else {
+							$reliquat = $generic_commande->lines[$lig]->qty;
+						}
+						if ($generic_commande->lines[$lig]->product_type == 0 && $generic_commande->lines[$lig]->fk_product > 0) {  // If line is a product and not a service
+							$nbprod++; // order contains real products
+							$generic_product->id = $generic_commande->lines[$lig]->fk_product;
+
+							// Get local and virtual stock and store it into cache
+							if (empty($productstat_cache[$generic_commande->lines[$lig]->fk_product])) {
+								$generic_product->load_stock('nobatch'); // ->load_virtual_stock() is already included into load_stock()
+								$productstat_cache[$generic_commande->lines[$lig]->fk_product]['stock_reel'] = $generic_product->stock_reel;
+								$productstat_cachevirtual[$generic_commande->lines[$lig]->fk_product]['stock_reel'] = $generic_product->stock_theorique;
+							} else {
+								$generic_product->stock_reel = $productstat_cache[$generic_commande->lines[$lig]->fk_product]['stock_reel'];
+								$generic_product->stock_theorique = $productstat_cachevirtual[$generic_commande->lines[$lig]->fk_product]['stock_reel'] = $generic_product->stock_theorique;
+							}
+
+							if ($reliquat > $generic_product->stock_reel) {
+								$notshippable++;
+							}
+							if (empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST)) {  // Default code. Default should be this case.
+								$text_info .= $reliquat.' x '.$generic_commande->lines[$lig]->product_ref.'&nbsp;'.dol_trunc($generic_commande->lines[$lig]->product_label, 20);
+								$text_info .= ' - '.$langs->trans("Stock").': <span class="'.($generic_product->stock_reel > 0 ? 'ok' : 'error').'">'.$generic_product->stock_reel.'</span>';
+								$text_info .= ' - '.$langs->trans("VirtualStock").': <span class="'.($generic_product->stock_theorique > 0 ? 'ok' : 'error').'">'.$generic_product->stock_theorique.'</span>';
+								$text_info .= ($reliquat != $generic_commande->lines[$lig]->qty ? ' <span class="opacitymedium">('.$langs->trans("QtyInOtherShipments").' '.($generic_commande->lines[$lig]->qty - $reliquat).')</span>' : '');
+								$text_info .= '<br>';
+							} else {  // BUGGED CODE.
+								// DOES NOT TAKE INTO ACCOUNT MANUFACTURING. THIS CODE SHOULD BE USELESS. PREVIOUS CODE SEEMS COMPLETE.
+								// COUNT STOCK WHEN WE SHOULD ALREADY HAVE VALUE
+								// Detailed virtual stock, looks bugged, uncomplete and need heavy load.
+								// stock order and stock order_supplier
+								$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 (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'];
+										} else {
+											$generic_product->stats_commande['qty'] = $productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_customer'];
+										}
+										$stock_order = $generic_product->stats_commande['qty'];
+									}
+									if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled)) {
+										if (empty($productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_supplier'])) {
+											$generic_product->load_stats_commande_fournisseur(0, '3');
+											$productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_supplier'] = $generic_product->stats_commande_fournisseur['qty'];
+										} else {
+											$generic_product->stats_commande_fournisseur['qty'] = $productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_supplier'];
+										}
+										$stock_order_supplier = $generic_product->stats_commande_fournisseur['qty'];
+									}
+								}
+								$text_info .= $reliquat.' x '.$generic_commande->lines[$lig]->ref.'&nbsp;'.dol_trunc($generic_commande->lines[$lig]->product_label, 20);
+								$text_stock_reel = $generic_product->stock_reel.'/'.$stock_order;
+								if ($stock_order > $generic_product->stock_reel && !($generic_product->stock_reel < $generic_commande->lines[$lig]->qty)) {
+									$warning++;
+									$text_warning .= '<span class="warning">'.$langs->trans('Available').'&nbsp;:&nbsp;'.$text_stock_reel.'</span>';
+								}
+								if ($reliquat > $generic_product->stock_reel) {
+									$text_info .= '<span class="warning">'.$langs->trans('Available').'&nbsp;:&nbsp;'.$text_stock_reel.'</span>';
+								} else {
+									$text_info .= '<span class="ok">'.$langs->trans('Available').'&nbsp;:&nbsp;'.$text_stock_reel.'</span>';
+								}
+								if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled)) {
+									$text_info .= '&nbsp;'.$langs->trans('SupplierOrder').'&nbsp;:&nbsp;'.$stock_order_supplier;
+								}
+								$text_info .= ($reliquat != $generic_commande->lines[$lig]->qty ? ' <span class="opacitymedium">('.$langs->trans("QtyInOtherShipments").' '.($generic_commande->lines[$lig]->qty - $reliquat).')</span>' : '');
+								$text_info .= '<br>';
+							}
+						}
+					}
+					if ($notshippable == 0) {
+						$text_icon = img_picto('', 'dolly', '', false, 0, 0, '', 'green paddingleft');
+						$text_info = $text_icon.' '.$langs->trans('Shippable').'<br>'.$text_info;
+					} else {
+						$text_icon = img_picto('', 'dolly', '', false, 0, 0, '', 'error paddingleft');
+						$text_info = $text_icon.' '.$langs->trans('NonShippable').'<br>'.$text_info;
+					}
+				}
+
+				if ($nbprod) {
+					print $form->textwithtooltip('', $text_info, 2, 1, $text_icon, '', 2);
+				}
+				if ($warning) {     // Always false in default mode
+					print $form->textwithtooltip('', $langs->trans('NotEnoughForAllOrders').'<br>'.$text_warning, 2, 1, img_picto('', 'error'), '', 2);
+				}
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Billed
+		if (!empty($arrayfields['c.facture']['checked'])) {
+			print '<td class="center">'.yn($obj->billed).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Import key
+		if (!empty($arrayfields['c.import_key']['checked'])) {
+			print '<td class="nowrap center">'.$obj->import_key.'</td>';
+			if (!$i) {
+				$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>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Action column
+		if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($obj->rowid, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+		}
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+
+		print "</tr>\n";
+
+		$total += $obj->total_ht;
+		$subtotal += $obj->total_ht;
+		$i++;
+	}
+
+	// Show total line
+	include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+	// If no record found
+	if ($num == 0) {
+		$colspan = 1;
+		foreach ($arrayfields as $key => $val) {
+			if (!empty($val['checked'])) {
+				$colspan++;
+			}
+		}
+		print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
+	}
+
+	$db->free($resql);
+
+	$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+	$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+
+	print '</table>'."\n";
+	print '</div>';
+
+	print '</form>'."\n";
+
+	$hidegeneratedfilelistifempty = 1;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+		$hidegeneratedfilelistifempty = 0;
+	}
+
+	// Show list of available documents
+	$urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	$urlsource .= str_replace('&amp;', '&', $param);
+
+	$filedir = $diroutputmassaction;
+	$genallowed = $permissiontoread;
+	$delallowed = $permissiontoadd;
+
+	print $formfile->showdocuments('massfilesarea_orders', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+} else {
+	dol_print_error($db);
+}
+
+// End of page
+llxFooter();
+$db->close();

From 5eb495224b1f73ccd960b1d0ce03681d932337ba Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Tue, 23 Aug 2022 10:51:38 +0200
Subject: [PATCH 026/816] clean

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

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 1b74238db1c..dbb99d0f993 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2016-2021  Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2018       Charlene Benke	        <charlie@patas-monkey.com>
- * Copyright (C) 2021		Anthony Berton			<anthony.berton@bb2a.fr>
+ * Copyright (C) 2021	   	Anthony Berton			<anthony.berton@bb2a.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -71,9 +71,6 @@ $search_dateorder_end = dol_mktime(23, 59, 59, GETPOST('search_dateorder_end_mon
 $search_datedelivery_start = dol_mktime(0, 0, 0, GETPOST('search_datedelivery_start_month', 'int'), GETPOST('search_datedelivery_start_day', 'int'), GETPOST('search_datedelivery_start_year', 'int'));
 $search_datedelivery_end = dol_mktime(23, 59, 59, GETPOST('search_datedelivery_end_month', 'int'), GETPOST('search_datedelivery_end_day', 'int'), GETPOST('search_datedelivery_end_year', 'int'));
 $search_product_category = GETPOST('search_product_category', 'int');
-
-
-
 $search_ref = GETPOST('search_ref', 'alpha') != '' ?GETPOST('search_ref', 'alpha') : GETPOST('sref', 'alpha');
 $search_ref_customer = GETPOST('search_ref_customer', 'alpha');
 $search_company = GETPOST('search_company', 'alpha');
@@ -207,9 +204,6 @@ $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';
 
@@ -245,8 +239,6 @@ if (empty($reshook)) {
 		$search_user = '';
 		$search_sale = '';
 		$search_product_category = '';
-		$search_refProduct = '';
-		$search_descProduct = '';
 		$search_ref = '';
 		$search_ref_customer = '';
 		$search_company = '';
@@ -800,9 +792,6 @@ $sql .= ' p.rowid as project_id, p.ref as project_ref, p.title as project_label,
 $sql .= ' u.login, u.lastname, u.firstname, u.email as user_email, u.statut as user_statut, u.entity, u.photo, u.office_phone, u.office_fax, u.user_mobile, u.job, u.gender,';
 $sql .= ' c.fk_cond_reglement,c.deposit_percent,c.fk_mode_reglement,c.fk_shipping_method,';
 $sql .= ' c.fk_input_reason, c.import_key';
-
-
-
 if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
 	$sql .= ", cc.fk_categorie, cc.fk_soc";
 }
@@ -823,11 +812,7 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid =
 if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
 }
-
-
 $sql .= ', '.MAIN_DB_PREFIX.'commande as c';
-
-
 if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_extrafields as ef on (c.rowid = ef.fk_object)";
 }
@@ -865,13 +850,6 @@ if ($socid > 0) {
 if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
-if ($search_refProduct) {
-	$sql .= natural_search('pr.ref', $search_refProduct);
-}
-if ($search_descProduct) {
-	$sql .= natural_search('pr.label', $search_descProduct);
-	$sql .= natural_search('cdet.description', $search_descProduct);
-}
 if ($search_ref) {
 	$sql .= natural_search('c.ref', $search_ref);
 }
@@ -1336,8 +1314,6 @@ if ($resql) {
 		print '<br>';
 	}
 
-
-
 	if ($sall) {
 		foreach ($fieldstosearchall as $key => $val) {
 			$fieldstosearchall[$key] = $langs->trans($val);
@@ -1418,7 +1394,6 @@ if ($resql) {
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre_filter">';
-
 	// Action column
 	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
 		print '<td class="liste_titre" align="middle">';
@@ -1427,18 +1402,6 @@ if ($resql) {
 		print '</td>';
 	}
 
-
-	// Product Description
-	if (!empty($arrayfields['pr.desc']['checked'])) {
-		print '<td class="liste_titre">';
-		print '<input class="flat" size="6" type="text" name="search_descProduct" value="'.dol_escape_htmltag($search_descProduct).'">';
-		print '</td>';
-	}
-	// Product QtyOrdered
-	if (!empty($arrayfields['cdet.qty']['checked'])) {
-		print '<td class="liste_titre"></td>';
-	}
-
 	// Ref
 	if (!empty($arrayfields['c.ref']['checked'])) {
 		print '<td class="liste_titre">';
@@ -1705,15 +1668,6 @@ if ($resql) {
 	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
 		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ');
 	}
-
-
-	if (!empty($arrayfields['pr.desc']['checked'])) {
-		print_liste_field_titre($arrayfields['pr.desc']['label'], $_SERVER["PHP_SELF"], 'pr.desc', '', $param, '', $sortfield, $sortorder);
-	}
-	if (!empty($arrayfields['cdet.qty']['checked'])) {
-		print_liste_field_titre($arrayfields['cdet.qty']['label'], $_SERVER["PHP_SELF"], 'cdet.qty', '', $param, '', $sortfield, $sortorder);
-	}
-
 	if (!empty($arrayfields['c.ref']['checked'])) {
 		print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], 'c.ref', '', $param, '', $sortfield, $sortorder);
 	}
@@ -1885,8 +1839,6 @@ if ($resql) {
 	$total_ht = 0;
 	$total_margin = 0;
 
-
-
 	$imaxinloop = ($limit ? min($num, $limit) : $num);
 	$last_num = min($num, $limit);
 	while ($i < $imaxinloop) {

From b3c903723f3e3335be8f8a8fe426cd5312c846b3 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Tue, 23 Aug 2022 11:37:08 +0200
Subject: [PATCH 027/816] Add menu and clean

---
 htdocs/commande/list_line.php           | 33 +++++++------------------
 htdocs/core/menus/standard/eldy.lib.php |  3 +++
 htdocs/langs/en_US/orders.lang          |  1 +
 3 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/htdocs/commande/list_line.php b/htdocs/commande/list_line.php
index ac1885b03af..219d8745587 100644
--- a/htdocs/commande/list_line.php
+++ b/htdocs/commande/list_line.php
@@ -75,7 +75,6 @@ $search_product_category = GETPOST('search_product_category', 'int');
 // Détail commande
 $search_refProduct = GETPOST('search_refProduct', 'alpha');
 $search_descProduct = GETPOST('search_descProduct', 'alpha');
-$check_orderdetail = GETPOST('check_orderdetail', 'alpha');
 
 $search_ref = GETPOST('search_ref', 'alpha') != '' ?GETPOST('search_ref', 'alpha') : GETPOST('sref', 'alpha');
 $search_ref_customer = GETPOST('search_ref_customer', 'alpha');
@@ -169,6 +168,10 @@ if (empty($user->socid)) {
 
 $checkedtypetiers = 0;
 $arrayfields = array(
+	// Détail commande
+	'pr.ref'=> array('label'=>'ProductRef', 'checked'=>1, 'position'=>1),
+	'pr.desc'=> array('label'=>'ProductDescription', 'checked'=>1, 'position'=>1),
+	'cdet.qty'=> array('label'=>'QtyOrdered', 'checked'=>1, 'position'=>1),
 	'c.ref'=>array('label'=>"Ref", 'checked'=>1, 'position'=>5),
 	'c.ref_client'=>array('label'=>"RefCustomerOrder", 'checked'=>-1, 'position'=>10),
 	'p.ref'=>array('label'=>"ProjectRef", 'checked'=>-1, 'enabled'=>(empty($conf->project->enabled) ? 0 : 1), 'position'=>20),
@@ -211,13 +214,6 @@ $arrayfields = array(
 	'c.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000)
 );
 
-// Détail commande
-if (!empty($check_orderdetail)) {
-	$arrayfields['cdet.qty'] = array('label'=>'QtyOrdered', 'checked'=>1, 'position'=>1);
-	$arrayfields['pr.desc'] = array('label'=>'ProductDescription', 'checked'=>1, 'position'=>1);
-	$arrayfields['pr.ref'] = array('label'=>'ProductRef', 'checked'=>1, 'position'=>1);
-}
-
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
@@ -810,10 +806,8 @@ $sql .= ' c.fk_cond_reglement,c.deposit_percent,c.fk_mode_reglement,c.fk_shippin
 $sql .= ' c.fk_input_reason, c.import_key';
 
 // Détail commande
-if (!empty($check_orderdetail)) {
-	$sql .= ', cdet.description, cdet.qty, ';
-	$sql .= ' pr.rowid as product_rowid, pr.ref as product_ref, pr.label as product_label, pr.barcode as product_barcode, pr.tobatch as product_batch, pr.tosell as product_status, pr.tobuy as product_status_buy';
-}
+$sql .= ', cdet.description, cdet.qty, ';
+$sql .= ' pr.rowid as product_rowid, pr.ref as product_ref, pr.label as product_label, pr.barcode as product_barcode, pr.tobatch as product_batch, pr.tosell as product_status, pr.tobuy as product_status_buy';
 
 if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
 	$sql .= ", cc.fk_categorie, cc.fk_soc";
@@ -837,13 +831,9 @@ if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
 }
 
 // Détail commande
-if (!empty($check_orderdetail)) {
-	$sql .= ', '.MAIN_DB_PREFIX.'commandedet as cdet';
-	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commande as c ON cdet.fk_commande=c.rowid';
-	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as pr ON pr.rowid=cdet.fk_product';
-} else {
-	$sql .= ', '.MAIN_DB_PREFIX.'commande as c';
-}
+$sql .= ', '.MAIN_DB_PREFIX.'commandedet as cdet';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commande as c ON cdet.fk_commande=c.rowid';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as pr ON pr.rowid=cdet.fk_product';
 
 if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_extrafields as ef on (c.rowid = ef.fk_object)";
@@ -1353,11 +1343,6 @@ if ($resql) {
 		print '<br>';
 	}
 
-	// Détail commande
-	if (!empty($conf->global->ORDER_ADD_OPTION_SHOW_DETAIL_LIST)) {
-		print '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_orderdetail" name="check_orderdetail" class="check_orderdetail"'.($check_orderdetail ? ' checked' : '').'><label for="check_orderdetail"> <span class="check_orderdetail_text">'.$langs->trans("OrderShowDetail").'</span></label> &nbsp; </div>';
-	}
-
 	if ($sall) {
 		foreach ($fieldstosearchall as $key => $val) {
 			$fieldstosearchall[$key] = $langs->trans($val);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 4707657d3e3..e4e6c8e2839 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1324,6 +1324,9 @@ function get_left_menu_commercial($mainmenu, &$newmenu, $usemenuhider = 1, $left
 				//$newmenu->add("/commande/list.php?leftmenu=orders&search_status=4", $langs->trans("StatusOrderProcessed"), 2, $user->rights->commande->lire);
 				$newmenu->add("/commande/list.php?leftmenu=orders&search_status=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->rights->commande->lire);
 			}
+			if ($conf->global->MAIN_FEATURES_LEVEL >= 2 && empty($user->socid)) {
+				$newmenu->add("/commande/list_line.php?leftmenu=orders", $langs->trans("ListOrderLigne"), 1, $user->rights->commande->lire);
+			}
 			$newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->rights->commande->lire);
 		}
 
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index 78a5e348516..cb64d1b603a 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -96,6 +96,7 @@ OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Number of orders by month
 AmountOfOrdersByMonthHT=Amount of orders by month (excl. tax)
 ListOfOrders=List of orders
+ListOrderLigne=Lines of orders
 CloseOrder=Close order
 ConfirmCloseOrder=Are you sure you want to set this order to delivered? Once an order is delivered, it can be set to billed.
 ConfirmDeleteOrder=Are you sure you want to delete this order?

From d7387ecd17ac974351de6dcd5919be717bd9632f Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Tue, 23 Aug 2022 12:33:03 +0200
Subject: [PATCH 028/816] optimise

---
 htdocs/commande/list_line.php | 606 +++-------------------------------
 1 file changed, 49 insertions(+), 557 deletions(-)

diff --git a/htdocs/commande/list_line.php b/htdocs/commande/list_line.php
index 219d8745587..9437daebf33 100644
--- a/htdocs/commande/list_line.php
+++ b/htdocs/commande/list_line.php
@@ -189,9 +189,9 @@ $arrayfields = array(
 	'c.fk_cond_reglement'=>array('label'=>"PaymentConditionsShort", 'checked'=>-1, 'position'=>67),
 	'c.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>-1, 'position'=>68),
 	'c.fk_input_reason'=>array('label'=>"Channel", 'checked'=>-1, 'position'=>69),
-	'c.total_ht'=>array('label'=>"AmountHT", 'checked'=>1, 'position'=>75),
+	'cdet.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),
+	'cdet.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0, 'position'=>85),
 	'c.multicurrency_code'=>array('label'=>'Currency', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>90),
 	'c.multicurrency_tx'=>array('label'=>'CurrencyRate', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>95),
 	'c.multicurrency_total_ht'=>array('label'=>'MulticurrencyAmountHT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>100),
@@ -314,458 +314,12 @@ if (empty($reshook)) {
 	$uploaddir = $conf->commande->multidir_output[$conf->entity];
 	$triggersendname = 'ORDER_SENTBYMAIL';
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-
-	if ($massaction == 'confirm_createbills') {   // Create bills from orders.
-		$orders = GETPOST('toselect', 'array');
-		$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
-		$validate_invoices = GETPOST('validate_invoices', 'int');
-
-		$errors = array();
-
-		$TFact = array();
-		$TFactThird = array();
-		$TFactThirdNbLines = array();
-
-		$nb_bills_created = 0;
-		$lastid= 0;
-		$lastref = '';
-
-		$db->begin();
-
-		$nbOrders = is_array($orders) ? count($orders) : 1;
-
-		foreach ($orders as $id_order) {
-			$cmd = new Commande($db);
-			if ($cmd->fetch($id_order) <= 0) {
-				continue;
-			}
-			$cmd->fetch_thirdparty();
-
-			$objecttmp = new Facture($db);
-			if (!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) {
-				// If option "one bill per third" is set, and an invoice for this thirdparty was already created, we re-use it.
-				$objecttmp = $TFactThird[$cmd->socid];
-			} else {
-				// If we want one invoice per order or if there is no first invoice yet for this thirdparty.
-				$objecttmp->socid = $cmd->socid;
-				$objecttmp->thirdparty = $cmd->thirdparty;
-
-				$objecttmp->type = $objecttmp::TYPE_STANDARD;
-				$objecttmp->cond_reglement_id = !empty($cmd->cond_reglement_id) ? $cmd->cond_reglement_id : $cmd->thirdparty->cond_reglement_id;
-				$objecttmp->mode_reglement_id = !empty($cmd->mode_reglement_id) ? $cmd->mode_reglement_id : $cmd->thirdparty->mode_reglement_id;
-
-				$objecttmp->fk_project = $cmd->fk_project;
-				$objecttmp->multicurrency_code = $cmd->multicurrency_code;
-				if (empty($createbills_onebythird)) {
-					$objecttmp->ref_client = $cmd->ref_client;
-				}
-
-				$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-				if (empty($datefacture)) {
-					$datefacture = dol_now();
-				}
-
-				$objecttmp->date = $datefacture;
-				$objecttmp->origin    = 'commande';
-				$objecttmp->origin_id = $id_order;
-
-				$objecttmp->array_options = $cmd->array_options; // Copy extrafields
-
-				$res = $objecttmp->create($user);
-
-				if ($res > 0) {
-					$nb_bills_created++;
-					$lastref = $objecttmp->ref;
-					$lastid = $objecttmp->id;
-
-					$TFactThird[$cmd->socid] = $objecttmp;
-					$TFactThirdNbLines[$cmd->socid] = 0; //init nblines to have lines ordered by expedition and rang
-				} else {
-					$langs->load("errors");
-					$errors[] = $cmd->ref.' : '.$langs->trans($objecttmp->errors[0]);
-					$error++;
-				}
-			}
-
-			if ($objecttmp->id > 0) {
-				$res = $objecttmp->add_object_linked($objecttmp->origin, $id_order);
-
-				if ($res == 0) {
-					$errors[] = $cmd->ref.' : '.$langs->trans($objecttmp->errors[0]);
-					$error++;
-				}
-
-				if (!$error) {
-					$lines = $cmd->lines;
-					if (empty($lines) && method_exists($cmd, 'fetch_lines')) {
-						$cmd->fetch_lines();
-						$lines = $cmd->lines;
-					}
-
-					$fk_parent_line = 0;
-					$num = count($lines);
-
-					for ($i = 0; $i < $num; $i++) {
-						$desc = ($lines[$i]->desc ? $lines[$i]->desc : '');
-						// If we build one invoice for several orders, we must put the ref of order on the invoice line
-						if (!empty($createbills_onebythird)) {
-							$desc = dol_concatdesc($desc, $langs->trans("Order").' '.$cmd->ref.' - '.dol_print_date($cmd->date, 'day'));
-						}
-
-						if ($lines[$i]->subprice < 0) {
-							// Negative line, we create a discount line
-							$discount = new DiscountAbsolute($db);
-							$discount->fk_soc = $objecttmp->socid;
-							$discount->amount_ht = abs($lines[$i]->total_ht);
-							$discount->amount_tva = abs($lines[$i]->total_tva);
-							$discount->amount_ttc = abs($lines[$i]->total_ttc);
-							$discount->tva_tx = $lines[$i]->tva_tx;
-							$discount->fk_user = $user->id;
-							$discount->description = $desc;
-							$discountid = $discount->create($user);
-							if ($discountid > 0) {
-								$result = $objecttmp->insert_discount($discountid);
-								//$result=$discount->link_to_invoice($lineid,$id);
-							} else {
-								setEventMessages($discount->error, $discount->errors, 'errors');
-								$error++;
-								break;
-							}
-						} else {
-							// Positive line
-							$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
-							// Date start
-							$date_start = false;
-							if ($lines[$i]->date_debut_prevue) {
-								$date_start = $lines[$i]->date_debut_prevue;
-							}
-							if ($lines[$i]->date_debut_reel) {
-								$date_start = $lines[$i]->date_debut_reel;
-							}
-							if ($lines[$i]->date_start) {
-								$date_start = $lines[$i]->date_start;
-							}
-							//Date end
-							$date_end = false;
-							if ($lines[$i]->date_fin_prevue) {
-								$date_end = $lines[$i]->date_fin_prevue;
-							}
-							if ($lines[$i]->date_fin_reel) {
-								$date_end = $lines[$i]->date_fin_reel;
-							}
-							if ($lines[$i]->date_end) {
-								$date_end = $lines[$i]->date_end;
-							}
-							// Reset fk_parent_line for no child products and special product
-							if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9) {
-								$fk_parent_line = 0;
-							}
-
-							// Extrafields
-							if (method_exists($lines[$i], 'fetch_optionals')) {
-								$lines[$i]->fetch_optionals();
-								$array_options = $lines[$i]->array_options;
-							}
-
-							$objecttmp->context['createfromclone'];
-
-							$rang = ($nbOrders > 1) ? -1 : $lines[$i]->rang;
-							//there may already be rows from previous orders
-							if (!empty($createbills_onebythird)) {
-								$rang = $TFactThirdNbLines[$cmd->socid];
-							}
-
-							$result = $objecttmp->addline(
-								$desc,
-								$lines[$i]->subprice,
-								$lines[$i]->qty,
-								$lines[$i]->tva_tx,
-								$lines[$i]->localtax1_tx,
-								$lines[$i]->localtax2_tx,
-								$lines[$i]->fk_product,
-								$lines[$i]->remise_percent,
-								$date_start,
-								$date_end,
-								0,
-								$lines[$i]->info_bits,
-								$lines[$i]->fk_remise_except,
-								'HT',
-								0,
-								$product_type,
-								$rang,
-								$lines[$i]->special_code,
-								$objecttmp->origin,
-								$lines[$i]->rowid,
-								$fk_parent_line,
-								$lines[$i]->fk_fournprice,
-								$lines[$i]->pa_ht,
-								$lines[$i]->label,
-								$array_options,
-								100,
-								0,
-								$lines[$i]->fk_unit
-							);
-							if ($result > 0) {
-								$lineid = $result;
-								if (!empty($createbills_onebythird)) //increment rang to keep order
-									$TFactThirdNbLines[$rcp->socid]++;
-							} else {
-								$lineid = 0;
-								$error++;
-								break;
-							}
-							// Defined the new fk_parent_line
-							if ($result > 0 && $lines[$i]->product_type == 9) {
-								$fk_parent_line = $result;
-							}
-						}
-					}
-				}
-			}
-
-			//$cmd->classifyBilled($user);        // Disabled. This behavior must be set or not using the workflow module.
-
-			if (!empty($createbills_onebythird) && empty($TFactThird[$cmd->socid])) {
-				$TFactThird[$cmd->socid] = $objecttmp;
-			} else {
-				$TFact[$objecttmp->id] = $objecttmp;
-			}
-		}
-
-		// Build doc with all invoices
-		$TAllFact = empty($createbills_onebythird) ? $TFact : $TFactThird;
-		$toselect = array();
-
-		if (!$error && $validate_invoices) {
-			$massaction = $action = 'builddoc';
-
-			foreach ($TAllFact as &$objecttmp) {
-				$result = $objecttmp->validate($user);
-				if ($result <= 0) {
-					$error++;
-					setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-					break;
-				}
-
-				$id = $objecttmp->id; // For builddoc action
-
-				// Builddoc
-				$donotredirect = 1;
-				$upload_dir = $conf->facture->dir_output;
-				$permissiontoadd = $user->rights->facture->creer;
-
-				// Call action to build doc
-				$savobject = $object;
-				$object = $objecttmp;
-				include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
-				$object = $savobject;
-			}
-
-			$massaction = $action = 'confirm_createbills';
-		}
-
-		if (!$error) {
-			$db->commit();
-
-			if ($nb_bills_created == 1) {
-				$texttoshow = $langs->trans('BillXCreated', '{s1}');
-				$texttoshow = str_replace('{s1}', '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?id='.urlencode($lastid).'">'.$lastref.'</a>', $texttoshow);
-				setEventMessages($texttoshow, null, 'mesgs');
-			} else {
-				setEventMessages($langs->trans('BillCreated', $nb_bills_created), null, 'mesgs');
-			}
-
-			// Make a redirect to avoid to bill twice if we make a refresh or back
-			$param = '';
-			if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
-				$param .= '&contextpage='.urlencode($contextpage);
-			}
-			if ($limit > 0 && $limit != $conf->liste_limit) {
-				$param .= '&limit='.urlencode($limit);
-			}
-			if ($sall) {
-				$param .= '&sall='.urlencode($sall);
-			}
-			if ($socid > 0) {
-				$param .= '&socid='.urlencode($socid);
-			}
-			if ($search_status != '') {
-				$param .= '&search_status='.urlencode($search_status);
-			}
-			if ($search_orderday) {
-				$param .= '&search_orderday='.urlencode($search_orderday);
-			}
-			if ($search_ordermonth) {
-				$param .= '&search_ordermonth='.urlencode($search_ordermonth);
-			}
-			if ($search_orderyear) {
-				$param .= '&search_orderyear='.urlencode($search_orderyear);
-			}
-			if ($search_deliveryday) {
-				$param .= '&search_deliveryday='.urlencode($search_deliveryday);
-			}
-			if ($search_deliverymonth) {
-				$param .= '&search_deliverymonth='.urlencode($search_deliverymonth);
-			}
-			if ($search_deliveryyear) {
-				$param .= '&search_deliveryyear='.urlencode($search_deliveryyear);
-			}
-			if ($search_ref) {
-				$param .= '&search_ref='.urlencode($search_ref);
-			}
-			if ($search_company) {
-				$param .= '&search_company='.urlencode($search_company);
-			}
-			if ($search_ref_customer) {
-				$param .= '&search_ref_customer='.urlencode($search_ref_customer);
-			}
-			if ($search_user > 0) {
-				$param .= '&search_user='.urlencode($search_user);
-			}
-			if ($search_sale > 0) {
-				$param .= '&search_sale='.urlencode($search_sale);
-			}
-			if ($search_total_ht != '') {
-				$param .= '&search_total_ht='.urlencode($search_total_ht);
-			}
-			if ($search_total_vat != '') {
-				$param .= '&search_total_vat='.urlencode($search_total_vat);
-			}
-			if ($search_total_ttc != '') {
-				$param .= '&search_total_ttc='.urlencode($search_total_ttc);
-			}
-			if ($search_project_ref >= 0) {
-				$param .= "&search_project_ref=".urlencode($search_project_ref);
-			}
-			if ($show_files) {
-				$param .= '&show_files='.urlencode($show_files);
-			}
-			if ($optioncss != '') {
-				$param .= '&optioncss='.urlencode($optioncss);
-			}
-			if ($billed != '') {
-				$param .= '&billed='.urlencode($billed);
-			}
-
-			header("Location: ".$_SERVER['PHP_SELF'].'?'.$param);
-			exit;
-		} else {
-			$db->rollback();
-
-			$action = 'create';
-			$_GET["origin"] = $_POST["origin"];
-			$_GET["originid"] = $_POST["originid"];
-			if (!empty($errors)) {
-				setEventMessages(null, $errors, 'errors');
-			} else {
-				setEventMessages("Error", null, 'errors');
-			}
-			$error++;
-		}
-	}
-}
-if ($action == 'validate' && $permissiontoadd) {
-	if (GETPOST('confirm') == 'yes') {
-		$objecttmp = new $objectclass($db);
-		$db->begin();
-		$error = 0;
-		foreach ($toselect as $checked) {
-			if ($objecttmp->fetch($checked)) {
-				if ($objecttmp->statut == 0) {
-					if (!empty($objecttmp->fk_warehouse)) {
-						$idwarehouse = $objecttmp->fk_warehouse;
-					} else {
-						$idwarehouse = 0;
-					}
-					if ($objecttmp->valid($user, $idwarehouse)) {
-						setEventMessage($langs->trans('hasBeenValidated', $objecttmp->ref), 'mesgs');
-					} else {
-						setEventMessage($objecttmp->error, $objecttmp->errors, 'errors');
-						$error++;
-					}
-				} else {
-					$langs->load("errors");
-					setEventMessage($langs->trans('ErrorIsNotADraft', $objecttmp->ref), 'errors');
-					$error++;
-				}
-			} else {
-				dol_print_error($db);
-				$error++;
-			}
-		}
-		if ($error) {
-			$db->rollback();
-		} else {
-			$db->commit();
-		}
-	}
-}
-if ($action == 'shipped' && $permissiontoadd) {
-	if (GETPOST('confirm') == 'yes') {
-		$objecttmp = new $objectclass($db);
-		$db->begin();
-		$error = 0;
-		foreach ($toselect as $checked) {
-			if ($objecttmp->fetch($checked)) {
-				if ($objecttmp->statut == 1 || $objecttmp->statut == 2) {
-					if ($objecttmp->cloture($user)) {
-						setEventMessage($langs->trans('PassedInClosedStatus', $objecttmp->ref), 'mesgs');
-					} else {
-						setEventMessage($langs->trans('CantBeClosed'), 'errors');
-						$error++;
-					}
-				} else {
-					$langs->load("errors");
-					setEventMessage($langs->trans('ErrorIsNotADraft', $objecttmp->ref), 'errors');
-					$error++;
-				}
-			} else {
-				dol_print_error($db);
-				$error++;
-			}
-		}
-		if ($error) {
-			$db->rollback();
-		} else {
-			$db->commit();
-		}
-	}
 }
+
 // Closed records
-if (!$error && $massaction === 'setbilled' && $permissiontoclose) {
-	$db->begin();
+// if (!$error && $massaction === 'setbilled' && $permissiontoclose) {
 
-	$objecttmp = new $objectclass($db);
-	$nbok = 0;
-	foreach ($toselect as $toselectid) {
-		$result = $objecttmp->fetch($toselectid);
-		if ($result > 0) {
-			$result = $objecttmp->classifyBilled($user, 0);
-			if ($result <= 0) {
-				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-				$error++;
-				break;
-			} else {
-				$nbok++;
-			}
-		} else {
-			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-			$error++;
-			break;
-		}
-	}
-
-	if (!$error) {
-		if ($nbok > 1) {
-			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-		} else {
-			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-		}
-		$db->commit();
-	} else {
-		$db->rollback();
-	}
-}
+// }
 
 /*
  * View
@@ -796,7 +350,7 @@ $sql .= ' s.rowid as socid, s.nom as name, s.name_alias as alias, s.email, s.pho
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
 $sql .= " country.code as country_code,";
-$sql .= ' c.rowid, c.ref, c.total_ht, c.total_tva, c.total_ttc, c.ref_client, c.fk_user_author,';
+$sql .= ' c.rowid, c.ref, c.ref_client, c.fk_user_author,';
 $sql .= ' c.fk_multicurrency, c.multicurrency_code, c.multicurrency_tx, c.multicurrency_total_ht, c.multicurrency_total_tva as multicurrency_total_vat, c.multicurrency_total_ttc,';
 $sql .= ' c.date_valid, c.date_commande, c.note_public, c.note_private, c.date_livraison as date_delivery, c.fk_statut, c.facture as billed,';
 $sql .= ' c.date_creation as date_creation, c.tms as date_update, c.date_cloture as date_cloture,';
@@ -806,7 +360,7 @@ $sql .= ' c.fk_cond_reglement,c.deposit_percent,c.fk_mode_reglement,c.fk_shippin
 $sql .= ' c.fk_input_reason, c.import_key';
 
 // Détail commande
-$sql .= ', cdet.description, cdet.qty, ';
+$sql .= ', cdet.rowid, cdet.description, cdet.qty, cdet.total_ht, cdet.total_tva, cdet.total_ttc, ';
 $sql .= ' pr.rowid as product_rowid, pr.ref as product_ref, pr.label as product_label, pr.barcode as product_barcode, pr.tobatch as product_batch, pr.tosell as product_status, pr.tobuy as product_status_buy';
 
 if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
@@ -959,13 +513,13 @@ if ($search_user > 0) {
 	$sql .= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='commande' AND tc.source='internal' AND ec.element_id = c.rowid AND ec.fk_socpeople = ".((int) $search_user);
 }
 if ($search_total_ht != '') {
-	$sql .= natural_search('c.total_ht', $search_total_ht, 1);
+	$sql .= natural_search('cdet.total_ht', $search_total_ht, 1);
 }
 if ($search_total_vat != '') {
-	$sql .= natural_search('c.total_tva', $search_total_vat, 1);
+	$sql .= natural_search('cdet.total_tva', $search_total_vat, 1);
 }
 if ($search_total_ttc != '') {
-	$sql .= natural_search('c.total_ttc', $search_total_ttc, 1);
+	$sql .= natural_search('cdet.total_ttc', $search_total_ttc, 1);
 }
 if ($search_warehouse != '' && $search_warehouse > 0) {
 	$sql .= natural_search('c.fk_warehouse', $search_warehouse, 1);
@@ -1231,33 +785,26 @@ if ($resql) {
 
 	// List of mass actions available
 	$arrayofmassactions = array(
-		'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
-		'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
+		'GenerateOrdersSuppliers'=>img_picto('', 'doc', 'class="pictofixedwidth"').$langs->trans("GenerateOrdersSupplie"),
 	);
-	if ($permissiontovalidate) {
-		$arrayofmassactions['prevalidate'] = img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate");
-	}
-	if ($permissiontosendbymail) {
-		$arrayofmassactions['presend'] = img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail");
-	}
-	if ($permissiontoclose) {
-		$arrayofmassactions['preshipped'] = img_picto('', 'dollyrevert', 'class="pictofixedwidth"').$langs->trans("ClassifyShipped");
-	}
-	if ($permissiontocancel) {
-		$arrayofmassactions['cancelorders'] = img_picto('', 'close_title', 'class="pictofixedwidth"').$langs->trans("Cancel");
-	}
-	if (!empty($conf->invoice->enabled) && $user->rights->facture->creer) {
-		$arrayofmassactions['createbills'] = img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("CreateInvoiceForThisCustomer");
-	}
-	if ($permissiontoclose) {
-		$arrayofmassactions['setbilled'] = img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("ClassifyBilled");
-	}
-	if ($permissiontodelete) {
-		$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
-	}
-	if (in_array($massaction, array('presend', 'predelete', 'createbills'))) {
-		$arrayofmassactions = array();
-	}
+	// if ($permissiontovalidate) {
+	// 	$arrayofmassactions['prevalidate'] = img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate");
+	// }
+	// if ($permissiontosendbymail) {
+	// 	$arrayofmassactions['presend'] = img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail");
+	// }
+	// if ($permissiontoclose) {
+	// 	$arrayofmassactions['preshipped'] = img_picto('', 'dollyrevert', 'class="pictofixedwidth"').$langs->trans("ClassifyShipped");
+	// }
+	// if ($permissiontocancel) {
+	// 	$arrayofmassactions['cancelorders'] = img_picto('', 'close_title', 'class="pictofixedwidth"').$langs->trans("Cancel");
+	// }
+	// if ($permissiontodelete) {
+	// 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
+	// }
+	// if (in_array($massaction, array('presend', 'predelete', 'createbills'))) {
+	// 	$arrayofmassactions = array();
+	// }
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 	$url = DOL_URL_ROOT.'/commande/card.php?action=create';
@@ -1288,61 +835,6 @@ if ($resql) {
 	$trackid = 'ord'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-	if ($massaction == 'prevalidate') {
-		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassValidation"), $langs->trans("ConfirmMassValidationQuestion"), "validate", null, '', 0, 200, 500, 1);
-	}
-	if ($massaction == 'preshipped') {
-		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("CloseOrder"), $langs->trans("ConfirmCloseOrder"), "shipped", null, '', 0, 200, 500, 1);
-	}
-
-	if ($massaction == 'createbills') {
-		print '<input type="hidden" name="massaction" value="confirm_createbills">';
-
-		print '<table class="noborder" width="100%" >';
-		print '<tr>';
-		print '<td class="titlefield">';
-		print $langs->trans('DateInvoice');
-		print '</td>';
-		print '<td>';
-		print $form->selectDate('', '', '', '', '', '', 1, 1);
-		print '</td>';
-		print '</tr>';
-		print '<tr>';
-		print '<td>';
-		print $langs->trans('CreateOneBillByThird');
-		print '</td>';
-		print '<td>';
-		print $form->selectyesno('createbills_onebythird', '', 1);
-		print '</td>';
-		print '</tr>';
-		print '<tr>';
-		print '<td>';
-		print $langs->trans('ValidateInvoices');
-		print '</td>';
-		print '<td>';
-		if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
-			print $form->selectyesno('validate_invoices', 0, 1, 1);
-			print ' ('.$langs->trans("AutoValidationNotPossibleWhenStockIsDecreasedOnInvoiceValidation").')';
-		} else {
-			print $form->selectyesno('validate_invoices', 0, 1);
-		}
-		if (!empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER)) {
-			print ' &nbsp; &nbsp; <span class="opacitymedium">'.$langs->trans("IfValidateInvoiceIsNoOrderStayUnbilled").'</span>';
-		} else {
-			print ' &nbsp; &nbsp; <span class="opacitymedium">'.$langs->trans("OptionToSetOrderBilledNotEnabled").'</span>';
-		}
-		print '</td>';
-		print '</tr>';
-		print '</table>';
-
-		print '<br>';
-		print '<div class="center">';
-		print '<input type="submit" class="button" id="createbills" name="createbills" value="'.$langs->trans('CreateInvoiceForThisCustomer').'">  ';
-		print '<input type="submit" class="button button-cancel" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-		print '</div>';
-		print '<br>';
-	}
-
 	if ($sall) {
 		foreach ($fieldstosearchall as $key => $val) {
 			$fieldstosearchall[$key] = $langs->trans($val);
@@ -1552,7 +1044,7 @@ if ($resql) {
 		$form->selectInputReason($search_fk_input_reason, 'search_fk_input_reason', '', 1, '', 1);
 		print '</td>';
 	}
-	if (!empty($arrayfields['c.total_ht']['checked'])) {
+	if (!empty($arrayfields['cdet.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).'">';
@@ -1564,7 +1056,7 @@ if ($resql) {
 		print '<input class="flat" type="text" size="4" name="search_total_vat" value="'.dol_escape_htmltag($search_total_vat).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['c.total_ttc']['checked'])) {
+	if (!empty($arrayfields['cdet.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.'">';
@@ -1778,14 +1270,14 @@ if ($resql) {
 	if (!empty($arrayfields['c.fk_input_reason']['checked'])) {
 		print_liste_field_titre($arrayfields['c.fk_input_reason']['label'], $_SERVER["PHP_SELF"], "c.fk_input_reason", "", $param, '', $sortfield, $sortorder);
 	}
-	if (!empty($arrayfields['c.total_ht']['checked'])) {
-		print_liste_field_titre($arrayfields['c.total_ht']['label'], $_SERVER["PHP_SELF"], 'c.total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
+	if (!empty($arrayfields['cdet.total_ht']['checked'])) {
+		print_liste_field_titre($arrayfields['cdet.total_ht']['label'], $_SERVER["PHP_SELF"], 'cdet.total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
 	}
 	if (!empty($arrayfields['c.total_vat']['checked'])) {
-		print_liste_field_titre($arrayfields['c.total_vat']['label'], $_SERVER["PHP_SELF"], 'c.total_tva', '', $param, '', $sortfield, $sortorder, 'right ');
+		print_liste_field_titre($arrayfields['c.total_vat']['label'], $_SERVER["PHP_SELF"], 'cdet.total_tva', '', $param, '', $sortfield, $sortorder, 'right ');
 	}
-	if (!empty($arrayfields['c.total_ttc']['checked'])) {
-		print_liste_field_titre($arrayfields['c.total_ttc']['label'], $_SERVER["PHP_SELF"], 'c.total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');
+	if (!empty($arrayfields['cdet.total_ttc']['checked'])) {
+		print_liste_field_titre($arrayfields['cdet.total_ttc']['label'], $_SERVER["PHP_SELF"], 'cdet.total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');
 	}
 	if (!empty($arrayfields['c.multicurrency_code']['checked'])) {
 		print_liste_field_titre($arrayfields['c.multicurrency_code']['label'], $_SERVER['PHP_SELF'], 'c.multicurrency_code', '', $param, '', $sortfield, $sortorder);
@@ -1824,9 +1316,9 @@ if ($resql) {
 	$totalarray = array(
 		'nbfield' => 0,
 		'val' => array(
-			'c.total_ht' => 0,
-			'c.total_tva' => 0,
-			'c.total_ttc' => 0,
+			'cdet.total_ht' => 0,
+			'cdet.total_tva' => 0,
+			'cdet.total_ttc' => 0,
 		),
 		'pos' => array(),
 	);
@@ -2195,18 +1687,18 @@ if ($resql) {
 			}
 		}
 		// Amount HT
-		if (!empty($arrayfields['c.total_ht']['checked'])) {
+		if (!empty($arrayfields['cdet.total_ht']['checked'])) {
 			  print '<td class="nowrap right"><span class="amount">'.price($obj->total_ht)."</span></td>\n";
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
 			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'c.total_ht';
+				$totalarray['pos'][$totalarray['nbfield']] = 'cdet.total_ht';
 			}
-			if (isset($totalarray['val']['c.total_ht'])) {
-				$totalarray['val']['c.total_ht'] += $obj->total_ht;
+			if (isset($totalarray['val']['cdet.total_ht'])) {
+				$totalarray['val']['cdet.total_ht'] += $obj->total_ht;
 			} else {
-				$totalarray['val']['c.total_ht'] = $obj->total_ht;
+				$totalarray['val']['cdet.total_ht'] = $obj->total_ht;
 			}
 		}
 		// Amount VAT
@@ -2216,20 +1708,20 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'c.total_tva';
+				$totalarray['pos'][$totalarray['nbfield']] = 'cdet.total_tva';
 			}
-			$totalarray['val']['c.total_tva'] += $obj->total_tva;
+			$totalarray['val']['cdet.total_tva'] += $obj->total_tva;
 		}
 		// Amount TTC
-		if (!empty($arrayfields['c.total_ttc']['checked'])) {
+		if (!empty($arrayfields['cdet.total_ttc']['checked'])) {
 			print '<td class="nowrap right"><span class="amount">'.price($obj->total_ttc)."</span></td>\n";
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
 			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'c.total_ttc';
+				$totalarray['pos'][$totalarray['nbfield']] = 'cdet.total_ttc';
 			}
-			$totalarray['val']['c.total_ttc'] += $obj->total_ttc;
+			$totalarray['val']['cdet.total_ttc'] += $obj->total_ttc;
 		}
 
 		// Currency

From 62163ae903a3f0c9e0d37f343c4497d5e765f4cb Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Tue, 23 Aug 2022 14:47:54 +0200
Subject: [PATCH 029/816] Add in auguria menu

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

diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 96625dd1f95..6821b065010 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -178,6 +178,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->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1207__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;search_status=4', 'StatusOrderProcessed', 1, 'orders', '$user->rights->commande->lire', '', 2, 6, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1208__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;search_status=-1', 'StatusOrderCanceledShort', 1, 'orders', '$user->rights->commande->lire', '', 2, 7, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled', __HANDLER__, 'left', 1209__+MAX_llx_menu__, 'commercial', '', 1200__+MAX_llx_menu__, '/commande/stats/index.php?mainmenu=commercial&amp;leftmenu=orders', 'Statistics', 1, 'orders', '$user->rights->commande->lire', '', 2, 4, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 2 && empty($user->socid)', __HANDLER__, 'left', 1210__+MAX_llx_menu__, 'commercial', '', 1200__+MAX_llx_menu__, '/commande/list_line.php?mainmenu=commercial&amp;leftmenu=orders', 'ListOrderLigne', 1, 'orders', '$user->rights->commande->lire', '', 2, 1, __ENTITY__);
 
 -- Commercial - Supplier's proposals
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_proposal->enabled', __HANDLER__, 'left', 1650__+MAX_llx_menu__, 'commercial', 'propals_supplier', 3__+MAX_llx_menu__, '/supplier_proposal/index.php?leftmenu=propals_supplier', 'SupplierProposalsShort', 0, 'supplier_proposal', '$user->rights->supplier_proposal->lire', '', 2, 4, __ENTITY__);

From 19248016bf05e8f77946035731c5643331fc12db Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Tue, 23 Aug 2022 15:40:12 +0200
Subject: [PATCH 030/816] Fix - $generic_commande mount

---
 htdocs/commande/list_line.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/htdocs/commande/list_line.php b/htdocs/commande/list_line.php
index 9437daebf33..cb7d76e8930 100644
--- a/htdocs/commande/list_line.php
+++ b/htdocs/commande/list_line.php
@@ -350,8 +350,9 @@ $sql .= ' s.rowid as socid, s.nom as name, s.name_alias as alias, s.email, s.pho
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
 $sql .= " country.code as country_code,";
-$sql .= ' c.rowid, c.ref, c.ref_client, c.fk_user_author,';
+$sql .= ' c.rowid as c_rowid, c.ref, c.ref_client, c.fk_user_author,';
 $sql .= ' c.fk_multicurrency, c.multicurrency_code, c.multicurrency_tx, c.multicurrency_total_ht, c.multicurrency_total_tva as multicurrency_total_vat, c.multicurrency_total_ttc,';
+$sql .= ' c.total_ht as c_total_ht, c.total_tva as c_total_tva, c.total_ttc as c_total_ttc,';
 $sql .= ' c.date_valid, c.date_commande, c.note_public, c.note_private, c.date_livraison as date_delivery, c.fk_statut, c.facture as billed,';
 $sql .= ' c.date_creation as date_creation, c.tms as date_update, c.date_cloture as date_cloture,';
 $sql .= ' p.rowid as project_id, p.ref as project_ref, p.title as project_label,';
@@ -601,12 +602,12 @@ if ($resql) {
 	if ($socid > 0) {
 		$soc = new Societe($db);
 		$soc->fetch($socid);
-		$title = $langs->trans('CustomersOrders').' - '.$soc->name;
+		$title = $langs->trans('ListOrderLigne').' - '.$soc->name;
 		if (empty($search_company)) {
 			$search_company = $soc->name;
 		}
 	} else {
-		$title = $langs->trans('CustomersOrders');
+		$title = $langs->trans('ListOrderLigne');
 	}
 	if (strval($search_status) == '0') {
 		$title .= ' - '.$langs->trans('StatusOrderDraftShort');
@@ -1419,7 +1420,7 @@ if ($resql) {
 			$getNomUrl_cache[$obj->socid] = $companystatic->getNomUrl(1, 'customer');
 		}
 
-		$generic_commande->id = $obj->rowid;
+		$generic_commande->id = $obj->c_rowid;
 		$generic_commande->ref = $obj->ref;
 		$generic_commande->statut = $obj->fk_statut;
 		$generic_commande->billed = $obj->billed;
@@ -1427,9 +1428,9 @@ if ($resql) {
 		$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;
-		$generic_commande->total_tva = $obj->total_tva;
-		$generic_commande->total_ttc = $obj->total_ttc;
+		$generic_commande->total_ht = $obj->c_total_ht;
+		$generic_commande->total_tva = $obj->c_total_tva;
+		$generic_commande->total_ttc = $obj->c_total_ttc;
 		$generic_commande->note_public = $obj->note_public;
 		$generic_commande->note_private = $obj->note_private;
 

From 6d625d6128bb1656d8dfe2ccf58aa0977053fe04 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Tue, 23 Aug 2022 20:09:40 +0200
Subject: [PATCH 031/816] Add options for clean list

---
 htdocs/commande/list_line.php  | 14 +++++++++++++-
 htdocs/langs/en_US/orders.lang |  2 ++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/htdocs/commande/list_line.php b/htdocs/commande/list_line.php
index cb7d76e8930..d564daf27ab 100644
--- a/htdocs/commande/list_line.php
+++ b/htdocs/commande/list_line.php
@@ -57,6 +57,8 @@ $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'orderlist';
+$productonly = GETPOST('productonly', 'alpha');
+$disablelinefree = GETPOST('disablelinefree', 'alpha');
 
 $search_datecloture_start = GETPOST('search_datecloture_start', 'int');
 if (empty($search_datecloture_start)) {
@@ -361,7 +363,7 @@ $sql .= ' c.fk_cond_reglement,c.deposit_percent,c.fk_mode_reglement,c.fk_shippin
 $sql .= ' c.fk_input_reason, c.import_key';
 
 // Détail commande
-$sql .= ', cdet.rowid, cdet.description, cdet.qty, cdet.total_ht, cdet.total_tva, cdet.total_ttc, ';
+$sql .= ', cdet.rowid, cdet.description, cdet.qty, cdet.product_type, cdet.fk_product, cdet.total_ht, cdet.total_tva, cdet.total_ttc, ';
 $sql .= ' pr.rowid as product_rowid, pr.ref as product_ref, pr.label as product_label, pr.barcode as product_barcode, pr.tobatch as product_batch, pr.tosell as product_status, pr.tobuy as product_status_buy';
 
 if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
@@ -418,6 +420,13 @@ $sql .= $hookmanager->resPrint;
 
 $sql .= ' WHERE c.fk_soc = s.rowid';
 $sql .= ' AND c.entity IN ('.getEntity('commande').')';
+
+if (!empty($productonly)) {
+	$sql .= " AND (cdet.product_type = 0 OR cdet.product_type = 1)";
+}
+if (!empty($disablelinefree)) {
+	$sql .= " AND cdet.fk_product IS NOT NULL";
+}
 if ($search_product_category > 0) {
 	$sql .= " AND cp.fk_categorie = ".((int) $search_product_category);
 }
@@ -830,6 +839,9 @@ if ($resql) {
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'order', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
+	print '<input type="checkbox" name="productonly"'.(!empty($productonly)?'value="productonlychecked" checked':'' ).'><label for="productonly">'.$langs->trans("productonly").'</label>';
+	print '<input type="checkbox" name="disablelinefree"'.(!empty($disablelinefree)?'value="disablelinefreechecked" checked':'' ).'><label for="disablelinefree">'.$langs->trans("disablelinefree").'</label>';
+
 	$topicmail = "SendOrderRef";
 	$modelmail = "order_send";
 	$objecttmp = new Commande($db);
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index cb64d1b603a..a465fc41ea6 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -97,6 +97,8 @@ NumberOfOrdersByMonth=Number of orders by month
 AmountOfOrdersByMonthHT=Amount of orders by month (excl. tax)
 ListOfOrders=List of orders
 ListOrderLigne=Lines of orders
+productonly=Lines products only
+disablelinefree=No lines free
 CloseOrder=Close order
 ConfirmCloseOrder=Are you sure you want to set this order to delivered? Once an order is delivered, it can be set to billed.
 ConfirmDeleteOrder=Are you sure you want to delete this order?

From 8cc9d72b37a534b5d90556ba9cb1a1f846c3b18c Mon Sep 17 00:00:00 2001
From: GregM <gregory.maza@atm-consulting.fr>
Date: Tue, 30 Aug 2022 16:53:14 +0200
Subject: [PATCH 032/816] update sql

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

diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index ce74f82b412..3ae7e7d8645 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -1777,12 +1777,11 @@ class Contact extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";
 		$sql .= ", ".MAIN_DB_PREFIX."societe_contacts sc";
 		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."socpeople sp";
-		$sql .= " ON sc.fk_socpeople = sp.rowid";
+		$sql .= " ON sc.fk_socpeople = sp.rowid AND sp.statut = 1";
 		$sql .= " WHERE sc.fk_soc =".((int) $this->socid);
 		$sql .= " AND sc.fk_c_type_contact=tc.rowid";
 		$sql .= " AND tc.element = '".$this->db->escape($element)."'";
 		$sql .= " AND tc.active = 1";
-		$sql .= " AND sp.statut = 1";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);

From c0c12a40b088b57694981844bc2d130958b15e88 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Thu, 1 Sep 2022 16:37:13 +0200
Subject: [PATCH 033/816] Fix inithook

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

diff --git a/htdocs/commande/list_line.php b/htdocs/commande/list_line.php
index d564daf27ab..7ea36fe8d09 100644
--- a/htdocs/commande/list_line.php
+++ b/htdocs/commande/list_line.php
@@ -146,7 +146,7 @@ $show_shippable_command = GETPOST('show_shippable_command', 'aZ09');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new Commande($db);
-$hookmanager->initHooks(array('orderlist'));
+$hookmanager->initHooks(array('orderlistdetail'));
 $extrafields = new ExtraFields($db);
 
 // fetch optionals attributes and labels

From 6e6a62d167d4ac9d48b937c0b6e98c3dbca7438e Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Wed, 7 Sep 2022 14:58:07 +0200
Subject: [PATCH 034/816] NEW set payment default values when supplier order
 created from reception

---
 htdocs/fourn/facture/card.php |  95 +++++++++++++++++++++++++++++---
 htdocs/reception/list.php     | 100 ++++++++++++++++++++++++++++++++--
 2 files changed, 181 insertions(+), 14 deletions(-)

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 2f8f3f2adae..d096d02d92c 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1954,15 +1954,93 @@ if ($action == 'create') {
 
 		$projectid = (!empty($objectsrc->fk_project) ? $objectsrc->fk_project : '');
 		//$ref_client			= (!empty($objectsrc->ref_client)?$object->ref_client:'');
-
 		$soc = $objectsrc->thirdparty;
-		$cond_reglement_id 	= (!empty($objectsrc->cond_reglement_id) ? $objectsrc->cond_reglement_id : (!empty($soc->cond_reglement_supplier_id) ? $soc->cond_reglement_supplier_id : 0)); // TODO maybe add default value option
-		$mode_reglement_id 	= (!empty($objectsrc->mode_reglement_id) ? $objectsrc->mode_reglement_id : (!empty($soc->mode_reglement_supplier_id) ? $soc->mode_reglement_supplier_id : 0));
-		$fk_account         = (!empty($objectsrc->fk_account) ? $objectsrc->fk_account : (!empty($soc->fk_account) ? $soc->fk_account : 0));
-		$remise_percent 	= (!empty($objectsrc->remise_percent) ? $objectsrc->remise_percent : (!empty($soc->remise_supplier_percent) ? $soc->remise_supplier_percent : 0));
-		$remise_absolue 	= (!empty($objectsrc->remise_absolue) ? $objectsrc->remise_absolue : (!empty($soc->remise_absolue) ? $soc->remise_absolue : 0));
-		$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));
+
+		$cond_reglement_id = 0;
+		$mode_reglement_id = 0;
+		$fk_account = 0;
+		$remise_percent = 0;
+		$remise_absolue = 0;
+		$transport_mode_id = 0;
+
+		// set from object source
+		if (!empty($objectsrc->cond_reglement_id)) {
+			$cond_reglement_id = $objectsrc->cond_reglement_id;
+		}
+		if (!empty($objectsrc->mode_reglement_id)) {
+			$mode_reglement_id = $objectsrc->mode_reglement_id;
+		}
+		if (!empty($objectsrc->fk_account)) {
+			$fk_account = $objectsrc->fk_account;
+		}
+		if (!empty($objectsrc->remise_percent)) {
+			$remise_percent = $objectsrc->remise_percent;
+		}
+		if (!empty($objectsrc->remise_absolue)) {
+			$remise_absolue = $objectsrc->remise_absolue;
+		}
+		if (!empty($objectsrc->transport_mode_id)) {
+			$transport_mode_id = $objectsrc->transport_mode_id;
+		}
+
+		if (empty($cond_reglement_id)
+			|| empty($mode_reglement_id)
+			|| empty($fk_account)
+			|| empty($remise_percent)
+			|| empty($remise_absolue)
+			|| empty($transport_mode_id)
+		) {
+			if ($origin == 'reception') {
+				// try to get from source of reception (supplier order)
+				if (!isset($objectsrc->supplier_order)) {
+					$objectsrc->fetch_origin();
+				}
+
+				if (!empty($objectsrc->commandeFournisseur)) {
+					$supplierOrder = $objectsrc->commandeFournisseur;
+					if (empty($cond_reglement_id) && !empty($supplierOrder->cond_reglement_id)) {
+						$cond_reglement_id = $supplierOrder->cond_reglement_id;
+					}
+					if (empty($mode_reglement_id) && !empty($supplierOrder->mode_reglement_id)) {
+						$mode_reglement_id = $supplierOrder->mode_reglement_id;
+					}
+					if (empty($fk_account) && !empty($supplierOrder->fk_account)) {
+						$fk_account = $supplierOrder->fk_account;
+					}
+					if (empty($remise_percent) && !empty($supplierOrder->remise_percent)) {
+						$remise_percent = $supplierOrder->remise_percent;
+					}
+					if (empty($remise_absolue) && !empty($supplierOrder->remise_absolue)) {
+						$remise_absolue = $supplierOrder->remise_absolue;
+					}
+					if (empty($transport_mode_id) && !empty($supplierOrder->transport_mode_id)) {
+						$transport_mode_id = $supplierOrder->transport_mode_id;
+					}
+				}
+			}
+
+			// try to get from third-party of source object
+			if (!empty($soc)) {
+				if (empty($cond_reglement_id) && !empty($soc->cond_reglement_supplier_id)) {
+					$cond_reglement_id = $soc->cond_reglement_supplier_id;
+				}
+				if (empty($mode_reglement_id) && !empty($soc->mode_reglement_supplier_id)) {
+					$mode_reglement_id = $soc->mode_reglement_supplier_id;
+				}
+				if (empty($fk_account) && !empty($soc->fk_account)) {
+					$fk_account = $soc->fk_account;
+				}
+				if (empty($remise_percent) && !empty($soc->remise_supplier_percent)) {
+					$remise_percent = $soc->remise_supplier_percent;
+				}
+				if (empty($remise_absolue) && !empty($soc->remise_absolue)) {
+					$remise_absolue = $soc->remise_absolue;
+				}
+				if (empty($transport_mode_id) && !empty($soc->transport_mode_id)) {
+					$transport_mode_id = $soc->transport_mode_id;
+				}
+			}
+		}
 
 		if (isModEnabled("multicurrency")) {
 			if (!empty($objectsrc->multicurrency_code)) {
@@ -1973,6 +2051,7 @@ if ($action == 'create') {
 			}
 		}
 
+		$dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '';
 		$datetmp = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 		$dateinvoice = ($datetmp == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $datetmp);
 		$datetmp = dol_mktime(12, 0, 0, GETPOST('echmonth', 'int'), GETPOST('echday', 'int'), GETPOST('echyear', 'int'));
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index 88c86168678..a6ed1ad935e 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -219,15 +219,98 @@ if (empty($reshook)) {
 					}
 				}
 			} else {
+				$cond_reglement_id = 0;
+				$mode_reglement_id = 0;
+				$fk_account = 0;
+				$remise_percent = 0;
+				$remise_absolue = 0;
+				$transport_mode_id = 0;
+				if (!empty($rcp->cond_reglement_id)) {
+					$cond_reglement_id = $rcp->cond_reglement_id;
+				}
+				if (!empty($rcp->mode_reglement_id)) {
+					$mode_reglement_id = $rcp->mode_reglement_id;
+				}
+				if (!empty($rcp->fk_account)) {
+					$fk_account = $rcp->fk_account;
+				}
+				if (!empty($rcp->remise_percent)) {
+					$remise_percent = $rcp->remise_percent;
+				}
+				if (!empty($rcp->remise_absolue)) {
+					$remise_absolue = $rcp->remise_absolue;
+				}
+				if (!empty($rcp->transport_mode_id)) {
+					$transport_mode_id = $rcp->transport_mode_id;
+				}
+
+				if (empty($cond_reglement_id)
+					|| empty($mode_reglement_id)
+					|| empty($fk_account)
+					|| empty($remise_percent)
+					|| empty($remise_absolue)
+					|| empty($transport_mode_id)
+				) {
+					if (!isset($rcp->supplier_order)) {
+						$rcp->fetch_origin();
+					}
+
+					// try to get from source of reception (supplier order)
+					if (!empty($rcp->commandeFournisseur)) {
+						$supplierOrder = $rcp->commandeFournisseur;
+						if (empty($cond_reglement_id) && !empty($supplierOrder->cond_reglement_id)) {
+							$cond_reglement_id = $supplierOrder->cond_reglement_id;
+						}
+						if (empty($mode_reglement_id) && !empty($supplierOrder->mode_reglement_id)) {
+							$mode_reglement_id = $supplierOrder->mode_reglement_id;
+						}
+						if (empty($fk_account) && !empty($supplierOrder->fk_account)) {
+							$fk_account = $supplierOrder->fk_account;
+						}
+						if (empty($remise_percent) && !empty($supplierOrder->remise_percent)) {
+							$remise_percent = $supplierOrder->remise_percent;
+						}
+						if (empty($remise_absolue) && !empty($supplierOrder->remise_absolue)) {
+							$remise_absolue = $supplierOrder->remise_absolue;
+						}
+						if (empty($transport_mode_id) && !empty($supplierOrder->transport_mode_id)) {
+							$transport_mode_id = $supplierOrder->transport_mode_id;
+						}
+					}
+
+					// try get from third-party of reception
+					if (!empty($rcp->thirdparty)) {
+						$soc = $rcp->thirdparty;
+						if (empty($cond_reglement_id) && !empty($soc->cond_reglement_supplier_id)) {
+							$cond_reglement_id = $soc->cond_reglement_supplier_id;
+						}
+						if (empty($mode_reglement_id) && !empty($soc->mode_reglement_supplier_id)) {
+							$mode_reglement_id = $soc->mode_reglement_supplier_id;
+						}
+						if (empty($fk_account) && !empty($soc->fk_account)) {
+							$fk_account = $soc->fk_account;
+						}
+						if (empty($remise_percent) && !empty($soc->remise_supplier_percent)) {
+							$remise_percent = $soc->remise_supplier_percent;
+						}
+						if (empty($remise_absolue) && !empty($soc->remise_absolue)) {
+							$remise_absolue = $soc->remise_absolue;
+						}
+						if (empty($transport_mode_id) && !empty($soc->transport_mode_id)) {
+							$transport_mode_id = $soc->transport_mode_id;
+						}
+					}
+				}
+
 				// If we want one invoice per reception or if there is no first invoice yet for this thirdparty.
 				$objecttmp->socid = $rcp->socid;
 				$objecttmp->type = $objecttmp::TYPE_STANDARD;
-				$objecttmp->cond_reglement_id	= $rcp->cond_reglement_id || $rcp->thirdparty->cond_reglement_supplier_id;
-				$objecttmp->mode_reglement_id	= $rcp->mode_reglement_id || $rcp->thirdparty->mode_reglement_supplier_id;
-
-				$objecttmp->fk_account = !empty($rcp->thirdparty->fk_account) ? $rcp->thirdparty->fk_account : 0;
-				$objecttmp->remise_percent 	= !empty($rcp->thirdparty->remise_percent) ? $rcp->thirdparty->remise_percent : 0;
-				$objecttmp->remise_absolue 	= !empty($rcp->thirdparty->remise_absolue) ? $rcp->thirdparty->remise_absolue : 0;
+				$objecttmp->cond_reglement_id = $cond_reglement_id;
+				$objecttmp->mode_reglement_id = $mode_reglement_id;
+				$objecttmp->fk_account = $fk_account;
+				$objecttmp->remise_percent = $remise_percent;
+				$objecttmp->remise_absolue = $remise_absolue;
+				$objecttmp->transport_mode_id = $transport_mode_id;
 
 				$objecttmp->fk_project			= $rcp->fk_project;
 				//$objecttmp->multicurrency_code = $rcp->multicurrency_code;
@@ -247,6 +330,11 @@ if (empty($reshook)) {
 				$objecttmp->origin    = 'reception';
 				$objecttmp->origin_id = $id_reception;
 
+				// Auto calculation of date due if not filled by user
+				if (empty($objecttmp->date_echeance)) {
+					$objecttmp->date_echeance = $objecttmp->calculate_date_lim_reglement();
+				}
+
 				$objecttmp->array_options = $rcp->array_options; // Copy extrafields
 
 				// Set $objecttmp->linked_objects with all links order_supplier existing on reception, so same links will be added to the generated supplier invoice

From 1833add141e439011e56691b6f038907ba7adfc3 Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Thu, 8 Sep 2022 10:12:40 +0200
Subject: [PATCH 035/816] FIX theorical stock when stock calculate on bill

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 0900f11ed29..bb04f6e9359 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2990,7 +2990,6 @@ class Product extends CommonObject
 					$sql .= " JOIN ".MAIN_DB_PREFIX."commande c ON el.fk_source = c.rowid ";
 					$sql .= " WHERE c.fk_statut IN (".$this->db->sanitize($filtrestatut).") AND c.facture = 0 AND fd.fk_product = ".((int) $this->id);
 					dol_syslog(__METHOD__.":: sql $sql", LOG_NOTICE);
-
 					$resql = $this->db->query($sql);
 					if ($resql) {
 						if ($this->db->num_rows($resql) > 0) {
@@ -2999,6 +2998,24 @@ class Product extends CommonObject
 						}
 					}
 
+					$this->stats_commande['qty'] -= $adeduire;
+				} else {
+					//For every order having invoice already validated we need to decrease stock cause it's in physical stock
+					$adeduire = 0;
+					$sql = 'SELECT sum(fd.qty) as count FROM '.MAIN_DB_PREFIX.'facturedet fd ';
+					$sql .= ' JOIN '.MAIN_DB_PREFIX.'facture f ON fd.fk_facture = f.rowid ';
+					$sql .= ' JOIN '.MAIN_DB_PREFIX."element_element el ON el.fk_target = f.rowid and el.targettype = 'facture' and sourcetype = 'commande'";
+					$sql .= ' JOIN '.MAIN_DB_PREFIX.'commande c ON el.fk_source = c.rowid ';
+					$sql .= ' WHERE c.fk_statut IN ('.$this->db->sanitize($filtrestatut).') AND f.fk_statut > '.Facture::STATUS_DRAFT.' AND fd.fk_product = '.((int) $this->id);
+					dol_syslog(__METHOD__.":: sql $sql", LOG_NOTICE);
+					$resql = $this->db->query($sql);
+					if($resql) {
+						if($this->db->num_rows($resql) > 0) {
+							$obj = $this->db->fetch_object($resql);
+							$adeduire += $obj->count;
+						}
+					}
+
 					$this->stats_commande['qty'] -= $adeduire;
 				}
 			}

From c4793fdb06a6f59f85defe372621c8c270df999a Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 8 Sep 2022 08:32:08 +0000
Subject: [PATCH 036/816] Fixing style errors.

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index bb04f6e9359..5a1385deb6f 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3009,8 +3009,8 @@ class Product extends CommonObject
 					$sql .= ' WHERE c.fk_statut IN ('.$this->db->sanitize($filtrestatut).') AND f.fk_statut > '.Facture::STATUS_DRAFT.' AND fd.fk_product = '.((int) $this->id);
 					dol_syslog(__METHOD__.":: sql $sql", LOG_NOTICE);
 					$resql = $this->db->query($sql);
-					if($resql) {
-						if($this->db->num_rows($resql) > 0) {
+					if ($resql) {
+						if ($this->db->num_rows($resql) > 0) {
 							$obj = $this->db->fetch_object($resql);
 							$adeduire += $obj->count;
 						}

From 4fcfe966903ad783639492bc2c0039e2c7553ef9 Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Wed, 14 Sep 2022 09:45:18 +0200
Subject: [PATCH 037/816] fix two sides

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index bb04f6e9359..670b4548228 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3004,7 +3004,7 @@ class Product extends CommonObject
 					$adeduire = 0;
 					$sql = 'SELECT sum(fd.qty) as count FROM '.MAIN_DB_PREFIX.'facturedet fd ';
 					$sql .= ' JOIN '.MAIN_DB_PREFIX.'facture f ON fd.fk_facture = f.rowid ';
-					$sql .= ' JOIN '.MAIN_DB_PREFIX."element_element el ON el.fk_target = f.rowid and el.targettype = 'facture' and sourcetype = 'commande'";
+					$sql .= ' JOIN '.MAIN_DB_PREFIX."element_element el ON ((el.fk_target = f.rowid AND el.targettype = 'facture' AND sourcetype = 'commande') OR (el.fk_source = f.rowid AND el.targettype = 'commande' AND sourcetype = 'facture'))";
 					$sql .= ' JOIN '.MAIN_DB_PREFIX.'commande c ON el.fk_source = c.rowid ';
 					$sql .= ' WHERE c.fk_statut IN ('.$this->db->sanitize($filtrestatut).') AND f.fk_statut > '.Facture::STATUS_DRAFT.' AND fd.fk_product = '.((int) $this->id);
 					dol_syslog(__METHOD__.":: sql $sql", LOG_NOTICE);

From 18be0b4f271d428e13949c2fc9441b9576c5a6a6 Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Tue, 20 Sep 2022 14:44:43 +0200
Subject: [PATCH 038/816] FIX missing facture class inclusion

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 705081484fe..ca2418a0ab1 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2926,7 +2926,6 @@ class Product extends CommonObject
 	{
 		// phpcs:enable
 		global $conf, $user, $hookmanager;
-
 		$sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_customers, COUNT(DISTINCT c.rowid) as nb,";
 		$sql .= " COUNT(cd.rowid) as nb_rows, SUM(cd.qty) as qty";
 		$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd";
@@ -3000,6 +2999,8 @@ class Product extends CommonObject
 
 					$this->stats_commande['qty'] -= $adeduire;
 				} else {
+					include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+
 					//For every order having invoice already validated we need to decrease stock cause it's in physical stock
 					$adeduire = 0;
 					$sql = 'SELECT sum(fd.qty) as count FROM '.MAIN_DB_PREFIX.'facturedet fd ';

From dc3d0c5c2e78bbe9c9fa1156b96c19422abeeaa3 Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Wed, 28 Sep 2022 11:04:09 +0200
Subject: [PATCH 039/816] FIX duplicate invoice date

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

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index d096d02d92c..e6c16d03eed 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2050,10 +2050,9 @@ if ($action == 'create') {
 				$currency_tx = $objectsrc->multicurrency_tx;
 			}
 		}
-
-		$dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '';
+		
 		$datetmp = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-		$dateinvoice = ($datetmp == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $datetmp);
+		$dateinvoice = ($datetmp == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ? -1 : '') : $datetmp);
 		$datetmp = dol_mktime(12, 0, 0, GETPOST('echmonth', 'int'), GETPOST('echday', 'int'), GETPOST('echyear', 'int'));
 		$datedue = ($datetmp == '' ?-1 : $datetmp);
 

From 4bcd9220e64d6784453ef324c59b7c6a9bc836c5 Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Wed, 28 Sep 2022 11:13:21 +0200
Subject: [PATCH 040/816] FIX stickler-ci

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

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index e6c16d03eed..d342ddc79d6 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2050,7 +2050,7 @@ if ($action == 'create') {
 				$currency_tx = $objectsrc->multicurrency_tx;
 			}
 		}
-		
+
 		$datetmp = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 		$dateinvoice = ($datetmp == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ? -1 : '') : $datetmp);
 		$datetmp = dol_mktime(12, 0, 0, GETPOST('echmonth', 'int'), GETPOST('echday', 'int'), GETPOST('echyear', 'int'));

From c268cf379c100c382fe90710ae2ca950edcbacfa Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Fri, 30 Sep 2022 14:00:06 +0200
Subject: [PATCH 041/816] FIX full day event compare start date in future

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

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 674348d6158..d5fb64ec471 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -944,16 +944,17 @@ while ($i < $imaxinloop) {
 	$event_more_class = '';
 	$event_start_date_style = '';
 	$event_start_date_time = $actionstatic->datep;
-	if ($obj->fulldayevent == 1) {
-		$today_start_date_time = $today_start_time;
-	} else {
-		$today_start_date_time = $now;
-	}
-	if ($event_start_date_time > $today_start_date_time) {
+	if ($event_start_date_time > $now) {
 		// future event
 		$event_more_class = 'event-future';
 		$event_start_date_color = $conf->global->AGENDA_EVENT_FUTURE_COLOR;
 	} else {
+		if ($obj->fulldayevent == 1) {
+			$today_start_date_time = $today_start_time;
+		} else {
+			$today_start_date_time = $now;
+		}
+
 		// check event end date
 		$event_end_date_time = $db->jdate($obj->dp2);
 		if ($event_end_date_time != null && $event_end_date_time < $today_start_date_time) {

From 069371fc954597341c3f7e889f8919c507e73174 Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Fri, 30 Sep 2022 14:12:03 +0200
Subject: [PATCH 042/816] FIX reload stickler-ci


From f18c84621266c9ff6bee315050318070cafab054 Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Mon, 3 Oct 2022 14:33:08 +0200
Subject: [PATCH 043/816] FIX user owner cache in event list

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

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index d5fb64ec471..8a811a90f22 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -273,7 +273,6 @@ if (empty($reshook)) {
  */
 
 $form = new Form($db);
-$userstatic = new User($db);
 $formactions = new FormActions($db);
 
 $actionstatic = new ActionComm($db);
@@ -927,6 +926,7 @@ while ($i < $imaxinloop) {
 
 	// cache of user list (owners)
 	if ($obj->fk_user_action > 0 && !isset($cache_user_list[$obj->fk_user_action])) {
+		$userstatic = new User($db);
 		$res = $userstatic->fetch($obj->fk_user_action);
 		if ($res > 0) {
 			$cache_user_list[$obj->fk_user_action] = $userstatic;
@@ -988,6 +988,7 @@ while ($i < $imaxinloop) {
 	if (!empty($arrayfields['owner']['checked'])) {
 		print '<td class="tdoverflowmax150"' . ($event_owner_style != '' ? ' style="'.$event_owner_style.'"' : '') . '>'; // With edge and chrome the td overflow is not supported correctly when content is not full text.
 		if ($obj->fk_user_action > 0 && !isset($cache_user_list[$obj->fk_user_action])) {
+			$userstatic = new User($db);
 			$res = $userstatic->fetch($obj->fk_user_action);
 			if ($res > 0) {
 				$cache_user_list[$obj->fk_user_action] = $userstatic;

From 9c6dd0f5df000710aa193195fdfe2f23ba805250 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Mon, 24 Oct 2022 18:24:11 +0200
Subject: [PATCH 044/816] FIX - removefilter

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

diff --git a/htdocs/commande/list_line.php b/htdocs/commande/list_line.php
index 7ea36fe8d09..98e0016d36f 100644
--- a/htdocs/commande/list_line.php
+++ b/htdocs/commande/list_line.php
@@ -247,6 +247,8 @@ if (empty($reshook)) {
 
 	// Purge search criteria
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+		$productonly = '';
+		$disablelinefree = '';
 		$search_categ = '';
 		$search_user = '';
 		$search_sale = '';

From 2671bd6433ccf2d60d2af5690a087a9ca8447b4f Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Mon, 24 Oct 2022 18:28:00 +0200
Subject: [PATCH 045/816] FIX - no ligne title or sub-total or comment

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

diff --git a/htdocs/commande/list_line.php b/htdocs/commande/list_line.php
index 98e0016d36f..4b20250e6de 100644
--- a/htdocs/commande/list_line.php
+++ b/htdocs/commande/list_line.php
@@ -422,6 +422,7 @@ $sql .= $hookmanager->resPrint;
 
 $sql .= ' WHERE c.fk_soc = s.rowid';
 $sql .= ' AND c.entity IN ('.getEntity('commande').')';
+$sql .= ' AND cdet.product_type <> 9';
 
 if (!empty($productonly)) {
 	$sql .= " AND (cdet.product_type = 0 OR cdet.product_type = 1)";

From 64bc7a93c3e328b57fedcc1cab339ff117c19744 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Mon, 24 Oct 2022 18:43:23 +0200
Subject: [PATCH 046/816] ADD - Option Products to buy only

---
 htdocs/commande/list_line.php  | 6 ++++++
 htdocs/langs/en_US/orders.lang | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/htdocs/commande/list_line.php b/htdocs/commande/list_line.php
index 4b20250e6de..a569d7a56e1 100644
--- a/htdocs/commande/list_line.php
+++ b/htdocs/commande/list_line.php
@@ -57,6 +57,7 @@ $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'orderlist';
+$productobuy = GETPOST('productobuy', 'alpha');
 $productonly = GETPOST('productonly', 'alpha');
 $disablelinefree = GETPOST('disablelinefree', 'alpha');
 
@@ -247,6 +248,7 @@ if (empty($reshook)) {
 
 	// Purge search criteria
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+		$productobuy = '';
 		$productonly = '';
 		$disablelinefree = '';
 		$search_categ = '';
@@ -424,6 +426,9 @@ $sql .= ' WHERE c.fk_soc = s.rowid';
 $sql .= ' AND c.entity IN ('.getEntity('commande').')';
 $sql .= ' AND cdet.product_type <> 9';
 
+if (!empty($productobuy)) {
+	$sql .= " AND pr.tobuy = 1";
+}
 if (!empty($productonly)) {
 	$sql .= " AND (cdet.product_type = 0 OR cdet.product_type = 1)";
 }
@@ -842,6 +847,7 @@ if ($resql) {
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'order', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
+	print '<input type="checkbox" name="productobuy"'.(!empty($productobuy)?'value="productobuychecked" checked':'' ).'><label for="productobuy">'.$langs->trans("productobuy").'</label>';
 	print '<input type="checkbox" name="productonly"'.(!empty($productonly)?'value="productonlychecked" checked':'' ).'><label for="productonly">'.$langs->trans("productonly").'</label>';
 	print '<input type="checkbox" name="disablelinefree"'.(!empty($disablelinefree)?'value="disablelinefreechecked" checked':'' ).'><label for="disablelinefree">'.$langs->trans("disablelinefree").'</label>';
 
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index a465fc41ea6..f988cd62f19 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -97,7 +97,8 @@ NumberOfOrdersByMonth=Number of orders by month
 AmountOfOrdersByMonthHT=Amount of orders by month (excl. tax)
 ListOfOrders=List of orders
 ListOrderLigne=Lines of orders
-productonly=Lines products only
+productobuy=Products to buy only
+productonly=Products only
 disablelinefree=No lines free
 CloseOrder=Close order
 ConfirmCloseOrder=Are you sure you want to set this order to delivered? Once an order is delivered, it can be set to billed.

From 60acbe8186b3015ff02f24d4612ad21c1ce40149 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Wed, 26 Oct 2022 12:45:09 +0200
Subject: [PATCH 047/816] FIX - contextpage

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

diff --git a/htdocs/commande/list_line.php b/htdocs/commande/list_line.php
index a569d7a56e1..70aef999c72 100644
--- a/htdocs/commande/list_line.php
+++ b/htdocs/commande/list_line.php
@@ -56,7 +56,7 @@ $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') : 'orderlist';
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'orderlistdet';
 $productobuy = GETPOST('productobuy', 'alpha');
 $productonly = GETPOST('productonly', 'alpha');
 $disablelinefree = GETPOST('disablelinefree', 'alpha');

From 78063b864ab65bc4c1c8ee28be4ddadffd39dd1b Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Wed, 26 Oct 2022 14:01:54 +0200
Subject: [PATCH 048/816] FIX - Delete button ADD order

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

diff --git a/htdocs/commande/list_line.php b/htdocs/commande/list_line.php
index 70aef999c72..42e4ce98b00 100644
--- a/htdocs/commande/list_line.php
+++ b/htdocs/commande/list_line.php
@@ -829,7 +829,7 @@ if ($resql) {
 	if (!empty($socid)) {
 		$url .= '&socid='.$socid;
 	}
-	$newcardbutton = dolGetButtonTitle($langs->trans('NewOrder'), '', 'fa fa-plus-circle', $url, '', $contextpage == 'orderlist' && $permissiontoadd);
+	$newcardbutton = '';//dolGetButtonTitle($langs->trans('NewOrder'), '', 'fa fa-plus-circle', $url, '', $contextpage == 'orderlistdet' && $permissiontoadd);
 
 	// Lines of title fields
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';

From 1a9f1e557455f9d76defe1d1e2a662ab8bfa1e37 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Wed, 26 Oct 2022 14:04:25 +0200
Subject: [PATCH 049/816] rename file

---
 htdocs/commande/{list_line.php => list_det.php} | 0
 htdocs/core/menus/init_menu_auguria.sql         | 2 +-
 htdocs/core/menus/standard/eldy.lib.php         | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename htdocs/commande/{list_line.php => list_det.php} (100%)

diff --git a/htdocs/commande/list_line.php b/htdocs/commande/list_det.php
similarity index 100%
rename from htdocs/commande/list_line.php
rename to htdocs/commande/list_det.php
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 27dd621ed59..5c479e900bd 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -178,7 +178,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->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1207__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;search_status=4', 'StatusOrderProcessed', 1, 'orders', '$user->rights->commande->lire', '', 2, 6, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1208__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;search_status=-1', 'StatusOrderCanceledShort', 1, 'orders', '$user->rights->commande->lire', '', 2, 7, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled', __HANDLER__, 'left', 1209__+MAX_llx_menu__, 'commercial', '', 1200__+MAX_llx_menu__, '/commande/stats/index.php?mainmenu=commercial&amp;leftmenu=orders', 'Statistics', 1, 'orders', '$user->rights->commande->lire', '', 2, 4, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 2 && empty($user->socid)', __HANDLER__, 'left', 1210__+MAX_llx_menu__, 'commercial', '', 1200__+MAX_llx_menu__, '/commande/list_line.php?mainmenu=commercial&amp;leftmenu=orders', 'ListOrderLigne', 1, 'orders', '$user->rights->commande->lire', '', 2, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 2 && empty($user->socid)', __HANDLER__, 'left', 1210__+MAX_llx_menu__, 'commercial', '', 1200__+MAX_llx_menu__, '/commande/list_det.php?mainmenu=commercial&amp;leftmenu=orders', 'ListOrderLigne', 1, 'orders', '$user->rights->commande->lire', '', 2, 1, __ENTITY__);
 
 -- Commercial - Supplier's proposals
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_proposal->enabled', __HANDLER__, 'left', 1650__+MAX_llx_menu__, 'commercial', 'propals_supplier', 3__+MAX_llx_menu__, '/supplier_proposal/index.php?leftmenu=propals_supplier', 'SupplierProposalsShort', 0, 'supplier_proposal', '$user->rights->supplier_proposal->lire', '', 2, 4, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index cdea369e47c..62cd8055cc1 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1338,7 +1338,7 @@ function get_left_menu_commercial($mainmenu, &$newmenu, $usemenuhider = 1, $left
 				$newmenu->add("/commande/list.php?leftmenu=orders&search_status=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->hasRight('commande',  'lire'));
 			}
 			if ($conf->global->MAIN_FEATURES_LEVEL >= 2 && empty($user->socid)) {
-				$newmenu->add("/commande/list_line.php?leftmenu=orders", $langs->trans("ListOrderLigne"), 1, $user->hasRight('commande',  'lire'));
+				$newmenu->add("/commande/list_det.php?leftmenu=orders", $langs->trans("ListOrderLigne"), 1, $user->hasRight('commande',  'lire'));
 			}
 			$newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->hasRight('commande',  'lire'));
 		}

From e1ee0b7d66a224ca1baffb7d60ae65fc82be59e2 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Wed, 26 Oct 2022 15:34:04 +0200
Subject: [PATCH 050/816] FIX - /td

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

diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index 42e4ce98b00..089c5dedbe1 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -2098,8 +2098,9 @@ if ($resql) {
 				}
 				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
+			print '</td>';
 		}
-		print '</td>';
+
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}

From cb3680a91bcc275357286757269846102157115f Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Wed, 26 Oct 2022 15:43:59 +0200
Subject: [PATCH 051/816] FIX - td

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

diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index 089c5dedbe1..7cd3f61c16d 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -1479,6 +1479,7 @@ if ($resql) {
 				}
 				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
+			print '</td>';
 		}
 
 		// Détail commande

From 0f842fdb3a42b65cf254ff3d5aa9fc35bc30fe60 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Wed, 26 Oct 2022 16:02:25 +0200
Subject: [PATCH 052/816] FIX - $totalarray['nbfield']++;

---
 htdocs/commande/list_det.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index 7cd3f61c16d..cac3d3e50e6 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -1480,6 +1480,9 @@ if ($resql) {
 				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
 			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Détail commande
@@ -2100,10 +2103,9 @@ if ($resql) {
 				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
 			print '</td>';
-		}
-
-		if (!$i) {
-			$totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		print "</tr>\n";
@@ -2112,7 +2114,7 @@ if ($resql) {
 		$subtotal += $obj->total_ht;
 		$i++;
 	}
-
+	var_dump($totalarray['nbfield']);
 	// Show total line
 	include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 

From 6c4b77a23c818c9b4225a2cd0659e7e93996835c Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Wed, 26 Oct 2022 18:35:58 +0200
Subject: [PATCH 053/816] Hook

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

diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index cac3d3e50e6..18c096d38c7 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -1911,7 +1911,7 @@ if ($resql) {
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
 		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 
 		// Date creation
@@ -2107,7 +2107,8 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
-
+		// $totalarray['nbfield']--;
+		// $totalarray['nbfield']--;
 		print "</tr>\n";
 
 		$total += $obj->total_ht;

From 1fc644572d678e455bcbc9d55b7c5ecfd601a556 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Sat, 29 Oct 2022 21:45:45 +0200
Subject: [PATCH 054/816] FIX - totalarray

---
 htdocs/commande/list_det.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index 18c096d38c7..7dcd8fb3835 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -1415,8 +1415,11 @@ if ($resql) {
 	// Détail commande
 	$totalqty = 0;
 
+	$totalarray = array();
+	$totalarray['nbfield'] = 0;
+	$totalarray['val']['cdet.total_tva'] = 0;
+	$totalarray['val']['cdet.total_ttc'] = 0;
 	$imaxinloop = ($limit ? min($num, $limit) : $num);
-	$last_num = min($num, $limit);
 	while ($i < $imaxinloop) {
 		$obj = $db->fetch_object($resql);
 
@@ -1517,9 +1520,6 @@ if ($resql) {
 		// Product QtyOrdered
 		if (!empty($arrayfields['cdet.qty']['checked'])) {
 			print '<td class="nowrap tdoverflowmax200">'.$obj->qty.'</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
 			if (!$i) {
 				$totalarray['pos'][$totalarray['nbfield']] = 'cdet.qty';
 			}
@@ -1528,6 +1528,9 @@ if ($resql) {
 			} else {
 				$totalarray['val']['cdet.qty'] = $obj->qty;
 			}
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Ref
@@ -1898,7 +1901,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 {

From 7baf98d6aa76a7e58c6f4360a6f519b8fec1de7f Mon Sep 17 00:00:00 2001
From: kkhelifa <kkhelifa@open-dsi.fr>
Date: Fri, 4 Nov 2022 16:18:19 +0100
Subject: [PATCH 055/816] FIX: Reload page on supplier change and keeping the
 values of the input already set in the form

---
 htdocs/fourn/commande/card.php | 17 +++++++++--------
 htdocs/fourn/facture/card.php  | 15 ++++++++-------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 86e34ce39a1..204b2d724da 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1616,15 +1616,16 @@ if ($action == 'create') {
 		print img_picto('', 'company').$form->select_company((empty($socid) ? '' : $socid), 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		// reload page to retrieve customer informations
 		if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE)) {
-			print '<script>
-			$(document).ready(function() {
-				$("#socid").change(function() {
-					var socid = $(this).val();
-					// reload page
-					window.location.href = "'.$_SERVER["PHP_SELF"].'?action=create&socid="+socid;
+			print '<script type="text/javascript">
+				$(document).ready(function() {
+					$("#socid").change(function() {
+						console.log("We have changed the company - Reload page");
+						// reload page
+						$("input[name=action]").val("create");
+						$("form[name=add]").submit();
+					});
 				});
-			});
-			</script>';
+				</script>';
 		}
 		print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&client=0&fournisseur=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddThirdParty").'"></span></a>';
 	}
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 366047da07c..103748aa541 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1945,14 +1945,15 @@ if ($action == 'create') {
 		// reload page to retrieve supplier informations
 		if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE)) {
 			print '<script type="text/javascript">
-			$(document).ready(function() {
-				$("#socid").change(function() {
-					var socid = $(this).val();
-					// reload page
-					window.location.href = "'.$_SERVER["PHP_SELF"].'?action=create&socid="+socid;
+				$(document).ready(function() {
+					$("#socid").change(function() {
+						console.log("We have changed the company - Reload page");
+						// reload page
+						$("input[name=action]").val("create");
+						$("form[name=add]").submit();
+					});
 				});
-			});
-			</script>';
+				</script>';
 		}
 		print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&client=0&fournisseur=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddThirdParty").'"></span></a>';
 	}

From c62a23b75a38009b39cca5db57dfb484d90d90aa Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Mon, 7 Nov 2022 13:07:50 +0100
Subject: [PATCH 056/816] clean code

---
 htdocs/commande/list_det.php | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index 7dcd8fb3835..fff7dc5b142 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -805,24 +805,6 @@ if ($resql) {
 	$arrayofmassactions = array(
 		'GenerateOrdersSuppliers'=>img_picto('', 'doc', 'class="pictofixedwidth"').$langs->trans("GenerateOrdersSupplie"),
 	);
-	// if ($permissiontovalidate) {
-	// 	$arrayofmassactions['prevalidate'] = img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate");
-	// }
-	// if ($permissiontosendbymail) {
-	// 	$arrayofmassactions['presend'] = img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail");
-	// }
-	// if ($permissiontoclose) {
-	// 	$arrayofmassactions['preshipped'] = img_picto('', 'dollyrevert', 'class="pictofixedwidth"').$langs->trans("ClassifyShipped");
-	// }
-	// if ($permissiontocancel) {
-	// 	$arrayofmassactions['cancelorders'] = img_picto('', 'close_title', 'class="pictofixedwidth"').$langs->trans("Cancel");
-	// }
-	// if ($permissiontodelete) {
-	// 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
-	// }
-	// if (in_array($massaction, array('presend', 'predelete', 'createbills'))) {
-	// 	$arrayofmassactions = array();
-	// }
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 	$url = DOL_URL_ROOT.'/commande/card.php?action=create';
@@ -2118,7 +2100,7 @@ if ($resql) {
 		$subtotal += $obj->total_ht;
 		$i++;
 	}
-	var_dump($totalarray['nbfield']);
+
 	// Show total line
 	include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 

From ce7e59a4b27d4e5eb6f762fd6a443b8940aa7131 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Mon, 7 Nov 2022 14:15:21 +0100
Subject: [PATCH 057/816] ADD colum warehouse

---
 htdocs/commande/list_det.php | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index fff7dc5b142..fd36f229e5c 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -200,6 +200,7 @@ $arrayfields = array(
 	'c.multicurrency_total_ht'=>array('label'=>'MulticurrencyAmountHT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>100),
 	'c.multicurrency_total_vat'=>array('label'=>'MulticurrencyAmountVAT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>105),
 	'c.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>110),
+	'c.fk_warehouse'=>array('label'=>'Warehouse', 'checked'=>0, 'enabled'=>(empty($conf->stock->enabled) && empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER) ? 0 : 1), 'position'=>110),
 	'u.login'=>array('label'=>"Author", 'checked'=>1, 'position'=>115),
 	'sale_representative'=>array('label'=>"SaleRepresentativesOfThirdParty", 'checked'=>0, 'position'=>116),
 	'total_pa' => array('label' => (getDolGlobalString('MARGIN_TYPE') == '1' ? 'BuyingPrice' : 'CostPrice'), 'checked' => 0, 'position' => 300, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous ? 0 : 1)),
@@ -358,7 +359,7 @@ $sql .= " state.code_departement as state_code, state.nom as state_name,";
 $sql .= " country.code as country_code,";
 $sql .= ' c.rowid as c_rowid, c.ref, c.ref_client, c.fk_user_author,';
 $sql .= ' c.fk_multicurrency, c.multicurrency_code, c.multicurrency_tx, c.multicurrency_total_ht, c.multicurrency_total_tva as multicurrency_total_vat, c.multicurrency_total_ttc,';
-$sql .= ' c.total_ht as c_total_ht, c.total_tva as c_total_tva, c.total_ttc as c_total_ttc,';
+$sql .= ' c.total_ht as c_total_ht, c.total_tva as c_total_tva, c.total_ttc as c_total_ttc, c.fk_warehouse as warehouse,';
 $sql .= ' c.date_valid, c.date_commande, c.note_public, c.note_private, c.date_livraison as date_delivery, c.fk_statut, c.facture as billed,';
 $sql .= ' c.date_creation as date_creation, c.tms as date_update, c.date_cloture as date_cloture,';
 $sql .= ' p.rowid as project_id, p.ref as project_ref, p.title as project_label,';
@@ -1066,6 +1067,10 @@ if ($resql) {
 		print '<input class="flat" type="text" size="5" name="search_total_ttc" value="'.$search_total_ttc.'">';
 		print '</td>';
 	}
+	if (!empty($arrayfields['c.fk_warehouse']['checked'])) {
+		// Warehouse
+		print '<td class="liste_titre right"></td>';
+	}
 	if (!empty($arrayfields['c.multicurrency_code']['checked'])) {
 		// Currency
 		print '<td class="liste_titre">';
@@ -1283,6 +1288,9 @@ if ($resql) {
 	if (!empty($arrayfields['cdet.total_ttc']['checked'])) {
 		print_liste_field_titre($arrayfields['cdet.total_ttc']['label'], $_SERVER["PHP_SELF"], 'cdet.total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');
 	}
+	if (!empty($arrayfields['c.fk_warehouse']['checked'])) {
+		print_liste_field_titre($arrayfields['c.fk_warehouse']['label'], "", '', '', $param, '', $sortfield, $sortorder);
+	}
 	if (!empty($arrayfields['c.multicurrency_code']['checked'])) {
 		print_liste_field_titre($arrayfields['c.multicurrency_code']['label'], $_SERVER['PHP_SELF'], 'c.multicurrency_code', '', $param, '', $sortfield, $sortorder);
 	}
@@ -1734,7 +1742,18 @@ if ($resql) {
 			}
 			$totalarray['val']['cdet.total_ttc'] += $obj->total_ttc;
 		}
-
+		// Warehouse
+		if (!empty($arrayfields['c.fk_warehouse']['checked'])) {
+			print '<td class="nowrap">';
+			if ($obj->warehouse > 0) {
+				print img_picto('', 'stock', 'class="paddingrightonly"');
+			}
+			$formproduct->formSelectWarehouses($_SERVER['PHP_SELF'], $obj->warehouse, 'none');
+			print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
 		// Currency
 		if (!empty($arrayfields['c.multicurrency_code']['checked'])) {
 			  print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";

From e9d32c882291c2eded62dca1b4ae5ae4ca02f7fe Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Wed, 16 Nov 2022 14:31:59 +0100
Subject: [PATCH 058/816] NEW hook printFieldListFrom in contact list

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

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 2bfdf9d1f66..39feeb125f4 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -402,6 +402,10 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_stcommcontact as st ON st.id = p.fk_stco
 if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 }
+// Add fields from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
 $sql .= ' WHERE p.entity IN ('.getEntity('contact').')';
 if (empty($user->rights->societe->client->voir) && !$socid) { //restriction
 	$sql .= " AND (sc.fk_user = ".((int) $user->id)." OR p.fk_soc IS NULL)";

From b5688427abb8e7c356d84fb5d5dff7d58742bca4 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Mon, 21 Nov 2022 16:59:36 +0100
Subject: [PATCH 059/816] NEW : Now we can edit amount on vat and salaries
 clone action

---
 htdocs/compta/tva/card.php | 5 +++++
 htdocs/salaries/card.php   | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index e7c7678b818..eae2f17f4ec 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -333,6 +333,10 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->char
 		$object->id = $object->ref = null;
 		$object->paye = 0;
 
+		if (GETPOST('amount', 'alphanohtml')) {
+			$object->amount = price2num(GETPOST('amount', 'alphanohtml'), 'MT', 2);
+		}
+
 		if (GETPOST('clone_label', 'alphanohtml')) {
 			$object->label = GETPOST('clone_label', 'alphanohtml');
 		} else {
@@ -540,6 +544,7 @@ if ($id > 0) {
 
 		//$formquestion[] = array('type' => 'date', 'name' => 'clone_date_ech', 'label' => $langs->trans("Date"), 'value' => -1);
 		$formquestion[] = array('type' => 'date', 'name' => 'clone_period', 'label' => $langs->trans("PeriodEndDate"), 'value' => -1);
+		$formquestion[] = array('type' => 'text', 'name' => 'amount', 'label' => $langs->trans("Amount"), 'value' => price($object->amount), 'morecss' => 'width100');
 
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneVAT', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 240);
 	}
diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index 5ba1b818137..66844d40f5b 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -380,6 +380,10 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->salaries-
 		$object->paye = 0;
 		$object->id = $object->ref = null;
 
+                if (GETPOST('amount', 'alphanohtml')) {
+                        $object->amount = price2num(GETPOST('amount', 'alphanohtml'), 'MT', 2);
+                }
+
 		if (GETPOST('clone_label', 'alphanohtml')) {
 			$object->label = GETPOST('clone_label', 'alphanohtml');
 		} else {
@@ -710,6 +714,7 @@ if ($id) {
 		//$formquestion[] = array('type' => 'date', 'name' => 'clone_date_ech', 'label' => $langs->trans("Date"), 'value' => -1);
 		$formquestion[] = array('type' => 'date', 'name' => 'clone_date_start', 'label' => $langs->trans("DateStart"), 'value' => -1);
 		$formquestion[] = array('type' => 'date', 'name' => 'clone_date_end', 'label' => $langs->trans("DateEnd"), 'value' => -1);
+		$formquestion[] = array('type' => 'text', 'name' => 'amount', 'label' => $langs->trans("Amount"), 'value' => price($object->amount), 'morecss' => 'width100');
 
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneSalary', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 250);
 	}

From c689ce1c52c6c3bae58975acb4e9d080ca3cb674 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 21 Nov 2022 16:08:00 +0000
Subject: [PATCH 060/816] Fixing style errors.

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

diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index 66844d40f5b..7e3111743b3 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -380,9 +380,9 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->salaries-
 		$object->paye = 0;
 		$object->id = $object->ref = null;
 
-                if (GETPOST('amount', 'alphanohtml')) {
-                        $object->amount = price2num(GETPOST('amount', 'alphanohtml'), 'MT', 2);
-                }
+		if (GETPOST('amount', 'alphanohtml')) {
+				$object->amount = price2num(GETPOST('amount', 'alphanohtml'), 'MT', 2);
+		}
 
 		if (GETPOST('clone_label', 'alphanohtml')) {
 			$object->label = GETPOST('clone_label', 'alphanohtml');

From 01a4d0414d2cf0504e7696110e166d5953283a43 Mon Sep 17 00:00:00 2001
From: Christian Foellmann <christian@foellmann.de>
Date: Tue, 22 Nov 2022 16:22:10 +0100
Subject: [PATCH 061/816] add applicant name

---
 htdocs/recruitment/recruitmentcandidature_agenda.php   | 1 +
 htdocs/recruitment/recruitmentcandidature_card.php     | 1 +
 htdocs/recruitment/recruitmentcandidature_document.php | 1 +
 htdocs/recruitment/recruitmentcandidature_note.php     | 1 +
 4 files changed, 4 insertions(+)

diff --git a/htdocs/recruitment/recruitmentcandidature_agenda.php b/htdocs/recruitment/recruitmentcandidature_agenda.php
index 04118f55572..ac4f54d115c 100644
--- a/htdocs/recruitment/recruitmentcandidature_agenda.php
+++ b/htdocs/recruitment/recruitmentcandidature_agenda.php
@@ -143,6 +143,7 @@ if ($object->id > 0) {
 	$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">';
+	$morehtmlref.= $object->getFullName('', 1);
 	/*
 	// Ref customer
 	$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php
index 2452c9e530b..7cf9fb47b56 100644
--- a/htdocs/recruitment/recruitmentcandidature_card.php
+++ b/htdocs/recruitment/recruitmentcandidature_card.php
@@ -426,6 +426,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$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">';
+	$morehtmlref.= $object->getFullName('', 1);
 	/*
 	 // Ref customer
 	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
diff --git a/htdocs/recruitment/recruitmentcandidature_document.php b/htdocs/recruitment/recruitmentcandidature_document.php
index 3f08c770111..ed0cb115ea7 100644
--- a/htdocs/recruitment/recruitmentcandidature_document.php
+++ b/htdocs/recruitment/recruitmentcandidature_document.php
@@ -121,6 +121,7 @@ if ($object->id) {
 	$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">';
+	$morehtmlref.= $object->getFullName('', 1);
 	/*
 	 // Ref customer
 	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
diff --git a/htdocs/recruitment/recruitmentcandidature_note.php b/htdocs/recruitment/recruitmentcandidature_note.php
index 1649ab5ee5e..f04a22aaf1b 100644
--- a/htdocs/recruitment/recruitmentcandidature_note.php
+++ b/htdocs/recruitment/recruitmentcandidature_note.php
@@ -96,6 +96,7 @@ if ($id > 0 || !empty($ref)) {
 	$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">';
+	$morehtmlref.= $object->getFullName('', 1);
 	/*
 	 // Ref customer
 	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);

From 638b7bc6534d9eb1eedc9eb827a99defbb5b3a1b Mon Sep 17 00:00:00 2001
From: FLIO <oflifli@nltechno.com>
Date: Tue, 22 Nov 2022 17:02:12 +0100
Subject: [PATCH 062/816] fix(scrutinizer)
 https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/core/boxes/box_services_contracts.php?selectedLabels%5B0%5D=9&selectedSeverities%5B0%5D=10&orderField=lastFound&order=desc&honorSelectedPaths=0

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

diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index 3d1e640f34b..acc1d40eed5 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -124,7 +124,7 @@ class box_services_contracts extends ModeleBoxes
 					$contractlinestatic->label = $objp->label;
 					$contractlinestatic->description = $objp->description;
 					$contractlinestatic->type = $objp->type;
-					$contractlinestatic->product_id = $objp->product_id;
+					$contractlinestatic->fk_productyy = $objp->product_id;
 					$contractlinestatic->product_ref = $objp->product_ref;
 					$contractlinestatic->product_type = $objp->product_type;
 					$contractlinestatic->statut = $objp->contractline_status;

From 1c5888d6d27c8608a701b46d106efa09ba4a19ea Mon Sep 17 00:00:00 2001
From: Christian Foellmann <christian@foellmann.de>
Date: Wed, 23 Nov 2022 20:47:32 +0100
Subject: [PATCH 063/816] add hook 'llxFooter'

---
 htdocs/core/class/hookmanager.class.php |  1 +
 htdocs/main.inc.php                     | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 5f87d81db9d..4886a3fd5d0 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -195,6 +195,7 @@ class HookManager
 				'getFormatedSupplierRef',
 				'getIdProfUrl',
 				'getInputIdProf',
+				'llxFooter',
 				'menuDropdownQuickaddItems',
 				'menuLeftMenuItems',
 				'moveUploadedFile',
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 4b580e7b808..e0ea7b1dbfc 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -3213,6 +3213,17 @@ if (!function_exists("llxFooter")) {
 
 		$ext = 'layout='.$conf->browser->layout.'&version='.urlencode(DOL_VERSION);
 
+		// Hook to add more things on all pages within fiche DIV
+		$llxfooter = '';
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('llxFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		if (empty($reshook)) {
+			$llxfooter .= $hookmanager->resPrint;
+		} elseif ($reshook > 0) {
+			$llxfooter = $hookmanager->resPrint;
+		}
+		print $llxfooter;
+
 		// Global html output events ($mesgs, $errors, $warnings)
 		dol_htmloutput_events($disabledoutputofmessages);
 

From 3a861af01e12d1d2b7d899501b755079dd147087 Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Fri, 25 Nov 2022 17:19:34 +0100
Subject: [PATCH 064/816] FIX reload travis


From d5e6c08319ab297297ebae7bd74b516c1c29d260 Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Thu, 1 Dec 2022 16:50:32 +0100
Subject: [PATCH 065/816] NEW operation type in email collector to load or
 create contact

---
 htdocs/admin/emailcollector_card.php          |   1 +
 .../class/emailcollector.class.php            | 114 ++++++++++++++++++
 htdocs/langs/en_US/admin.lang                 |   1 +
 htdocs/langs/fr_FR/admin.lang                 |   1 +
 4 files changed, 117 insertions(+)

diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index 8dfafb19b63..b3d6e045470 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -668,6 +668,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$arrayoftypes = array(
 		'loadthirdparty' => $langs->trans('LoadThirdPartyFromName', $langs->transnoentities("ThirdPartyName")),
 		'loadandcreatethirdparty' => $langs->trans('LoadThirdPartyFromNameOrCreate', $langs->transnoentities("ThirdPartyName")),
+		'loadandcreatecontact' => $langs->trans('LoadContactFromEmailOrCreate', $langs->transnoentities("Email")),
 		'recordjoinpiece' => 'AttachJoinedDocumentsToObject',
 		'recordevent' => 'RecordEvent'
 	);
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 8d72666ad53..db932e0a4ca 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -2141,6 +2141,120 @@ class EmailCollector extends CommonObject
 									}
 								}
 							}
+						}
+						// Search and create contact
+						elseif ($operation['type'] == 'loadandcreatecontact') {
+							if (empty($operation['actionparam'])) {
+								$errorforactions++;
+								$this->error = "Action loadandcreatecontact has empty parameter. Must be 'SET:xxx' or 'EXTRACT:(body|subject):regex' to define how to extract data";
+								$this->errors[] = $this->error;
+							} else {
+								$contact_static = new Contact($this->db);
+								// Overwrite values with values extracted from source email
+								$errorforthisaction = $this->overwritePropertiesOfObject($contact_static, $operation['actionparam'], $messagetext, $subject, $header, $operationslog);
+								if ($errorforthisaction) {
+									$errorforactions++;
+								} else {
+									if (!empty($contact_static->email) && $contact_static->email != $from) $from = $contact_static->email;
+
+									$result = $contactstatic->fetch(0, null, '', $from);
+									if ($result < 0) {
+										$errorforactions++;
+										$this->error = 'Error when getting contact with email ' . $from;
+										$this->errors[] = $this->error;
+										break;
+									} elseif ($result == 0) {
+										dol_syslog("Contact with email " . $from . " was not found. We try to create it.");
+										$contactstatic = new Contact($this->db);
+
+										// Create contact
+										$contactstatic->email = $from;
+										$operationslog .= '<br>We set property email='.dol_escape_htmltag($from);
+
+										// Overwrite values with values extracted from source email
+										$errorforthisaction = $this->overwritePropertiesOfObject($contactstatic, $operation['actionparam'], $messagetext, $subject, $header, $operationslog);
+
+										if ($errorforthisaction) {
+											$errorforactions++;
+										} else {
+											// Search country by name or code
+											if (!empty($contactstatic->country)) {
+												require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
+												$result = getCountry('', 3, $this->db, '', 1, $contactstatic->country);
+												if ($result == 'NotDefined') {
+													$errorforactions++;
+													$this->error = "Error country not found by this name '" . $contactstatic->country . "'";
+												} elseif (!($result > 0)) {
+													$errorforactions++;
+													$this->error = "Error when search country by this name '" . $contactstatic->country . "'";
+													$this->errors[] = $this->db->lasterror();
+												} else {
+													$contactstatic->country_id = $result;
+													$operationslog .= '<br>We set property country_id='.dol_escape_htmltag($result);
+												}
+											} elseif (!empty($contactstatic->country_code)) {
+												require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
+												$result = getCountry($contactstatic->country_code, 3, $this->db);
+												if ($result == 'NotDefined') {
+													$errorforactions++;
+													$this->error = "Error country not found by this code '" . $contactstatic->country_code . "'";
+												} elseif (!($result > 0)) {
+													$errorforactions++;
+													$this->error = "Error when search country by this code '" . $contactstatic->country_code . "'";
+													$this->errors[] = $this->db->lasterror();
+												} else {
+													$contactstatic->country_id = $result;
+													$operationslog .= '<br>We set property country_id='.dol_escape_htmltag($result);
+												}
+											}
+
+											if (!$errorforactions) {
+												// Search state by name or code (for country if defined)
+												if (!empty($contactstatic->state)) {
+													require_once DOL_DOCUMENT_ROOT . '/core/lib/functions.lib.php';
+													$result = dol_getIdFromCode($this->db, $contactstatic->state, 'c_departements', 'nom', 'rowid');
+													if (empty($result)) {
+														$errorforactions++;
+														$this->error = "Error state not found by this name '" . $contactstatic->state . "'";
+													} elseif (!($result > 0)) {
+														$errorforactions++;
+														$this->error = "Error when search state by this name '" . $contactstatic->state . "'";
+														$this->errors[] = $this->db->lasterror();
+													} else {
+														$contactstatic->state_id = $result;
+														$operationslog .= '<br>We set property state_id='.dol_escape_htmltag($result);
+													}
+												} elseif (!empty($contactstatic->state_code)) {
+													require_once DOL_DOCUMENT_ROOT . '/core/lib/functions.lib.php';
+													$result = dol_getIdFromCode($this->db, $contactstatic->state_code, 'c_departements', 'code_departement', 'rowid');
+													if (empty($result)) {
+														$errorforactions++;
+														$this->error = "Error state not found by this code '" . $contactstatic->state_code . "'";
+													} elseif (!($result > 0)) {
+														$errorforactions++;
+														$this->error = "Error when search state by this code '" . $contactstatic->state_code . "'";
+														$this->errors[] = $this->db->lasterror();
+													} else {
+														$contactstatic->state_id = $result;
+														$operationslog .= '<br>We set property state_id='.dol_escape_htmltag($result);
+													}
+												}
+											}
+
+											if (!$errorforactions) {
+												$result = $contactstatic->create($user);
+												if ($result <= 0) {
+													$errorforactions++;
+													$this->error = $contactstatic->error;
+													$this->errors = $contactstatic->errors;
+												} else {
+													$operationslog .= '<br>Contact created -> id = '.dol_escape_htmltag($contactstatic->id);
+												}
+											}
+										}
+									}
+								}
+							}
 						} elseif ($operation['type'] == 'recordevent') {
 							// Create event
 							$actioncomm = new ActionComm($this->db);
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index b6c780a6be0..9fa5f7f1c28 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2119,6 +2119,7 @@ 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)
+LoadContactFromEmailOrCreate=Load contact 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
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 79a266df816..6a59583e7c0 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -2115,6 +2115,7 @@ CodeLastResult=Dernier code de retour
 NbOfEmailsInInbox=Nombre de courriels dans le répertoire source
 LoadThirdPartyFromName=Charger le Tiers en cherchant sur %s (chargement uniquement)
 LoadThirdPartyFromNameOrCreate=Charger le Tiers en cherchant sur %s (créer si non trouvé)
+LoadContactFromEmailOrCreate=Charger le Contact en cherchant sur %s (créer si non trouvé)
 AttachJoinedDocumentsToObject=Enregistrez les fichiers joints dans des documents d'objet si la référence d'un objet est trouvée dans le sujet de l'e-mail.
 WithDolTrackingID=Message d'une conversation initiée par un premier mail envoyé depuis Dolibarr
 WithoutDolTrackingID=Message d'une conversation initiée par un premier e-mail NON envoyé depuis Dolibarr

From 3be0f0e1d0f2c206442cc83b7325d6f8ac6ac7d9 Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Thu, 1 Dec 2022 17:21:41 +0100
Subject: [PATCH 066/816] FIX stickler-ci

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

diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index db932e0a4ca..1393913bb35 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -2141,9 +2141,7 @@ class EmailCollector extends CommonObject
 									}
 								}
 							}
-						}
-						// Search and create contact
-						elseif ($operation['type'] == 'loadandcreatecontact') {
+						} elseif ($operation['type'] == 'loadandcreatecontact') { // Search and create contact
 							if (empty($operation['actionparam'])) {
 								$errorforactions++;
 								$this->error = "Action loadandcreatecontact has empty parameter. Must be 'SET:xxx' or 'EXTRACT:(body|subject):regex' to define how to extract data";

From 8426e955c8f221817653f9cc498db8eb60a7c713 Mon Sep 17 00:00:00 2001
From: Jesse Rovira <contato@merlionti.com>
Date: Fri, 2 Dec 2022 12:34:13 -0300
Subject: [PATCH 067/816] Showing Due date into last customer invoice at comm
 card

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

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index f578aa75cf5..0df573b7f9b 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -1418,7 +1418,7 @@ if ($object->id > 0) {
 		$sql .= ', f.total_tva';
 		$sql .= ', f.total_ttc';
 		$sql .= ', f.entity';
-		$sql .= ', f.datef as df, f.datec as dc, f.paye as paye, f.fk_statut as status';
+		$sql .= ', f.datef as df, f.date_lim_reglement as dl, f.datec as dc, f.paye as paye, f.fk_statut as status';
 		$sql .= ', s.nom, s.rowid as socid';
 		$sql .= ', SUM(pf.amount) as am';
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
@@ -1496,6 +1496,11 @@ if ($object->id > 0) {
 				} else {
 					print '<td class="right"><b>!!!</b></td>';
 				}
+				if ($objp->dl > 0) {
+					print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->dl), 'day').'</td>';
+				} else {
+					print '<td class="right"><b>!!!</b></td>';
+				}
 				print '<td class="right" style="min-width: 60px">';
 				print price($objp->total_ht);
 				print '</td>';

From f98381de8a45047a182d10df72c1509575f2a915 Mon Sep 17 00:00:00 2001
From: Jesse Rovira <contato@merlionti.com>
Date: Fri, 2 Dec 2022 13:36:17 -0300
Subject: [PATCH 068/816] Showing label for Due date into last customer invoice
 at comm card

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

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 0df573b7f9b..345a97e9e19 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -1492,12 +1492,12 @@ if ($object->id > 0) {
 				//print $formfile->getDocumentsLink($facturestatic->element, $filename, $filedir);
 				print '</td>';
 				if ($objp->df > 0) {
-					print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->df), 'day').'</td>';
+					print '<td class="right" width="80px">'.$langs->trans('DateInvoice').": ".dol_print_date($db->jdate($objp->df), 'day').'</td>';
 				} else {
 					print '<td class="right"><b>!!!</b></td>';
 				}
 				if ($objp->dl > 0) {
-					print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->dl), 'day').'</td>';
+					print '<td class="right" width="80px">'.$langs->trans('DateMaxPayment').": ".dol_print_date($db->jdate($objp->dl), 'day').'</td>';
 				} else {
 					print '<td class="right"><b>!!!</b></td>';
 				}

From 19e3a8949a0476647849c18e4aeae45785ce6e73 Mon Sep 17 00:00:00 2001
From: FLIO <oflifli@nltechno.com>
Date: Mon, 5 Dec 2022 10:51:09 +0100
Subject: [PATCH 069/816] Fix(scrutinizer)

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

diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index acc1d40eed5..433db55a515 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -124,7 +124,7 @@ class box_services_contracts extends ModeleBoxes
 					$contractlinestatic->label = $objp->label;
 					$contractlinestatic->description = $objp->description;
 					$contractlinestatic->type = $objp->type;
-					$contractlinestatic->fk_productyy = $objp->product_id;
+					$contractlinestatic->fk_product = $objp->product_id;
 					$contractlinestatic->product_ref = $objp->product_ref;
 					$contractlinestatic->product_type = $objp->product_type;
 					$contractlinestatic->statut = $objp->contractline_status;

From 1c108f3583c76c00fd243f918d2fc84643b251fb Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Tue, 6 Dec 2022 16:11:14 +0100
Subject: [PATCH 070/816] New mode kaban for products list

---
 htdocs/product/class/product.class.php |   55 ++
 htdocs/product/list.php                | 1128 ++++++++++++------------
 htdocs/theme/eldy/info-box.inc.php     |   25 +
 3 files changed, 655 insertions(+), 553 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index ffb72bfca78..b0b55cab66c 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -6238,6 +6238,61 @@ class Product extends CommonObject
 
 		return $prodDurationHours;
 	}
+
+
+		/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string								HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $langs,$conf;
+
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<div class="info-box-img">';
+		$label = '';
+
+		if ($this->is_photo_available($conf->product->multidir_output[$this->entity])) {
+				$label .= $this->show_photos('product', $conf->product->multidir_output[$this->entity]);
+				$return .= $label;
+		} else {
+			if ($this->type == Product::TYPE_PRODUCT) {
+				$label .= img_picto('', 'product');
+			} elseif ($this->type == Product::TYPE_SERVICE) {
+				$label .= img_picto('', 'service');
+			}
+			$return .= $label;
+		}
+
+		$return .= '</div>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>';
+		if (property_exists($this, 'label')) {
+			$return .= '<br><span class="info-box-label opacitymedium">'.$this->label.'</span>';
+		}
+		if (property_exists($this, 'price') && property_exists($this, 'price_ttc')) {
+			if ($this->price_base_type == 'TTC') {
+				$return .= '<br><span class="info-box-status amount">'.price($this->price_ttc).' '.$langs->trans("TTC").'</span>';
+			} else {
+				if ($this->status) {
+					$return .= '<br><span class="info-box-status amount">'.price($this->price).' '.$langs->trans("HT").'</span>';
+				}
+			}
+		}
+		if (property_exists($this, 'stock_reel')) {
+			$return .= '<br><span class="info-box-status opacitymedium">'.$langs->trans('PhysicalStock').' : <span class="bold">'.$this->stock_reel.'</span></span>';
+		}
+		if (method_exists($this, 'getLibStatut')) {
+			$return .='<br><span class="info-box-status margintoponly">'.$this->getLibStatut(5, 1).' '.$this->getLibStatut(5, 0).'</span>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
 
 /**
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index df9acd10cf7..f45f33c9de1 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -97,6 +97,8 @@ $search_accountancy_code_buy_export = GETPOST("search_accountancy_code_buy_expor
 $search_finished = GETPOST("search_finished", 'int');
 $optioncss = GETPOST('optioncss', 'alpha');
 $type = GETPOST("type", "int");
+$mode = GETPOST('mode', 'alpha');
+
 
 //Show/hide child products
 if (isModEnabled('variants') && !empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD)) {
@@ -642,6 +644,9 @@ if ($resql) {
 	}
 
 	$param = '';
+	if (!empty($mode)) {
+		$param = "&mode=".urlencode($mode);
+	}
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 		$param .= '&contextpage='.urlencode($contextpage);
 	}
@@ -751,6 +756,8 @@ if ($resql) {
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 	$newcardbutton = '';
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
 	if ($type === "") {
 		$perm = ($user->rights->produit->creer || $user->rights->service->creer);
 	} elseif ($type == Product::TYPE_SERVICE) {
@@ -784,6 +791,7 @@ if ($resql) {
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="mode" value="'.$mode.'">';
 	//print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="type" value="'.$type.'">';
 	if (empty($arrayfields['p.fk_product_type']['checked'])) {
@@ -1297,7 +1305,8 @@ if ($resql) {
 	$i = 0;
 	$totalarray = array();
 	$totalarray['nbfield'] = 0;
-	while ($i < min($num, $limit)) {
+	$imaxinloop = ($limit ? min($num, $limit) : $num);
+	while ($i < $imaxinloop) {
 		$obj = $db->fetch_object($resql);
 
 		// Multilangs
@@ -1366,592 +1375,605 @@ if ($resql) {
 		if ($product_static->isService()) {
 			$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('service', 'service_advance', 'read_prices'):$user->hasRight('service', 'lire');
 		}
+		if ($mode == 'Kanban') {
+			if ($i == 0) {
+				print '<tr><td colspan="12">';
+				print '<div class="box-flex-container">';
+			}
+			$product_static->price = $obj->price;
+			// Output Kanban
+			print $product_static->getKanbanView('');
+			if ($i == ($imaxinloop - 1)) {
+				print '</div>';
+				print '</td></tr>';
+			}
+		} else {
+			print '<tr class="oddeven">';
 
-		print '<tr class="oddeven">';
-
-		// Action column
-		if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
-			print '<td class="nowrap center">';
-			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-				$selected = 0;
-				if (in_array($obj->rowid, $arrayofselected)) {
-					$selected = 1;
+			// Action column
+			if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+				print '<td class="nowrap center">';
+				if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+					$selected = 0;
+					if (in_array($obj->rowid, $arrayofselected)) {
+						$selected = 1;
+					}
+					print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
 				}
-				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Ref
-		if (!empty($arrayfields['p.rowid']['checked'])) {
-			print '<td class="nowraponall">';
-			print $product_static->id;
-			print "</td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Ref
-		if (!empty($arrayfields['p.ref']['checked'])) {
-			print '<td class="tdoverflowmax200">';
-			print $product_static->getNomUrl(1);
-			print "</td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Ref supplier
-		if (!empty($arrayfields['pfp.ref_fourn']['checked'])) {
-			print '<td class="tdoverflowmax200">';
-			print $product_static->getNomUrl(1);
-			print "</td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Thumbnail
-		if (!empty($arrayfields['thumbnail']['checked'])) {
-			$product_thumbnail_html = '';
-			if (!empty($product_static->entity)) {
-				$product_thumbnail = $product_static->show_photos('product', $conf->product->multidir_output[$product_static->entity], 1, 1, 0, 0, 0, 80);
-				if ($product_static->nbphoto > 0) {
-					$product_thumbnail_html = $product_thumbnail;
+			// Ref
+			if (!empty($arrayfields['p.rowid']['checked'])) {
+				print '<td class="nowraponall">';
+				print $product_static->id;
+				print "</td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
 				}
 			}
 
-			print '<td class="center">' . $product_thumbnail_html . '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Label
-		if (!empty($arrayfields['p.label']['checked'])) {
-			print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->label).'">'.$obj->label.'</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Type
-		if (!empty($arrayfields['p.fk_product_type']['checked'])) {
-			print '<td class="center">';
-			$s = '';
-			if ($obj->fk_product_type == 0) {
-				$s .= img_picto($langs->trans("Product"), 'product', 'class="paddingleftonly paddingrightonly colorgrey"');
-			} else {
-				$s .= img_picto($langs->trans("Service"), 'service', 'class="paddingleftonly paddingrightonly colorgrey"');
-			}
-			print $s;
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Barcode
-		if (!empty($arrayfields['p.barcode']['checked'])) {
-			print '<td>'.$obj->barcode.'</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Duration
-		if (!empty($arrayfields['p.duration']['checked'])) {
-			print '<td class="center nowraponall">';
-
-			if (preg_match('/([^a-z]+)[a-z]$/i', $obj->duration)) {
-				$duration_value = substr($obj->duration, 0, dol_strlen($obj->duration) - 1);
-				$duration_unit = substr($obj->duration, -1);
-
-				if ((float) $duration_value > 1) {
-					$dur = array("i"=>$langs->trans("Minutes"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
-				} elseif ((float) $duration_value > 0) {
-					$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
+			// Ref
+			if (!empty($arrayfields['p.ref']['checked'])) {
+				print '<td class="tdoverflowmax200">';
+				print $product_static->getNomUrl(1);
+				print "</td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
 				}
-				print $duration_value;
-				print ((!empty($duration_unit) && isset($dur[$duration_unit]) && $duration_value != '') ? ' '.$langs->trans($dur[$duration_unit]) : '');
-			} elseif (!preg_match('/^[a-z]$/i', $obj->duration)) {		// If duration is a simple char (like 's' of 'm'), we do not show value
-				print $obj->duration;
 			}
 
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
+			// Ref supplier
+			if (!empty($arrayfields['pfp.ref_fourn']['checked'])) {
+				print '<td class="tdoverflowmax200">';
+				print $product_static->getNomUrl(1);
+				print "</td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
-		}
 
-		// Finished
-		if (!empty($arrayfields['p.finished']['checked'])) {
-			print '<td class="center">';
-			print $product_static->getLibFinished();
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
+			// Thumbnail
+			if (!empty($arrayfields['thumbnail']['checked'])) {
+				$product_thumbnail_html = '';
+				if (!empty($product_static->entity)) {
+					$product_thumbnail = $product_static->show_photos('product', $conf->product->multidir_output[$product_static->entity], 1, 1, 0, 0, 0, 80);
+					if ($product_static->nbphoto > 0) {
+						$product_thumbnail_html = $product_thumbnail;
+					}
+				}
 
-		// Weight
-		if (!empty($arrayfields['p.weight']['checked'])) {
-			print '<td class="center">';
-			print $obj->weight;
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
+				print '<td class="center">' . $product_thumbnail_html . '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
-		}
-		// Weight units
-		if (!empty($arrayfields['p.weight_units']['checked'])) {
-			print '<td class="center">';
-			if ($product_static->weight != '') {
-				print measuringUnitString(0, 'weight', $product_static->weight_units);
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Length
-		if (!empty($arrayfields['p.length']['checked'])) {
-			print '<td class="center">';
-			print $obj->length;
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Length units
-		if (!empty($arrayfields['p.length_units']['checked'])) {
-			print '<td class="center">';
-			if ($product_static->length != '') {
-				print measuringUnitString(0, 'size', $product_static->length_units);
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Width
-		if (!empty($arrayfields['p.width']['checked'])) {
-			print '<td align="center">';
-			print $obj->width;
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Width units
-		if (!empty($arrayfields['p.width_units']['checked'])) {
-			print '<td class="center">';
-			if ($product_static->width != '') {
-				print measuringUnitString(0, 'size', $product_static->width_units);
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Height
-		if (!empty($arrayfields['p.height']['checked'])) {
-			print '<td align="center">';
-			print $obj->height;
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Height units
-		if (!empty($arrayfields['p.height_units']['checked'])) {
-			print '<td class="center">';
-			if ($product_static->height != '') {
-				print measuringUnitString(0, 'size', $product_static->height_units);
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Surface
-		if (!empty($arrayfields['p.surface']['checked'])) {
-			print '<td class="center">';
-			print $obj->surface;
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Surface units
-		if (!empty($arrayfields['p.surface_units']['checked'])) {
-			print '<td class="center">';
-			if ($product_static->surface != '') {
-				print measuringUnitString(0, 'surface', $product_static->surface_units);
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Volume
-		if (!empty($arrayfields['p.volume']['checked'])) {
-			print '<td class="center">';
-			print $obj->volume;
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Volume units
-		if (!empty($arrayfields['p.volume_units']['checked'])) {
-			print '<td class="center">';
-			if ($product_static->volume != '') {
-				print measuringUnitString(0, 'volume', $product_static->volume_units);
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Unit
-		if (!empty($arrayfields['cu.label']['checked'])) {
-			print '<td align="center">';
-			if (!empty($obj->cu_label)) {
-				print $langs->trans($obj->cu_label);
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
 
-		// Sell price
-		if (!empty($arrayfields['p.sellprice']['checked'])) {
-			print '<td class="right nowraponall">';
-			if ($obj->tosell && $usercancreadprice) {
-				if ($obj->price_base_type == 'TTC') {
-					print '<span class="amount">'.price($obj->price_ttc).' '.$langs->trans("TTC").'</span>';
+			// Label
+			if (!empty($arrayfields['p.label']['checked'])) {
+				print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->label).'">'.$obj->label.'</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Type
+			if (!empty($arrayfields['p.fk_product_type']['checked'])) {
+				print '<td class="center">';
+				$s = '';
+				if ($obj->fk_product_type == 0) {
+					$s .= img_picto($langs->trans("Product"), 'product', 'class="paddingleftonly paddingrightonly colorgrey"');
 				} else {
-					print '<span class="amount">'.price($obj->price).' '.$langs->trans("HT").'</span>';
+					$s .= img_picto($langs->trans("Service"), 'service', 'class="paddingleftonly paddingrightonly colorgrey"');
+				}
+				print $s;
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
 				}
 			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
 
-
-		// Multiprices
-		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
-			if (! isset($productpricescache)) {
-				$productpricescache=array();
-			}
-			if (! isset($productpricescache[$obj->rowid])) {
-				$productpricescache[$obj->rowid] = array();
+			// Barcode
+			if (!empty($arrayfields['p.barcode']['checked'])) {
+				print '<td>'.$obj->barcode.'</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
-			if ($obj->tosell && $usercancreadprice) {
-				// Make 1 request for all price levels (without filter on price_level) and saved result into an cache array
-				// then reuse the cache array if we need prices for other price levels
-				$sqlp = "SELECT p.rowid, p.fk_product, p.price, p.price_ttc, p.price_level, p.date_price, p.price_base_type";
-				$sqlp .= " FROM ".MAIN_DB_PREFIX."product_price as p";
-				$sqlp .= " WHERE fk_product = ".((int) $obj->rowid);
-				$sqlp .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC";
-				$resultp = $db->query($sqlp);
-				if ($resultp) {
-					$nump = $db->num_rows($resultp);
-					$j = 0;
-					while ($j < $nump) {
-						$objp = $db->fetch_object($resultp);
+			// Duration
+			if (!empty($arrayfields['p.duration']['checked'])) {
+				print '<td class="center nowraponall">';
 
-						if (empty($productpricescache[$obj->rowid][$objp->price_level])) {
-							$productpricescache[$obj->rowid][$objp->price_level]['price'] = $objp->price;
-							$productpricescache[$obj->rowid][$objp->price_level]['price_ttc'] = $objp->price_ttc;
-							$productpricescache[$obj->rowid][$objp->price_level]['price_base_type'] = $objp->price_base_type;
+				if (preg_match('/([^a-z]+)[a-z]$/i', $obj->duration)) {
+					$duration_value = substr($obj->duration, 0, dol_strlen($obj->duration) - 1);
+					$duration_unit = substr($obj->duration, -1);
+
+					if ((float) $duration_value > 1) {
+						$dur = array("i"=>$langs->trans("Minutes"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
+					} elseif ((float) $duration_value > 0) {
+						$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
+					}
+					print $duration_value;
+					print ((!empty($duration_unit) && isset($dur[$duration_unit]) && $duration_value != '') ? ' '.$langs->trans($dur[$duration_unit]) : '');
+				} elseif (!preg_match('/^[a-z]$/i', $obj->duration)) {		// If duration is a simple char (like 's' of 'm'), we do not show value
+					print $obj->duration;
+				}
+
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Finished
+			if (!empty($arrayfields['p.finished']['checked'])) {
+				print '<td class="center">';
+				print $product_static->getLibFinished();
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Weight
+			if (!empty($arrayfields['p.weight']['checked'])) {
+				print '<td class="center">';
+				print $obj->weight;
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Weight units
+			if (!empty($arrayfields['p.weight_units']['checked'])) {
+				print '<td class="center">';
+				if ($product_static->weight != '') {
+					print measuringUnitString(0, 'weight', $product_static->weight_units);
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Length
+			if (!empty($arrayfields['p.length']['checked'])) {
+				print '<td class="center">';
+				print $obj->length;
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Length units
+			if (!empty($arrayfields['p.length_units']['checked'])) {
+				print '<td class="center">';
+				if ($product_static->length != '') {
+					print measuringUnitString(0, 'size', $product_static->length_units);
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Width
+			if (!empty($arrayfields['p.width']['checked'])) {
+				print '<td align="center">';
+				print $obj->width;
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Width units
+			if (!empty($arrayfields['p.width_units']['checked'])) {
+				print '<td class="center">';
+				if ($product_static->width != '') {
+					print measuringUnitString(0, 'size', $product_static->width_units);
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Height
+			if (!empty($arrayfields['p.height']['checked'])) {
+				print '<td align="center">';
+				print $obj->height;
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Height units
+			if (!empty($arrayfields['p.height_units']['checked'])) {
+				print '<td class="center">';
+				if ($product_static->height != '') {
+					print measuringUnitString(0, 'size', $product_static->height_units);
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Surface
+			if (!empty($arrayfields['p.surface']['checked'])) {
+				print '<td class="center">';
+				print $obj->surface;
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Surface units
+			if (!empty($arrayfields['p.surface_units']['checked'])) {
+				print '<td class="center">';
+				if ($product_static->surface != '') {
+					print measuringUnitString(0, 'surface', $product_static->surface_units);
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Volume
+			if (!empty($arrayfields['p.volume']['checked'])) {
+				print '<td class="center">';
+				print $obj->volume;
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Volume units
+			if (!empty($arrayfields['p.volume_units']['checked'])) {
+				print '<td class="center">';
+				if ($product_static->volume != '') {
+					print measuringUnitString(0, 'volume', $product_static->volume_units);
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Unit
+			if (!empty($arrayfields['cu.label']['checked'])) {
+				print '<td align="center">';
+				if (!empty($obj->cu_label)) {
+					print $langs->trans($obj->cu_label);
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Sell price
+			if (!empty($arrayfields['p.sellprice']['checked'])) {
+				print '<td class="right nowraponall">';
+				if ($obj->tosell && $usercancreadprice) {
+					if ($obj->price_base_type == 'TTC') {
+						print '<span class="amount">'.price($obj->price_ttc).' '.$langs->trans("TTC").'</span>';
+					} else {
+						print '<span class="amount">'.price($obj->price).' '.$langs->trans("HT").'</span>';
+					}
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+
+			// Multiprices
+			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+				if (! isset($productpricescache)) {
+					$productpricescache=array();
+				}
+				if (! isset($productpricescache[$obj->rowid])) {
+					$productpricescache[$obj->rowid] = array();
+				}
+
+				if ($obj->tosell && $usercancreadprice) {
+					// Make 1 request for all price levels (without filter on price_level) and saved result into an cache array
+					// then reuse the cache array if we need prices for other price levels
+					$sqlp = "SELECT p.rowid, p.fk_product, p.price, p.price_ttc, p.price_level, p.date_price, p.price_base_type";
+					$sqlp .= " FROM ".MAIN_DB_PREFIX."product_price as p";
+					$sqlp .= " WHERE fk_product = ".((int) $obj->rowid);
+					$sqlp .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC";
+					$resultp = $db->query($sqlp);
+					if ($resultp) {
+						$nump = $db->num_rows($resultp);
+						$j = 0;
+						while ($j < $nump) {
+							$objp = $db->fetch_object($resultp);
+
+							if (empty($productpricescache[$obj->rowid][$objp->price_level])) {
+								$productpricescache[$obj->rowid][$objp->price_level]['price'] = $objp->price;
+								$productpricescache[$obj->rowid][$objp->price_level]['price_ttc'] = $objp->price_ttc;
+								$productpricescache[$obj->rowid][$objp->price_level]['price_base_type'] = $objp->price_base_type;
+							}
+
+							$j++;
 						}
 
-						$j++;
+						$db->free($resultp);
+					} else {
+						dol_print_error($db);
 					}
+				}
 
-					$db->free($resultp);
+				foreach ($arraypricelevel as $key => $value) {
+					if (!empty($arrayfields['p.sellprice'.$key]['checked'])) {
+						print '<td class="right nowraponall">';
+						if (!empty($productpricescache[$obj->rowid])) {
+							if ($productpricescache[$obj->rowid][$key]['price_base_type'] == 'TTC') {
+								print '<span class="amount">'.price($productpricescache[$obj->rowid][$key]['price_ttc']).' '.$langs->trans("TTC").'</span>';
+							} else {
+								print '<span class="amount">'.price($productpricescache[$obj->rowid][$key]['price']).' '.$langs->trans("HT").'</span>';
+							}
+						}
+						print '</td>';
+						if (!$i) {
+							$totalarray['nbfield']++;
+						}
+					}
+				}
+			}
+
+			// Better buy price
+			if (!empty($arrayfields['p.minbuyprice']['checked'])) {
+				print  '<td class="right nowraponall">';
+				if ($obj->tobuy && $obj->minsellprice != '' && $usercancreadprice) {
+					//print price($obj->minsellprice).' '.$langs->trans("HT");
+					if ($product_fourn->find_min_price_product_fournisseur($obj->rowid) > 0) {
+						if ($product_fourn->product_fourn_price_id > 0) {
+							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))) {
+								$htmltext = $product_fourn->display_price_product_fournisseur(1, 1, 0, 1);
+								print '<span class="amount">'.$form->textwithpicto(price($product_fourn->fourn_unitprice * (1 - $product_fourn->fourn_remise_percent / 100) - $product_fourn->fourn_remise).' '.$langs->trans("HT"), $htmltext).'</span>';
+							} else {
+								print '<span class="amount">'.price($product_fourn->fourn_unitprice).' '.$langs->trans("HT").'</span>';
+							}
+						}
+					}
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Number of buy prices
+			if (!empty($arrayfields['p.numbuyprice']['checked'])) {
+				print  '<td class="right">';
+				if ($obj->tobuy && $usercancreadprice) {
+					if (count($productFournList = $product_fourn->list_product_fournisseur_price($obj->rowid)) > 0) {
+						$htmltext = $product_fourn->display_price_product_fournisseur(1, 1, 0, 1, $productFournList);
+						print $form->textwithpicto(count($productFournList), $htmltext);
+					}
+				}
+				print '</td>';
+			}
+
+			// VAT or Sell Tax Rate
+			if (!empty($arrayfields['p.tva_tx']['checked'])) {
+				print '<td class="right">';
+				print vatrate($obj->tva_tx, true);
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// WAP
+			if (!empty($arrayfields['p.pmp']['checked'])) {
+				print '<td class="nowrap right">';
+				if ($usercancreadprice) {
+					print '<span class="amount">'.price($product_static->pmp, 1, $langs)."</span>";
+				}
+				print '</td>';
+			}
+			// Cost price
+			if (!empty($arrayfields['p.cost_price']['checked'])) {
+				print '<td class="nowrap right">';
+				//print $obj->cost_price;
+				if ($usercancreadprice) {
+					print '<span class="amount">'.price($obj->cost_price).' '.$langs->trans("HT").'</span>';
+				}
+				print '</td>';
+			}
+
+			// Limit alert
+			if (!empty($arrayfields['p.seuil_stock_alerte']['checked'])) {
+				print '<td class="right">';
+				if ($obj->fk_product_type != 1) {
+					print $obj->seuil_stock_alerte;
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Desired stock
+			if (!empty($arrayfields['p.desiredstock']['checked'])) {
+				print '<td class="right">';
+				if ($obj->fk_product_type != 1) {
+					print $obj->desiredstock;
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Stock real
+			if (!empty($arrayfields['p.stock']['checked'])) {
+				print '<td class="right">';
+				if ($obj->fk_product_type != 1) {
+					if ($obj->seuil_stock_alerte != '' && $product_static->stock_reel < (float) $obj->seuil_stock_alerte) {
+						print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)).' ';
+					}
+					if ($usercancreadprice) {
+						print price(price2num($product_static->stock_reel, 'MS'));
+					}
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Stock virtual
+			if (!empty($arrayfields['stock_virtual']['checked'])) {
+				print '<td class="right">';
+				if ($obj->fk_product_type != 1) {
+					if ($obj->seuil_stock_alerte != '' && $product_static->stock_theorique < (float) $obj->seuil_stock_alerte) {
+						print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)).' ';
+					}
+					if ($usercancreadprice) {
+						print price(price2num($product_static->stock_theorique, 'MS'));
+					}
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Lot/Serial
+			if (!empty($arrayfields['p.tobatch']['checked'])) {
+				print '<td class="center">';
+				print $product_static->getLibStatut(1, 2);
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Country
+			if (!empty($arrayfields['p.fk_country']['checked'])) {
+				print '<td>'.getCountry($obj->fk_country, 0, $db).'</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// State
+			if (!empty($arrayfields['p.fk_state']['checked'])) {
+				print '<td>';
+				if (!empty($obj->fk_state)) {
+					print  getState($obj->fk_state, 0, $db);
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Accountancy code sell
+			if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_sell']['checked'])) {
+				print '<td>'.$obj->accountancy_code_sell.'</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_sell_intra']['checked'])) {
+				print '<td>'.$obj->accountancy_code_sell_intra.'</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_sell_export']['checked'])) {
+				print '<td>'.$obj->accountancy_code_sell_export.'</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Accountancy code buy
+			if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_buy']['checked'])) {
+				print '<td>'.$obj->accountancy_code_buy.'</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_buy_intra']['checked'])) {
+				print '<td>'.$obj->accountancy_code_buy_intra.'</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_buy_export']['checked'])) {
+				print '<td>'.$obj->accountancy_code_buy_export.'</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Extra fields
+			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+			// Fields from hook
+			$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			print $hookmanager->resPrint;
+			// Date creation
+			if (!empty($arrayfields['p.datec']['checked'])) {
+				print '<td class="center nowraponall">';
+				print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Date modification
+			if (!empty($arrayfields['p.tms']['checked'])) {
+				print '<td class="center nowraponall">';
+				print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Status (to sell)
+			if (!empty($arrayfields['p.tosell']['checked'])) {
+				print '<td class="center nowrap">';
+				if (!empty($conf->use_javascript_ajax) && $user->hasRight("produit", "creer") && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
+					print ajax_object_onoff($product_static, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
 				} else {
-					dol_print_error($db);
+					print $product_static->LibStatut($obj->tosell, 5, 0);
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Status (to buy)
+			if (!empty($arrayfields['p.tobuy']['checked'])) {
+				print '<td class="center nowrap">';
+				if (!empty($conf->use_javascript_ajax) && $user->hasRight("produit", "creer") && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
+					print ajax_object_onoff($product_static, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
+				} else {
+					print $product_static->LibStatut($obj->tobuy, 5, 1);
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
 				}
 			}
 
-			foreach ($arraypricelevel as $key => $value) {
-				if (!empty($arrayfields['p.sellprice'.$key]['checked'])) {
-					print '<td class="right nowraponall">';
-					if (!empty($productpricescache[$obj->rowid])) {
-						if ($productpricescache[$obj->rowid][$key]['price_base_type'] == 'TTC') {
-							print '<span class="amount">'.price($productpricescache[$obj->rowid][$key]['price_ttc']).' '.$langs->trans("TTC").'</span>';
-						} else {
-							print '<span class="amount">'.price($productpricescache[$obj->rowid][$key]['price']).' '.$langs->trans("HT").'</span>';
-						}
-					}
-					print '</td>';
-					if (!$i) {
-						$totalarray['nbfield']++;
+			// Action column
+			if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+				print '<td class="nowrap center">';
+				if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+					$selected = 0;
+					if (in_array($obj->rowid, $arrayofselected)) {
+						$selected = 1;
 					}
+					print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
 				}
 			}
-		}
 
-		// Better buy price
-		if (!empty($arrayfields['p.minbuyprice']['checked'])) {
-			print  '<td class="right nowraponall">';
-			if ($obj->tobuy && $obj->minsellprice != '' && $usercancreadprice) {
-				//print price($obj->minsellprice).' '.$langs->trans("HT");
-				if ($product_fourn->find_min_price_product_fournisseur($obj->rowid) > 0) {
-					if ($product_fourn->product_fourn_price_id > 0) {
-						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))) {
-							$htmltext = $product_fourn->display_price_product_fournisseur(1, 1, 0, 1);
-							print '<span class="amount">'.$form->textwithpicto(price($product_fourn->fourn_unitprice * (1 - $product_fourn->fourn_remise_percent / 100) - $product_fourn->fourn_remise).' '.$langs->trans("HT"), $htmltext).'</span>';
-						} else {
-							print '<span class="amount">'.price($product_fourn->fourn_unitprice).' '.$langs->trans("HT").'</span>';
-						}
-					}
-				}
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
+			print "</tr>\n";
 		}
-
-		// Number of buy prices
-		if (!empty($arrayfields['p.numbuyprice']['checked'])) {
-			print  '<td class="right">';
-			if ($obj->tobuy && $usercancreadprice) {
-				if (count($productFournList = $product_fourn->list_product_fournisseur_price($obj->rowid)) > 0) {
-					$htmltext = $product_fourn->display_price_product_fournisseur(1, 1, 0, 1, $productFournList);
-					print $form->textwithpicto(count($productFournList), $htmltext);
-				}
-			}
-			print '</td>';
-		}
-
-		// VAT or Sell Tax Rate
-		if (!empty($arrayfields['p.tva_tx']['checked'])) {
-			print '<td class="right">';
-			print vatrate($obj->tva_tx, true);
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// WAP
-		if (!empty($arrayfields['p.pmp']['checked'])) {
-			print '<td class="nowrap right">';
-			if ($usercancreadprice) {
-				print '<span class="amount">'.price($product_static->pmp, 1, $langs)."</span>";
-			}
-			print '</td>';
-		}
-		// Cost price
-		if (!empty($arrayfields['p.cost_price']['checked'])) {
-			print '<td class="nowrap right">';
-			//print $obj->cost_price;
-			if ($usercancreadprice) {
-				print '<span class="amount">'.price($obj->cost_price).' '.$langs->trans("HT").'</span>';
-			}
-			print '</td>';
-		}
-
-		// Limit alert
-		if (!empty($arrayfields['p.seuil_stock_alerte']['checked'])) {
-			print '<td class="right">';
-			if ($obj->fk_product_type != 1) {
-				print $obj->seuil_stock_alerte;
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Desired stock
-		if (!empty($arrayfields['p.desiredstock']['checked'])) {
-			print '<td class="right">';
-			if ($obj->fk_product_type != 1) {
-				print $obj->desiredstock;
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Stock real
-		if (!empty($arrayfields['p.stock']['checked'])) {
-			print '<td class="right">';
-			if ($obj->fk_product_type != 1) {
-				if ($obj->seuil_stock_alerte != '' && $product_static->stock_reel < (float) $obj->seuil_stock_alerte) {
-					print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)).' ';
-				}
-				if ($usercancreadprice) {
-					print price(price2num($product_static->stock_reel, 'MS'));
-				}
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Stock virtual
-		if (!empty($arrayfields['stock_virtual']['checked'])) {
-			print '<td class="right">';
-			if ($obj->fk_product_type != 1) {
-				if ($obj->seuil_stock_alerte != '' && $product_static->stock_theorique < (float) $obj->seuil_stock_alerte) {
-					print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)).' ';
-				}
-				if ($usercancreadprice) {
-					print price(price2num($product_static->stock_theorique, 'MS'));
-				}
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Lot/Serial
-		if (!empty($arrayfields['p.tobatch']['checked'])) {
-			print '<td class="center">';
-			print $product_static->getLibStatut(1, 2);
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Country
-		if (!empty($arrayfields['p.fk_country']['checked'])) {
-			print '<td>'.getCountry($obj->fk_country, 0, $db).'</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// State
-		if (!empty($arrayfields['p.fk_state']['checked'])) {
-			print '<td>';
-			if (!empty($obj->fk_state)) {
-				print  getState($obj->fk_state, 0, $db);
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Accountancy code sell
-		if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_sell']['checked'])) {
-			print '<td>'.$obj->accountancy_code_sell.'</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_sell_intra']['checked'])) {
-			print '<td>'.$obj->accountancy_code_sell_intra.'</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_sell_export']['checked'])) {
-			print '<td>'.$obj->accountancy_code_sell_export.'</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Accountancy code buy
-		if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_buy']['checked'])) {
-			print '<td>'.$obj->accountancy_code_buy.'</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_buy_intra']['checked'])) {
-			print '<td>'.$obj->accountancy_code_buy_intra.'</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_buy_export']['checked'])) {
-			print '<td>'.$obj->accountancy_code_buy_export.'</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Extra fields
-		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-		print $hookmanager->resPrint;
-		// Date creation
-		if (!empty($arrayfields['p.datec']['checked'])) {
-			print '<td class="center nowraponall">';
-			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Date modification
-		if (!empty($arrayfields['p.tms']['checked'])) {
-			print '<td class="center nowraponall">';
-			print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Status (to sell)
-		if (!empty($arrayfields['p.tosell']['checked'])) {
-			print '<td class="center nowrap">';
-			if (!empty($conf->use_javascript_ajax) && $user->hasRight("produit", "creer") && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
-				print ajax_object_onoff($product_static, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
-			} else {
-				print $product_static->LibStatut($obj->tosell, 5, 0);
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Status (to buy)
-		if (!empty($arrayfields['p.tobuy']['checked'])) {
-			print '<td class="center nowrap">';
-			if (!empty($conf->use_javascript_ajax) && $user->hasRight("produit", "creer") && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
-				print ajax_object_onoff($product_static, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
-			} else {
-				print $product_static->LibStatut($obj->tobuy, 5, 1);
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Action column
-		if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
-			print '<td class="nowrap center">';
-			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-				$selected = 0;
-				if (in_array($obj->rowid, $arrayofselected)) {
-					$selected = 1;
-				}
-				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		print "</tr>\n";
 		$i++;
 	}
 
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 29f1a229054..b241d4d278b 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -173,6 +173,31 @@ a.info-box-text-a i.fa.fa-exclamation-triangle {
 	bottom: 0;
 }
 
+/* customize section img box on list of products */
+.info-box-img {
+	height: 105px !important;
+	width: 88px;
+	border-top-left-radius: 2px;
+	border-top-right-radius: 0;
+	border-bottom-right-radius: 0;
+	border-bottom-left-radius: 2px;
+	display: block;
+	overflow: hidden;
+	float: left;
+	text-align: center;
+	font-size: 2.8em;
+	line-height: 90px;
+	margin-right: 5px;
+	background: var(--colorbacktitle1) !important;
+}
+.info-box-img > img {
+	width: 90%;
+	position: relative;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+}
+
 <?php if (empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS) && !empty($conf->global->MAIN_INCLUDE_GLOBAL_STATS_IN_OPENED_DASHBOARD)) { ?>
 .info-box-icon-text{
 	opacity: 1;

From 3f2367dc16406967486a3325c29cdda3c241ad9f Mon Sep 17 00:00:00 2001
From: Milen Karaganski <milen@blacktiehost.com>
Date: Wed, 7 Dec 2022 13:49:54 +0200
Subject: [PATCH 071/816] NEW|New [Bulk delete Project tasks]

Massaction to delete multiple tasks from tab Taks of Project
---
 htdocs/core/lib/project.lib.php | 13 +++++++++++-
 htdocs/projet/tasks.php         | 36 +++++++++++++++++++++++++++++++--
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index b944e8b47a5..7b0b30bcaef 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -569,9 +569,10 @@ function project_admin_prepare_head()
  * @param   string      $filterprogresscalc     filter text
  * @param   string      $showbilltime           Add the column 'TimeToBill' and 'TimeBilled'
  * @param   array       $arrayfields            Array with displayed coloumn information
+ * @param   array       $arrayofselected        Array with selected fields
  * @return	int									Nb of tasks shown
  */
-function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole, $projectsListId = '', $addordertick = 0, $projectidfortotallink = 0, $filterprogresscalc = '', $showbilltime = 0, $arrayfields = array())
+function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole, $projectsListId = '', $addordertick = 0, $projectidfortotallink = 0, $filterprogresscalc = '', $showbilltime = 0, $arrayfields = array(), $arrayofselected = array())
 {
 	global $user, $langs, $conf, $db, $hookmanager;
 	global $projectstatic, $taskstatic, $extrafields;
@@ -910,6 +911,16 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				// Tick to drag and drop
 				print '<td class="tdlineupdown center"></td>';
 
+				// Action column
+				print '<td class="nowrap" align="center">';
+				$selected = 0;
+				if (in_array($lines[$i]->id, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb' . $lines[$i]->id . '" class="flat checkforselect" type="checkbox" name="toselect[]" value="' . $lines[$i]->id . '"' . ($selected ? ' checked="checked"' : '') . '>';
+
+				print '</td>';
+
 				print "</tr>\n";
 
 				if (!$showlineingray) {
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 951406b4275..c619b25a37b 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -183,6 +183,14 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
  * Actions
  */
 
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list';
+	$massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
+
 $parameters = array('id'=>$id);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
@@ -413,6 +421,7 @@ $help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
 
 llxHeader("", $title, $help_url);
 
+$arrayofselected = is_array($toselect) ? $toselect : array();
 
 if ($id > 0 || !empty($ref)) {
 	$result = $object->fetch($id, $ref);
@@ -544,6 +553,17 @@ if ($id > 0 || !empty($ref)) {
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
+	$arrayofmassactions = array(
+		'clone'=>img_picto('', 'rightarrow', 'class="pictofixedwidth"').$langs->trans("Clone"),
+	);
+	if ($permissiontodelete) {
+		$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
+	}
+	if (in_array($massaction, array('presend', 'predelete'))) {
+		$arrayofmassactions = array();
+	}
+	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+
 	// Project card
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
@@ -842,7 +862,11 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	$linktotasks .= dolGetButtonTitle($langs->trans('ViewGantt'), '', 'fa fa-stream imgforviewmode', DOL_URL_ROOT.'/projet/ganttview.php?id='.$object->id.'&withproject=1', '', 1, array('morecss'=>'reposition marginleftonly'));
 
 	//print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'generic', 0, '', '', 0, 1);
-	print load_fiche_titre($title, $linktotasks.' &nbsp; '.$linktocreatetask, 'projecttask');
+	print load_fiche_titre($title, $linktotasks.' &nbsp; '.$linktocreatetask, 'projecttask', '', '', '', $massactionbutton);
+
+	$objecttmp = new Task($db);
+	$trackid = 'task'.$taskstatic->id;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 	// Get list of tasks in tasksarray and taskarrayfiltered
 	// We need all tasks (even not limited to a user because a task to user can have a parent that is not affected to him).
@@ -877,6 +901,11 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 		print '</div>';
 	}
 
+	// Show the massaction checkboxes only when this page is not opend from the Extended POS
+	if ($massactionbutton && $contextpage != 'poslist') {
+		$selectedfields = $form->showCheckAddButtons('checkforselect', 1);
+	}
+
 	print '<div class="div-table-responsive">';
 	print '<table id="tablelines" class="tagtable nobottom liste'.($moreforfilter ? " listwithfilterbefore" : "").'">';
 
@@ -987,6 +1016,8 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
+	print '<td class="liste_titre maxwidthsearch">&nbsp;</td>';
+
 	// Action column
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons();
@@ -1055,6 +1086,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
 	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
+	print '<td></td>';
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 	print "</tr>\n";
 
@@ -1062,7 +1094,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	if (count($tasksarray) > 0) {
 		// Show all lines in taskarray (recursive function to go down on tree)
 		$j = 0; $level = 0;
-		$nboftaskshown = projectLinesa($j, 0, $tasksarray, $level, true, 0, $tasksrole, $object->id, 1, $object->id, $filterprogresscalc, ($object->usage_bill_time ? 1 : 0), $arrayfields);
+		$nboftaskshown = projectLinesa($j, 0, $tasksarray, $level, true, 0, $tasksrole, $object->id, 1, $object->id, $filterprogresscalc, ($object->usage_bill_time ? 1 : 0), $arrayfields, $arrayofselected);
 	} else {
 		$colspan = 10;
 		if ($object->usage_bill_time) {

From ccf40855d8f61981d2a083c98de38a6e07cc4464 Mon Sep 17 00:00:00 2001
From: Milen Karaganski <milen@blacktiehost.com>
Date: Wed, 7 Dec 2022 14:04:54 +0200
Subject: [PATCH 072/816] Removed "Clone" option from massactions list (work in
 progress)

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

diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index c619b25a37b..c891179617d 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -554,7 +554,7 @@ if ($id > 0 || !empty($ref)) {
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 	$arrayofmassactions = array(
-		'clone'=>img_picto('', 'rightarrow', 'class="pictofixedwidth"').$langs->trans("Clone"),
+		//'clone'=>img_picto('', 'rightarrow', 'class="pictofixedwidth"').$langs->trans("Clone"),
 	);
 	if ($permissiontodelete) {
 		$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");

From 6b6cfb13395bb6e5d706691c02f17e425b3073f7 Mon Sep 17 00:00:00 2001
From: Milen Karaganski <milen@blacktiehost.com>
Date: Wed, 7 Dec 2022 16:57:22 +0200
Subject: [PATCH 073/816] Add mass action to clone selected tasks to another
 project

---
 htdocs/core/actions_massactions.inc.php | 60 +++++++++++++++++++
 htdocs/core/class/html.form.class.php   |  2 +-
 htdocs/core/tpl/massactions_pre.tpl.php | 12 ++++
 htdocs/langs/en_US/main.lang            |  3 +
 htdocs/langs/en_US/projects.lang        |  3 +-
 htdocs/projet/class/project.class.php   | 80 +++++++++++++++++++++++++
 htdocs/projet/tasks.php                 |  7 ++-
 7 files changed, 162 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index ec2ecabcf0d..40ecab72a60 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1707,6 +1707,66 @@ if (!$error && ($massaction == 'increaseholiday' || ($action == 'increaseholiday
 	}
 }
 
+//if (!$error && $massaction == 'clonetasks' && $user->rights->projet->creer) {
+if (!$error && ($massaction == 'clonetasks' || ($action == 'clonetasks' && $confirm == 'yes'))) {
+	$num = 0;
+
+	dol_include_once('/projet/class/task.class.php');
+
+	$origin_task = new Task($db);
+	$clone_task = new Task($db);
+
+	foreach (GETPOST('selected') as $task) {
+		$origin_task->fetch($task, $ref = '', $loadparentdata = 0);
+
+		$defaultref = '';
+		$obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
+		if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT . "/core/modules/project/task/" . $conf->global->PROJECT_TASK_ADDON . ".php")) {
+			require_once DOL_DOCUMENT_ROOT . "/core/modules/project/task/" . $conf->global->PROJECT_TASK_ADDON . '.php';
+			$modTask = new $obj;
+			$defaultref = $modTask->getNextValue(0, $clone_task);
+		}
+
+		if (!$error) {
+			$clone_task->fk_project = GETPOST('projectid', 'int');
+			$clone_task->ref = $defaultref;
+			$clone_task->label = $origin_task->label;
+			$clone_task->description = $origin_task->description;
+			$clone_task->planned_workload = $origin_task->planned_workload;
+			$clone_task->fk_task_parent = $origin_task->fk_task_parent;
+			$clone_task->date_c = dol_now();
+			$clone_task->date_start = $origin_task->date_start;
+			$clone_task->date_end = $origin_task->date_end;
+			$clone_task->progress = $origin_task->progress;
+
+			// Fill array 'array_options' with data from add form
+			$ret = $extrafields->setOptionalsFromPost(null, $clone_task);
+
+			$taskid = $clone_task->create($user);
+
+			if ($taskid > 0) {
+				$result = $clone_task->add_contact(GETPOST("userid", 'int'), 'TASKEXECUTIVE', 'internal');
+				$num++;
+			} else {
+				if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+					$langs->load("projects");
+					setEventMessages($langs->trans('NewTaskRefSuggested'), '', 'warnings');
+					$duplicate_code_error = true;
+				} else {
+					setEventMessages($clone_task->error, $clone_task->errors, 'errors');
+				}
+				$action = 'list';
+				$error++;
+			}
+		}
+	}
+
+	if (!$error) {
+		setEventMessage($langs->trans('NumberOfTasksCloned', $num));
+		header("Refresh: 1;URL=".DOL_URL_ROOT.'/projet/tasks.php?id=' . GETPOST('projectid', 'int'));
+	}
+}
+
 $parameters['toselect'] = (empty($toselect) ? array() : $toselect);
 $parameters['uploaddir'] = $uploaddir;
 $parameters['massaction'] = $massaction;
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 9e26170f214..6df62ded8bd 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7286,7 +7286,7 @@ class Form
 			$out .= $this->selectProjectsList($selected, $htmlname, $filtertype, $limit, $status, 0, $socid, $showempty, $forcecombo, $morecss);
 		}
 
-		if (empty($nooutput)) print $out;
+		if (!empty($nooutput)) print $out;
 		else return $out;
 	}
 
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index 5124a1dce35..e0293210cf6 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -40,6 +40,18 @@ if ($massaction == 'predelete') {
 	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassDeletion"), $langs->trans("ConfirmMassDeletionQuestion", count($toselect)), "delete", null, '', 0, 200, 500, 1);
 }
 
+if ($massaction == 'preclonetasks') {
+	$selected = '';
+	foreach (GETPOST('toselect') as $tmpselected) {
+		$selected .= '&selected[]=' . $tmpselected;
+	}
+
+	$formquestion = array(
+		array('type' => 'other', 'name' => 'projectid', 'label' => $langs->trans('Project') .': ', 'value' => $form->selectProjects('', 'projectid', '', '', '', '', '', '', '', 1, 1)),
+	);
+	print $form->formconfirm($_SERVER['PHP_SELF'] . '?id=' . $object->id . $selected . '', $langs->trans('ConfirmMassClone'), '', 'clonetasks', $formquestion, '', 1, 300, 590);
+}
+
 if ($massaction == 'preaffecttag' && isModEnabled('category')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$categ = new Categorie($db);
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 87b4f8f3036..47a11b949aa 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -897,6 +897,9 @@ MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
 ConfirmMassDeletion=Bulk Delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record(s)?
+ConfirmMassClone=Bulk clone confirmation
+ConfirmMassCloneQuestion=Select project to clone to
+ConfirmMassCloneToOneProject=Clone to project %s
 RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 ClassifyUnbilled=Classify unbilled
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 2407d4b2d86..43eecc60b7b 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -258,6 +258,7 @@ RecordsClosed=%s project(s) closed
 SendProjectRef=Information project %s
 ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Salaries' must be enabled to define employee hourly rate to have time spent valorized
 NewTaskRefSuggested=Task ref already used, a new task ref is required
+NumberOfTasksCloned=%s task(s) cloned
 TimeSpentInvoiced=Time spent billed
 TimeSpentForIntervention=Time spent
 TimeSpentForInvoice=Time spent
@@ -297,4 +298,4 @@ EnablePublicLeadForm=Enable the public form for contact
 NewLeadbyWeb=Your message or request has been recorded. We will answer or contact your soon.
 NewLeadForm=New contact form
 LeadFromPublicForm=Online lead from public form
-ExportAccountingReportButtonLabel=Get report
\ No newline at end of file
+ExportAccountingReportButtonLabel=Get report
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 9c8b4ebee26..90057832c23 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -747,6 +747,86 @@ class Project extends CommonObject
 		}
 	}
 
+	/**
+	 * Load list of objects in memory from the database.
+	 *
+	 * @param  string      $sortorder    Sort Order
+	 * @param  string      $sortfield    Sort field
+	 * @param  int         $limit        limit
+	 * @param  int         $offset       Offset
+	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
+	 * @param  string      $filtermode   Filter mode (AND or OR)
+	 * @return array|int                 int <0 if KO, array of pages if OK
+	 */
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	{
+		global $conf;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$records = array();
+
+		$sql = 'SELECT ';
+		$sql .= $this->getFieldList('t');
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
+			$sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+		} else {
+			$sql .= ' WHERE 1 = 1';
+		}
+		// Manage filter
+		$sqlwhere = array();
+		if (count($filter) > 0) {
+			foreach ($filter as $key => $value) {
+				if ($key == 't.rowid') {
+					$sqlwhere[] = $key.'='.$value;
+				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+				} elseif ($key == 'customsql') {
+					$sqlwhere[] = $value;
+				} elseif (strpos($value, '%') === false) {
+					$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
+				} else {
+					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+				}
+			}
+		}
+		if (count($sqlwhere) > 0) {
+			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+		}
+
+		if (!empty($sortfield)) {
+			$sql .= $this->db->order($sortfield, $sortorder);
+		}
+		if (!empty($limit)) {
+			$sql .= ' '.$this->db->plimit($limit, $offset);
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < ($limit ? min($limit, $num) : $num)) {
+				$obj = $this->db->fetch_object($resql);
+
+				$record = new self($this->db);
+				$record->setVarsFromFetchObj($obj);
+
+				$records[$record->id] = $record;
+
+				$i++;
+			}
+			$this->db->free($resql);
+
+			return $records;
+		} else {
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+
+			return -1;
+		}
+	}
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Return list of elements for type, linked to a project
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index c891179617d..1fdf9939447 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -553,9 +553,10 @@ if ($id > 0 || !empty($ref)) {
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
-	$arrayofmassactions = array(
-		//'clone'=>img_picto('', 'rightarrow', 'class="pictofixedwidth"').$langs->trans("Clone"),
-	);
+	$arrayofmassactions = array();
+	if ($user->rights->projet->creer) {
+		$arrayofmassactions['preclonetasks'] = img_picto('', 'rightarrow', 'class="pictofixedwidth"').$langs->trans("Clone");
+	}
 	if ($permissiontodelete) {
 		$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 	}

From f0f66327b938927b0d255f4ed28a1f79fa83adc5 Mon Sep 17 00:00:00 2001
From: Milen Karaganski <milen@blacktiehost.com>
Date: Wed, 7 Dec 2022 17:47:01 +0200
Subject: [PATCH 074/816] Fix syntax error

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

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 90057832c23..7f0da4a6c98 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -792,7 +792,7 @@ class Project extends CommonObject
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+			$sql .= ' AND ('.implode("'.$filtermode.'", $sqlwhere).')';
 		}
 
 		if (!empty($sortfield)) {

From 5770d01c75af41c097e7fed679e844a44074b45b Mon Sep 17 00:00:00 2001
From: Milen Karaganski <milen@blacktiehost.com>
Date: Wed, 7 Dec 2022 17:57:43 +0200
Subject: [PATCH 075/816] Fix syntax error

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

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 7f0da4a6c98..7ab69e070a3 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -792,7 +792,7 @@ class Project extends CommonObject
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode("'.$filtermode.'", $sqlwhere).')';
+			$sql .= ' AND ('.implode('"'.$filtermode.'"', $sqlwhere).')';
 		}
 
 		if (!empty($sortfield)) {

From 52ec95d7bff99e25342d2d26a484a2b3fccad402 Mon Sep 17 00:00:00 2001
From: Milen Karaganski <milen@blacktiehost.com>
Date: Wed, 7 Dec 2022 18:08:10 +0200
Subject: [PATCH 076/816] Removed unnecessary fetchAll() method from project
 class

---
 htdocs/projet/class/project.class.php | 80 ---------------------------
 1 file changed, 80 deletions(-)

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 7ab69e070a3..9c8b4ebee26 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -747,86 +747,6 @@ class Project extends CommonObject
 		}
 	}
 
-	/**
-	 * Load list of objects in memory from the database.
-	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
-	 * @return array|int                 int <0 if KO, array of pages if OK
-	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
-	{
-		global $conf;
-
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$records = array();
-
-		$sql = 'SELECT ';
-		$sql .= $this->getFieldList('t');
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			$sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
-		} else {
-			$sql .= ' WHERE 1 = 1';
-		}
-		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key.'='.$value;
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} elseif (strpos($value, '%') === false) {
-					$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
-				} else {
-					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode('"'.$filtermode.'"', $sqlwhere).')';
-		}
-
-		if (!empty($sortfield)) {
-			$sql .= $this->db->order($sortfield, $sortorder);
-		}
-		if (!empty($limit)) {
-			$sql .= ' '.$this->db->plimit($limit, $offset);
-		}
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			while ($i < ($limit ? min($limit, $num) : $num)) {
-				$obj = $this->db->fetch_object($resql);
-
-				$record = new self($this->db);
-				$record->setVarsFromFetchObj($obj);
-
-				$records[$record->id] = $record;
-
-				$i++;
-			}
-			$this->db->free($resql);
-
-			return $records;
-		} else {
-			$this->errors[] = 'Error '.$this->db->lasterror();
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
-
-			return -1;
-		}
-	}
-
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Return list of elements for type, linked to a project

From 7c352c9cefe8e241c0dd862d9c148dff11519b33 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Fri, 9 Dec 2022 17:00:11 +0100
Subject: [PATCH 077/816] BOM : calculate total cost of lines

---
 htdocs/bom/class/bom.class.php         | 3 ++-
 htdocs/bom/tpl/objectline_view.tpl.php | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 0e57bebd922..4dfb47a3887 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -1073,7 +1073,8 @@ class BOM extends CommonObject
 					if ($res>0) {
 						$bom_child->calculateCosts();
 						$line->childBom[] = $bom_child;
-						$this->total_cost += $bom_child->total_cost  * $line->qty;
+						$line->total_cost = price2num( $bom_child->total_cost  * $line->qty, 'MT');
+						$this->total_cost += $line->total_cost;
 					} else {
 						$this->error = $bom_child->error;
 						return -2;
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index 61b394a3b0f..3897b875652 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -239,13 +239,13 @@ if ($resql) {
 		// Cost
 		if (!empty($sub_bom->id)) {
 			$sub_bom->calculateCosts();
-			print '<td class="linecolcost nowrap right" id="sub_bom_cost_'.$sub_bom_line->id.'"><span class="amount">'.price($sub_bom->total_cost * $sub_bom_line->qty * $line->qty).'</span></td>';
+			print '<td class="linecolcost nowrap right" id="sub_bom_cost_'.$sub_bom_line->id.'"><span class="amount">'.price2num($sub_bom->total_cost * $sub_bom_line->qty * $line->qty, 'MT').'</span></td>';
 			$total_cost+= $sub_bom->total_cost * $sub_bom_line->qty * $line->qty;
 		} elseif ($sub_bom_product->cost_price > 0) {
-			print '<td class="linecolcost nowrap right" id="sub_bom_cost_'.$sub_bom_line->id.'"><span class="amount">'.price($sub_bom_product->cost_price * $sub_bom_line->qty * $line->qty).'</span></td>';
+			print '<td class="linecolcost nowrap right" id="sub_bom_cost_'.$sub_bom_line->id.'"><span class="amount">'.price2num($sub_bom_product->cost_price * $sub_bom_line->qty * $line->qty, 'MT').'</span></td>';
 			$total_cost+= $sub_bom_product->cost_price * $sub_bom_line->qty * $line->qty;
 		} elseif ($sub_bom_product->pmp > 0) {	// PMP if cost price isn't defined
-			print '<td class="linecolcost nowrap right" id="sub_bom_cost_'.$sub_bom_line->id.'"><span class="amount">'.price($sub_bom_product->pmp * $sub_bom_line->qty * $line->qty).'</span></td>';
+			print '<td class="linecolcost nowrap right" id="sub_bom_cost_'.$sub_bom_line->id.'"><span class="amount">'.price2num($sub_bom_product->pmp * $sub_bom_line->qty * $line->qty, 'MT').'</span></td>';
 			$total_cost.= $sub_bom_product->pmp * $sub_bom_line->qty * $line->qty;
 		} else {	// Minimum purchase price if cost price and PMP aren't defined
 			$sql_supplier_price = 'SELECT MIN(price) AS min_price, quantity AS qty FROM '.MAIN_DB_PREFIX.'product_fournisseur_price';
@@ -255,7 +255,7 @@ if ($resql) {
 				$obj = $object->db->fetch_object($resql_supplier_price);
 				$line_cost = $obj->min_price/$obj->qty * $sub_bom_line->qty * $line->qty;
 
-				print '<td class="linecolcost nowrap right" id="sub_bom_cost_'.$sub_bom_line->id.'"><span class="amount">'.price($line_cost).'</span></td>';
+				print '<td class="linecolcost nowrap right" id="sub_bom_cost_'.$sub_bom_line->id.'"><span class="amount">'.price2num($line_cost, 'MT').'</span></td>';
 				$total_cost+= $line_cost;
 			}
 		}

From 92bff0fcfbbba88af2b422d4cefa6b4c3d38cd8f Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Mon, 12 Dec 2022 11:41:54 +0100
Subject: [PATCH 078/816] Missing Unit TD for sub-bom lines

---
 htdocs/bom/tpl/objectline_view.tpl.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index 3897b875652..bb83e62c07f 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -218,11 +218,16 @@ if ($resql) {
 		}
 
 		// Qty
+		$label = $sub_bom_product->getLabelOfUnit('long');
 		if ($sub_bom_line->qty_frozen > 0) {
 			print '<td class="linecolqty nowrap right" id="sub_bom_qty_'.$sub_bom_line->id.'">'.price($sub_bom_line->qty, 0, '', 0, 0).'</td>';
+			print '<td class="linecoluseunit nowrap left">'.($label !== '') ? $langs->trans($label) : '' . '</td>';
 			print '<td class="linecolqtyfrozen nowrap right" id="sub_bom_qty_frozen_'.$sub_bom_line->id.'">'.$langs->trans('Yes').'</td>';
 		} else {
 			print '<td class="linecolqty nowrap right" id="sub_bom_qty_'.$sub_bom_line->id.'">'.price($sub_bom_line->qty * $line->qty, 0, '', 0, 0).'</td>';
+			print '<td class="linecoluseunit nowrap left">';
+			print '<td class="linecoluseunit nowrap left">'.($label !== '') ? $langs->trans($label) : '' . '</td>';
+			print '</td>';
 			print '<td class="linecolqtyfrozen nowrap right" id="sub_bom_qty_frozen_'.$sub_bom_line->id.'">&nbsp;</td>';
 		}
 

From 88ab5d72030ee0f5d1b2b306456907d0175b055b Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Tue, 13 Dec 2022 15:48:00 +0100
Subject: [PATCH 079/816] NEW Quadratus export with attachments in accountancy
 export

---
 htdocs/accountancy/bookkeeping/list.php       |  96 ++++++----
 .../class/accountancyexport.class.php         | 177 +++++++++++++++++-
 htdocs/accountancy/tpl/export_journal.tpl.php |   8 +-
 htdocs/langs/en_US/accountancy.lang           |   2 +
 htdocs/langs/fr_FR/accountancy.lang           |   2 +
 5 files changed, 233 insertions(+), 52 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index f0e95c3efb7..2d48bc706ea 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -715,58 +715,62 @@ if ($action == 'export_fileconfirm' && $user->hasRight('accounting', 'mouvements
 			}
 		}
 
-		$mimetype = $accountancyexport->getMimeType($formatexportset);
-
-		top_httphead($mimetype, 1);
-
-		// Output data on screen
-		$accountancyexport->export($object->lines, $formatexportset);
-
 		$notifiedexportdate = GETPOST('notifiedexportdate', 'alpha');
 		$notifiedvalidationdate = GETPOST('notifiedvalidationdate', 'alpha');
+		$withAttachment = !empty(trim(GETPOST('notifiedexportfull', 'alphanohtml'))) ? 1 : 0;
 
-		if (!empty($accountancyexport->errors)) {
-			dol_print_error('', '', $accountancyexport->errors);
-		} elseif (!empty($notifiedexportdate) || !empty($notifiedvalidationdate)) {
-			// Specify as export : update field date_export or date_validated
-			$error = 0;
-			$db->begin();
+		// Output data on screen or download
+		$result = $accountancyexport->export($object->lines, $formatexportset, $withAttachment);
 
-			if (is_array($object->lines)) {
-				foreach ($object->lines as $movement) {
-					$now = dol_now();
+		$error = 0;
+		if ($result < 0) {
+			$error++;
+		} else {
+			if (!empty($notifiedexportdate) || !empty($notifiedvalidationdate)) {
+				if (is_array($object->lines)) {
+					// Specify as export : update field date_export or date_validated
+					$db->begin();
 
-					$sql = " UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping";
-					$sql .= " SET";
-					if (!empty($notifiedexportdate) && !empty($notifiedvalidationdate)) {
-						$sql .= " date_export = '".$db->idate($now)."'";
-						$sql .= ", date_validated = '".$db->idate($now)."'";
-					} elseif (!empty($notifiedexportdate)) {
-						$sql .= " date_export = '".$db->idate($now)."'";
-					} elseif (!empty($notifiedvalidationdate)) {
-						$sql .= " date_validated = '".$db->idate($now)."'";
+					foreach ($object->lines as $movement) {
+						$now = dol_now();
+
+						$sql = " UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping";
+						$sql .= " SET";
+						if (!empty($notifiedexportdate) && !empty($notifiedvalidationdate)) {
+							$sql .= " date_export = '".$db->idate($now)."'";
+							$sql .= ", date_validated = '".$db->idate($now)."'";
+						} elseif (!empty($notifiedexportdate)) {
+							$sql .= " date_export = '".$db->idate($now)."'";
+						} elseif (!empty($notifiedvalidationdate)) {
+							$sql .= " date_validated = '".$db->idate($now)."'";
+						}
+						$sql .= " WHERE rowid = ".((int) $movement->id);
+
+						dol_syslog("/accountancy/bookkeeping/list.php Function export_file Specify movements as exported", LOG_DEBUG);
+
+						$result = $db->query($sql);
+						if (!$result) {
+							$error++;
+							break;
+						}
 					}
-					$sql .= " WHERE rowid = ".((int) $movement->id);
 
-					dol_syslog("/accountancy/bookkeeping/list.php Function export_file Specify movements as exported", LOG_DEBUG);
-
-					$result = $db->query($sql);
-					if (!$result) {
+					if (!$error) {
+						$db->commit();
+					} else {
 						$error++;
-						break;
+						$accountancyexport->errors[] = $langs->trans('NotAllExportedMovementsCouldBeRecordedAsExportedOrValidated');
+						$db->rollback();
 					}
 				}
 			}
-
-			if (!$error) {
-				$db->commit();
-			} else {
-				$error++;
-				$db->rollback();
-				dol_print_error('', $langs->trans("NotAllExportedMovementsCouldBeRecordedAsExportedOrValidated"));
-			}
 		}
-		exit;
+
+		if ($error) {
+			setEventMessages('', $accountancyexport->errors, 'errors');
+			header('Location: '.$_SERVER['PHP_SELF']);
+		}
+		exit(); // download or show errors
 	}
 }
 
@@ -854,7 +858,17 @@ if ($action == 'export_file') {
 		$form_question['separator3'] = array('name'=>'separator3', 'type'=>'separator');
 	}
 
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans("ExportFilteredList").' ('.$listofformat[$formatexportset].')', $langs->trans('ConfirmExportFile'), 'export_fileconfirm', $form_question, '', 1, 350, 600);
+	// add documents in an archive for accountancy export (Quadratus)
+	if(getDolGlobalString('ACCOUNTING_EXPORT_MODELCSV') == AccountancyExport::$EXPORT_TYPE_QUADRATUS) {
+		$form_question['notifiedexportfull'] = array(
+			'name' => 'notifiedexportfull',
+			'type' => 'checkbox',
+			'label' => $langs->trans('NotifiedExportFull'),
+			'value' => 'false',
+		);
+	}
+
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans("ExportFilteredList").' ('.$listofformat[$formatexportset].')', $langs->trans('ConfirmExportFile'), 'export_fileconfirm', $form_question, '', 1, 400, 600);
 }
 
 //if ($action == 'delbookkeepingyear') {
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 3c45315ffa9..76b6782c174 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -36,6 +36,7 @@
 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/class/hookmanager.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 
 /**
@@ -313,9 +314,10 @@ class AccountancyExport
 	 *
 	 * @param 	array	$TData 				Array with data
 	 * @param	int		$formatexportset	Id of export format
-	 * @return 	void
+	 * @param	int		$withAttachment		[=0] Not add files or 1 to have attached in an archive (ex : Quadratus)
+	 * @return 	int		<0 if KO, >0 OK
 	 */
-	public function export(&$TData, $formatexportset)
+	public function export(&$TData, $formatexportset, $withAttachment = 0)
 	{
 		global $conf, $langs;
 		global $search_date_end; // Used into /accountancy/tpl/export_journal.tpl.php
@@ -325,8 +327,44 @@ class AccountancyExport
 		$type_export = 'general_ledger';
 
 		global $db; // The tpl file use $db
+		$completefilename = '';
+		$exportFile = null;
+		$exportFileName = '';
+		$exportFilePath = '';
+		$archiveFileList = array();
+		if ($withAttachment == 1) {
+			// PHP ZIP extension must be enabled
+			if (!extension_loaded('zip')) {
+				$langs->load('install');
+				$this->errors[] = $langs->trans('ErrorPHPDoesNotSupport', 'ZIP');;
+				return -1;
+			}
+		} else {
+			$mimetype = $this->getMimeType($formatexportset);
+			top_httphead($mimetype, 1);
+		}
 		include DOL_DOCUMENT_ROOT.'/accountancy/tpl/export_journal.tpl.php';
+		if ($withAttachment == 1 && !empty($completefilename)) {
+			// create export file
+			$tmpDir = !empty($conf->accounting->multidir_temp[$conf->entity]) ? $conf->accounting->multidir_temp[$conf->entity] : $conf->accounting->dir_temp;
+			$exportFileFullName = $completefilename;
+			$exportFileBaseName = basename($exportFileFullName);
+			$exportFileName = pathinfo($exportFileBaseName, PATHINFO_FILENAME);
+			$exportFilePath = $tmpDir.'/'.$exportFileFullName;
+			$exportFile = fopen($exportFilePath, 'w');
+			if (!$exportFile) {
+				$this->errors[] = $langs->trans('ErrorFileNotFound', $exportFilePath);
+				return -1;
+			}
+			$archiveFileList[0] = array(
+				'path' => $exportFilePath,
+				'name' => $exportFileFullName,
+			);
 
+			// archive name and path
+			$archiveFullName = $exportFileName.'.zip';
+			$archivePath = $tmpDir.'/'.$archiveFullName;
+		}
 
 		switch ($formatexportset) {
 			case self::$EXPORT_TYPE_CONFIGURABLE:
@@ -345,7 +383,7 @@ class AccountancyExport
 				$this->exportCiel($TData);
 				break;
 			case self::$EXPORT_TYPE_QUADRATUS:
-				$this->exportQuadratus($TData);
+				$archiveFileList = $this->exportQuadratus($TData, $exportFile, $archiveFileList, $withAttachment);
 				break;
 			case self::$EXPORT_TYPE_WINFIC:
 				$this->exportWinfic($TData);
@@ -399,6 +437,69 @@ class AccountancyExport
 				}
 				break;
 		}
+
+		// create and download export file or archive
+		if ($withAttachment == 1) {
+			$error = 0;
+
+			// close export file
+			if ($exportFile) {
+				fclose($exportFile);
+			}
+
+			if (!empty($archiveFullName) && !empty($archivePath) && !empty($archiveFileList)) {
+				// archive files
+				$downloadFileMimeType = 'application/zip';
+				$downloadFileFullName = $archiveFullName;
+				$downloadFilePath = $archivePath;
+
+				// create archive
+				$archive = new ZipArchive();
+				$res = $archive->open($archivePath, ZipArchive::OVERWRITE | ZipArchive::CREATE);
+				if ($res !== true) {
+					$error++;
+					$this->errors[] = $langs->trans('ErrorFileNotFound', $archivePath);
+				}
+				if (!$error) {
+					// add files
+					foreach ($archiveFileList as $archiveFileArr) {
+						$res = $archive->addFile($archiveFileArr['path'], $archiveFileArr['name']);
+						if (!$res) {
+							$error++;
+							$this->errors[] = $langs->trans('ErrorArchiveAddFile', $archiveFileArr['name']);
+							break;
+						}
+					}
+				}
+				if (!$error) {
+					// close archive
+					$archive->close();
+				}
+			} elseif (!empty($exportFileFullName) && !empty($exportFilePath)) {
+				// only one file to download
+				$downloadFileMimeType = 'text/csv';
+				$downloadFileFullName = $exportFileFullName;
+				$downloadFilePath = $exportFilePath;
+			}
+
+			if (!$error) {
+				// download export file
+				if (!empty($downloadFileMimeType) && !empty($downloadFileFullName) && !empty($downloadFilePath)) {
+					header('Content-Type: '.$downloadFileMimeType);
+					header('Content-Disposition: attachment; filename='.$downloadFileFullName);
+					header('Cache-Control: Public, must-revalidate');
+					header('Pragma: public');
+					header('Content-Length: '.dol_filesize($downloadFilePath));
+					readfileLowMemory($downloadFilePath);
+				}
+			}
+
+			if ($error) {
+				return -1;
+			}
+		}
+
+		return 1;
 	}
 
 
@@ -584,10 +685,13 @@ class AccountancyExport
 	 * Help : https://docplayer.fr/20769649-Fichier-d-entree-ascii-dans-quadracompta.html
 	 * In QuadraCompta | Use menu : "Outils" > "Suivi des dossiers" > "Import ASCII(Compta)"
 	 *
-	 * @param array $TData data
-	 * @return void
+	 * @param 	array		$TData					Data
+	 * @param 	resource	$exportFile				[=null] File resource to export or print if null
+	 * @param 	array		$archiveFileList		[=array()] Archive file list : array of ['path', 'name']
+	 * @param 	bool		$withAttachment			[=0] Not add files or 1 to have attached in an archive
+	 * @return	array		Archive file list : array of ['path', 'name']
 	 */
-	public function exportQuadratus(&$TData)
+	public function exportQuadratus(&$TData, $exportFile = null, $archiveFileList = array(), $withAttachment = 0)
 	{
 		global $conf, $db;
 
@@ -637,7 +741,11 @@ class AccountancyExport
 
 				$Tab['end_line'] = $end_line;
 
-				print implode($Tab);
+				if ($exportFile) {
+					fwrite($exportFile, implode($Tab));
+				} else {
+					print implode($Tab);
+				}
 			}
 
 			$Tab = array();
@@ -708,12 +816,63 @@ class AccountancyExport
 			// We need to keep the 10 lastest number of invoice doc_ref not the beginning part that is the unusefull almost same part
 			// $Tab['num_piece3'] = str_pad(self::trunc($data->piece_num, 10), 10);
 			$Tab['num_piece3'] = substr(self::trunc($data->doc_ref, 20), -10);
-			$Tab['filler4'] = str_repeat(' ', 73);
+			$Tab['reserved'] = str_repeat(' ', 10); // position 159
+			$Tab['currency_amount'] = str_repeat(' ', 13); // position 169
+			// get document file
+			$attachmentFileName = '';
+			if ($withAttachment == 1) {
+				$attachmentFileKey = trim($data->piece_num);
 
+				if (!isset($archiveFileList[$attachmentFileKey])) {
+					$objectDirPath = '';
+					$objectFileName = dol_sanitizeFileName($data->doc_ref);
+					if ($data->doc_type == 'customer_invoice') {
+						$objectDirPath = !empty($conf->facture->multidir_output[$conf->entity]) ? $conf->facture->multidir_output[$conf->entity] : $conf->facture->dir_output;
+					} elseif ($data->doc_type == 'expense_report') {
+						$objectDirPath = !empty($conf->expensereport->multidir_output[$conf->entity]) ? $conf->expensereport->multidir_output[$conf->entity] : $conf->factureexpensereport->dir_output;
+					} elseif ($data->doc_type == 'supplier_invoice') {
+						$objectDirPath = !empty($conf->fournisseur->facture->multidir_output[$conf->entity]) ? $conf->fournisseur->facture->multidir_output[$conf->entity] : $conf->fournisseur->facture->dir_output;
+					}
+					$arrayofinclusion = array();
+					$arrayofinclusion[] = '^'.preg_quote($objectFileName, '/').'\.pdf$';
+					$fileFoundList = dol_dir_list($objectDirPath.'/'.$objectFileName, 'files', 0, implode('|', $arrayofinclusion), '(\.meta|_preview.*\.png)$', 'date', SORT_DESC, 0, true);
+					if (!empty($fileFoundList)) {
+						$attachmentFileNameTrunc = str_pad(self::trunc($data->piece_num, 8), 8, '0', STR_PAD_LEFT);
+						foreach ($fileFoundList as $fileFound) {
+							if (strstr($fileFound['name'], $objectFileName)) {
+								$fileFoundPath = $objectDirPath.'/'.$objectFileName.'/'.$fileFound['name'];
+								if (file_exists($fileFoundPath)) {
+									$archiveFileList[$attachmentFileKey] = array(
+										'path' => $fileFoundPath,
+										'name' => $attachmentFileNameTrunc.'.pdf',
+									);
+									break;
+								}
+							}
+						}
+					}
+				}
+
+				if (isset($archiveFileList[$attachmentFileKey])) {
+					$attachmentFileName = $archiveFileList[$attachmentFileKey]['name'];
+				}
+			}
+			if (dol_strlen($attachmentFileName) == 12) {
+				$Tab['attachment'] = $attachmentFileName; // position 182
+			} else {
+				$Tab['attachment'] = str_repeat(' ', 12); // position 182
+			}
+			$Tab['filler4'] = str_repeat(' ', 38);
 			$Tab['end_line'] = $end_line;
 
-			print implode($Tab);
+			if ($exportFile) {
+				fwrite($exportFile, implode($Tab));
+			} else {
+				print implode($Tab);
+			}
 		}
+
+		return $archiveFileList;
 	}
 
 	/**
diff --git a/htdocs/accountancy/tpl/export_journal.tpl.php b/htdocs/accountancy/tpl/export_journal.tpl.php
index 22537a60a39..833b81fc8c0 100644
--- a/htdocs/accountancy/tpl/export_journal.tpl.php
+++ b/htdocs/accountancy/tpl/export_journal.tpl.php
@@ -33,7 +33,9 @@ $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');
 
-header('Content-Type: text/csv');
+if (!isset($withAttachments) || $withAttachments == 1) {
+	header('Content-Type: text/csv');
+}
 
 include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancyexport.class.php';
 $accountancyexport = new AccountancyExport($db);
@@ -66,4 +68,6 @@ if (($accountancyexport->getFormatCode($formatexportset) == 'fec' || $accountanc
 	$completefilename = ($code ? $code."_" : "").($prefix ? $prefix."_" : "").$filename.($nodateexport ? "" : $date_export).".".$format;
 }
 
-header('Content-Disposition: attachment;filename='.$completefilename);
+if (!isset($withAttachments) || $withAttachments == 1) {
+	header('Content-Disposition: attachment;filename=' . $completefilename);
+}
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index e988764d8ba..5ea3c692aee 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -342,6 +342,7 @@ ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
 NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Date validation and lock
 ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
@@ -442,6 +443,7 @@ AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
 AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index 53edef4c0a1..0d2b7bb69a2 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -337,6 +337,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=Validez et verrouillez les entrées exportées <span class="warning"> (même effet que la fonctionnalité "%s", la modification et la suppression des lignes ne seront définitivement plus possibles) </span>
+NotifiedExportFull=Exporter les pièces ?
 DateValidationAndLock=Validation et verrouillage de la date
 ConfirmExportFile=Confirmation de la génération du fichier d'export comptable ?
 ExportDraftJournal=Exporter le journal brouillon
@@ -437,6 +438,7 @@ AccountancyErrorMismatchLetterCode=Non-concordance dans le code de réconciliati
 AccountancyErrorMismatchBalanceAmount=Le solde (%s) n'est pas égal à 0
 AccountancyErrorLetteringBookkeeping=Des erreurs sont survenues concernant les transactions : %s
 ErrorAccountNumberAlreadyExists=Le code comptable %s existe déjà
+ErrorArchiveAddFile=Impossible d'ajouter le fichier "%s" dans l'archive
 
 ## Import
 ImportAccountingEntries=Écritures comptables

From 6dedeb368d1f18d610dcd21ac4de81d30eb8bbfd Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Tue, 13 Dec 2022 15:51:23 +0100
Subject: [PATCH 080/816] NEW Quadratus export with attachments in accountancy
 export

---
 htdocs/accountancy/tpl/export_journal.tpl.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/tpl/export_journal.tpl.php b/htdocs/accountancy/tpl/export_journal.tpl.php
index 833b81fc8c0..4dc4dedbe0e 100644
--- a/htdocs/accountancy/tpl/export_journal.tpl.php
+++ b/htdocs/accountancy/tpl/export_journal.tpl.php
@@ -33,7 +33,7 @@ $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');
 
-if (!isset($withAttachments) || $withAttachments == 1) {
+if (empty($withAttachment)) {
 	header('Content-Type: text/csv');
 }
 
@@ -68,6 +68,6 @@ if (($accountancyexport->getFormatCode($formatexportset) == 'fec' || $accountanc
 	$completefilename = ($code ? $code."_" : "").($prefix ? $prefix."_" : "").$filename.($nodateexport ? "" : $date_export).".".$format;
 }
 
-if (!isset($withAttachments) || $withAttachments == 1) {
+if (empty($withAttachment)) {
 	header('Content-Disposition: attachment;filename=' . $completefilename);
 }

From 787618d9d6927a25faa0ae6bdf8f9fa67dedb67f Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Tue, 13 Dec 2022 16:36:49 +0100
Subject: [PATCH 081/816] NEW Copyrights

---
 htdocs/accountancy/bookkeeping/list.php              | 3 ++-
 htdocs/accountancy/class/accountancyexport.class.php | 3 ++-
 htdocs/accountancy/tpl/export_journal.tpl.php        | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 2d48bc706ea..2f255dec734 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -1,9 +1,10 @@
 <?php
 /* Copyright (C) 2013-2016  Olivier Geffroy         <jeff@jeffinfo.com>
  * Copyright (C) 2013-2016  Florian Henry           <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2022  Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2013-2022  Open-DSI      			<support@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>
+ * Copyright (C) 2022  		Progiseize         		<a.bisotti@progiseize.fr>
  *
  * This 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/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 76b6782c174..e101c09abd3 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -5,13 +5,14 @@
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2016       Pierre-Henry Favre  <phf@atm-consulting.fr>
- * Copyright (C) 2016-2021  Alexandre Spangaro  <aspangaro@open-dsi.fr>
+ * Copyright (C) 2016-2022  Open-DSI      		<support@open-dsi.fr>
  * Copyright (C) 2013-2017  Olivier Geffroy     <jeff@jeffinfo.com>
  * Copyright (C) 2017       Elarifr. Ari Elbaz  <github@accedinfo.com>
  * Copyright (C) 2017-2019  Frédéric France     <frederic.france@netlogic.fr>
  * Copyright (C) 2017       André Schild        <a.schild@aarboard.ch>
  * Copyright (C) 2020       Guillaume Alexandre <guillaume@tag-info.fr>
  * Copyright (C) 2022		Joachim Kueter		<jkueter@gmx.de>
+ * Copyright (C) 2022  		Progiseize         	<a.bisotti@progiseize.fr>
  *
  * This 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/accountancy/tpl/export_journal.tpl.php b/htdocs/accountancy/tpl/export_journal.tpl.php
index 4dc4dedbe0e..f57d54fcfbd 100644
--- a/htdocs/accountancy/tpl/export_journal.tpl.php
+++ b/htdocs/accountancy/tpl/export_journal.tpl.php
@@ -1,6 +1,7 @@
 <?php
-/* Copyright (C) 2015-2022  Alexandre Spangaro	<aspangaro@open-dsi.fr>
+/* Copyright (C) 2015-2022  Open-DSI      		<support@open-dsi.fr>
  * Copyright (C) 2016       Charlie Benke		<charlie@patas-monkey.com>
+ * Copyright (C) 2022  		Progiseize         	<a.bisotti@progiseize.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

From fb16a97d6d4e743c8f8a44884399a81badba2a88 Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Tue, 13 Dec 2022 18:13:24 +0100
Subject: [PATCH 082/816] FIX stickler-ci

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

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 2f255dec734..781b20edc2e 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -860,7 +860,7 @@ if ($action == 'export_file') {
 	}
 
 	// add documents in an archive for accountancy export (Quadratus)
-	if(getDolGlobalString('ACCOUNTING_EXPORT_MODELCSV') == AccountancyExport::$EXPORT_TYPE_QUADRATUS) {
+	if (getDolGlobalString('ACCOUNTING_EXPORT_MODELCSV') == AccountancyExport::$EXPORT_TYPE_QUADRATUS) {
 		$form_question['notifiedexportfull'] = array(
 			'name' => 'notifiedexportfull',
 			'type' => 'checkbox',

From b597a43b21a7488bd271f05d99da65539a3f0d96 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 14 Dec 2022 08:37:30 +0000
Subject: [PATCH 083/816] Fixing style errors.

---
 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 4dfb47a3887..7f9a1aa09c6 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -1073,7 +1073,7 @@ class BOM extends CommonObject
 					if ($res>0) {
 						$bom_child->calculateCosts();
 						$line->childBom[] = $bom_child;
-						$line->total_cost = price2num( $bom_child->total_cost  * $line->qty, 'MT');
+						$line->total_cost = price2num($bom_child->total_cost  * $line->qty, 'MT');
 						$this->total_cost += $line->total_cost;
 					} else {
 						$this->error = $bom_child->error;

From 1ebd2135e0f15c34fa62674ec9b19a7fcf4e6412 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Thu, 15 Dec 2022 15:00:27 +0100
Subject: [PATCH 084/816] Fix stickler error

---
 htdocs/bom/tpl/objectline_view.tpl.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index bb83e62c07f..f9b39c517e9 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -221,12 +221,15 @@ if ($resql) {
 		$label = $sub_bom_product->getLabelOfUnit('long');
 		if ($sub_bom_line->qty_frozen > 0) {
 			print '<td class="linecolqty nowrap right" id="sub_bom_qty_'.$sub_bom_line->id.'">'.price($sub_bom_line->qty, 0, '', 0, 0).'</td>';
-			print '<td class="linecoluseunit nowrap left">'.($label !== '') ? $langs->trans($label) : '' . '</td>';
+			print '<td class="linecoluseunit nowrap left">';
+			if ($label !== '') print $langs->trans($label);
+			print '</td>';
 			print '<td class="linecolqtyfrozen nowrap right" id="sub_bom_qty_frozen_'.$sub_bom_line->id.'">'.$langs->trans('Yes').'</td>';
 		} else {
 			print '<td class="linecolqty nowrap right" id="sub_bom_qty_'.$sub_bom_line->id.'">'.price($sub_bom_line->qty * $line->qty, 0, '', 0, 0).'</td>';
 			print '<td class="linecoluseunit nowrap left">';
-			print '<td class="linecoluseunit nowrap left">'.($label !== '') ? $langs->trans($label) : '' . '</td>';
+			if($label !== '') print $langs->trans($label);
+			print '</td>';
 			print '</td>';
 			print '<td class="linecolqtyfrozen nowrap right" id="sub_bom_qty_frozen_'.$sub_bom_line->id.'">&nbsp;</td>';
 		}

From ae3b9970dd60791dd86a53774aeafc5004145e5e Mon Sep 17 00:00:00 2001
From: Milen Karaganski <milen@blacktiehost.com>
Date: Sat, 17 Dec 2022 18:02:42 +0200
Subject: [PATCH 085/816] fix html.form.class.php

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 6df62ded8bd..9e26170f214 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7286,7 +7286,7 @@ class Form
 			$out .= $this->selectProjectsList($selected, $htmlname, $filtertype, $limit, $status, 0, $socid, $showempty, $forcecombo, $morecss);
 		}
 
-		if (!empty($nooutput)) print $out;
+		if (empty($nooutput)) print $out;
 		else return $out;
 	}
 

From 48b4caaa70178498146b230b9c1fceb826502c1c Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 19 Dec 2022 09:41:39 +0000
Subject: [PATCH 086/816] 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 f9b39c517e9..85bd4d6b02a 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -228,7 +228,7 @@ if ($resql) {
 		} else {
 			print '<td class="linecolqty nowrap right" id="sub_bom_qty_'.$sub_bom_line->id.'">'.price($sub_bom_line->qty * $line->qty, 0, '', 0, 0).'</td>';
 			print '<td class="linecoluseunit nowrap left">';
-			if($label !== '') print $langs->trans($label);
+			if ($label !== '') print $langs->trans($label);
 			print '</td>';
 			print '</td>';
 			print '<td class="linecolqtyfrozen nowrap right" id="sub_bom_qty_frozen_'.$sub_bom_line->id.'">&nbsp;</td>';

From f90b887ec257c2580c9a8db36c4f39254fd8be13 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Mon, 19 Dec 2022 13:48:08 +0100
Subject: [PATCH 087/816] NEW mode view for list adherent

---
 htdocs/adherents/class/adherent.class.php |  36 ++
 htdocs/adherents/list.php                 | 541 +++++++++++-----------
 2 files changed, 319 insertions(+), 258 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 4c68b3e91ec..ec2cd91813d 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -3167,4 +3167,40 @@ class Adherent extends CommonObject
 
 		return $nbko;
 	}
+
+		/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string								HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+
+		if (property_exists($this, 'photo') || !empty($this->photo)) {
+			$return.= Form::showphoto('memberphoto', $this, 0, 60, 0, 'photokanban photoref photowithmargin photologintooltip', 'small', 0, 1);
+		} else {
+			$return .= img_picto('', 'user');
+		}
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>';
+		if (property_exists($this, 'type')) {
+			$return .= '<br><span class="info-box-label opacitymedium">'.$this->type.'</span>';
+		}
+		if (method_exists($this, 'getmorphylib')) {
+			$return .= '<br><span class="info-box-label">'.$this->getmorphylib('', 2).'</span>';
+		}
+		if (method_exists($this, 'getLibStatut')) {
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index c2b81860210..6ef559deb75 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -47,6 +47,7 @@ $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'memberslist'; // To manage different context of search
+$mode        = GETPOST('mode', 'alpha');
 
 
 // Search fields
@@ -535,6 +536,9 @@ if ($search_type > 0) {
 }
 
 $param = '';
+if (!empty($mode)) {
+	$param .= '&mode='.urlencode($mode);
+}
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 	$param .= '&contextpage='.urlencode($contextpage);
 }
@@ -636,6 +640,8 @@ if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'pr
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $newcardbutton = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
 if ($user->hasRight('adherent', 'creer')) {
 	$newcardbutton .= dolGetButtonTitle($langs->trans('NewMember'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/card.php?action=create');
 }
@@ -650,6 +656,8 @@ print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
+
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -988,276 +996,293 @@ while ($i < min($num, $limit)) {
 	}
 	$memberstatic->company = $companyname;
 
-	print '<tr class="oddeven">';
-
-	// Action column
-	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
-		print '<td class="center">';
-		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($obj->rowid, $arrayofselected)) {
-				$selected = 1;
-			}
-			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr><td colspan="12">';
+			print '<div class="box-flex-container">';
 		}
-		print '</td>';
-	}
-
-	if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
-		print '<td class="center" data-key="id">'.$obj->rowid.'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Ref
-	if (!empty($arrayfields['d.ref']['checked'])) {
-		print "<td>";
-		print $memberstatic->getNomUrl(-1, 0, 'card', 'ref', '', -1, 0, 1);
-		print "</td>\n";
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Civility
-	if (!empty($arrayfields['d.civility']['checked'])) {
-		print "<td>";
-		print $obj->civility;
-		print "</td>\n";
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Firstname
-	if (!empty($arrayfields['d.firstname']['checked'])) {
-		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->firstname).'">';
-		print $memberstatic->getNomUrl(0, 0, 'card', 'firstname');
-		//print $obj->firstname;
-		print "</td>\n";
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Lastname
-	if (!empty($arrayfields['d.lastname']['checked'])) {
-		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->lastname).'">';
-		print $memberstatic->getNomUrl(0, 0, 'card', 'lastname');
-		//print $obj->lastname;
-		print "</td>\n";
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Gender
-	if (!empty($arrayfields['d.gender']['checked'])) {
-		print '<td>';
-		if ($obj->gender) {
-			print $langs->trans("Gender".$obj->gender);
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Company
-	if (!empty($arrayfields['d.company']['checked'])) {
-		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($companyname).'">';
-		print $companynametoshow;
-		print "</td>\n";
-	}
-	// Login
-	if (!empty($arrayfields['d.login']['checked'])) {
-		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->login).'">'.$obj->login."</td>\n";
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Nature (Moral/Physical)
-	if (!empty($arrayfields['d.morphy']['checked'])) {
-		print '<td class="center">';
-		print $memberstatic->getmorphylib('', 2);
-		print "</td>\n";
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Type label
-	if (!empty($arrayfields['t.libelle']['checked'])) {
 		$membertypestatic->id = $obj->type_id;
 		$membertypestatic->label = $obj->type;
-		print '<td class="nowraponall">';
-		print $membertypestatic->getNomUrl(1, 32);
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
+		$memberstatic->type = $membertypestatic->label;
+		$memberstatic->photo = $obj->photo;
+		// Output Kanban
+		print $memberstatic->getKanbanView('');
+		if ($i == (min($num, $limit) - 1)) {
+			print '</div>';
+			print '</td></tr>';
 		}
-	}
-	// Address
-	if (!empty($arrayfields['d.address']['checked'])) {
-		print '<td class="nocellnopadd tdoverflowmax200" title="'.dol_escape_htmltag($obj->address).'">';
-		print $obj->address;
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Zip
-	if (!empty($arrayfields['d.zip']['checked'])) {
-		print '<td class="nocellnopadd">';
-		print $obj->zip;
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Town
-	if (!empty($arrayfields['d.town']['checked'])) {
-		print '<td class="nocellnopadd">';
-		print $obj->town;
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// State
-	if (!empty($arrayfields['state.nom']['checked'])) {
-		print "<td>".$obj->state_name."</td>\n";
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Country
-	if (!empty($arrayfields['country.code_iso']['checked'])) {
-		$tmparray = getCountry($obj->country, 'all');
-		print '<td class="center tdoverflowmax100" title="'.dol_escape_htmltag($tmparray['label']).'">';
-		print dol_escape_htmltag($tmparray['label']);
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Phone pro
-	if (!empty($arrayfields['d.phone']['checked'])) {
-		print '<td class="nocellnopadd">';
-		print $obj->phone;
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Phone perso
-	if (!empty($arrayfields['d.phone_perso']['checked'])) {
-		print '<td class="nocellnopadd">';
-		print $obj->phone_perso;
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Phone mobile
-	if (!empty($arrayfields['d.phone_mobile']['checked'])) {
-		print '<td class="nocellnopadd">';
-		print $obj->phone_mobile;
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// EMail
-	if (!empty($arrayfields['d.email']['checked'])) {
-		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->email).'">';
-		print dol_print_email($obj->email, 0, 0, 1, 64, 1, 1);
-		print "</td>\n";
-	}
-	// End of subscription date
-	$datefin = $db->jdate($obj->datefin);
-	if (!empty($arrayfields['d.datefin']['checked'])) {
-		print '<td class="nowrap center">';
-		if ($datefin) {
-			print dol_print_date($datefin, 'day');
-			if ($memberstatic->hasDelay()) {
-				$textlate = ' ('.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($conf->adherent->subscription->warning_delay / 60 / 60 / 24) >= 0 ? '+' : '').ceil($conf->adherent->subscription->warning_delay / 60 / 60 / 24).' '.$langs->trans("days").')';
-				print " ".img_warning($langs->trans("SubscriptionLate").$textlate);
+	} else {
+		print '<tr class="oddeven">';
+
+		// Action column
+		if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+			print '<td class="center">';
+			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($obj->rowid, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
-		} else {
-			if (!empty($obj->subscription)) {
-				print '<span class="opacitymedium">'.$langs->trans("SubscriptionNotReceived").'</span>';
-				if ($obj->statut > 0) {
-					print " ".img_warning();
+			print '</td>';
+		}
+
+		if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
+			print '<td class="center" data-key="id">'.$obj->rowid.'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Ref
+		if (!empty($arrayfields['d.ref']['checked'])) {
+			print "<td>";
+			print $memberstatic->getNomUrl(-1, 0, 'card', 'ref', '', -1, 0, 1);
+			print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Civility
+		if (!empty($arrayfields['d.civility']['checked'])) {
+			print "<td>";
+			print $obj->civility;
+			print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Firstname
+		if (!empty($arrayfields['d.firstname']['checked'])) {
+			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->firstname).'">';
+			print $memberstatic->getNomUrl(0, 0, 'card', 'firstname');
+			//print $obj->firstname;
+			print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Lastname
+		if (!empty($arrayfields['d.lastname']['checked'])) {
+			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->lastname).'">';
+			print $memberstatic->getNomUrl(0, 0, 'card', 'lastname');
+			//print $obj->lastname;
+			print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Gender
+		if (!empty($arrayfields['d.gender']['checked'])) {
+			print '<td>';
+			if ($obj->gender) {
+				print $langs->trans("Gender".$obj->gender);
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Company
+		if (!empty($arrayfields['d.company']['checked'])) {
+			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($companyname).'">';
+			print $companynametoshow;
+			print "</td>\n";
+		}
+		// Login
+		if (!empty($arrayfields['d.login']['checked'])) {
+			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->login).'">'.$obj->login."</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Nature (Moral/Physical)
+		if (!empty($arrayfields['d.morphy']['checked'])) {
+			print '<td class="center">';
+			print $memberstatic->getmorphylib('', 2);
+			print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Type label
+		if (!empty($arrayfields['t.libelle']['checked'])) {
+			$membertypestatic->id = $obj->type_id;
+			$membertypestatic->label = $obj->type;
+			print '<td class="nowraponall">';
+			print $membertypestatic->getNomUrl(1, 32);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Address
+		if (!empty($arrayfields['d.address']['checked'])) {
+			print '<td class="nocellnopadd tdoverflowmax200" title="'.dol_escape_htmltag($obj->address).'">';
+			print $obj->address;
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Zip
+		if (!empty($arrayfields['d.zip']['checked'])) {
+			print '<td class="nocellnopadd">';
+			print $obj->zip;
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Town
+		if (!empty($arrayfields['d.town']['checked'])) {
+			print '<td class="nocellnopadd">';
+			print $obj->town;
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// State
+		if (!empty($arrayfields['state.nom']['checked'])) {
+			print "<td>".$obj->state_name."</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Country
+		if (!empty($arrayfields['country.code_iso']['checked'])) {
+			$tmparray = getCountry($obj->country, 'all');
+			print '<td class="center tdoverflowmax100" title="'.dol_escape_htmltag($tmparray['label']).'">';
+			print dol_escape_htmltag($tmparray['label']);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Phone pro
+		if (!empty($arrayfields['d.phone']['checked'])) {
+			print '<td class="nocellnopadd">';
+			print $obj->phone;
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Phone perso
+		if (!empty($arrayfields['d.phone_perso']['checked'])) {
+			print '<td class="nocellnopadd">';
+			print $obj->phone_perso;
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Phone mobile
+		if (!empty($arrayfields['d.phone_mobile']['checked'])) {
+			print '<td class="nocellnopadd">';
+			print $obj->phone_mobile;
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// EMail
+		if (!empty($arrayfields['d.email']['checked'])) {
+			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->email).'">';
+			print dol_print_email($obj->email, 0, 0, 1, 64, 1, 1);
+			print "</td>\n";
+		}
+		// End of subscription date
+		$datefin = $db->jdate($obj->datefin);
+		if (!empty($arrayfields['d.datefin']['checked'])) {
+			print '<td class="nowrap center">';
+			if ($datefin) {
+				print dol_print_date($datefin, 'day');
+				if ($memberstatic->hasDelay()) {
+					$textlate = ' ('.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($conf->adherent->subscription->warning_delay / 60 / 60 / 24) >= 0 ? '+' : '').ceil($conf->adherent->subscription->warning_delay / 60 / 60 / 24).' '.$langs->trans("days").')';
+					print " ".img_warning($langs->trans("SubscriptionLate").$textlate);
 				}
 			} else {
-				print '&nbsp;';
+				if (!empty($obj->subscription)) {
+					print '<span class="opacitymedium">'.$langs->trans("SubscriptionNotReceived").'</span>';
+					if ($obj->statut > 0) {
+						print " ".img_warning();
+					}
+				} else {
+					print '&nbsp;';
+				}
+			}
+			print '</td>';
+		}
+		// Extra fields
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+		// Fields from hook
+		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		// Date creation
+		if (!empty($arrayfields['d.datec']['checked'])) {
+			print '<td class="nowrap center">';
+			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
 			}
 		}
-		print '</td>';
-	}
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	// Date creation
-	if (!empty($arrayfields['d.datec']['checked'])) {
-		print '<td class="nowrap center">';
-		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Birth
-	if (!empty($arrayfields['d.birth']['checked'])) {
-		print '<td class="nowrap center">';
-		print dol_print_date($db->jdate($obj->birth), 'day', 'tzuser');
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Date modification
-	if (!empty($arrayfields['d.tms']['checked'])) {
-		print '<td class="nowrap center">';
-		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Status
-	if (!empty($arrayfields['d.statut']['checked'])) {
-		print '<td class="nowrap right">';
-		print $memberstatic->LibStatut($obj->statut, $obj->subscription, $datefin, 5);
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	if (!empty($arrayfields['d.import_key']['checked'])) {
-		print '<td class="tdoverflowmax100 center" title="'.dol_escape_htmltag($obj->import_key).'">';
-		print dol_escape_htmltag($obj->import_key);
-		print "</td>\n";
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Action column
-	if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
-		print '<td class="center">';
-		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($obj->rowid, $arrayofselected)) {
-				$selected = 1;
+		// Birth
+		if (!empty($arrayfields['d.birth']['checked'])) {
+			print '<td class="nowrap center">';
+			print dol_print_date($db->jdate($obj->birth), 'day', 'tzuser');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
 			}
-			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
-		print '</td>';
-	}
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
+		// Date modification
+		if (!empty($arrayfields['d.tms']['checked'])) {
+			print '<td class="nowrap center">';
+			print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Status
+		if (!empty($arrayfields['d.statut']['checked'])) {
+			print '<td class="nowrap right">';
+			print $memberstatic->LibStatut($obj->statut, $obj->subscription, $datefin, 5);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		if (!empty($arrayfields['d.import_key']['checked'])) {
+			print '<td class="tdoverflowmax100 center" title="'.dol_escape_htmltag($obj->import_key).'">';
+			print dol_escape_htmltag($obj->import_key);
+			print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Action column
+		if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+			print '<td class="center">';
+			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($obj->rowid, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+		}
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
-	print '</tr>'."\n";
+		print '</tr>'."\n";
+	}
 	$i++;
 }
 

From 517af503ed225d26e7a76df5e9891031fff2aa91 Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Mon, 19 Dec 2022 14:27:22 +0100
Subject: [PATCH 088/816] NEW category of operation for crabe PDF model

---
 .../modules/facture/doc/pdf_crabe.modules.php | 57 +++++++++++++++++++
 .../facture/doc/pdf_sponge.modules.php        | 20 ++++---
 2 files changed, 68 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index ee4cc9b5d0d..30a61fbb1d3 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -132,6 +132,11 @@ class pdf_crabe extends ModelePDFFactures
 	 */
 	public $posxprogress;
 
+	/**
+	 * @var int Category of operation
+	 */
+	public $categoryOfOperation = -1; // unknown by default
+
 
 	/**
 	 *	Constructor
@@ -402,11 +407,37 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// Set $this->atleastonediscount if you have at least one discount
+				// and determine category of operation
+				$categoryOfOperation = 0;
+				$nbProduct = 0;
+				$nbService = 0;
 				for ($i = 0; $i < $nblines; $i++) {
 					if ($object->lines[$i]->remise_percent) {
 						$this->atleastonediscount++;
 					}
+
+					// determine category of operation
+					if ($categoryOfOperation < 2) {
+						$lineProductType = $object->lines[$i]->product_type;
+						if ($lineProductType == Product::TYPE_PRODUCT) {
+							$nbProduct++;
+						} elseif ($lineProductType == Product::TYPE_SERVICE) {
+							$nbService++;
+						}
+						if ($nbProduct > 0 && $nbService > 0) {
+							// mixed products and services
+							$categoryOfOperation = 2;
+						}
+					}
 				}
+				// determine category of operation
+				if ($categoryOfOperation <= 0) {
+					// only services
+					if ($nbProduct == 0 && $nbService > 0) {
+						$categoryOfOperation = 1;
+					}
+				}
+				$this->categoryOfOperation = $categoryOfOperation;
 				if (empty($this->atleastonediscount)) {    // retrieve space not used by discount
 					$delta = ($this->posxprogress - $this->posxdiscount);
 					$this->posxpicture += $delta;
@@ -1128,6 +1159,10 @@ class pdf_crabe extends ModelePDFFactures
 		}
 
 		$posxval = 52;
+		$posxend = 110;	// End of x for text on left side
+		if ($this->page_largeur < 210) { // To work with US executive format
+			$posxend -= 10;
+		}
 
 		// Show payments conditions
 		if ($object->type != 2 && ($object->cond_reglement_code || $object->cond_reglement)) {
@@ -1145,6 +1180,21 @@ class pdf_crabe extends ModelePDFFactures
 			$posy = $pdf->GetY() + 3;	// We need spaces for 2 lines payment conditions
 		}
 
+		// Show category of operations
+		if (getDolGlobalInt('INVOICE_CATEGORY_OF_OPERATION') == 2 && $this->categoryOfOperation >= 0) {
+			$pdf->SetFont('', 'B', $default_font_size - 2);
+			$pdf->SetXY($this->marge_gauche, $posy);
+			$categoryOfOperationTitle = $outputlangs->transnoentities("MentionCategoryOfOperations").' : ';
+			$pdf->MultiCell($posxval - $this->marge_gauche, 4, $categoryOfOperationTitle, 0, 'L');
+
+			$pdf->SetFont('', '', $default_font_size - 2);
+			$pdf->SetXY($posxval, $posy);
+			$categoryOfOperationLabel = $outputlangs->transnoentities("MentionCategoryOfOperations" . $this->categoryOfOperation);
+			$pdf->MultiCell($posxend - $posxval, 4, $categoryOfOperationLabel, 0, 'L');
+
+			$posy = $pdf->GetY() + 3; // for 2 lines
+		}
+
 		if ($object->type != 2) {
 			// Check a payment mode is defined
 			if (empty($object->mode_reglement_code)
@@ -1659,6 +1709,13 @@ class pdf_crabe extends ModelePDFFactures
 		$pdf->SetFont('', '', $default_font_size - 2);
 
 		if (empty($hidetop)) {
+			// Show category of operations
+			if (getDolGlobalInt('INVOICE_CATEGORY_OF_OPERATION') == 1 && $this->categoryOfOperation >= 0) {
+				$categoryOfOperations = $outputlangs->transnoentities("MentionCategoryOfOperations") . ' : ' . $outputlangs->transnoentities("MentionCategoryOfOperations" . $this->categoryOfOperation);
+				$pdf->SetXY($this->marge_gauche, $tab_top - 4);
+				$pdf->MultiCell(($pdf->GetStringWidth($categoryOfOperations)) + 4, 2, $categoryOfOperations);
+			}
+
 			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index adf47af3cce..072ddb566bd 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -445,15 +445,17 @@ class pdf_sponge extends ModelePDFFactures
 					}
 
 					// determine category of operation
-					$lineProductType = $object->lines[$i]->product_type;
-					if ($lineProductType == Product::TYPE_PRODUCT) {
-						$nbProduct++;
-					} elseif ($lineProductType == Product::TYPE_SERVICE) {
-						$nbService++;
-					}
-					if ($nbProduct > 0 && $nbService > 0) {
-						// mixed products and services
-						$categoryOfOperation = 2;
+					if ($categoryOfOperation < 2) {
+						$lineProductType = $object->lines[$i]->product_type;
+						if ($lineProductType == Product::TYPE_PRODUCT) {
+							$nbProduct++;
+						} elseif ($lineProductType == Product::TYPE_SERVICE) {
+							$nbService++;
+						}
+						if ($nbProduct > 0 && $nbService > 0) {
+							// mixed products and services
+							$categoryOfOperation = 2;
+						}
 					}
 				}
 				// determine category of operation

From abd5a86f348256fa6ab2eb09b93bed678f0ff9d2 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Mon, 19 Dec 2022 15:19:12 +0100
Subject: [PATCH 089/816] mode Kanban for subscription list

---
 htdocs/adherents/class/subscription.class.php |  32 ++
 htdocs/adherents/subscription/list.php        | 275 ++++++++++--------
 2 files changed, 187 insertions(+), 120 deletions(-)

diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index b3cfe027197..411fdb2181f 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -505,4 +505,36 @@ class Subscription extends CommonObject
 			dol_print_error($this->db);
 		}
 	}
+
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string								HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		$return .= '</span>';
+
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(property_exists($this, 'fk_adherent')? $this->fk_adherent: $this->ref ).'</span>';
+		if (property_exists($this, 'dateh') || property_exists($this, 'datef')) {
+			$return .= '<br><span class="info-box-status opacitymedium">'.dol_print_date($this->dateh, 'day').' - '.dol_print_date($this->datef, 'day').'</span>';
+		}
+		
+		if (property_exists($this, 'fk_bank')) {
+			$return .= '<br><span class="info-box-label ">'.$this->fk_bank.'</span>';
+		}
+		if (property_exists($this, 'amount')) {
+			$return .= '<br><div class="info-box-label margintoponly amount">'.price($this->amount).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 1523bd4ee90..5aa19c6c6d0 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -37,6 +37,8 @@ $massaction = GETPOST('massaction', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'subscriptionlist'; // To manage different context of search
+$mode = GETPOST('mode', 'alpha');
+
 
 $statut = (GETPOSTISSET("statut") ?GETPOST("statut", "alpha") : 1);
 $search_ref = GETPOST('search_ref', 'alpha');
@@ -253,6 +255,9 @@ if (!empty($date_select)) {
 }
 
 $param = '';
+if (!empty($mode)) {
+	$param .='&mode='.urlencode($mode);
+}
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 	$param .= '&contextpage='.urlencode($contextpage);
 }
@@ -298,6 +303,9 @@ if (in_array($massaction, array('presend', 'predelete'))) {
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $newcardbutton = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+
 if ($user->rights->adherent->cotisation->creer) {
 	$newcardbutton .= dolGetButtonTitle($langs->trans('NewSubscription'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/list.php?status=-1,1');
 }
@@ -313,6 +321,8 @@ print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 print '<input type="hidden" name="date_select" value="'.$date_select.'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
+
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $subscription->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -506,144 +516,169 @@ while ($i < min($num, $limit)) {
 	$adht->fetch($typeid);
 
 	$adherent->need_subscription = $adht->subscription;
-
-	print '<tr class="oddeven">';
-
-	// Ref
-	if (!empty($arrayfields['d.ref']['checked'])) {
-		print '<td>'.$subscription->getNomUrl(1).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
+	
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr><td colspan="12">';
+			print '<div class="box-flex-container">';
 		}
-	}
-	// Type
-	if (!empty($arrayfields['d.fk_type']['checked'])) {
-		print '<td class="nowraponall">';
-		if ($typeid > 0) {
-			print $adht->getNomUrl(1);
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Lastname
-	if (!empty($arrayfields['d.lastname']['checked'])) {
-		print '<td class="tdoverflowmax150">'.$adherent->getNomUrl(-1, 0, 'card', 'lastname').'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Firstname
-	if (!empty($arrayfields['d.firstname']['checked'])) {
-		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($adherent->firstname).'">'.$adherent->firstname.'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Login
-	if (!empty($arrayfields['d.login']['checked'])) {
-		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($adherent->login).'">'.$adherent->login.'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Label
-	if (!empty($arrayfields['t.libelle']['checked'])) {
-		print '<td class="tdoverflowmax400" title="'.dol_escape_htmltag($obj->note).'">';
-		print $obj->note;
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Banque
-	if (!empty($arrayfields['d.bank']['checked'])) {
-		print '<td class="tdmaxoverflow150">';
+		
+		//fetch informations needs on this mode
+		$subscription->fk_adherent = $adherent->getNomUrl(1);
+		$subscription->fk_type = $adht->getNomUrl(1);
+		$subscription->amount = $obj->subscription;
 		if ($obj->fk_account > 0) {
 			$accountstatic->id = $obj->fk_account;
 			$accountstatic->fetch($obj->fk_account);
-			//$accountstatic->label=$obj->label;
-			print $accountstatic->getNomUrl(1);
+			$subscription->fk_bank = $accountstatic->getNomUrl(1);
 		}
-		print "</td>\n";
-		if (!$i) {
-			$totalarray['nbfield']++;
+		// Output Kanban
+		print $subscription->getKanbanView('');
+		if ($i == (min($num, $limit) - 1)) {
+			print '</div>';
+			print '</td></tr>';
 		}
 	}
 
-	// Date start
-	if (!empty($arrayfields['c.dateadh']['checked'])) {
-		print '<td class="center">'.dol_print_date($db->jdate($obj->dateadh), 'day')."</td>\n";
-		if (!$i) {
-			$totalarray['nbfield']++;
+	else {
+		print '<tr class="oddeven">';
+
+		// Ref
+		if (!empty($arrayfields['d.ref']['checked'])) {
+			print '<td>'.$subscription->getNomUrl(1).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
-	}
-	// Date end
-	if (!empty($arrayfields['c.datef']['checked'])) {
-		print '<td class="center">'.dol_print_date($db->jdate($obj->datef), 'day')."</td>\n";
-		if (!$i) {
-			$totalarray['nbfield']++;
+		// Type
+		if (!empty($arrayfields['d.fk_type']['checked'])) {
+			print '<td class="nowraponall">';
+			if ($typeid > 0) {
+				print $adht->getNomUrl(1);
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
-	}
-	// Price
-	if (!empty($arrayfields['d.amount']['checked'])) {
-		print '<td class="right amount">'.price($obj->subscription).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
+
+		// Lastname
+		if (!empty($arrayfields['d.lastname']['checked'])) {
+			print '<td class="tdoverflowmax150">'.$adherent->getNomUrl(-1, 0, 'card', 'lastname').'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
-		if (!$i) {
-			$totalarray['pos'][$totalarray['nbfield']] = 'd.amount';
+		// Firstname
+		if (!empty($arrayfields['d.firstname']['checked'])) {
+			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($adherent->firstname).'">'.$adherent->firstname.'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
-		if (empty($totalarray['val']['d.amount'])) {
-			$totalarray['val']['d.amount'] = $obj->subscription;
-		} else {
-			$totalarray['val']['d.amount'] += $obj->subscription;
+
+		// Login
+		if (!empty($arrayfields['d.login']['checked'])) {
+			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($adherent->login).'">'.$adherent->login.'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Label
+		if (!empty($arrayfields['t.libelle']['checked'])) {
+			print '<td class="tdoverflowmax400" title="'.dol_escape_htmltag($obj->note).'">';
+			print $obj->note;
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Banque
+		if (!empty($arrayfields['d.bank']['checked'])) {
+			print '<td class="tdmaxoverflow150">';
+			if ($obj->fk_account > 0) {
+				$accountstatic->id = $obj->fk_account;
+				$accountstatic->fetch($obj->fk_account);
+				//$accountstatic->label=$obj->label;
+				print $accountstatic->getNomUrl(1);
+			}
+			print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Date start
+		if (!empty($arrayfields['c.dateadh']['checked'])) {
+			print '<td class="center">'.dol_print_date($db->jdate($obj->dateadh), 'day')."</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Date end
+		if (!empty($arrayfields['c.datef']['checked'])) {
+			print '<td class="center">'.dol_print_date($db->jdate($obj->datef), 'day')."</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Price
+		if (!empty($arrayfields['d.amount']['checked'])) {
+			print '<td class="right amount">'.price($obj->subscription).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'd.amount';
+			}
+			if (empty($totalarray['val']['d.amount'])) {
+				$totalarray['val']['d.amount'] = $obj->subscription;
+			} else {
+				$totalarray['val']['d.amount'] += $obj->subscription;
+			}
+		}
+		// Extra fields
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+		// Fields from hook
+		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // 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="nowrap center">';
+			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Date modification
+		if (!empty($arrayfields['c.tms']['checked'])) {
+			print '<td class="nowrap center">';
+			print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Action column
+		print '<td class="center">';
+		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($obj->crowid, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$obj->crowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->crowid.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
-	}
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // 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="nowrap center">';
-		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
-	}
-	// Date modification
-	if (!empty($arrayfields['c.tms']['checked'])) {
-		print '<td class="nowrap center">';
-		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Action column
-	print '<td class="center">';
-	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		$selected = 0;
-		if (in_array($obj->crowid, $arrayofselected)) {
-			$selected = 1;
-		}
-		print '<input id="cb'.$obj->crowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->crowid.'"'.($selected ? ' checked="checked"' : '').'>';
-	}
-	print '</td>';
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
 
-	print "</tr>\n";
+		print "</tr>\n";
+	}
 	$i++;
 }
 

From 0c75e5bb2d81adb5cfa356e528c0cf77ec2c94c2 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Mon, 19 Dec 2022 15:19:18 +0100
Subject: [PATCH 090/816] mode Kanban for subscription list

---
 htdocs/adherents/class/subscription.class.php | 2 +-
 htdocs/adherents/subscription/list.php        | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index 411fdb2181f..12e19fd9c3a 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -525,7 +525,7 @@ class Subscription extends CommonObject
 		if (property_exists($this, 'dateh') || property_exists($this, 'datef')) {
 			$return .= '<br><span class="info-box-status opacitymedium">'.dol_print_date($this->dateh, 'day').' - '.dol_print_date($this->datef, 'day').'</span>';
 		}
-		
+
 		if (property_exists($this, 'fk_bank')) {
 			$return .= '<br><span class="info-box-label ">'.$this->fk_bank.'</span>';
 		}
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 5aa19c6c6d0..501bd9c80e5 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -516,13 +516,13 @@ while ($i < min($num, $limit)) {
 	$adht->fetch($typeid);
 
 	$adherent->need_subscription = $adht->subscription;
-	
+
 	if ($mode == 'kanban') {
 		if ($i == 0) {
 			print '<tr><td colspan="12">';
 			print '<div class="box-flex-container">';
 		}
-		
+
 		//fetch informations needs on this mode
 		$subscription->fk_adherent = $adherent->getNomUrl(1);
 		$subscription->fk_type = $adht->getNomUrl(1);
@@ -538,9 +538,7 @@ while ($i < min($num, $limit)) {
 			print '</div>';
 			print '</td></tr>';
 		}
-	}
-
-	else {
+	} else {
 		print '<tr class="oddeven">';
 
 		// Ref

From aed3f841bc1424304bc44e71449456d38ea3a2f7 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Tue, 20 Dec 2022 11:27:55 +0100
Subject: [PATCH 091/816] New View mode for Adherent Type list

---
 .../adherents/class/adherent_type.class.php   | 42 +++++++++++
 htdocs/adherents/type.php                     | 71 ++++++++++++-------
 2 files changed, 89 insertions(+), 24 deletions(-)

diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 4516b132982..25211f11bd9 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -927,4 +927,46 @@ class AdherentType extends CommonObject
 
 		return '';
 	}
+
+
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return 	void				HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $langs,$user;
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>';
+		if ($user->rights->adherent->configurer) {
+			$return .= '<span class="right paddingleft"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$this->ref.'">'.img_edit().'</a></span>';
+		} else {
+			$return .= '<span class="right">&nbsp;</span>';
+		}
+		if (property_exists($this, 'vote')) {
+			$return .= '<br><span class="info-box-label opacitymedium">'.$langs->trans("VoteAllowed").' : '.yn($this->vote).'</span>';
+		}
+		if (property_exists($this, 'amount')) {
+			if (is_null($this->amount) || $this->amount === '') {
+				$return .= '<br>';
+			} else {
+				$return .= '<br><span class="info-box-label opacitymedium">'.$langs->trans("Amount").'</span>';
+				$return .= '<span class="amount"> : '.price($this->amount).'</span>';
+			}
+		}
+		if (method_exists($this, 'getLibStatut')) {
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		print $return;
+	}
 }
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 257e7266e5a..6a2dbdb125d 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -44,6 +44,7 @@ $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
+$mode = GETPOST('mode', 'alopha');
 
 $sall = GETPOST("sall", "alpha");
 $filter = GETPOST("filter", 'alpha');
@@ -248,6 +249,9 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 		$i = 0;
 
 		$param = '';
+		if (!empty($mode)) {
+			$param .= '&mode'.urlencode($mode);
+		}
 		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 			$param .= '&contextpage='.$contextpage;
 		}
@@ -256,6 +260,9 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 		}
 
 		$newcardbutton = '';
+		$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+		$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+
 		if ($user->rights->adherent->configurer) {
 			$newcardbutton .= dolGetButtonTitle($langs->trans('NewMemberType'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/type.php?action=create');
 		}
@@ -269,6 +276,8 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 		print '<input type="hidden" name="action" value="list">';
 		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+		print '<input type="hidden" name="mode" value="'.$mode.'">';
+
 
 		print_barre_liste($langs->trans("MembersTypes"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'members', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -302,32 +311,46 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 			$membertype->amount = $objp->amount;
 			$membertype->caneditamount = $objp->caneditamount;
 
-			print '<tr class="oddeven">';
-			print '<td class="nowraponall">';
-			print $membertype->getNomUrl(1);
-			//<a href="'.$_SERVER["PHP_SELF"].'?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowType"),'group').' '.$objp->rowid.'</a>
-			print '</td>';
-			print '<td>'.dol_escape_htmltag($objp->label).'</td>';
-			print '<td class="center">';
-			if ($objp->morphy == 'phy') {
-				print $langs->trans("Physical");
-			} elseif ($objp->morphy == 'mor') {
-				print $langs->trans("Moral");
+			if ($mode == 'kanban') {
+				if ($i == 0) {
+					print '<tr><td colspan="12">';
+					print '<div class="box-flex-container">';
+				}
+				//output kanban
+				$membertype->label = $objp->label;
+				$membertype->getKanbanView('');
+				if ($i == ($imaxinloop - 1)) {
+					print '</div>';
+					print '</td></tr>';
+				}
 			} else {
-				print $langs->trans("MorAndPhy");
+				print '<tr class="oddeven">';
+				print '<td class="nowraponall">';
+				print $membertype->getNomUrl(1);
+				//<a href="'.$_SERVER["PHP_SELF"].'?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowType"),'group').' '.$objp->rowid.'</a>
+				print '</td>';
+				print '<td>'.dol_escape_htmltag($objp->label).'</td>';
+				print '<td class="center">';
+				if ($objp->morphy == 'phy') {
+					print $langs->trans("Physical");
+				} elseif ($objp->morphy == 'mor') {
+					print $langs->trans("Moral");
+				} else {
+					print $langs->trans("MorAndPhy");
+				}
+				print '</td>';
+				print '<td class="center">'.yn($objp->subscription).'</td>';
+				print '<td class="center"><span class="amount">'.(is_null($objp->amount) || $objp->amount === '' ? '' : price($objp->amount)).'</span></td>';
+				print '<td class="center">'.yn($objp->caneditamount).'</td>';
+				print '<td class="center">'.yn($objp->vote).'</td>';
+				print '<td class="center">'.$membertype->getLibStatut(5).'</td>';
+				if ($user->rights->adherent->configurer) {
+					print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$objp->rowid.'">'.img_edit().'</a></td>';
+				} else {
+					print '<td class="right">&nbsp;</td>';
+				}
+				print "</tr>";
 			}
-			print '</td>';
-			print '<td class="center">'.yn($objp->subscription).'</td>';
-			print '<td class="center"><span class="amount">'.(is_null($objp->amount) || $objp->amount === '' ? '' : price($objp->amount)).'</span></td>';
-			print '<td class="center">'.yn($objp->caneditamount).'</td>';
-			print '<td class="center">'.yn($objp->vote).'</td>';
-			print '<td class="center">'.$membertype->getLibStatut(5).'</td>';
-			if ($user->rights->adherent->configurer) {
-				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$objp->rowid.'">'.img_edit().'</a></td>';
-			} else {
-				print '<td class="right">&nbsp;</td>';
-			}
-			print "</tr>";
 			$i++;
 		}
 

From 54bd44e14af1744946b0d8d8148080b84be49422 Mon Sep 17 00:00:00 2001
From: kkhelifa <kkhelifa@open-dsi.fr>
Date: Tue, 20 Dec 2022 11:43:42 +0100
Subject: [PATCH 092/816] NEW : notify also the contributor affected to a
 ticket if a new message public is post (add global
 TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_ALSO_CONTRIBUTOR)

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

diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 2a3160b3b67..10c0541c168 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -2449,6 +2449,16 @@ class Ticket extends CommonObject
 								$assigned_user_dont_have_email = $assigned_user->getFullName($langs);
 							}
 						}
+						if (!empty($conf->global->TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_ALSO_CONTRIBUTOR)) {
+							$contactList = $object->liste_contact(-1, 'internal', 0, 'CONTRIBUTOR');
+							if (is_array($contactList)) {
+								foreach ($contactList as $contactArray) {
+									if (!empty($contactArray['email'])) {
+										$sendto[] = dolGetFirstLastname($contactArray['firstname'], $contactArray['lastname']) . " <" . $contactArray['email'] . ">";
+									}
+								}
+							}
+						}
 						if (empty($sendto)) {
 							if (!empty($conf->global->TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL)) {
 								$sendto[] = $conf->global->TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL;

From a849283e378b883ec59c6702efa1dcd2cbc2010e Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Tue, 20 Dec 2022 12:41:54 +0100
Subject: [PATCH 093/816] update return type

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

diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 25211f11bd9..e0311aacd34 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -933,7 +933,7 @@ class AdherentType extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return 	void				HTML Code for Kanban thumb.
+	 *  @return 	string				HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '')
 	{
@@ -967,6 +967,6 @@ class AdherentType extends CommonObject
 		$return .= '</div>';
 		$return .= '</div>';
 		$return .= '</div>';
-		print $return;
+		return $return;
 	}
 }

From 0582653a679d0da3399f399ed39d634d46c99d57 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Wed, 21 Dec 2022 10:55:03 +0100
Subject: [PATCH 094/816] FIX : get multicurrency infos of propal when create
 order from propal with "WORKFLOW_PROPAL_AUTOCREATE_ORDER" conf

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

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 54e50baa9f7..2e20567e4c5 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1355,6 +1355,27 @@ class Commande extends CommonOrder
 		$this->origin = $object->element;
 		$this->origin_id = $object->id;
 
+                // Multicurrency (test on $this->multicurrency_tx because we should take the default rate only if not using origin rate)
+		if (!empty($conf->multicurrency->enabled)) {
+			if (!empty($object->multicurrency_code)) {
+				$this->multicurrency_code = $object->multicurrency_code;
+			}
+			if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($object->multicurrency_tx)) {
+				$this->multicurrency_tx = $object->multicurrency_tx;
+			}
+
+	                if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) {
+	                        list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date_commande);
+	                } else {
+	                        $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+	                }
+	                if (empty($this->fk_multicurrency)) {
+	                        $this->multicurrency_code = $conf->currency;
+	                        $this->fk_multicurrency = 0;
+	                        $this->multicurrency_tx = 1;
+	                }
+		}
+
 		// get extrafields from original line
 		$object->fetch_optionals();
 

From 3b9d39c1d2fae893b272532167353a64ba866ba1 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 21 Dec 2022 10:00:26 +0000
Subject: [PATCH 095/816] Fixing style errors.

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

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 2e20567e4c5..12054c3ccb8 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1355,7 +1355,7 @@ class Commande extends CommonOrder
 		$this->origin = $object->element;
 		$this->origin_id = $object->id;
 
-                // Multicurrency (test on $this->multicurrency_tx because we should take the default rate only if not using origin rate)
+				// Multicurrency (test on $this->multicurrency_tx because we should take the default rate only if not using origin rate)
 		if (!empty($conf->multicurrency->enabled)) {
 			if (!empty($object->multicurrency_code)) {
 				$this->multicurrency_code = $object->multicurrency_code;
@@ -1364,16 +1364,16 @@ class Commande extends CommonOrder
 				$this->multicurrency_tx = $object->multicurrency_tx;
 			}
 
-	                if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) {
-	                        list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date_commande);
-	                } else {
-	                        $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
-	                }
-	                if (empty($this->fk_multicurrency)) {
-	                        $this->multicurrency_code = $conf->currency;
-	                        $this->fk_multicurrency = 0;
-	                        $this->multicurrency_tx = 1;
-	                }
+			if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) {
+					list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date_commande);
+			} else {
+					$this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+			}
+			if (empty($this->fk_multicurrency)) {
+					$this->multicurrency_code = $conf->currency;
+					$this->fk_multicurrency = 0;
+					$this->multicurrency_tx = 1;
+			}
 		}
 
 		// get extrafields from original line

From 471260738ab41260459150b7ad3ccefbb9af4574 Mon Sep 17 00:00:00 2001
From: IC-Florian <71641704+IC-Florian@users.noreply.github.com>
Date: Wed, 21 Dec 2022 12:03:32 +0100
Subject: [PATCH 096/816]  FIX : Product list in setup.php in new Module

---
 htdocs/modulebuilder/template/admin/setup.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 1c46028b142..37fa410f1e7 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -55,6 +55,7 @@ global $langs, $user;
 // Libraries
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once '../lib/mymodule.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 //require_once "../class/myclass.class.php";
 
 // Translations

From a48d1ae8e392cc2b2ad9d9c324983d1e6193c1b1 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Wed, 21 Dec 2022 12:31:24 +0100
Subject: [PATCH 097/816] FIX : multicurrency_tx and not currency_tx

---
 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 c0d7cf53a5d..4f3d9230899 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2929,8 +2929,8 @@ if ($action == 'create') {
 				$remise_absolue 	= (!empty($expesrc->remise_absolue) ? $expesrc->remise_absolue : (!empty($soc->remise_absolue) ? $soc->remise_absolue : 0));
 
 				if (!empty($conf->multicurrency->enabled)) {
-					$currency_code 	= (!empty($expesrc->currency_code) ? $expesrc->currency_code : (!empty($soc->currency_code) ? $soc->currency_code : $objectsrc->multicurrency_code));
-					$currency_tx 	= (!empty($expesrc->currency_tx) ? $expesrc->currency_tx : (!empty($soc->currency_tx) ? $soc->currency_tx : $objectsrc->currency_tx));
+					$currency_code 	= (!empty($expesrc->multicurrency_code) ? $expesrc->multicurrency_code : (!empty($soc->multicurrency_code) ? $soc->multicurrency_code : $objectsrc->multicurrency_code));
+					$currency_tx 	= (!empty($expesrc->multicurrency_tx) ? $expesrc->multicurrency_tx : (!empty($soc->multicurrency_tx) ? $soc->multicurrency_tx : $objectsrc->multicurrency_tx));
 				}
 
 				//Replicate extrafields

From c033a4778e68f8371ff7a4983a0751de0ed6b591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josep=20Llu=C3=ADs?= <joseplluis@lliuretic.cat>
Date: Wed, 21 Dec 2022 13:17:18 +0100
Subject: [PATCH 098/816] New filter for Signed+Billed in proposals

New filter for Signed+Billed in proposals
---
 htdocs/core/class/html.formpropal.class.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php
index e23e71a8124..d9c458161bc 100644
--- a/htdocs/core/class/html.formpropal.class.php
+++ b/htdocs/core/class/html.formpropal.class.php
@@ -132,6 +132,14 @@ class FormPropal
 			print '</option>';
 			$i++;
 		}
+		//Option for Signed+Billed
+		if ($selected != '' && $selected == "2,4") {
+            print '<option value="2,4" selected>';
+        } else {
+            print '<option value="2,4">';
+        }
+		print ($langs->trans($prefix.'Signed'.($short ? 'Short' : '')).'+'.$langs->trans($prefix.'Billed'.($short ? 'Short' : '')));
+        print '</option>';
 		print '</select>';
 
 		print ajax_combobox($htmlname, array(), 0, 0, 'resolve', ($showempty < 0 ? (string) $showempty : '-1'), $morecss);

From 3004c3cd920b815651aaa36c491cd4444d7fb1e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josep=20Llu=C3=ADs?= <joseplluis@lliuretic.cat>
Date: Wed, 21 Dec 2022 13:22:56 +0100
Subject: [PATCH 099/816] Update html.formpropal.class.php

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

diff --git a/htdocs/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php
index d9c458161bc..48551926e1f 100644
--- a/htdocs/core/class/html.formpropal.class.php
+++ b/htdocs/core/class/html.formpropal.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2012 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2022 Josep Lluís Amador	<joseplluis@lliuretic.cat>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

From 80d6c262029ec69caec69db358fa4fbae5cc89ec Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 21 Dec 2022 12:31:33 +0000
Subject: [PATCH 100/816] Fixing style errors.

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

diff --git a/htdocs/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php
index 48551926e1f..fbbf2c97fb7 100644
--- a/htdocs/core/class/html.formpropal.class.php
+++ b/htdocs/core/class/html.formpropal.class.php
@@ -135,12 +135,12 @@ class FormPropal
 		}
 		//Option for Signed+Billed
 		if ($selected != '' && $selected == "2,4") {
-            print '<option value="2,4" selected>';
-        } else {
-            print '<option value="2,4">';
-        }
+			print '<option value="2,4" selected>';
+		} else {
+			print '<option value="2,4">';
+		}
 		print ($langs->trans($prefix.'Signed'.($short ? 'Short' : '')).'+'.$langs->trans($prefix.'Billed'.($short ? 'Short' : '')));
-        print '</option>';
+		print '</option>';
 		print '</select>';
 
 		print ajax_combobox($htmlname, array(), 0, 0, 'resolve', ($showempty < 0 ? (string) $showempty : '-1'), $morecss);

From 69b0cf9bcfeeab25166131128b3f229477255771 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Wed, 21 Dec 2022 14:05:54 +0100
Subject: [PATCH 101/816] FIX : include class multicurrency

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

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 12054c3ccb8..d56eeb2af0e 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1281,6 +1281,7 @@ class Commande extends CommonOrder
 	{
 		global $conf, $hookmanager;
 
+		dol_include_once('/multicurrency/class/multicurrency.class.php');
 		dol_include_once('/core/class/extrafields.class.php');
 
 		$error = 0;

From 2c7e0afabd7c04cbde50fcd9734edc75ac60cb35 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Wed, 21 Dec 2022 17:17:33 +0100
Subject: [PATCH 102/816] FIX : travis

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

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index d56eeb2af0e..33de271b45d 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1366,7 +1366,9 @@ class Commande extends CommonOrder
 			}
 
 			if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) {
-					list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date_commande);
+					$tmparray = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date_commande);
+					$this->fk_multicurrency = $tmparray[0];
+					$this->multicurrency_tx = $tmparray[1];
 			} else {
 					$this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
 			}

From 20cd8348394af379df498ee23fa0391176745322 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 22 Dec 2022 10:15:21 +0000
Subject: [PATCH 103/816] Fixing style errors.

---
 htdocs/product/list.php | 1339 +++++++++++++++++++--------------------
 1 file changed, 667 insertions(+), 672 deletions(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index c4473a9376a..f7634c7311b 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -675,7 +675,7 @@ if (GETPOST('delprod')) {
 
 $param = '';
 if (!empty($mode)) {
-  $param = "&mode=".urlencode($mode);
+	$param = "&mode=".urlencode($mode);
 }
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 	$param .= '&contextpage='.urlencode($contextpage);
@@ -788,26 +788,26 @@ $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 	$newcardbutton = '';
 	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
 	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
-	if ($type === "") {
-		$perm = ($user->rights->produit->creer || $user->rights->service->creer);
-	} elseif ($type == Product::TYPE_SERVICE) {
-		$perm = $user->rights->service->creer;
-	} elseif ($type == Product::TYPE_PRODUCT) {
-		$perm = $user->rights->produit->creer;
-	}
+if ($type === "") {
+	$perm = ($user->rights->produit->creer || $user->rights->service->creer);
+} elseif ($type == Product::TYPE_SERVICE) {
+	$perm = $user->rights->service->creer;
+} elseif ($type == Product::TYPE_PRODUCT) {
+	$perm = $user->rights->produit->creer;
+}
 	$oldtype = $type;
 	$params = array();
-	if ($type === "") {
-		$params['forcenohideoftext'] = 1;
-	}
-	if ($type === "") {
-		$newcardbutton .= dolGetButtonTitle($langs->trans('NewProduct'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/product/card.php?action=create&type=0', '', $perm, $params);
-		$type = Product::TYPE_SERVICE;
-	}
+if ($type === "") {
+	$params['forcenohideoftext'] = 1;
+}
+if ($type === "") {
+	$newcardbutton .= dolGetButtonTitle($langs->trans('NewProduct'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/product/card.php?action=create&type=0', '', $perm, $params);
+	$type = Product::TYPE_SERVICE;
+}
 	$label = 'NewProduct';
-	if ($type == Product::TYPE_SERVICE) {
-		$label = 'NewService';
-	}
+if ($type == Product::TYPE_SERVICE) {
+	$label = 'NewService';
+}
 	$newcardbutton .= dolGetButtonTitle($langs->trans($label), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/product/card.php?action=create&type='.$type, '', $perm, $params);
 
 
@@ -1337,679 +1337,99 @@ print "</tr>\n";
 	$totalarray = array();
 	$totalarray['nbfield'] = 0;
 	$imaxinloop = ($limit ? min($num, $limit) : $num);
-	while ($i < $imaxinloop) {
-		$obj = $db->fetch_object($resql);
+while ($i < $imaxinloop) {
+	$obj = $db->fetch_object($resql);
 
-		// Multilangs
-		if (getDolGlobalInt('MAIN_MULTILANGS')) {  // If multilang is enabled
-			$sql = "SELECT label";
-			$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
-			$sql .= " WHERE fk_product = ".((int) $obj->rowid);
-			$sql .= " AND lang = '".$db->escape($langs->getDefaultLang())."'";
-			$sql .= " LIMIT 1";
-
-			$result = $db->query($sql);
-			if ($result) {
-				$objtp = $db->fetch_object($result);
-				if (!empty($objtp->label)) {
-					$obj->label = $objtp->label;
-				}
+	// Multilangs
+	if (getDolGlobalInt('MAIN_MULTILANGS')) {  // If multilang is enabled
+		$sql = "SELECT label";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
+		$sql .= " WHERE fk_product = ".((int) $obj->rowid);
+		$sql .= " AND lang = '".$db->escape($langs->getDefaultLang())."'";
+		$sql .= " LIMIT 1";
 
+		$result = $db->query($sql);
+		if ($result) {
+			$objtp = $db->fetch_object($result);
+			if (!empty($objtp->label)) {
+				$obj->label = $objtp->label;
 			}
 		}
 	}
+}
 	$parameters = array('staticdata' => $obj);
 	// Note that $action and $object may have been modified by hook
 	// do product_static fetch in hook if wanted or anything else
 	$reshook = $hookmanager->executeHooks('loadStaticObject', $parameters, $product_static, $action);
-	if (empty($reshook)) {
-		$product_static->id = $obj->rowid;
-		$product_static->ref = $obj->ref;
-		$product_static->ref_fourn = empty($obj->ref_supplier) ? '' : $obj->ref_supplier; // deprecated
-		$product_static->ref_supplier = empty($obj->ref_supplier) ? '' : $obj->ref_supplier;
-		$product_static->label = $obj->label;
-		$product_static->finished = $obj->finished;
-		$product_static->type = $obj->fk_product_type;
-		$product_static->status_buy = $obj->tobuy;
-		$product_static->status = $obj->tosell;
-		$product_static->status_batch = $obj->tobatch;
-		$product_static->entity = $obj->entity;
-		$product_static->pmp = $obj->pmp;
-		$product_static->accountancy_code_sell = $obj->accountancy_code_sell;
-		$product_static->accountancy_code_sell_export = $obj->accountancy_code_sell_export;
-		$product_static->accountancy_code_sell_intra = $obj->accountancy_code_sell_intra;
-		$product_static->accountancy_code_buy = $obj->accountancy_code_buy;
-		$product_static->accountancy_code_buy_intra = $obj->accountancy_code_buy_intra;
-		$product_static->accountancy_code_buy_export = $obj->accountancy_code_buy_export;
-		$product_static->length = $obj->length;
-		$product_static->length_units = $obj->length_units;
-		$product_static->width = $obj->width;
-		$product_static->width_units = $obj->width_units;
-		$product_static->height = $obj->height;
-		$product_static->height_units = $obj->height_units;
-		$product_static->weight = $obj->weight;
-		$product_static->weight_units = $obj->weight_units;
-		$product_static->volume = $obj->volume;
-		$product_static->volume_units = $obj->volume_units;
-		$product_static->surface = $obj->surface;
-		$product_static->surface_units = $obj->surface_units;
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
-			$product_static->fk_unit = $obj->fk_unit;
-		}
+if (empty($reshook)) {
+	$product_static->id = $obj->rowid;
+	$product_static->ref = $obj->ref;
+	$product_static->ref_fourn = empty($obj->ref_supplier) ? '' : $obj->ref_supplier; // deprecated
+	$product_static->ref_supplier = empty($obj->ref_supplier) ? '' : $obj->ref_supplier;
+	$product_static->label = $obj->label;
+	$product_static->finished = $obj->finished;
+	$product_static->type = $obj->fk_product_type;
+	$product_static->status_buy = $obj->tobuy;
+	$product_static->status = $obj->tosell;
+	$product_static->status_batch = $obj->tobatch;
+	$product_static->entity = $obj->entity;
+	$product_static->pmp = $obj->pmp;
+	$product_static->accountancy_code_sell = $obj->accountancy_code_sell;
+	$product_static->accountancy_code_sell_export = $obj->accountancy_code_sell_export;
+	$product_static->accountancy_code_sell_intra = $obj->accountancy_code_sell_intra;
+	$product_static->accountancy_code_buy = $obj->accountancy_code_buy;
+	$product_static->accountancy_code_buy_intra = $obj->accountancy_code_buy_intra;
+	$product_static->accountancy_code_buy_export = $obj->accountancy_code_buy_export;
+	$product_static->length = $obj->length;
+	$product_static->length_units = $obj->length_units;
+	$product_static->width = $obj->width;
+	$product_static->width_units = $obj->width_units;
+	$product_static->height = $obj->height;
+	$product_static->height_units = $obj->height_units;
+	$product_static->weight = $obj->weight;
+	$product_static->weight_units = $obj->weight_units;
+	$product_static->volume = $obj->volume;
+	$product_static->volume_units = $obj->volume_units;
+	$product_static->surface = $obj->surface;
+	$product_static->surface_units = $obj->surface_units;
+	if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		$product_static->fk_unit = $obj->fk_unit;
+	}
 
-		// STOCK_DISABLE_OPTIM_LOAD can be set to force load_stock whatever is permissions on stock.
-		if ((isModEnabled('stock') && $user->rights->stock->lire && $search_type != 1) || !empty($conf->global->STOCK_DISABLE_OPTIM_LOAD)) {	// To optimize call of load_stock
-			if ($product_static->type != 1 || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {    // Not a service
-				$option = 'nobatch';
-				if (empty($arrayfields['stock_virtual']['checked'])) {
-					$option .= ',novirtual';
-				}
-				$product_static->load_stock($option); // Load stock_reel + stock_warehouse. This can also call load_virtual_stock()
+	// STOCK_DISABLE_OPTIM_LOAD can be set to force load_stock whatever is permissions on stock.
+	if ((isModEnabled('stock') && $user->rights->stock->lire && $search_type != 1) || !empty($conf->global->STOCK_DISABLE_OPTIM_LOAD)) {	// To optimize call of load_stock
+		if ($product_static->type != 1 || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {    // Not a service
+			$option = 'nobatch';
+			if (empty($arrayfields['stock_virtual']['checked'])) {
+				$option .= ',novirtual';
 			}
+			$product_static->load_stock($option); // Load stock_reel + stock_warehouse. This can also call load_virtual_stock()
 		}
 	}
+}
 
 
 		$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');
-		}
-		if ($mode == 'Kanban') {
-			if ($i == 0) {
-				print '<tr><td colspan="12">';
-				print '<div class="box-flex-container">';
-			}
-			$product_static->price = $obj->price;
-			// Output Kanban
-			print $product_static->getKanbanView('');
-			if ($i == ($imaxinloop - 1)) {
-				print '</div>';
-				print '</td></tr>';
-			}
-		} else {
-			print '<tr class="oddeven">';
-
-			// Action column
-			if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
-				print '<td class="nowrap center">';
-				if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-					$selected = 0;
-					if (in_array($obj->rowid, $arrayofselected)) {
-						$selected = 1;
-					}
-					print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Ref
-			if (!empty($arrayfields['p.rowid']['checked'])) {
-				print '<td class="nowraponall">';
-				print $product_static->id;
-				print "</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Ref
-			if (!empty($arrayfields['p.ref']['checked'])) {
-				print '<td class="tdoverflowmax200">';
-				print $product_static->getNomUrl(1);
-				print "</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Ref supplier
-			if (!empty($arrayfields['pfp.ref_fourn']['checked'])) {
-				print '<td class="tdoverflowmax200">';
-				print $product_static->getNomUrl(1);
-				print "</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Thumbnail
-			if (!empty($arrayfields['thumbnail']['checked'])) {
-				$product_thumbnail_html = '';
-				if (!empty($product_static->entity)) {
-					$product_thumbnail = $product_static->show_photos('product', $conf->product->multidir_output[$product_static->entity], 1, 1, 0, 0, 0, 80);
-					if ($product_static->nbphoto > 0) {
-						$product_thumbnail_html = $product_thumbnail;
-					}
-				}
-
-				print '<td class="center">' . $product_thumbnail_html . '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Label
-			if (!empty($arrayfields['p.label']['checked'])) {
-				print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->label).'">'.$obj->label.'</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Type
-			if (!empty($arrayfields['p.fk_product_type']['checked'])) {
-				print '<td class="center">';
-				$s = '';
-				if ($obj->fk_product_type == 0) {
-					$s .= img_picto($langs->trans("Product"), 'product', 'class="paddingleftonly paddingrightonly colorgrey"');
-				} else {
-					$s .= img_picto($langs->trans("Service"), 'service', 'class="paddingleftonly paddingrightonly colorgrey"');
-				}
-				print $s;
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Barcode
-			if (!empty($arrayfields['p.barcode']['checked'])) {
-				print '<td>'.$obj->barcode.'</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Duration
-			if (!empty($arrayfields['p.duration']['checked'])) {
-				print '<td class="center nowraponall">';
-
-				if (preg_match('/([^a-z]+)[a-z]$/i', $obj->duration)) {
-					$duration_value = substr($obj->duration, 0, dol_strlen($obj->duration) - 1);
-					$duration_unit = substr($obj->duration, -1);
-
-					if ((float) $duration_value > 1) {
-						$dur = array("i"=>$langs->trans("Minutes"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
-					} elseif ((float) $duration_value > 0) {
-						$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
-					}
-					print $duration_value;
-					print ((!empty($duration_unit) && isset($dur[$duration_unit]) && $duration_value != '') ? ' '.$langs->trans($dur[$duration_unit]) : '');
-				} elseif (!preg_match('/^[a-z]$/i', $obj->duration)) {		// If duration is a simple char (like 's' of 'm'), we do not show value
-					print $obj->duration;
-				}
-
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Finished
-			if (!empty($arrayfields['p.finished']['checked'])) {
-				print '<td class="center">';
-				print $product_static->getLibFinished();
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Weight
-			if (!empty($arrayfields['p.weight']['checked'])) {
-				print '<td class="center">';
-				print $obj->weight;
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Weight units
-			if (!empty($arrayfields['p.weight_units']['checked'])) {
-				print '<td class="center">';
-				if ($product_static->weight != '') {
-					print measuringUnitString(0, 'weight', $product_static->weight_units);
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Length
-			if (!empty($arrayfields['p.length']['checked'])) {
-				print '<td class="center">';
-				print $obj->length;
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Length units
-			if (!empty($arrayfields['p.length_units']['checked'])) {
-				print '<td class="center">';
-				if ($product_static->length != '') {
-					print measuringUnitString(0, 'size', $product_static->length_units);
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Width
-			if (!empty($arrayfields['p.width']['checked'])) {
-				print '<td align="center">';
-				print $obj->width;
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Width units
-			if (!empty($arrayfields['p.width_units']['checked'])) {
-				print '<td class="center">';
-				if ($product_static->width != '') {
-					print measuringUnitString(0, 'size', $product_static->width_units);
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Height
-			if (!empty($arrayfields['p.height']['checked'])) {
-				print '<td align="center">';
-				print $obj->height;
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Height units
-			if (!empty($arrayfields['p.height_units']['checked'])) {
-				print '<td class="center">';
-				if ($product_static->height != '') {
-					print measuringUnitString(0, 'size', $product_static->height_units);
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Surface
-			if (!empty($arrayfields['p.surface']['checked'])) {
-				print '<td class="center">';
-				print $obj->surface;
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Surface units
-			if (!empty($arrayfields['p.surface_units']['checked'])) {
-				print '<td class="center">';
-				if ($product_static->surface != '') {
-					print measuringUnitString(0, 'surface', $product_static->surface_units);
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Volume
-			if (!empty($arrayfields['p.volume']['checked'])) {
-				print '<td class="center">';
-				print $obj->volume;
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Volume units
-			if (!empty($arrayfields['p.volume_units']['checked'])) {
-				print '<td class="center">';
-				if ($product_static->volume != '') {
-					print measuringUnitString(0, 'volume', $product_static->volume_units);
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Unit
-			if (!empty($arrayfields['cu.label']['checked'])) {
-				print '<td align="center">';
-				if (!empty($obj->cu_label)) {
-					print $langs->trans($obj->cu_label);
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Sell price
-			if (!empty($arrayfields['p.sellprice']['checked'])) {
-				print '<td class="right nowraponall">';
-				if ($obj->tosell && $usercancreadprice) {
-					if ($obj->price_base_type == 'TTC') {
-						print '<span class="amount">'.price($obj->price_ttc).' '.$langs->trans("TTC").'</span>';
-					} else {
-						print '<span class="amount">'.price($obj->price).' '.$langs->trans("HT").'</span>';
-					}
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-
-			// Multiprices
-			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
-				if (! isset($productpricescache)) {
-					$productpricescache=array();
-				}
-				if (! isset($productpricescache[$obj->rowid])) {
-					$productpricescache[$obj->rowid] = array();
-				}
-
-				if ($obj->tosell && $usercancreadprice) {
-					// Make 1 request for all price levels (without filter on price_level) and saved result into an cache array
-					// then reuse the cache array if we need prices for other price levels
-					$sqlp = "SELECT p.rowid, p.fk_product, p.price, p.price_ttc, p.price_level, p.date_price, p.price_base_type";
-					$sqlp .= " FROM ".MAIN_DB_PREFIX."product_price as p";
-					$sqlp .= " WHERE fk_product = ".((int) $obj->rowid);
-					$sqlp .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC";
-					$resultp = $db->query($sqlp);
-					if ($resultp) {
-						$nump = $db->num_rows($resultp);
-						$j = 0;
-						while ($j < $nump) {
-							$objp = $db->fetch_object($resultp);
-
-							if (empty($productpricescache[$obj->rowid][$objp->price_level])) {
-								$productpricescache[$obj->rowid][$objp->price_level]['price'] = $objp->price;
-								$productpricescache[$obj->rowid][$objp->price_level]['price_ttc'] = $objp->price_ttc;
-								$productpricescache[$obj->rowid][$objp->price_level]['price_base_type'] = $objp->price_base_type;
-							}
-
-							$j++;
-						}
-
-						$db->free($resultp);
-					} else {
-						dol_print_error($db);
-					}
-				}
-
-				foreach ($arraypricelevel as $key => $value) {
-					if (!empty($arrayfields['p.sellprice'.$key]['checked'])) {
-						print '<td class="right nowraponall">';
-						if (!empty($productpricescache[$obj->rowid])) {
-							if ($productpricescache[$obj->rowid][$key]['price_base_type'] == 'TTC') {
-								print '<span class="amount">'.price($productpricescache[$obj->rowid][$key]['price_ttc']).' '.$langs->trans("TTC").'</span>';
-							} else {
-								print '<span class="amount">'.price($productpricescache[$obj->rowid][$key]['price']).' '.$langs->trans("HT").'</span>';
-							}
-						}
-						print '</td>';
-						if (!$i) {
-							$totalarray['nbfield']++;
-						}
-
-					}
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-		}
+if ($product_static->isService()) {
+	$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('service', 'service_advance', 'read_prices'):$user->hasRight('service', 'lire');
+}
+if ($mode == 'Kanban') {
+	if ($i == 0) {
+		print '<tr><td colspan="12">';
+		print '<div class="box-flex-container">';
 	}
-
-	// Better buy price
-	if (!empty($arrayfields['p.minbuyprice']['checked'])) {
-		print  '<td class="right nowraponall">';
-		if ($product_static->status_buy && $obj->bestpurchaseprice != '' && $usercancreadprice) {
-			if ($product_fourn->find_min_price_product_fournisseur($obj->rowid) > 0) {
-				if ($product_fourn->product_fourn_price_id > 0) {
-					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))) {
-						$htmltext = $product_fourn->display_price_product_fournisseur(1, 1, 0, 1);
-						print '<span class="amount">'.$form->textwithpicto(price($product_fourn->fourn_unitprice * (1 - $product_fourn->fourn_remise_percent / 100) - $product_fourn->fourn_remise).' '.$langs->trans("HT"), $htmltext).'</span>';
-					} else {
-						print '<span class="amount">'.price($product_fourn->fourn_unitprice).' '.$langs->trans("HT").'</span>';
-
-					}
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Number of buy prices
-	if (!empty($arrayfields['p.numbuyprice']['checked'])) {
-		print  '<td class="right">';
-		if ($product_static->status_buy && $usercancreadprice) {
-			if (count($productFournList = $product_fourn->list_product_fournisseur_price($obj->rowid)) > 0) {
-				$htmltext = $product_fourn->display_price_product_fournisseur(1, 1, 0, 1, $productFournList);
-				print $form->textwithpicto(count($productFournList), $htmltext);
-			}
-		}
-		print '</td>';
-	}
-
-	// VAT or Sell Tax Rate
-	if (!empty($arrayfields['p.tva_tx']['checked'])) {
-		print '<td class="right">';
-		print vatrate($obj->tva_tx, true);
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// WAP
-	if (!empty($arrayfields['p.pmp']['checked'])) {
-		print '<td class="nowrap right">';
-		if ($usercancreadprice) {
-			print '<span class="amount">'.price($product_static->pmp, 1, $langs)."</span>";
-		}
-		print '</td>';
-	}
-	// Cost price
-	if (!empty($arrayfields['p.cost_price']['checked'])) {
-		print '<td class="nowrap right">';
-		//print $obj->cost_price;
-		if ($usercancreadprice) {
-			print '<span class="amount">'.price($obj->cost_price).' '.$langs->trans("HT").'</span>';
-		}
-		print '</td>';
-	}
-
-	// Limit alert
-	if (!empty($arrayfields['p.seuil_stock_alerte']['checked'])) {
-		print '<td class="right">';
-		if ($product_static->type != 1) {
-			print $obj->seuil_stock_alerte;
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Desired stock
-	if (!empty($arrayfields['p.desiredstock']['checked'])) {
-		print '<td class="right">';
-		if ($product_static->type != 1) {
-			print $obj->desiredstock;
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Stock real
-	if (!empty($arrayfields['p.stock']['checked'])) {
-		print '<td class="right">';
-		if ($product_static->type != 1) {
-			if ($obj->seuil_stock_alerte != '' && $product_static->stock_reel < (float) $obj->seuil_stock_alerte) {
-				print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)).' ';
-			}
-			if ($usercancreadprice) {
-				print price(price2num($product_static->stock_reel, 'MS'));
-			}
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Stock virtual
-	if (!empty($arrayfields['stock_virtual']['checked'])) {
-		print '<td class="right">';
-		if ($product_static->type != 1) {
-			if ($obj->seuil_stock_alerte != '' && $product_static->stock_theorique < (float) $obj->seuil_stock_alerte) {
-				print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)).' ';
-			}
-			if ($usercancreadprice) {
-				print price(price2num($product_static->stock_theorique, 'MS'));
-			}
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Lot/Serial
-	if (!empty($arrayfields['p.tobatch']['checked'])) {
-		print '<td class="center">';
-		print $product_static->getLibStatut(1, 2);
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Country
-	if (!empty($arrayfields['p.fk_country']['checked'])) {
-		print '<td>'.getCountry($obj->fk_country, 0, $db).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// State
-	if (!empty($arrayfields['p.fk_state']['checked'])) {
-		print '<td>';
-		if (!empty($obj->fk_state)) {
-			print  getState($obj->fk_state, 0, $db);
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Accountancy code sell
-	if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_sell']['checked'])) {
-		print '<td>'.$product_static->accountancy_code_sell.'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_sell_intra']['checked'])) {
-		print '<td>'.$product_static->accountancy_code_sell_intra.'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_sell_export']['checked'])) {
-		print '<td>'.$product_static->accountancy_code_sell_export.'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Accountancy code buy
-	if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_buy']['checked'])) {
-		print '<td>'.$product_static->accountancy_code_buy.'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_buy_intra']['checked'])) {
-		print '<td>'.$product_static->accountancy_code_buy_intra.'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_buy_export']['checked'])) {
-		print '<td>'.$product_static->accountancy_code_buy_export.'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	// Date creation
-	if (!empty($arrayfields['p.datec']['checked'])) {
-		print '<td class="center nowraponall">';
-		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Date modification
-	if (!empty($arrayfields['p.tms']['checked'])) {
-		print '<td class="center nowraponall">';
-		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Status (to sell)
-	if (!empty($arrayfields['p.tosell']['checked'])) {
-		print '<td class="center nowrap">';
-		if (!empty($conf->use_javascript_ajax) && $user->hasRight("produit", "creer") && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
-			print ajax_object_onoff($product_static, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
-		} else {
-			print $product_static->LibStatut($product_static->status, 5, 0);
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Status (to buy)
-	if (!empty($arrayfields['p.tobuy']['checked'])) {
-		print '<td class="center nowrap">';
-		if (!empty($conf->use_javascript_ajax) && $user->hasRight("produit", "creer") && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
-			print ajax_object_onoff($product_static, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
-		} else {
-			print $product_static->LibStatut($product_static->status_buy, 5, 1);
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
+	$product_static->price = $obj->price;
+	// Output Kanban
+	print $product_static->getKanbanView('');
+	if ($i == ($imaxinloop - 1)) {
+		print '</div>';
+		print '</td></tr>';
 	}
+} else {
+	print '<tr class="oddeven">';
 
 	// Action column
-	if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
 		print '<td class="nowrap center">';
 		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 			$selected = 0;
@@ -2023,9 +1443,584 @@ print "</tr>\n";
 			$totalarray['nbfield']++;
 		}
 	}
+	// Ref
+	if (!empty($arrayfields['p.rowid']['checked'])) {
+		print '<td class="nowraponall">';
+		print $product_static->id;
+		print "</td>\n";
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
+	// Ref
+	if (!empty($arrayfields['p.ref']['checked'])) {
+		print '<td class="tdoverflowmax200">';
+		print $product_static->getNomUrl(1);
+		print "</td>\n";
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
+	// Ref supplier
+	if (!empty($arrayfields['pfp.ref_fourn']['checked'])) {
+		print '<td class="tdoverflowmax200">';
+		print $product_static->getNomUrl(1);
+		print "</td>\n";
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
+	// Thumbnail
+	if (!empty($arrayfields['thumbnail']['checked'])) {
+		$product_thumbnail_html = '';
+		if (!empty($product_static->entity)) {
+			$product_thumbnail = $product_static->show_photos('product', $conf->product->multidir_output[$product_static->entity], 1, 1, 0, 0, 0, 80);
+			if ($product_static->nbphoto > 0) {
+				$product_thumbnail_html = $product_thumbnail;
+			}
+		}
+
+		print '<td class="center">' . $product_thumbnail_html . '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
+	// Label
+	if (!empty($arrayfields['p.label']['checked'])) {
+		print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->label).'">'.$obj->label.'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
+	// Type
+	if (!empty($arrayfields['p.fk_product_type']['checked'])) {
+		print '<td class="center">';
+		$s = '';
+		if ($obj->fk_product_type == 0) {
+			$s .= img_picto($langs->trans("Product"), 'product', 'class="paddingleftonly paddingrightonly colorgrey"');
+		} else {
+			$s .= img_picto($langs->trans("Service"), 'service', 'class="paddingleftonly paddingrightonly colorgrey"');
+		}
+		print $s;
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
+	// Barcode
+	if (!empty($arrayfields['p.barcode']['checked'])) {
+		print '<td>'.$obj->barcode.'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
+	// Duration
+	if (!empty($arrayfields['p.duration']['checked'])) {
+		print '<td class="center nowraponall">';
+
+		if (preg_match('/([^a-z]+)[a-z]$/i', $obj->duration)) {
+			$duration_value = substr($obj->duration, 0, dol_strlen($obj->duration) - 1);
+			$duration_unit = substr($obj->duration, -1);
+
+			if ((float) $duration_value > 1) {
+				$dur = array("i"=>$langs->trans("Minutes"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
+			} elseif ((float) $duration_value > 0) {
+				$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
+			}
+			print $duration_value;
+			print ((!empty($duration_unit) && isset($dur[$duration_unit]) && $duration_value != '') ? ' '.$langs->trans($dur[$duration_unit]) : '');
+		} elseif (!preg_match('/^[a-z]$/i', $obj->duration)) {		// If duration is a simple char (like 's' of 'm'), we do not show value
+			print $obj->duration;
+		}
+
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
+	// Finished
+	if (!empty($arrayfields['p.finished']['checked'])) {
+		print '<td class="center">';
+		print $product_static->getLibFinished();
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
+	// Weight
+	if (!empty($arrayfields['p.weight']['checked'])) {
+		print '<td class="center">';
+		print $obj->weight;
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+	// Weight units
+	if (!empty($arrayfields['p.weight_units']['checked'])) {
+		print '<td class="center">';
+		if ($product_static->weight != '') {
+			print measuringUnitString(0, 'weight', $product_static->weight_units);
+		}
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+	// Length
+	if (!empty($arrayfields['p.length']['checked'])) {
+		print '<td class="center">';
+		print $obj->length;
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+	// Length units
+	if (!empty($arrayfields['p.length_units']['checked'])) {
+		print '<td class="center">';
+		if ($product_static->length != '') {
+			print measuringUnitString(0, 'size', $product_static->length_units);
+		}
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+	// Width
+	if (!empty($arrayfields['p.width']['checked'])) {
+		print '<td align="center">';
+		print $obj->width;
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+	// Width units
+	if (!empty($arrayfields['p.width_units']['checked'])) {
+		print '<td class="center">';
+		if ($product_static->width != '') {
+			print measuringUnitString(0, 'size', $product_static->width_units);
+		}
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+	// Height
+	if (!empty($arrayfields['p.height']['checked'])) {
+		print '<td align="center">';
+		print $obj->height;
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+	// Height units
+	if (!empty($arrayfields['p.height_units']['checked'])) {
+		print '<td class="center">';
+		if ($product_static->height != '') {
+			print measuringUnitString(0, 'size', $product_static->height_units);
+		}
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+	// Surface
+	if (!empty($arrayfields['p.surface']['checked'])) {
+		print '<td class="center">';
+		print $obj->surface;
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+	// Surface units
+	if (!empty($arrayfields['p.surface_units']['checked'])) {
+		print '<td class="center">';
+		if ($product_static->surface != '') {
+			print measuringUnitString(0, 'surface', $product_static->surface_units);
+		}
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+	// Volume
+	if (!empty($arrayfields['p.volume']['checked'])) {
+		print '<td class="center">';
+		print $obj->volume;
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+	// Volume units
+	if (!empty($arrayfields['p.volume_units']['checked'])) {
+		print '<td class="center">';
+		if ($product_static->volume != '') {
+			print measuringUnitString(0, 'volume', $product_static->volume_units);
+		}
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+	// Unit
+	if (!empty($arrayfields['cu.label']['checked'])) {
+		print '<td align="center">';
+		if (!empty($obj->cu_label)) {
+			print $langs->trans($obj->cu_label);
+		}
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
+	// Sell price
+	if (!empty($arrayfields['p.sellprice']['checked'])) {
+		print '<td class="right nowraponall">';
+		if ($obj->tosell && $usercancreadprice) {
+			if ($obj->price_base_type == 'TTC') {
+				print '<span class="amount">'.price($obj->price_ttc).' '.$langs->trans("TTC").'</span>';
+			} else {
+				print '<span class="amount">'.price($obj->price).' '.$langs->trans("HT").'</span>';
+			}
+		}
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
+
+	// Multiprices
+	if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+		if (! isset($productpricescache)) {
+			$productpricescache=array();
+		}
+		if (! isset($productpricescache[$obj->rowid])) {
+			$productpricescache[$obj->rowid] = array();
+		}
+
+		if ($obj->tosell && $usercancreadprice) {
+			// Make 1 request for all price levels (without filter on price_level) and saved result into an cache array
+			// then reuse the cache array if we need prices for other price levels
+			$sqlp = "SELECT p.rowid, p.fk_product, p.price, p.price_ttc, p.price_level, p.date_price, p.price_base_type";
+			$sqlp .= " FROM ".MAIN_DB_PREFIX."product_price as p";
+			$sqlp .= " WHERE fk_product = ".((int) $obj->rowid);
+			$sqlp .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC";
+			$resultp = $db->query($sqlp);
+			if ($resultp) {
+				$nump = $db->num_rows($resultp);
+				$j = 0;
+				while ($j < $nump) {
+					$objp = $db->fetch_object($resultp);
+
+					if (empty($productpricescache[$obj->rowid][$objp->price_level])) {
+						$productpricescache[$obj->rowid][$objp->price_level]['price'] = $objp->price;
+						$productpricescache[$obj->rowid][$objp->price_level]['price_ttc'] = $objp->price_ttc;
+						$productpricescache[$obj->rowid][$objp->price_level]['price_base_type'] = $objp->price_base_type;
+					}
+
+					$j++;
+				}
+
+				$db->free($resultp);
+			} else {
+				dol_print_error($db);
+			}
+		}
+
+		foreach ($arraypricelevel as $key => $value) {
+			if (!empty($arrayfields['p.sellprice'.$key]['checked'])) {
+				print '<td class="right nowraponall">';
+				if (!empty($productpricescache[$obj->rowid])) {
+					if ($productpricescache[$obj->rowid][$key]['price_base_type'] == 'TTC') {
+						print '<span class="amount">'.price($productpricescache[$obj->rowid][$key]['price_ttc']).' '.$langs->trans("TTC").'</span>';
+					} else {
+						print '<span class="amount">'.price($productpricescache[$obj->rowid][$key]['price']).' '.$langs->trans("HT").'</span>';
+					}
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+		}
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+}
+	}
+
+	// Better buy price
+if (!empty($arrayfields['p.minbuyprice']['checked'])) {
+	print  '<td class="right nowraponall">';
+	if ($product_static->status_buy && $obj->bestpurchaseprice != '' && $usercancreadprice) {
+		if ($product_fourn->find_min_price_product_fournisseur($obj->rowid) > 0) {
+			if ($product_fourn->product_fourn_price_id > 0) {
+				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))) {
+					$htmltext = $product_fourn->display_price_product_fournisseur(1, 1, 0, 1);
+					print '<span class="amount">'.$form->textwithpicto(price($product_fourn->fourn_unitprice * (1 - $product_fourn->fourn_remise_percent / 100) - $product_fourn->fourn_remise).' '.$langs->trans("HT"), $htmltext).'</span>';
+				} else {
+					print '<span class="amount">'.price($product_fourn->fourn_unitprice).' '.$langs->trans("HT").'</span>';
+				}
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+	}
+	print '</td>';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+}
+
+	// Number of buy prices
+if (!empty($arrayfields['p.numbuyprice']['checked'])) {
+	print  '<td class="right">';
+	if ($product_static->status_buy && $usercancreadprice) {
+		if (count($productFournList = $product_fourn->list_product_fournisseur_price($obj->rowid)) > 0) {
+			$htmltext = $product_fourn->display_price_product_fournisseur(1, 1, 0, 1, $productFournList);
+			print $form->textwithpicto(count($productFournList), $htmltext);
+		}
+	}
+	print '</td>';
+}
+
+	// VAT or Sell Tax Rate
+if (!empty($arrayfields['p.tva_tx']['checked'])) {
+	print '<td class="right">';
+	print vatrate($obj->tva_tx, true);
+	print '</td>';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+}
+
+	// WAP
+if (!empty($arrayfields['p.pmp']['checked'])) {
+	print '<td class="nowrap right">';
+	if ($usercancreadprice) {
+		print '<span class="amount">'.price($product_static->pmp, 1, $langs)."</span>";
+	}
+	print '</td>';
+}
+	// Cost price
+if (!empty($arrayfields['p.cost_price']['checked'])) {
+	print '<td class="nowrap right">';
+	//print $obj->cost_price;
+	if ($usercancreadprice) {
+		print '<span class="amount">'.price($obj->cost_price).' '.$langs->trans("HT").'</span>';
+	}
+	print '</td>';
+}
+
+	// Limit alert
+if (!empty($arrayfields['p.seuil_stock_alerte']['checked'])) {
+	print '<td class="right">';
+	if ($product_static->type != 1) {
+		print $obj->seuil_stock_alerte;
+	}
+	print '</td>';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+}
+	// Desired stock
+if (!empty($arrayfields['p.desiredstock']['checked'])) {
+	print '<td class="right">';
+	if ($product_static->type != 1) {
+		print $obj->desiredstock;
+	}
+	print '</td>';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+}
+	// Stock real
+if (!empty($arrayfields['p.stock']['checked'])) {
+	print '<td class="right">';
+	if ($product_static->type != 1) {
+		if ($obj->seuil_stock_alerte != '' && $product_static->stock_reel < (float) $obj->seuil_stock_alerte) {
+			print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)).' ';
+		}
+		if ($usercancreadprice) {
+			print price(price2num($product_static->stock_reel, 'MS'));
+		}
+	}
+	print '</td>';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+}
+	// Stock virtual
+if (!empty($arrayfields['stock_virtual']['checked'])) {
+	print '<td class="right">';
+	if ($product_static->type != 1) {
+		if ($obj->seuil_stock_alerte != '' && $product_static->stock_theorique < (float) $obj->seuil_stock_alerte) {
+			print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)).' ';
+		}
+		if ($usercancreadprice) {
+			print price(price2num($product_static->stock_theorique, 'MS'));
+		}
+	}
+	print '</td>';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+}
+	// Lot/Serial
+if (!empty($arrayfields['p.tobatch']['checked'])) {
+	print '<td class="center">';
+	print $product_static->getLibStatut(1, 2);
+	print '</td>';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+}
+	// Country
+if (!empty($arrayfields['p.fk_country']['checked'])) {
+	print '<td>'.getCountry($obj->fk_country, 0, $db).'</td>';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+}
+	// State
+if (!empty($arrayfields['p.fk_state']['checked'])) {
+	print '<td>';
+	if (!empty($obj->fk_state)) {
+		print  getState($obj->fk_state, 0, $db);
+	}
+	print '</td>';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+}
+	// Accountancy code sell
+if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_sell']['checked'])) {
+	print '<td>'.$product_static->accountancy_code_sell.'</td>';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+}
+if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_sell_intra']['checked'])) {
+	print '<td>'.$product_static->accountancy_code_sell_intra.'</td>';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+}
+if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_sell_export']['checked'])) {
+	print '<td>'.$product_static->accountancy_code_sell_export.'</td>';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+}
+	// Accountancy code buy
+if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_buy']['checked'])) {
+	print '<td>'.$product_static->accountancy_code_buy.'</td>';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+}
+if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_buy_intra']['checked'])) {
+	print '<td>'.$product_static->accountancy_code_buy_intra.'</td>';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+}
+if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_buy_export']['checked'])) {
+	print '<td>'.$product_static->accountancy_code_buy_export.'</td>';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+}
+	// Extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+	// Fields from hook
+	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	// Date creation
+if (!empty($arrayfields['p.datec']['checked'])) {
+	print '<td class="center nowraponall">';
+	print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
+	print '</td>';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+}
+	// Date modification
+if (!empty($arrayfields['p.tms']['checked'])) {
+	print '<td class="center nowraponall">';
+	print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
+	print '</td>';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+}
+
+	// Status (to sell)
+if (!empty($arrayfields['p.tosell']['checked'])) {
+	print '<td class="center nowrap">';
+	if (!empty($conf->use_javascript_ajax) && $user->hasRight("produit", "creer") && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
+		print ajax_object_onoff($product_static, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
+	} else {
+		print $product_static->LibStatut($product_static->status, 5, 0);
+	}
+	print '</td>';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+}
+	// Status (to buy)
+if (!empty($arrayfields['p.tobuy']['checked'])) {
+	print '<td class="center nowrap">';
+	if (!empty($conf->use_javascript_ajax) && $user->hasRight("produit", "creer") && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
+		print ajax_object_onoff($product_static, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
+	} else {
+		print $product_static->LibStatut($product_static->status_buy, 5, 1);
+	}
+	print '</td>';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+}
+
+	// Action column
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="nowrap center">';
+	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+		$selected = 0;
+		if (in_array($obj->rowid, $arrayofselected)) {
+			$selected = 1;
+		}
+		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+	}
+	print '</td>';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+}
 
 	print "</tr>\n";
-  
+
 }
 	$i++;
 }

From 53ba5c0a4939e019a34e265bb8528e0b163cd781 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 22 Dec 2022 10:22:57 +0000
Subject: [PATCH 104/816] Fixing style errors.

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

diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 0d8b37bbeb9..3796522e70e 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -264,9 +264,8 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 
 		$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
 		$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
-		
-		if ($user->hasRight('adherent', 'configurer')) {
 
+		if ($user->hasRight('adherent', 'configurer')) {
 			$newcardbutton .= dolGetButtonTitle($langs->trans('NewMemberType'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/type.php?action=create');
 		}
 
@@ -327,8 +326,7 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 					print '</div>';
 					print '</td></tr>';
 				}
-			} 
-      else {
+			} else {
 				print '<tr class="oddeven">';
 				print '<td class="nowraponall">';
 				print $membertype->getNomUrl(1);

From 2a68836375fd0cdb9f1b03068fcfdfac0f61711b Mon Sep 17 00:00:00 2001
From: IC-Florian <71641704+IC-Florian@users.noreply.github.com>
Date: Thu, 22 Dec 2022 14:52:03 +0100
Subject: [PATCH 105/816] New require for product in generateOutputField

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

diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
index 1cfddb588fd..4f88c597178 100644
--- a/htdocs/core/class/html.formsetup.class.php
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -1103,6 +1103,9 @@ class FormSetupItem
 				$out.= $this->langs->trans("NorProspectNorCustomer");
 			}
 		} elseif ($this->type == 'product') {
+			if (!class_exists("Product")){
+                require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+            }
 			$product = new Product($this->db);
 			$resprod = $product->fetch($this->fieldValue);
 			if ($resprod > 0) {

From 56d05c09b2fd02450831083af0ec5ca560478378 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 22 Dec 2022 13:52:39 +0000
Subject: [PATCH 106/816] Fixing style errors.

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

diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
index 4f88c597178..611455f003f 100644
--- a/htdocs/core/class/html.formsetup.class.php
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -1103,9 +1103,9 @@ class FormSetupItem
 				$out.= $this->langs->trans("NorProspectNorCustomer");
 			}
 		} elseif ($this->type == 'product') {
-			if (!class_exists("Product")){
-                require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-            }
+			if (!class_exists("Product")) {
+				require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+			}
 			$product = new Product($this->db);
 			$resprod = $product->fetch($this->fieldValue);
 			if ($resprod > 0) {

From 1b03c423b94427c6eef855b9678b797c984c5f37 Mon Sep 17 00:00:00 2001
From: ksar <35605507+ksar-ksar@users.noreply.github.com>
Date: Thu, 22 Dec 2022 17:13:11 +0100
Subject: [PATCH 107/816] FIX #23281

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

diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index d2f0d79e4f3..60f8c9d064a 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -226,7 +226,7 @@ if ($result) {
 		// Tick
 		if ($obj->bydefault == 1) {
 			print '<td class="center">';
-			print '<a class="reposition" href="perms.php?pid='.$obj->id.'&amp;action=remove">';
+			print '<a class="reposition" href="perms.php?pid='.$obj->id.'&amp;action=remove&token='.newToken().'">';
 			//print img_edit_remove();
 			print img_picto('', 'switch_on');
 			print '</a>';

From 298c97d5a65a0c1512d1b5ab44cbea3320db2c90 Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Fri, 23 Dec 2022 12:43:26 +0100
Subject: [PATCH 108/816] NEW copyrights

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

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 781b20edc2e..bdd0fefe191 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -1,7 +1,8 @@
 <?php
 /* Copyright (C) 2013-2016  Olivier Geffroy         <jeff@jeffinfo.com>
  * Copyright (C) 2013-2016  Florian Henry           <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2022  Open-DSI      			<support@open-dsi.fr>
+ * Copyright (C) 2013-2022  Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2022  		Lionel Vessiller        <lvessiller@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>
  * Copyright (C) 2022  		Progiseize         		<a.bisotti@progiseize.fr>

From 92d9d31b8ce8dc956b30658d459a295366c4f70e Mon Sep 17 00:00:00 2001
From: Randall Mora <50120822+randallmoraes@users.noreply.github.com>
Date: Fri, 23 Dec 2022 13:18:04 -0600
Subject: [PATCH 109/816] Update functions.lib.php

Agrega el tipo de moneda CRC (colones Costa Rica) para que se muestre al incio como simbolo de moneda.
Adds the CRC currency (Costa Rican colones) so that it is displayed at the beginning as a currency symbol.
---
 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 00defaf909c..cf5b77ff63e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5762,7 +5762,7 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $
 			$currency_code = $conf->currency;
 		}
 
-		$listofcurrenciesbefore = array('AUD', 'CAD', 'CNY', 'COP', 'CLP', 'GBP', 'HKD', 'MXN', 'PEN', 'USD');
+		$listofcurrenciesbefore = array('AUD', 'CAD', 'CNY', 'COP', 'CLP', 'GBP', 'HKD', 'MXN', 'PEN', 'USD', 'CRC);
 		$listoflanguagesbefore = array('nl_NL');
 		if (in_array($currency_code, $listofcurrenciesbefore) || in_array($outlangs->defaultlang, $listoflanguagesbefore)) {
 			$cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);

From 07a1f8e65188d5b352aa233cfca13128de8c1bf8 Mon Sep 17 00:00:00 2001
From: Amael <41053833+Amael-PE@users.noreply.github.com>
Date: Mon, 26 Dec 2022 00:05:34 +0100
Subject: [PATCH 110/816] FIX #23334 Implement a price equivalent in command

Implement a price equivalent when dealing with minimum prices and foreign currencies.
Added in command/card.php for add and update.
---
 htdocs/commande/card.php | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index d394df997ff..051f047241a 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -629,6 +629,15 @@ if (empty($reshook)) {
 			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
 		}
+		
+		$price_equivalent = $price_ht;
+		$currency_tx = $object->multicurrency_tx;
+
+		// Check if we have a foreing currency
+		// If so, we update the pu_equiv as the equivalent price in base currency
+		if ($price_ht == '' && $price_ht_devise != '' && $currency_tx != '') {
+		 	$price_equivalent = $price_ht_devise * $currency_tx;
+		}
 
 		$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS');
 
@@ -916,7 +925,7 @@ if (empty($reshook)) {
 				$info_bits |= 0x01;
 			}
 
-			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS)) && (!empty($price_min) && (price2num($pu_ht) * (1 - price2num($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)) && (!empty($price_min) && (price2num($price_equivalent) * (1 - price2num($remise_percent) / 100) < price2num($price_min)))) {
 				$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency));
 				setEventMessages($mesg, null, 'errors');
 			} else {
@@ -990,6 +999,15 @@ if (empty($reshook)) {
 		$pu_ht = price2num(GETPOST('price_ht'), '', 2);
 		$vat_rate = (GETPOST('tva_tx') ?GETPOST('tva_tx') : 0);
 		$pu_ht_devise = price2num(GETPOST('multicurrency_subprice'), '', 2);
+		
+		$pu_equivalent = $pu_ht;
+		$currency_tx = $object->multicurrency_tx;
+
+		// Check if we have a foreing currency
+		// If so, we update the pu_equiv as the equivalent price in base currency
+		if ($pu_ht == '' && $pu_ht_devise != '' && $currency_tx != '') {
+		 	$pu_equivalent = $pu_ht_devise * $currency_tx;
+		}
 
 		// Define info_bits
 		$info_bits = 0;
@@ -1039,7 +1057,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 - $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_equivalent) * (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++;
 			}

From 58d3cdb13cc55fe5d221270d4c8babe107639fa3 Mon Sep 17 00:00:00 2001
From: Amael <41053833+Amael-PE@users.noreply.github.com>
Date: Mon, 26 Dec 2022 00:31:38 +0100
Subject: [PATCH 111/816] FIX #23334 Implement a price equivalent in propal

Implement a price equivalent when dealing with minimum prices and foreign currencies.
Added in comm/propal/card.php as it was done in command/card.php for add and update.
---
 htdocs/comm/propal/card.php | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index da4c756705f..9461927bec5 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1116,7 +1116,17 @@ if (empty($reshook)) {
 
 			$date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
 			$date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
+			
+			// Prepare a price equivlanet for mimum price check
+			$pu_equivalent = $pu_ht;
+			$currency_tx = $object->multicurrency_tx;
 
+			// Check if we have a foreing currency
+			// If so, we update the pu_equiv as the equivalent price in base currency
+			if ($pu_ht == '' && $pu_ht_devise != '' && $currency_tx != '') {
+				$pu_equivalent = $pu_ht_devise * $currency_tx;
+			}
+			
 			// Local Taxes
 			$localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty, $tva_npr);
 			$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty, $tva_npr);
@@ -1125,8 +1135,9 @@ if (empty($reshook)) {
 			if ($tva_npr) {
 				$info_bits |= 0x01;
 			}
-
-			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS)) && (!empty($price_min) && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min)))) {
+			
+			// Check minimum price
+			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS)) && (!empty($price_min) && (price2num($pu_equivalent) * (1 - price2num($remise_percent) / 100) < price2num($price_min)))) {
 				$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency));
 				setEventMessages($mesg, null, 'errors');
 			} else {
@@ -1218,6 +1229,16 @@ if (empty($reshook)) {
 		$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);
+		
+		// Prepare pu_equivament for checking the minimun price
+		$pu_equivalent = $pu_ht;
+		$currency_tx = $object->multicurrency_tx;
+
+		// Check if we have a foreing currency
+		// If so, we update the pu_equiv as the equivalent price in base currency
+		if ($pu_ht == '' && $pu_ht_devise != '' && $currency_tx != '') {
+		 	$pu_equivalent = $pu_ht_devise * $currency_tx;
+		 }
 
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -1250,7 +1271,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 - $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_equivalent) * (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++;
 			}

From 50e2545bea8bbb7d3632fe54d81c655cb51831b7 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 25 Dec 2022 23:41:03 +0000
Subject: [PATCH 112/816] Fixing style errors.

---
 htdocs/comm/propal/card.php | 12 ++++++------
 htdocs/commande/card.php    |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 9461927bec5..4881209e386 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1116,7 +1116,7 @@ if (empty($reshook)) {
 
 			$date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
 			$date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
-			
+
 			// Prepare a price equivlanet for mimum price check
 			$pu_equivalent = $pu_ht;
 			$currency_tx = $object->multicurrency_tx;
@@ -1126,7 +1126,7 @@ if (empty($reshook)) {
 			if ($pu_ht == '' && $pu_ht_devise != '' && $currency_tx != '') {
 				$pu_equivalent = $pu_ht_devise * $currency_tx;
 			}
-			
+
 			// Local Taxes
 			$localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty, $tva_npr);
 			$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty, $tva_npr);
@@ -1135,7 +1135,7 @@ if (empty($reshook)) {
 			if ($tva_npr) {
 				$info_bits |= 0x01;
 			}
-			
+
 			// Check minimum price
 			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS)) && (!empty($price_min) && (price2num($pu_equivalent) * (1 - price2num($remise_percent) / 100) < price2num($price_min)))) {
 				$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency));
@@ -1229,7 +1229,7 @@ if (empty($reshook)) {
 		$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);
-		
+
 		// Prepare pu_equivament for checking the minimun price
 		$pu_equivalent = $pu_ht;
 		$currency_tx = $object->multicurrency_tx;
@@ -1237,8 +1237,8 @@ if (empty($reshook)) {
 		// Check if we have a foreing currency
 		// If so, we update the pu_equiv as the equivalent price in base currency
 		if ($pu_ht == '' && $pu_ht_devise != '' && $currency_tx != '') {
-		 	$pu_equivalent = $pu_ht_devise * $currency_tx;
-		 }
+			$pu_equivalent = $pu_ht_devise * $currency_tx;
+		}
 
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 051f047241a..e48b3183006 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -629,14 +629,14 @@ if (empty($reshook)) {
 			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
 		}
-		
+
 		$price_equivalent = $price_ht;
 		$currency_tx = $object->multicurrency_tx;
 
 		// Check if we have a foreing currency
 		// If so, we update the pu_equiv as the equivalent price in base currency
 		if ($price_ht == '' && $price_ht_devise != '' && $currency_tx != '') {
-		 	$price_equivalent = $price_ht_devise * $currency_tx;
+			$price_equivalent = $price_ht_devise * $currency_tx;
 		}
 
 		$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS');
@@ -999,14 +999,14 @@ if (empty($reshook)) {
 		$pu_ht = price2num(GETPOST('price_ht'), '', 2);
 		$vat_rate = (GETPOST('tva_tx') ?GETPOST('tva_tx') : 0);
 		$pu_ht_devise = price2num(GETPOST('multicurrency_subprice'), '', 2);
-		
+
 		$pu_equivalent = $pu_ht;
 		$currency_tx = $object->multicurrency_tx;
 
 		// Check if we have a foreing currency
 		// If so, we update the pu_equiv as the equivalent price in base currency
 		if ($pu_ht == '' && $pu_ht_devise != '' && $currency_tx != '') {
-		 	$pu_equivalent = $pu_ht_devise * $currency_tx;
+			$pu_equivalent = $pu_ht_devise * $currency_tx;
 		}
 
 		// Define info_bits

From ffae98085bcaa3b54e9d3439bff7e4ab71506fab Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Mon, 26 Dec 2022 22:36:05 +0100
Subject: [PATCH 113/816] New box box_members_by_tags.php

---
 htdocs/adherents/class/adherent.class.php     |   2 +-
 .../adherents/class/adherentstats.class.php   |  78 +++++
 htdocs/core/boxes/box_members_by_tags.php     | 279 ++++++++++++++++++
 htdocs/core/boxes/modules_boxes.php           |   1 +
 htdocs/langs/en_US/boxes.lang                 |   1 +
 5 files changed, 360 insertions(+), 1 deletion(-)
 create mode 100644 htdocs/core/boxes/box_members_by_tags.php

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 6aaac503060..15df4f7225d 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -3203,4 +3203,4 @@ class Adherent extends CommonObject
 
 		return $nbko;
 	}
-}
+}
\ No newline at end of file
diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
index 9aa2fe2e8ad..ed86cae8704 100644
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -181,4 +181,82 @@ class AdherentStats extends Stats
 
 		return $this->_getAllByYear($sql);
 	}
+
+
+
+	/**
+	 *	Return count of member by status group by adh type, total and average
+	 *
+	 *  @param		int		$numberYears    Years to scan
+	 * 	@return		array 	Array with total of draft, pending, uptodate, expired, resiliated for each member type
+	 */
+	public function countMembersByTagAndStatus($tag_id, $numberYears = 2)
+	{
+		global $user;
+
+		$now = dol_now();
+		$endYear = date('Y');
+		$startYear = $endYear - $numberYears;
+
+		$sql = "SELECT c.rowid as fk_categorie, c.label as label";
+		$sql .= ", COUNT(".$this->db->ifsql("d.statut = ".Adherent::STATUS_DRAFT, "'members_draft'", 'NULL').") as members_draft";
+		$sql .= ", COUNT(".$this->db->ifsql("d.statut = ".Adherent::STATUS_VALIDATED."  AND (d.datefin IS NULL AND t.subscription = '1')", "'members_pending'", 'NULL').") as members_pending";
+		$sql .= ", COUNT(".$this->db->ifsql("d.statut = ".Adherent::STATUS_VALIDATED."  AND (d.datefin >= '".$this->db->idate($now)."' OR t.subscription = 0)", "'members_uptodate'", 'NULL').") as members_uptodate";
+		$sql .= ", COUNT(".$this->db->ifsql("d.statut = ".Adherent::STATUS_VALIDATED."  AND (d.datefin < '".$this->db->idate($now)."' AND t.subscription = 1)", "'members_expired'", 'NULL').") as members_expired";
+		$sql .= ", COUNT(".$this->db->ifsql("d.statut = ".Adherent::STATUS_EXCLUDED, "'members_excluded'", 'NULL').") as members_excluded";
+		$sql .= ", COUNT(".$this->db->ifsql("d.statut = ".Adherent::STATUS_RESILIATED, "'members_resiliated'", 'NULL').") as members_resiliated";
+		$sql .= " FROM ".MAIN_DB_PREFIX."categorie as c";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_member as ct ON c.rowid = ct.fk_categorie";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent as d ON d.rowid = ct.fk_member";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_type as t ON t.rowid = d.fk_adherent_type";
+		$sql .= " WHERE c.entity IN (".getEntity('member_type').")";
+		$sql .= " AND d.entity IN (" . getEntity('adherent') . ")";
+		$sql .= " AND t.entity IN (" . getEntity('adherent') . ")";
+		$sql .= " AND d.datefin > '".$this->db->idate(dol_get_first_day($startYear))."'";
+		$sql .= " AND c.fk_parent = 0";
+		$sql .= " GROUP BY c.rowid";
+
+		dol_syslog("box_members_by_type::select nb of members per type", LOG_DEBUG);
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			$MembersCountArray = [];
+			$totalstatus = array(
+				'label' => 'Total',
+				'members_draft' => 0,
+				'members_pending' => 0,
+				'members_uptodate' => 0,
+				'members_expired' => 0,
+				'members_excluded' => 0,
+				'members_resiliated' => 0
+			);
+			while ($i < $num) {
+				$objp = $this->db->fetch_object($result);
+				$MembersCountArray[$objp->fk_categorie] = array(
+					'label' => $objp->label,
+					'members_draft' => (int) $objp->members_draft,
+					'members_pending' => (int) $objp->members_pending,
+					'members_uptodate' => (int) $objp->members_uptodate,
+					'members_expired' => (int) $objp->members_expired,
+					'members_excluded' => (int) $objp->members_excluded,
+					'members_resiliated' => (int) $objp->members_resiliated
+				);
+				$totalrow = 0;
+				foreach ($MembersCountArray[$objp->fk_categorie] as $key=>$nb) {
+					if ($key!='label') {
+						$totalrow += $nb;
+						$totalstatus[$key] += $nb;
+					}
+				}
+				$MembersCountArray[$objp->fk_categorie]['total_adhtype'] = $totalrow;
+				$i++;
+			}
+			$this->db->free($result);
+			$MembersCountArray['total'] = $totalstatus;
+			$MembersCountArray['total']['all'] = array_sum($totalstatus);
+		}
+		return $MembersCountArray;
+	}
 }
diff --git a/htdocs/core/boxes/box_members_by_tags.php b/htdocs/core/boxes/box_members_by_tags.php
new file mode 100644
index 00000000000..cd7a499c867
--- /dev/null
+++ b/htdocs/core/boxes/box_members_by_tags.php
@@ -0,0 +1,279 @@
+<?php
+/* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2015-2020 Frederic France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2021-2022 Waël Almoman         <info@almoman.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/core/boxes/box_members_by_tags.php
+ *	\ingroup    adherent
+ *	\brief      Module to show box of members
+ */
+
+include_once DOL_DOCUMENT_ROOT . '/core/boxes/modules_boxes.php';
+
+
+/**
+ * Class to manage the box to show last modofied members
+ */
+class box_members_by_tags extends ModeleBoxes
+{
+	public $boxcode = "box_members_by_tags";
+	public $boximg = "object_user";
+	public $boxlabel = "BoxTitleMembersByTags";
+	public $depends = array("adherent", "categorie");
+
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
+
+	public $param;
+	public $enabled = 1;
+
+	public $info_box_head = array();
+	public $info_box_contents = array();
+
+
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB	$db      	Database handler
+	 *  @param	string	$param		More parameters
+	 */
+	public function __construct($db, $param = '')
+	{
+		global $conf, $user;
+
+		$this->db = $db;
+
+		// disable module for such cases
+		$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
+		if (!in_array('adherent', $listofmodulesforexternal) && !empty($user->socid)) {
+			$this->enabled = 0; // disabled for external users
+		}
+
+		$this->hidden = !(isModEnabled('adherent') && $user->rights->adherent->lire);
+	}
+
+	/**
+	 *  Load data into info_box_contents array to show array later.
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $user, $langs, $conf;
+		$langs->load("boxes");
+
+		$this->max = $max;
+
+		include_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
+		$staticmember = new Adherent($this->db);
+
+		$year = date('Y');
+		$numberyears = empty(getDolGlobalInt("MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH")) ? 2 : getDolGlobalInt("MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH");
+
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleMembersByTags").' ('.$year-$numberyears.' - '.$year.')');
+
+		if ($user->rights->adherent->lire) {
+			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherentstats.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+			$stats = new AdherentStats($this->db, $user->socid, $user->id);
+
+			// Show array
+			$sumMembers= $stats->countMembersByTagAndStatus($tag_id, $numberyears);
+			echo "<pre>";print_r($sumMembers);echo "</pre>";
+			if ($sumMembers) {
+				$line = 0;
+				$this->info_box_contents[$line][] = array(
+					'td' => 'class=""',
+					'text' => '',
+				);
+				// Members Status To Valid
+				$labelstatus = $staticmember->LibStatut($staticmember::STATUS_DRAFT, 0, 0, 1);
+				$this->info_box_contents[$line][] = array(
+					'td' => 'class="right tdoverflowmax100" width="10%" title="'.dol_escape_htmltag($labelstatus).'"',
+					'text' => $labelstatus
+				);
+				// Waiting for subscription
+				$labelstatus = $staticmember->LibStatut($staticmember::STATUS_VALIDATED, 1, 0, 1);
+				$this->info_box_contents[$line][] = array(
+					'td' => 'class="right tdoverflowmax100" width="10%" title="'.dol_escape_htmltag($labelstatus).'"',
+					'text' => $labelstatus,
+				);
+				// Up to date
+				$labelstatus = $staticmember->LibStatut($staticmember::STATUS_VALIDATED, 1, dol_now() + 86400, 1);
+				$this->info_box_contents[$line][] = array(
+					'td' => 'class="right tdoverflowmax100" width="10%" title="'.dol_escape_htmltag($labelstatus).'"',
+					'text' => $labelstatus,
+				);
+				// Expired
+				$labelstatus = $staticmember->LibStatut($staticmember::STATUS_VALIDATED, 1, dol_now() - 86400, 1);
+				$this->info_box_contents[$line][] = array(
+					'td' => 'class="right tdoverflowmax100" width="10%" title="'.dol_escape_htmltag($labelstatus).'"',
+					'text' => $labelstatus
+				);
+				// Excluded
+				$labelstatus = $staticmember->LibStatut($staticmember::STATUS_EXCLUDED, 0, 0, 1);
+				$this->info_box_contents[$line][] = array(
+					'td' => 'class="right tdoverflowmax100" width="10%" title="'.dol_escape_htmltag($labelstatus).'"',
+					'text' => $labelstatus
+				);
+				// Resiliated
+				$labelstatus = $staticmember->LibStatut($staticmember::STATUS_RESILIATED, 0, 0, 1);
+				$this->info_box_contents[$line][] = array(
+					'td' => 'class="right tdoverflowmax100" width="10%" title="'.dol_escape_htmltag($labelstatus).'"',
+					'text' => $labelstatus
+				);
+				// Total row
+				$labelstatus = $staticmember->LibStatut($staticmember::STATUS_RESILIATED, 0, 0, 1);
+				$this->info_box_contents[$line][] = array(
+					'td' => 'class="right tdoverflowmax100" width="10%" title="'.dol_escape_htmltag($langs->trans("Total")).'"',
+					'text' => $langs->trans("Total")
+				);
+				$line++;
+				foreach ($sumMembers as $key => $data) {
+					$adhtype = new AdherentType($this->db);
+					$adhtype->id = $key;
+
+					if ($key=='total') {
+						break;
+					}
+					$adhtype->label = $data['label'];
+					$AdherentType[$key] = $adhtype;
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $adhtype->getNomUrl(1, dol_size(32)),
+						'asis' => 1,
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => (isset($data['members_draft']) && $data['members_draft'] > 0 ? $data['members_draft'] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_DRAFT, 1, 0, 3),
+						'asis' => 1,
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => (isset($data['members_pending']) && $data['members_pending'] > 0 ? $data['members_pending'] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_VALIDATED, 1, $now, 3),
+						'asis' => 1,
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => (isset($data['members_uptodate']) && $data['members_uptodate'] > 0 ? $data['members_uptodate'] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_VALIDATED, 0, 0, 3),
+						'asis' => 1,
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => (isset($data['members_expired']) && $data['members_expired'] > 0 ? $data['members_expired'] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_VALIDATED, 1, 1, 3),
+						'asis' => 1,
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => (isset($data['members_excluded']) && $data['members_excluded'] > 0 ? $data['members_excluded'] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_EXCLUDED, 1, $now, 3),
+						'asis' => 1,
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => (isset($data['members_resiliated']) && $data['members_resiliated'] > 0 ? $data['members_resiliated'] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_RESILIATED, 1, 0, 3),
+						'asis' => 1,
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => (isset($data['total_adhtype']) && $data['total_adhtype'] > 0 ? $data['total_adhtype'] : ''),
+						'asis' => 1,
+					);
+					$line++;
+				}
+
+				if (count($sumMembers) == 0) {
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center" colspan="6"',
+						'text' => $langs->trans("NoRecordedMembersByType")
+					);
+				} else {
+					$this->info_box_contents[$line][] = array(
+						'tr' => 'class="liste_total"',
+						'td' => 'class="liste_total"',
+						'text' => $langs->trans("Total")
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="liste_total right"',
+						'text' => $sumMembers['total']['members_draft'].' '.$staticmember->LibStatut(Adherent::STATUS_DRAFT, 1, 0, 3),
+						'asis' => 1
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="liste_total right"',
+						'text' => $sumMembers['total']['members_pending'].' '.$staticmember->LibStatut(Adherent::STATUS_VALIDATED, 1, $now, 3),
+						'asis' => 1
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="liste_total right"',
+						'text' => $sumMembers['total']['members_uptodate'].' '.$staticmember->LibStatut(Adherent::STATUS_VALIDATED, 0, 0, 3),
+						'asis' => 1
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="liste_total right"',
+						'text' => $sumMembers['total']['members_expired'].' '.$staticmember->LibStatut(Adherent::STATUS_VALIDATED, 1, 1, 3),
+						'asis' => 1
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="liste_total right"',
+						'text' => $sumMembers['total']['members_excluded'].' '.$staticmember->LibStatut(Adherent::STATUS_EXCLUDED, 1, 0, 3),
+						'asis' => 1
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="liste_total right"',
+						'text' => $sumMembers['total']['members_resiliated'].' '.$staticmember->LibStatut(Adherent::STATUS_RESILIATED, 1, 0, 3),
+						'asis' => 1
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="liste_total right"',
+						'text' => $sumMembers['total']['all'],
+						'asis' => 1
+					);
+				}
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength' => 500,
+					'text' => ($this->db->error() . ' sql=' . $sql)
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
+
+	/**
+	 *	Method to show box
+	 *
+	 *	@param	array	$head       Array with properties of box title
+	 *	@param  array	$contents   Array with properties of box lines
+	 *  @param	int		$nooutput	No print, only return string
+	 *	@return	string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
+}
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 1a29c8e1389..54ad02c0f3b 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -464,6 +464,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 				closedir($handle);
 			}
 		}
+		echo "<pre>";print_r($modules);echo "</pre>";
 
 		asort($orders);
 
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index 0ac1ecce545..9e80e36b119 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -24,6 +24,7 @@ BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Open accounts balance
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
 BoxTitleMembersByType=Members by type and status
+BoxTitleMembersByTags=Members by tags and status
 BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Products/Services: last %s modified

From 5b40a4a21097b2550063c228e0d020b7ffd63752 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 26 Dec 2022 21:37:33 +0000
Subject: [PATCH 114/816] 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 15df4f7225d..6aaac503060 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -3203,4 +3203,4 @@ class Adherent extends CommonObject
 
 		return $nbko;
 	}
-}
\ No newline at end of file
+}

From 5d09076a8faad01b77446ceb03d7ddcfd9f6bbe0 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Mon, 26 Dec 2022 22:56:26 +0100
Subject: [PATCH 115/816] Doc

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

diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
index ed86cae8704..20d66130362 100644
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -187,10 +187,10 @@ class AdherentStats extends Stats
 	/**
 	 *	Return count of member by status group by adh type, total and average
 	 *
-	 *  @param		int		$numberYears    Years to scan
-	 * 	@return		array 	Array with total of draft, pending, uptodate, expired, resiliated for each member type
+	 * 	@param		int	$numberYears    Years to scan
+	 * 	@return		array 	Array with total of draft, pending, uptodate, expired, resiliated for each member tag
 	 */
-	public function countMembersByTagAndStatus($tag_id, $numberYears = 2)
+	public function countMembersByTagAndStatus($numberYears = 2)
 	{
 		global $user;
 

From 7a15e61849fd66edb0b1a33de6f34b2d1b5f201a Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Mon, 26 Dec 2022 22:59:39 +0100
Subject: [PATCH 116/816] Clean code

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

diff --git a/htdocs/core/boxes/box_members_by_tags.php b/htdocs/core/boxes/box_members_by_tags.php
index cd7a499c867..196cec30738 100644
--- a/htdocs/core/boxes/box_members_by_tags.php
+++ b/htdocs/core/boxes/box_members_by_tags.php
@@ -98,8 +98,7 @@ class box_members_by_tags extends ModeleBoxes
 			$stats = new AdherentStats($this->db, $user->socid, $user->id);
 
 			// Show array
-			$sumMembers= $stats->countMembersByTagAndStatus($tag_id, $numberyears);
-			echo "<pre>";print_r($sumMembers);echo "</pre>";
+			$sumMembers= $stats->countMembersByTagAndStatus($numberyears);
 			if ($sumMembers) {
 				$line = 0;
 				$this->info_box_contents[$line][] = array(

From d0ea4760d9f8921c3e2761c84689f9c9b0904e4e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Dec 2022 02:38:40 +0100
Subject: [PATCH 117/816] Update perms.php

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

diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index 60f8c9d064a..8b1f6249d93 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -226,7 +226,7 @@ if ($result) {
 		// Tick
 		if ($obj->bydefault == 1) {
 			print '<td class="center">';
-			print '<a class="reposition" href="perms.php?pid='.$obj->id.'&amp;action=remove&token='.newToken().'">';
+			print '<a class="reposition" href="perms.php?pid='.$obj->id.'&action=remove&token='.newToken().'">';
 			//print img_edit_remove();
 			print img_picto('', 'switch_on');
 			print '</a>';

From f3d73690c6a8139590ff7db7b752909e72379deb Mon Sep 17 00:00:00 2001
From: Randall Mora <50120822+randallmoraes@users.noreply.github.com>
Date: Wed, 28 Dec 2022 08:29:55 -0600
Subject: [PATCH 118/816] Update notify.class.php

Allows modification of attachments using the hook
---
 htdocs/core/class/notify.class.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index 2a3a2b805da..c85339f7df8 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -658,6 +658,11 @@ class Notify
 
 						$reshook = $hookmanager->executeHooks('formatNotificationMessage', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 						if (empty($reshook)) {
+							if (!empty($hookmanager->resArray['files'])) {
+								$filename_list = $hookmanager->resArray['files']['file'];
+								$mimetype_list = $hookmanager->resArray['files']['mimefile'];
+								$mimefilename_list = $hookmanager->resArray['files']['filename'];
+							}
 							if (!empty($hookmanager->resArray['subject'])) {
 								$subject .= $hookmanager->resArray['subject'];
 							}
@@ -901,6 +906,11 @@ class Notify
 					$parameters = array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$filename_list, 'mimefile'=>$mimetype_list, 'filename'=>$mimefilename_list);
 					$reshook = $hookmanager->executeHooks('formatNotificationMessage', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 					if (empty($reshook)) {
+						if (!empty($hookmanager->resArray['files'])) {
+							$filename_list = $hookmanager->resArray['files']['file'];
+							$mimetype_list = $hookmanager->resArray['files']['mimefile'];
+							$mimefilename_list = $hookmanager->resArray['files']['filename'];
+						}
 						if (!empty($hookmanager->resArray['subject'])) {
 							$subject .= $hookmanager->resArray['subject'];
 						}

From 53912df6f2b8127c61cc215798f7fc27c6fc77af Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Dec 2022 15:49:03 +0100
Subject: [PATCH 119/816] FIX Warning not visible

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

diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index ae39569a36e..6869e80bd87 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -1480,20 +1480,22 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			print $string;
 			print '</td>';
 			// IBAN
-			print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($rib->iban).'">'.dol_escape_htmltag($rib->iban);
+			print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($rib->iban).'">';
 			if (!empty($rib->iban)) {
 				if (!checkIbanForAccount($rib)) {
-					print ' '.img_picto($langs->trans("IbanNotValid"), 'warning');
+					print img_picto($langs->trans("IbanNotValid"), 'warning').' ';
 				}
 			}
+			print dol_escape_htmltag($rib->iban);
 			print '</td>';
 			// BIC
-			print '<td>'.$rib->bic;
+			print '<td>';
 			if (!empty($rib->bic)) {
 				if (!checkSwiftForAccount($rib)) {
-					print ' '.img_picto($langs->trans("SwiftNotValid"), 'warning');
+					print img_picto($langs->trans("SwiftNotValid"), 'warning').' ';
 				}
 			}
+			print dol_escape_htmltag($rib->bic);
 			print '</td>';
 
 			if (!empty($conf->prelevement->enabled)) {

From 2aa271d96eea915d56f5230689b25b2a0ffe539c Mon Sep 17 00:00:00 2001
From: Eric Seigne <eric.seigne@cap-rel.fr>
Date: Wed, 28 Dec 2022 17:50:16 +0100
Subject: [PATCH 120/816] avoid editretainedwarranty if invoice is not draft

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index c0d7cf53a5d..d682a17d91b 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4517,13 +4517,13 @@ if ($action == 'create') {
 			print '<table id="retained-warranty-table" class="nobordernopadding" width="100%"><tr><td>';
 			print $langs->trans('RetainedWarranty');
 			print '</td>';
-			if ($action != 'editretainedwarranty' && $user->rights->facture->creer) {
+			if ($action != 'editretainedwarranty' && $user->rights->facture->creer && $object->statut == Facture::STATUS_DRAFT) {
 				print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarranty&amp;facid='.$object->id.'">'.img_edit($langs->trans('setretainedwarranty'), 1).'</a></td>';
 			}
 
 			print '</tr></table>';
 			print '</td><td>';
-			if ($action == 'editretainedwarranty') {
+			if ($action == 'editretainedwarranty' && $object->statut == Facture::STATUS_DRAFT) {
 				print '<form  id="retained-warranty-form"  method="POST" action="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'">';
 				print '<input type="hidden" name="action" value="setretainedwarranty">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -4540,7 +4540,7 @@ if ($action == 'create') {
 			print '<table id="retained-warranty-cond-reglement-table"  class="nobordernopadding" width="100%"><tr><td>';
 			print $langs->trans('PaymentConditionsShortRetainedWarranty');
 			print '</td>';
-			if ($action != 'editretainedwarrantypaymentterms' && $user->rights->facture->creer) {
+			if ($action != 'editretainedwarrantypaymentterms' && $user->rights->facture->creer && $object->statut == Facture::STATUS_DRAFT) {
 				print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarrantypaymentterms&amp;facid='.$object->id.'">'.img_edit($langs->trans('setPaymentConditionsShortRetainedWarranty'), 1).'</a></td>';
 			}
 
@@ -4551,7 +4551,7 @@ if ($action == 'create') {
 				$defaultDate = $object->date;
 			}
 
-			if ($action == 'editretainedwarrantypaymentterms') {
+			if ($action == 'editretainedwarrantypaymentterms' && $object->statut == Facture::STATUS_DRAFT) {
 				//date('Y-m-d',$object->date_lim_reglement)
 				print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'">';
 				print '<input type="hidden" name="action" value="setretainedwarrantyconditions">';
@@ -4575,7 +4575,7 @@ if ($action == 'create') {
 			print '<table id="retained-warranty-date-limit-table"  class="nobordernopadding" width="100%"><tr><td>';
 			print $langs->trans('RetainedWarrantyDateLimit');
 			print '</td>';
-			if ($action != 'editretainedwarrantydatelimit' && $user->rights->facture->creer) {
+			if ($action != 'editretainedwarrantydatelimit' && $user->rights->facture->creer && $object->statut == Facture::STATUS_DRAFT) {
 				print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarrantydatelimit&amp;facid='.$object->id.'">'.img_edit($langs->trans('setretainedwarrantyDateLimit'), 1).'</a></td>';
 			}
 
@@ -4586,7 +4586,7 @@ if ($action == 'create') {
 				$defaultDate = $object->date;
 			}
 
-			if ($action == 'editretainedwarrantydatelimit') {
+			if ($action == 'editretainedwarrantydatelimit' && $object->statut == Facture::STATUS_DRAFT) {
 				//date('Y-m-d',$object->date_lim_reglement)
 				print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'">';
 				print '<input type="hidden" name="action" value="setretainedwarrantydatelimit">';

From 39cf086ace24ffd79ef4072dc2022caa28df7d54 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Dec 2022 18:20:52 +0100
Subject: [PATCH 121/816] Update modules_boxes.php

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

diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 54ad02c0f3b..96928adfdff 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -464,7 +464,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 				closedir($handle);
 			}
 		}
-		echo "<pre>";print_r($modules);echo "</pre>";
+		//echo "<pre>";print_r($modules);echo "</pre>";
 
 		asort($orders);
 

From be03dcb8ceeb94f03958509e7070caa1ac1a8da5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Dec 2022 19:06:16 +0100
Subject: [PATCH 122/816] Fix strange condition

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index ca2418a0ab1..5e5198d6b4c 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2985,7 +2985,7 @@ class Product extends CommonObject
 					$adeduire = 0;
 					$sql = "SELECT sum(fd.qty) as count FROM ".MAIN_DB_PREFIX."facturedet fd ";
 					$sql .= " JOIN ".MAIN_DB_PREFIX."facture f ON fd.fk_facture = f.rowid ";
-					$sql .= " JOIN ".MAIN_DB_PREFIX."element_element el ON el.fk_target = f.rowid and el.targettype = 'facture' and sourcetype = 'commande'";
+					$sql .= " JOIN ".MAIN_DB_PREFIX."element_element el ON ((el.fk_target = f.rowid AND el.targettype = 'facture' AND sourcetype = 'commande') OR (el.fk_source = f.rowid AND el.targettype = 'commande' AND sourcetype = 'facture'))";
 					$sql .= " JOIN ".MAIN_DB_PREFIX."commande c ON el.fk_source = c.rowid ";
 					$sql .= " WHERE c.fk_statut IN (".$this->db->sanitize($filtrestatut).") AND c.facture = 0 AND fd.fk_product = ".((int) $this->id);
 					dol_syslog(__METHOD__.":: sql $sql", LOG_NOTICE);

From 934d7b46d01c3ae93d7fe50179dfb1c0376fab7f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Dec 2022 19:15:07 +0100
Subject: [PATCH 123/816] Update product.class.php

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 9cb7187a0ad..d9e09ce788d 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3091,9 +3091,9 @@ class Product extends CommonObject
 					// For every order having invoice already validated we need to decrease stock cause it's in physical stock
 					$adeduire = 0;
 					$sql = 'SELECT sum(fd.qty) as count FROM '.MAIN_DB_PREFIX.'facturedet fd ';
-					$sql .= ' JOIN '.MAIN_DB_PREFIX.'facture f ON fd.fk_facture = f.rowid ';
-					$sql .= ' JOIN '.MAIN_DB_PREFIX."element_element el ON ((el.fk_target = f.rowid AND el.targettype = 'facture' AND sourcetype = 'commande') OR (el.fk_source = f.rowid AND el.targettype = 'commande' AND sourcetype = 'facture'))";
-					$sql .= ' JOIN '.MAIN_DB_PREFIX.'commande c ON el.fk_source = c.rowid ';
+					$sql .= ' JOIN '.MAIN_DB_PREFIX.'facture as f ON fd.fk_facture = f.rowid ';
+					$sql .= ' JOIN '.MAIN_DB_PREFIX."element_element as el ON ((el.fk_target = f.rowid AND el.targettype = 'facture' AND sourcetype = 'commande') OR (el.fk_source = f.rowid AND el.targettype = 'commande' AND sourcetype = 'facture'))";
+					$sql .= ' JOIN '.MAIN_DB_PREFIX.'commande as c ON el.fk_source = c.rowid ';
 					$sql .= ' WHERE c.fk_statut IN ('.$this->db->sanitize($filtrestatut).') AND f.fk_statut > '.Facture::STATUS_DRAFT.' AND fd.fk_product = '.((int) $this->id);
 					dol_syslog(__METHOD__.":: sql $sql", LOG_NOTICE);
 					$resql = $this->db->query($sql);

From 572ba6d3e06b591c51dd7c0dd3d0ec7f6592248e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Dec 2022 19:15:46 +0100
Subject: [PATCH 124/816] Update product.class.php

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index d9e09ce788d..0271e0c0d2c 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3070,7 +3070,7 @@ class Product extends CommonObject
 			if (!empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
 				if (!empty($conf->global->DECREASE_ONLY_UNINVOICEDPRODUCTS)) {
 					$adeduire = 0;
-					$sql = "SELECT sum(fd.qty) as count FROM ".$this->db->prefix()."facturedet fd ";
+					$sql = "SELECT sum(fd.qty) as count FROM ".$this->db->prefix()."facturedet as fd ";
 					$sql .= " JOIN ".$this->db->prefix()."facture as f ON fd.fk_facture = f.rowid ";
 					$sql .= " JOIN ".$this->db->prefix()."element_element as el ON ((el.fk_target = f.rowid AND el.targettype = 'facture' AND sourcetype = 'commande') OR (el.fk_source = f.rowid AND el.targettype = 'commande' AND sourcetype = 'facture'))";
 					$sql .= " JOIN ".$this->db->prefix()."commande as c ON el.fk_source = c.rowid ";
@@ -3090,7 +3090,7 @@ class Product extends CommonObject
 
 					// For every order having invoice already validated we need to decrease stock cause it's in physical stock
 					$adeduire = 0;
-					$sql = 'SELECT sum(fd.qty) as count FROM '.MAIN_DB_PREFIX.'facturedet fd ';
+					$sql = 'SELECT sum(fd.qty) as count FROM '.MAIN_DB_PREFIX.'facturedet as fd ';
 					$sql .= ' JOIN '.MAIN_DB_PREFIX.'facture as f ON fd.fk_facture = f.rowid ';
 					$sql .= ' JOIN '.MAIN_DB_PREFIX."element_element as el ON ((el.fk_target = f.rowid AND el.targettype = 'facture' AND sourcetype = 'commande') OR (el.fk_source = f.rowid AND el.targettype = 'commande' AND sourcetype = 'facture'))";
 					$sql .= ' JOIN '.MAIN_DB_PREFIX.'commande as c ON el.fk_source = c.rowid ';

From 582d9ac514bd94632a8eea47fe39e25844cb0365 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Dec 2022 19:22:34 +0100
Subject: [PATCH 125/816] Update product.class.php

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 0271e0c0d2c..f17a128544a 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3005,7 +3005,7 @@ class Product extends CommonObject
 	 *
 	 * @param  int    $socid           Id societe pour filtrer sur une societe
 	 * @param  string $filtrestatut    Id statut pour filtrer sur un statut
-	 * @param  int    $forVirtualStock Ignore rights filter for virtual stock calculation.
+	 * @param  int    $forVirtualStock Ignore rights filter for virtual stock calculation. Set when load_stats_commande is used for virtual stock calculation.
 	 * @return integer                 Array of stats in $this->stats_commande (nb=nb of order, qty=qty ordered), <0 if ko or >0 if ok
 	 */
 	public function load_stats_commande($socid = 0, $filtrestatut = '', $forVirtualStock = 0)
@@ -3065,10 +3065,10 @@ class Product extends CommonObject
 			}
 
 			// If stock decrease is on invoice validation, the theorical stock continue to
-			// count the orders to ship in theorical stock when some are already removed b invoice validation.
-			// If option DECREASE_ONLY_UNINVOICEDPRODUCTS is on, we make a compensation.
-			if (!empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
+			// count the orders to ship in theorical stock when some are already removed by invoice validation.
+			if ($forVirtualStock && !empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
 				if (!empty($conf->global->DECREASE_ONLY_UNINVOICEDPRODUCTS)) {
+					// If option DECREASE_ONLY_UNINVOICEDPRODUCTS is on, we make a compensation but only if order not yet invoice.
 					$adeduire = 0;
 					$sql = "SELECT sum(fd.qty) as count FROM ".$this->db->prefix()."facturedet as fd ";
 					$sql .= " JOIN ".$this->db->prefix()."facture as f ON fd.fk_facture = f.rowid ";
@@ -3086,6 +3086,7 @@ class Product extends CommonObject
 
 					$this->stats_commande['qty'] -= $adeduire;
 				} else {
+					// If option DECREASE_ONLY_UNINVOICEDPRODUCTS is off, we make a compensation with lines of invoices linked to the order
 					include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 					// For every order having invoice already validated we need to decrease stock cause it's in physical stock

From ec95c6402452d45557e1be939fdd9ea730330de1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Dec 2022 23:20:42 +0100
Subject: [PATCH 126/816] Clean code

---
 htdocs/accountancy/admin/categories.php                   | 3 ++-
 htdocs/categories/viewcat.php                             | 2 +-
 htdocs/core/menus/standard/eldy.lib.php                   | 2 +-
 htdocs/core/modules/modMrp.class.php                      | 2 +-
 .../mailings/mailinglist_mymodule_myobject.modules.php    | 8 ++++----
 htdocs/mrp/lib/mrp.lib.php                                | 2 +-
 htdocs/recruitment/admin/setup.php                        | 3 +--
 htdocs/recruitment/admin/setup_candidatures.php           | 3 +--
 htdocs/recruitment/lib/recruitment.lib.php                | 4 ++--
 9 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php
index 87e6a3b490c..442c0d6763b 100644
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2016       Jamal Elbaz         <jamelbaz@gmail.pro>
  * Copyright (C) 2017-2022  Alexandre Spangaro  <aspangaro@open-dsi.fr>
+ * 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
@@ -31,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 $error = 0;
 
 // Load translation files required by the page
-$langs->loadLangs(array("bills", "accountancy"));
+$langs->loadLangs(array("bills", "accountancy", "compta"));
 
 $id = GETPOST('id', 'int');
 $cancel = GETPOST('cancel', 'alpha');
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 329c9473cc7..6f09e734406 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 // Load translation files required by the page
-$langs->load("categories");
+$langs->loadLangs(array("categories", "compta"));
 
 $id         = GETPOST('id', 'int');
 $label      = GETPOST('label', 'alpha');
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 398aa6421a7..fece6df98ec 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1622,7 +1622,6 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 				$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->hasRight('accounting',  'chartofaccount'), '', $mainmenu, 'accountancy_admin_bank', 70);
@@ -1640,6 +1639,7 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 				if ($conf->global->MAIN_FEATURES_LEVEL > 1) {
 					$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/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', 125);
 				$newmenu->add("/accountancy/admin/export.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ExportOptions"), 1, $user->hasRight('accounting',  'chartofaccount'), '', $mainmenu, 'accountancy_admin_export', 130);
 			}
 
diff --git a/htdocs/core/modules/modMrp.class.php b/htdocs/core/modules/modMrp.class.php
index fb836c8393b..58e7791845a 100644
--- a/htdocs/core/modules/modMrp.class.php
+++ b/htdocs/core/modules/modMrp.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2004-2018  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2018-2019  Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
- * Copyright (C) 2019 Alicealalalamdskfldmjgdfgdfhfghgfh Adminson <testldr9@dolicloud.com>
+ * Copyright (C) 2019       Destailleur Laurent     <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
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 7b2c4e2ab5a..ad0814f7b4d 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
@@ -104,9 +104,9 @@ class mailing_mailinglist_mymodule_myobject extends MailingTargets
 		$target = array();
 		$j = 0;
 
-		$sql = " select rowid as id, email, firstname, lastname, plan, partner";
+		$sql = " select rowid as id, label, firstname, lastname";
 		$sql .= " from ".MAIN_DB_PREFIX."myobject";
-		$sql .= " where email IS NOT NULL AND email != ''";
+		$sql .= " where email IS NOT NULL AND email <> ''";
 		if (GETPOSTISSET('filter') && GETPOST('filter', 'alphanohtml') != 'none') {
 			$sql .= " AND status = '".$this->db->escape(GETPOST('filter', 'alphanohtml'))."'";
 		}
@@ -129,10 +129,10 @@ class mailing_mailinglist_mymodule_myobject extends MailingTargets
 						'name' => $obj->lastname,
 						'id' => $obj->id,
 						'firstname' => $obj->firstname,
-						'other' => $obj->plan.';'.$obj->partner,
+						'other' => $obj->label,
 						'source_url' => $this->url($obj->id),
 						'source_id' => $obj->id,
-						'source_type' => 'dolicloud'
+						'source_type' => 'myobject@mymodule'
 					);
 					$old = $obj->email;
 					$j++;
diff --git a/htdocs/mrp/lib/mrp.lib.php b/htdocs/mrp/lib/mrp.lib.php
index 854244e53c7..55ec94ef097 100644
--- a/htdocs/mrp/lib/mrp.lib.php
+++ b/htdocs/mrp/lib/mrp.lib.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2019 Alicealalalamdskfldmjgdfgdfhfghgfh Adminson <testldr9@dolicloud.com>
+/* Copyright (C) 2019 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
diff --git a/htdocs/recruitment/admin/setup.php b/htdocs/recruitment/admin/setup.php
index 517bbca5c19..120c476de90 100644
--- a/htdocs/recruitment/admin/setup.php
+++ b/htdocs/recruitment/admin/setup.php
@@ -1,6 +1,5 @@
 <?php
-/* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2020 Adminson Alicealalalamdskfldmjgdfgdfhfghgfh <testldr9@dolicloud.com>
+/* Copyright (C) 2004-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
diff --git a/htdocs/recruitment/admin/setup_candidatures.php b/htdocs/recruitment/admin/setup_candidatures.php
index adc12a656f4..b53fff4213a 100644
--- a/htdocs/recruitment/admin/setup_candidatures.php
+++ b/htdocs/recruitment/admin/setup_candidatures.php
@@ -1,6 +1,5 @@
 <?php
-/* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2020 Adminson Alicealalalamdskfldmjgdfgdfhfghgfh <testldr9@dolicloud.com>
+/* Copyright (C) 2004-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
diff --git a/htdocs/recruitment/lib/recruitment.lib.php b/htdocs/recruitment/lib/recruitment.lib.php
index 6fa58cc64f5..911c6abdb03 100644
--- a/htdocs/recruitment/lib/recruitment.lib.php
+++ b/htdocs/recruitment/lib/recruitment.lib.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2020 Adminson Alicealalalamdskfldmjgdfgdfhfghgfh <testldr9@dolicloud.com>
- * Copyright (C) 2022       Frédéric France             <frederic.france@netlogic.fr>
+/* Copyright (C) 2019   Laurent Destailleur     <eldy@users.sourceforge.net>
+ * 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

From f7f140f003eb0b7e10bb929b054d9f1d640efc3c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Dec 2022 23:39:46 +0100
Subject: [PATCH 127/816] css

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

diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 385c105451e..244b6f72330 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -430,7 +430,7 @@ foreach ($list_binding as $key) {
 		print $form->selectDate((!empty($conf->global->$key) ? $db->idate($conf->global->$key) : -1), $key, 0, 0, 1);
 	} elseif ($key == 'ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER') {
 		$array = array(0=>$langs->trans("PreviousMonth"), 1=>$langs->trans("CurrentMonth"), 2=>$langs->trans("Fiscalyear"));
-		print $form->selectarray($key, $array, (isset($conf->global->ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER) ? $conf->global->ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER : 0));
+		print $form->selectarray($key, $array, (isset($conf->global->ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER) ? $conf->global->ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER : 0), 0, 0, 0, '', 0, 0, 0, '', 'onrightofpage');
 	} else {
 		print '<input type="text" class="maxwidth100" id="'.$key.'" name="'.$key.'" value="'.getDolGlobalString($key).'">';
 	}

From aa5419cfb53626010970a5a6339bd33e298cb6a2 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Thu, 29 Dec 2022 16:10:53 +0100
Subject: [PATCH 128/816] update in modulbuilder for menu object

---
 htdocs/modulebuilder/index.php                | 58 +++++++++++++++++--
 .../core/modules/modMyModule.class.php        |  2 +-
 2 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 8b87d84c10e..eeb016db6b6 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -1344,12 +1344,12 @@ if ($dirins && $action == 'initobject' && $module && $objectname) {
             // 0=Menu for internal users, 1=external users, 2=both
             'user'=>2
         );\n";
-			$stringtoadd = preg_replace('/MyObject/', $objectnameloop, $stringtoadd);
+			$stringtoadd = preg_replace('/MyObject/', $objectname, $stringtoadd);
 			$stringtoadd = preg_replace('/mymodule/', strtolower($module), $stringtoadd);
-			$stringtoadd = preg_replace('/myobject/', strtolower($objectnameloop), $stringtoadd);
+			$stringtoadd = preg_replace('/myobject/', strtolower($objectname), $stringtoadd);
 
 			$moduledescriptorfile = $destdir.'/core/modules/mod'.$module.'.class.php';
-
+		}
 			// TODO Allow a replace with regex using dolReplaceInFile with param arryreplacementisregex to 1
 			// TODO Avoid duplicate addition
 
@@ -1357,7 +1357,6 @@ if ($dirins && $action == 'initobject' && $module && $objectname) {
 
 			// Add module descriptor to list of files to replace "MyObject' string with real name of object.
 			$filetogenerate[] = 'core/modules/mod'.$module.'.class.php';
-		}
 	}
 
 	if (!$error) {
@@ -1377,7 +1376,7 @@ if ($dirins && $action == 'initobject' && $module && $objectname) {
 				'htdocs/modulebuilder/template/'=>strtolower($modulename),
 				'myobject'=>strtolower($objectname),
 				'MyObject'=>$objectname,
-				'MYOBJECT'=>strtoupper($objectname),
+				//'MYOBJECT'=>strtoupper($objectname),
 				'---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
 			);
 
@@ -1730,6 +1729,55 @@ if ($dirins && $action == 'confirm_deleteobject' && $objectname) {
 			'core/modules/mymodule/doc/pdf_standard_myobject.modules.php'=>'core/modules/'.strtolower($module).'/doc/pdf_standard_'.strtolower($objectname).'.modules.php'
 		);
 
+		//menu for the object selected
+		$stringtoedit = "\$this->menu[\$r++]=array(
+            // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+            'fk_menu'=>'fk_mainmenu=".strtolower($module)."',
+            // This is a Left menu entry
+            'type'=>'left',
+            'titre'=>'List ".ucfirst($objectname)."',
+            'mainmenu'=>'".strtolower($module)."',
+            'leftmenu'=>'".strtolower($module)."_".strtolower($objectname)."',
+            'url'=>'/".strtolower($module)."/".strtolower($objectname)."_list.php',
+            // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+            'langs'=>'".strtolower($module)."@".strtolower($module)."',
+            'position'=>1100+\$r,
+            // Define condition to show or hide menu entry. Use '\$conf->".strtolower($module)."->enabled' if entry must be visible if module is enabled. Use '\$leftmenu==\'system\'' to show if leftmenu system is selected.
+            'enabled'=>'\$conf->".strtolower($module)."->enabled',
+            // Use 'perms'=>'\$user->rights->".strtolower($module)."->level1->level2' if you want your menu with a permission rules
+            'perms'=>'1',
+            'target'=>'',
+            // 0=Menu for internal users, 1=external users, 2=both
+            'user'=>2,
+        );
+        \$this->menu[\$r++]=array(
+            // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+            'fk_menu'=>'fk_mainmenu=".strtolower($module).",fk_leftmenu=".strtolower($module)."_".strtolower($objectname)."',
+            // This is a Left menu entry
+            'type'=>'left',
+            'titre'=>'New ".ucfirst($objectname)."',
+            'mainmenu'=>'".strtolower($module)."',
+            'leftmenu'=>'".strtolower($module)."_".strtolower($objectname)."',
+            'url'=>'/".strtolower($module)."/".strtolower($objectname)."_card.php?action=create',
+            // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+            'langs'=>'".strtolower($module)."@".strtolower($module)."',
+            'position'=>1100+\$r,
+            // Define condition to show or hide menu entry. Use '\$conf->".strtolower($module)."->enabled' if entry must be visible if module is enabled. Use '\$leftmenu==\'system\'' to show if leftmenu system is selected.
+            'enabled'=>'\$conf->".strtolower($module)."->enabled',
+            // Use 'perms'=>'\$user->rights->".strtolower($module)."->level1->level2' if you want your menu with a permission rules
+            'perms'=>'1',
+            'target'=>'',
+            // 0=Menu for internal users, 1=external users, 2=both
+            'user'=>2
+        );";
+
+		$moduledescriptorfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
+
+		$check = dolReplaceInFile($moduledescriptorfile, array($stringtoedit => ''));
+		if ($check > 0) {
+			dolReplaceInFile($moduledescriptorfile, array('/*'.strtoupper($objectname).'*/' => ''));
+		}
+
 		$resultko = 0;
 		foreach ($filetodelete as $filetodelete) {
 			$resulttmp = dol_delete_file($dir.'/'.$filetodelete, 0, 0, 1);
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index 99cd900b512..2788c78fc37 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -348,7 +348,7 @@ class modMyModule extends DolibarrModules
 			'target'=>'',
 			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
 		);
-		END MODULEBUILDER LEFTMENU MYOBJECT */
+		/* END MODULEBUILDER LEFTMENU MYOBJECT */
 		// Exports profiles provided by this module
 		$r = 1;
 		/* BEGIN MODULEBUILDER EXPORT MYOBJECT */

From a7c2d723158916e1e73b4e28063a202df2b5ab11 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 29 Dec 2022 13:28:36 +0100
Subject: [PATCH 129/816] NEW Can filter on a custom group of accounts. Perf or
 ledger list.

---
 htdocs/accountancy/admin/card.php             |   4 +-
 htdocs/accountancy/admin/categories.php       |   2 +-
 htdocs/accountancy/bookkeeping/list.php       |  83 ++++++--
 .../accountancy/bookkeeping/listbyaccount.php |  53 +++--
 .../class/accountancycategory.class.php       | 127 ++++++------
 .../accountancy/class/bookkeeping.class.php   | 181 ++++++++++--------
 .../core/class/html.formaccounting.class.php  |   4 +-
 htdocs/langs/en_US/accountancy.lang           |   2 +-
 8 files changed, 277 insertions(+), 179 deletions(-)

diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index 97d2509b898..43d1852c720 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -282,7 +282,7 @@ if ($action == 'create') {
 	print $form->textwithpicto($langs->trans("AccountingCategory"), $langs->transnoentitiesnoconv("AccountingAccountGroupsDesc"));
 	print '</td>';
 	print '<td>';
-	$formaccounting->select_accounting_category($object->account_category, 'account_category', 1, 0, 1);
+	print $formaccounting->select_accounting_category($object->account_category, 'account_category', 1, 0, 1);
 	print '</td></tr>';
 
 	print '</table>';
@@ -359,7 +359,7 @@ if ($action == 'create') {
 			print $form->textwithpicto($langs->trans("AccountingCategory"), $langs->transnoentitiesnoconv("AccountingAccountGroupsDesc"));
 			print '</td>';
 			print '<td>';
-			$formaccounting->select_accounting_category($object->account_category, 'account_category', 1);
+			print $formaccounting->select_accounting_category($object->account_category, 'account_category', 1);
 			print '</td></tr>';
 
 			print '</table>';
diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php
index 442c0d6763b..3414c36cd52 100644
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -111,7 +111,7 @@ print '<table class="border centpercent">';
 // Select the category
 print '<tr><td class="titlefield">'.$langs->trans("AccountingCategory").'</td>';
 print '<td>';
-$formaccounting->select_accounting_category($cat_id, 'account_category', 1, 0, 0, 0);
+print $formaccounting->select_accounting_category($cat_id, 'account_category', 1, 0, 0, 0);
 print '<input type="submit" class="button small" value="'.$langs->trans("Select").'">';
 print '</td></tr>';
 
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 9590c3551cf..ac1cc93cba7 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -102,7 +102,9 @@ if (GETPOST("button_export_file_x") || GETPOST("button_export_file.x") || GETPOS
 	$action = 'export_file';
 }
 
-$search_accountancy_code = GETPOST("search_accountancy_code");
+$search_account_category = GETPOST('search_account_category', 'int');
+
+$search_accountancy_code = GETPOST("search_accountancy_code", 'alpha');
 $search_accountancy_code_start = GETPOST('search_accountancy_code_start', 'alpha');
 if ($search_accountancy_code_start == - 1) {
 	$search_accountancy_code_start = '';
@@ -253,6 +255,7 @@ if (empty($reshook)) {
 		$search_doc_type = '';
 		$search_doc_ref = '';
 		$search_doc_date = '';
+		$search_account_category = '';
 		$search_accountancy_code = '';
 		$search_accountancy_code_start = '';
 		$search_accountancy_code_end = '';
@@ -335,6 +338,20 @@ if (empty($reshook)) {
 		$filter['t.doc_ref'] = $search_doc_ref;
 		$param .= '&search_doc_ref='.urlencode($search_doc_ref);
 	}
+	if ($search_account_category != '-1' && !empty($search_account_category)) {
+		require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancycategory.class.php';
+		$accountingcategory = new AccountancyCategory($db);
+
+		$listofaccountsforgroup = $accountingcategory->getCptsCat(0, 'fk_accounting_category = '.((int) $search_account_category));
+		$listofaccountsforgroup2 = array();
+		if (is_array($listofaccountsforgroup)) {
+			foreach ($listofaccountsforgroup as $tmpval) {
+				$listofaccountsforgroup2[] = $tmpval['id'];
+			}
+		}
+		$filter['t.search_accounting_code_in'] = join(',', $listofaccountsforgroup2);
+		$param .= '&search_account_category='.urlencode($search_account_category);
+	}
 	if (!empty($search_accountancy_code)) {
 		$filter['t.numero_compte'] = $search_accountancy_code;
 		$param .= '&search_accountancy_code='.urlencode($search_accountancy_code);
@@ -642,6 +659,9 @@ $sql .= " t.tms as date_modification,";
 $sql .= " t.date_export,";
 $sql .= " t.date_validated as date_validation,";
 $sql .= " t.import_key";
+
+$sqlfields = $sql; // $sql fields to remove for count total
+
 $sql .= ' FROM '.MAIN_DB_PREFIX.$object->table_element.' as t';
 // Manage filter
 $sqlwhere = array();
@@ -672,7 +692,13 @@ if (count($filter) > 0) {
 		} elseif ($key == 't.reconciled_option') {
 			$sqlwhere[] = 't.lettering_code IS NULL';
 		} elseif ($key == 't.code_journal' && !empty($value)) {
-			$sqlwhere[] = natural_search("t.code_journal", join(',', $value), 3, 1);
+			if (is_array($value)) {
+				$sqlwhere[] = natural_search("t.code_journal", join(',', $value), 3, 1);
+			} else {
+				$sqlwhere[] = natural_search("t.code_journal", $value, 3, 1);
+			}
+		} elseif ($key == 't.search_accounting_code_in' && !empty($value)) {
+			$sqlwhere[] = 't.numero_compte IN ('.$value.')';
 		} else {
 			$sqlwhere[] = natural_search($key, $value, 0, 1);
 		}
@@ -685,9 +711,6 @@ if (empty($conf->global->ACCOUNTING_REEXPORT)) {
 if (count($sqlwhere) > 0) {
 	$sql .= ' AND '.implode(' AND ', $sqlwhere);
 }
-if (!empty($sortfield)) {
-	$sql .= $db->order($sortfield, $sortorder);
-}
 //print $sql;
 
 
@@ -783,28 +806,38 @@ $title_page = $langs->trans("Operations").' - '.$langs->trans("Journals");
 // Count total nb of records
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-	$resql = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($resql);
-	if (($page * $limit) > $nbtotalofrecords) {	// if total of record found is smaller than page * limit, goto and load page 0
+	/* The fast and low memory method to get and count full list converts the sql into a sql count */
+	$sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
+	$sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount);
+	$resql = $db->query($sqlforcount);
+	if ($resql) {
+		$objforcount = $db->fetch_object($resql);
+		$nbtotalofrecords = $objforcount->nbtotalofrecords;
+	} else {
+		dol_print_error($db);
+	}
+
+	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
+	$db->free($resql);
 }
-// if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
-if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords) {
-	$num = $nbtotalofrecords;
-} else {
+
+// Complete request and execute it with limit
+$sql .= $db->order($sortfield, $sortorder);
+if ($limit) {
 	$sql .= $db->plimit($limit + 1, $offset);
-
-	$resql = $db->query($sql);
-	if (!$resql) {
-		dol_print_error($db);
-		exit;
-	}
-
-	$num = $db->num_rows($resql);
 }
 
+$resql = $db->query($sql);
+if (!$resql) {
+	dol_print_error($db);
+	exit;
+}
+
+$num = $db->num_rows($resql);
+
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 // Output page
@@ -997,6 +1030,12 @@ if ($massactionbutton && $contextpage != 'poslist') {
 }
 
 $moreforfilter = '';
+$moreforfilter .= '<div class="divsearchfield">';
+$moreforfilter .= $langs->trans('AccountingCategory').': ';
+$moreforfilter .= '<div class="nowrap inline-block">';
+$moreforfilter .= $formaccounting->select_accounting_category($search_account_category, 'search_account_category', 1, 0, 0, 0);
+$moreforfilter .= '</div>';
+$moreforfilter .= '</div>';
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
@@ -1006,6 +1045,10 @@ if (empty($reshook)) {
 	$moreforfilter = $hookmanager->resPrint;
 }
 
+print '<div class="liste_titre liste_titre_bydiv centpercent">';
+print $moreforfilter;
+print '</div>';
+
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste centpercent">';
 
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 4a6e37ceb29..c24e509ff60 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -79,7 +79,8 @@ $search_date_validation_start = dol_mktime(0, 0, 0, $search_date_validation_star
 $search_date_validation_end = dol_mktime(23, 59, 59, $search_date_validation_endmonth, $search_date_validation_endday, $search_date_validation_endyear);
 $search_import_key = GETPOST("search_import_key", 'alpha');
 
-$search_accountancy_code = GETPOST("search_accountancy_code");
+$search_account_category = GETPOST('search_account_category', 'int');
+
 $search_accountancy_code_start = GETPOST('search_accountancy_code_start', 'alpha');
 if ($search_accountancy_code_start == - 1) {
 	$search_accountancy_code_start = '';
@@ -198,6 +199,8 @@ if (!$user->hasRight('accounting', 'mouvements', 'lire')) {
 	accessforbidden();
 }
 
+$error = 0;
+
 
 /*
  * Action
@@ -224,7 +227,7 @@ if (empty($reshook)) {
 
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 		$search_doc_date = '';
-		$search_accountancy_code = '';
+		$search_account_category = '';
 		$search_accountancy_code_start = '';
 		$search_accountancy_code_end = '';
 		$search_label_account = '';
@@ -280,6 +283,20 @@ if (empty($reshook)) {
 		$filter['t.doc_date'] = $search_doc_date;
 		$param .= '&doc_datemonth='.GETPOST('doc_datemonth', 'int').'&doc_dateday='.GETPOST('doc_dateday', 'int').'&doc_dateyear='.GETPOST('doc_dateyear', 'int');
 	}
+	if ($search_account_category != '-1' && !empty($search_account_category)) {
+		require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancycategory.class.php';
+		$accountingcategory = new AccountancyCategory($db);
+
+		$listofaccountsforgroup = $accountingcategory->getCptsCat(0, 'fk_accounting_category = '.((int) $search_account_category));
+		$listofaccountsforgroup2 = array();
+		if (is_array($listofaccountsforgroup)) {
+			foreach ($listofaccountsforgroup as $tmpval) {
+				$listofaccountsforgroup2[] = $tmpval['id'];
+			}
+		}
+		$filter['t.search_accounting_code_in'] = join(',', $listofaccountsforgroup2);
+		$param .= '&search_account_category='.urlencode($search_account_category);
+	}
 	if (!empty($search_accountancy_code_start)) {
 		if ($type == 'sub') {
 			$filter['t.subledger_account>='] = $search_accountancy_code_start;
@@ -358,7 +375,6 @@ if (empty($reshook)) {
 		$filter['t.import_key'] = $search_import_key;
 		$param .= '&search_import_key='.urlencode($search_import_key);
 	}
-
 	// param with type of list
 	$url_param = substr($param, 1); // remove first "&"
 	if (!empty($type)) {
@@ -544,25 +560,29 @@ llxHeader('', $title_page);
 // List
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+	// TODO Perf Replace this by a count
 	if ($type == 'sub') {
-		$nbtotalofrecords = $object->fetchAllByAccount($sortorder, $sortfield, 0, 0, $filter, 'AND', 1);
+		$nbtotalofrecords = $object->fetchAllByAccount($sortorder, $sortfield, 0, 0, $filter, 'AND', 1, 1);
 	} else {
-		$nbtotalofrecords = $object->fetchAllByAccount($sortorder, $sortfield, 0, 0, $filter);
+		$nbtotalofrecords = $object->fetchAllByAccount($sortorder, $sortfield, 0, 0, $filter, 'AND', 0, 1);
 	}
 
 	if ($nbtotalofrecords < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
+		$error++;
 	}
 }
 
-if ($type == 'sub') {
-	$result = $object->fetchAllByAccount($sortorder, $sortfield, $limit, $offset, $filter, 'AND', 1);
-} else {
-	$result = $object->fetchAllByAccount($sortorder, $sortfield, $limit, $offset, $filter);
-}
+if (!$error) {
+	if ($type == 'sub') {
+		$result = $object->fetchAllByAccount($sortorder, $sortfield, $limit, $offset, $filter, 'AND', 1);
+	} else {
+		$result = $object->fetchAllByAccount($sortorder, $sortfield, $limit, $offset, $filter, 'AND', 0);
+	}
 
-if ($result < 0) {
-	setEventMessages($object->error, $object->errors, 'errors');
+	if ($result < 0) {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
 }
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
@@ -711,7 +731,7 @@ if ($type == 'sub') {
 
 $moreforfilter = '';
 
-// Accountancy account
+// Search on accountancy custom groups or account
 $moreforfilter .= '<div class="divsearchfield">';
 $moreforfilter .= $langs->trans('AccountAccounting').': ';
 $moreforfilter .= '<div class="nowrap inline-block">';
@@ -729,6 +749,13 @@ if ($type == 'sub') {
 $moreforfilter .= '</div>';
 $moreforfilter .= '</div>';
 
+$moreforfilter .= '<div class="divsearchfield">';
+$moreforfilter .= $langs->trans('AccountingCategory').': ';
+$moreforfilter .= '<div class="nowrap inline-block">';
+$moreforfilter .= $formaccounting->select_accounting_category($search_account_category, 'search_account_category', 1, 0, 0, 0);
+$moreforfilter .= '</div>';
+$moreforfilter .= '</div>';
+
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index 2f6c71dde7f..74626aa61e0 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -605,60 +605,6 @@ class AccountancyCategory // extends CommonObject
 		}
 	}
 
-	/**
-	 * Function to know all custom groupd from an accounting account
-	 *
-	 * @return array|integer       Result in table (array), -1 if KO
-	 */
-	public function getCatsCpts()
-	{
-		global $mysoc, $conf;
-
-		if (empty($mysoc->country_id)) {
-			dol_print_error('', 'Call to select_accounting_account with mysoc country not yet defined');
-			exit();
-		}
-
-		$sql = "SELECT t.rowid, t.account_number, t.label as account_label, cat.code, cat.position, cat.label as name_cat, cat.sens ";
-		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as t, ".MAIN_DB_PREFIX."c_accounting_category as cat";
-		$sql .= " WHERE t.fk_accounting_category IN ( SELECT c.rowid ";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
-		$sql .= " WHERE c.active = 1";
-		$sql .= " AND c.entity = ".$conf->entity;
-		$sql .= " AND (c.fk_country = ".((int) $mysoc->country_id)." OR c.fk_country = 0)";
-		$sql .= " AND cat.rowid = t.fk_accounting_category";
-		$sql .= " AND t.entity = ".$conf->entity;
-		$sql .= " ORDER BY cat.position ASC";
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$i = 0;
-			$obj = '';
-			$num = $this->db->num_rows($resql);
-			$data = array();
-			if ($num) {
-				while ($obj = $this->db->fetch_object($resql)) {
-					$name_cat = $obj->name_cat;
-					$data[$name_cat][$i] = array(
-							'id' => $obj->rowid,
-							'code' => $obj->code,
-							'position' => $obj->position,
-							'account_number' => $obj->account_number,
-							'account_label' => $obj->account_label,
-							'sens' => $obj->sens
-					);
-					$i++;
-				}
-			}
-			return $data;
-		} else {
-			$this->error = "Error ".$this->db->lasterror();
-			dol_syslog(__METHOD__." ".$this->error, LOG_ERR);
-
-			return -1;
-		}
-	}
-
 	/**
 	 * Function to show result of an accounting account from the ledger with a direction and a period
 	 *
@@ -734,12 +680,75 @@ class AccountancyCategory // extends CommonObject
 		}
 	}
 
+	/**
+	 * Function to get an array of all active custom groups (llx_c_accunting_categories) with their accounts from the chart of account (ll_accounting_acount)
+	 *
+	 * @param	int				$catid		Custom group ID
+	 * @return 	array|integer   		    Result in table (array), -1 if KO
+	 * @see getCats(), getCptsCat()
+	 */
+	public function getCatsCpts($catid = 0)
+	{
+		global $mysoc, $conf;
+
+		if (empty($mysoc->country_id)) {
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(__METHOD__." ".$this->error, LOG_ERR);
+			return -1;
+		}
+
+		$sql = "SELECT t.rowid, t.account_number, t.label as account_label,";
+		$sql .= " cat.code, cat.position, cat.label as name_cat, cat.sens, cat.category_type, cat.formula";
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as t, ".MAIN_DB_PREFIX."c_accounting_category as cat";
+		$sql .= " WHERE t.fk_accounting_category IN (SELECT c.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
+		$sql .= " WHERE c.active = 1";
+		$sql .= " AND c.entity = ".$conf->entity;
+		$sql .= " AND (c.fk_country = ".((int) $mysoc->country_id)." OR c.fk_country = 0)";
+		$sql .= " AND cat.rowid = t.fk_accounting_category";
+		$sql .= " AND t.entity = ".$conf->entity;
+		if ($catid > 0) {
+			$sql .= " AND cat.rowid = ".((int) $catid);
+		}
+		$sql .= " ORDER BY cat.position ASC";
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$obj = '';
+			$num = $this->db->num_rows($resql);
+			$data = array();
+			if ($num) {
+				while ($obj = $this->db->fetch_object($resql)) {
+					$name_cat = $obj->name_cat;
+					$data[$name_cat][$obj->rowid] = array(
+						'id' => $obj->rowid,
+						'code' => $obj->code,
+						'label' => $obj->label,
+						'position' => $obj->position,
+						'category_type' => $obj->category_type,
+						'formula' => $obj->formula,
+						'sens' => $obj->sens,
+						'account_number' => $obj->account_number,
+						'account_label' => $obj->account_label
+					);
+				}
+			}
+			return $data;
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(__METHOD__." ".$this->error, LOG_ERR);
+			return -1;
+		}
+	}
+
 	/**
 	 * Return list of custom groups.
+	 * For list + detail of accounting account, see getCatsCpt()
 	 *
 	 * @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
+	 * @see getCatsCpts(), getCptsCat()
 	 */
 	public function getCats($categorytype = -1, $active = 1)
 	{
@@ -774,9 +783,10 @@ class AccountancyCategory // extends CommonObject
 							'rowid' => $obj->rowid,
 							'code' => $obj->code,
 							'label' => $obj->label,
-							'formula' => $obj->formula,
 							'position' => $obj->position,
 							'category_type' => $obj->category_type,
+							'formula' => $obj->formula,
+							'sens' => $obj->sens,
 							'bc' => $obj->sens
 					);
 					$i++;
@@ -794,12 +804,15 @@ class AccountancyCategory // extends CommonObject
 
 
 	/**
-	 * Get all accounting account of a custom group (or a list of custom groups).
+	 * Get all accounting account of a given custom group (or a list of custom groups).
 	 * You must choose between first parameter (personalized group) or the second (free criteria filter)
 	 *
 	 * @param 	int 		$cat_id 				Id if personalized accounting group/category
-	 * @param 	string 		$predefinedgroupwhere 	Sql criteria filter to select accounting accounts. This value must not come from an input of a user.
+	 * @param 	string 		$predefinedgroupwhere 	Sql criteria filter to select accounting accounts. This value must be sanitized and not come from an input of a user.
+	 * 												Example: "pcg_type = 'EXPENSE' AND fk_pcg_version = 'xx'"
+	 * 												Example: "fk_accounting_category = 99"
 	 * @return 	array|int							Array of accounting accounts or -1 if error
+	 * @see getCats(), getCatsCpts()
 	 */
 	public function getCptsCat($cat_id, $predefinedgroupwhere = '')
 	{
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 95ba38d20bb..0458250489f 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -817,56 +817,61 @@ class BookKeeping extends CommonObject
 
 
 	/**
-	 * Load object in memory from the database
+	 * Load object in memory from the database in ->lines. Or just make a simple count if $countonly=1.
 	 *
-	 * @param string $sortorder Sort Order
-	 * @param string $sortfield Sort field
-	 * @param int $limit offset limit
-	 * @param int $offset offset limit
-	 * @param array $filter filter array
-	 * @param string $filtermode filter mode (AND or OR)
-	 * @param int $option option (0: general account or 1: subaccount)
-	 *
-	 * @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)
+	 * @param 	int 	$option 		option (0: general account or 1: subaccount)
+	 * @param	int		$countonly		Do not fill the $object->lines, return only the count.
+	 * @return 	int 					<0 if KO, Number of lines if OK
 	 */
-	public function fetchAllByAccount($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND', $option = 0)
+	public function fetchAllByAccount($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND', $option = 0, $countonly = 0)
 	{
 		global $conf;
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$this->lines = array();
+		$num = 0;
 
 		$sql = 'SELECT';
-		$sql .= ' t.rowid,';
-		$sql .= " t.doc_date,";
-		$sql .= " t.doc_type,";
-		$sql .= " t.doc_ref,";
-		$sql .= " t.fk_doc,";
-		$sql .= " t.fk_docdet,";
-		$sql .= " t.thirdparty_code,";
-		$sql .= " t.subledger_account,";
-		$sql .= " t.subledger_label,";
-		$sql .= " t.numero_compte,";
-		$sql .= " t.label_compte,";
-		$sql .= " t.label_operation,";
-		$sql .= " t.debit,";
-		$sql .= " t.credit,";
-		$sql .= " t.montant as amount,";
-		$sql .= " t.sens,";
-		$sql .= " t.multicurrency_amount,";
-		$sql .= " t.multicurrency_code,";
-		$sql .= " t.lettering_code,";
-		$sql .= " t.date_lettering,";
-		$sql .= " t.fk_user_author,";
-		$sql .= " t.import_key,";
-		$sql .= " t.code_journal,";
-		$sql .= " t.journal_label,";
-		$sql .= " t.piece_num,";
-		$sql .= " t.date_creation,";
-		$sql .= " t.date_export,";
-		$sql .= " t.date_validated as date_validation,";
-		$sql .= " t.import_key";
+		if ($countonly) {
+			$sql .= ' COUNT(t.rowid) as nb';
+		} else {
+			$sql .= ' t.rowid,';
+			$sql .= " t.doc_date,";
+			$sql .= " t.doc_type,";
+			$sql .= " t.doc_ref,";
+			$sql .= " t.fk_doc,";
+			$sql .= " t.fk_docdet,";
+			$sql .= " t.thirdparty_code,";
+			$sql .= " t.subledger_account,";
+			$sql .= " t.subledger_label,";
+			$sql .= " t.numero_compte,";
+			$sql .= " t.label_compte,";
+			$sql .= " t.label_operation,";
+			$sql .= " t.debit,";
+			$sql .= " t.credit,";
+			$sql .= " t.montant as amount,";
+			$sql .= " t.sens,";
+			$sql .= " t.multicurrency_amount,";
+			$sql .= " t.multicurrency_code,";
+			$sql .= " t.lettering_code,";
+			$sql .= " t.date_lettering,";
+			$sql .= " t.fk_user_author,";
+			$sql .= " t.import_key,";
+			$sql .= " t.code_journal,";
+			$sql .= " t.journal_label,";
+			$sql .= " t.piece_num,";
+			$sql .= " t.date_creation,";
+			$sql .= " t.date_export,";
+			$sql .= " t.date_validated as date_validation,";
+			$sql .= " t.import_key";
+		}
 		// Manage filter
 		$sqlwhere = array();
 		if (count($filter) > 0) {
@@ -880,7 +885,7 @@ class BookKeeping extends CommonObject
 				} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
 					$sqlwhere[] = $key.'='.$value;
 				} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
-					$sqlwhere[] = $key.' LIKE \''.$this->db->escape($value).'%\'';
+					$sqlwhere[] = $key.' LIKE \''.$this->db->escapeforlike($this->db->escape($value)).'%\'';
 				} elseif ($key == 't.date_creation>=' || $key == 't.date_creation<=') {
 					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
 				} elseif ($key == 't.date_export>=' || $key == 't.date_export<=') {
@@ -897,18 +902,19 @@ class BookKeeping extends CommonObject
 					} else {
 						$sqlwhere[] = natural_search("t.code_journal", $value, 3, 1);
 					}
+				} elseif ($key == 't.search_accounting_code_in' && !empty($value)) {
+					$sqlwhere[] = 't.numero_compte IN ('.$value.')';
 				} else {
 					$sqlwhere[] = natural_search($key, $value, 0, 1);
 				}
 			}
 		}
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-		$sql .= ' WHERE 1 = 1';
-		$sql .= " AND entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
+		$sql .= ' WHERE entity = ' . ((int) $conf->entity); // Do not use getEntity for accounting features
 		if (count($sqlwhere) > 0) {
 			$sql .= " AND ".implode(" ".$filtermode." ", $sqlwhere);
 		}
-		// Affichage par compte comptable
+		// Filter by ledger account or subledger account
 		if (!empty($option)) {
 			$sql .= " AND t.subledger_account IS NOT NULL";
 			$sql .= " AND t.subledger_account <> ''";
@@ -919,54 +925,63 @@ class BookKeeping extends CommonObject
 			$sortorder = 'ASC'.($sortorder ? ','.$sortorder : '');
 		}
 
-		$sql .= $this->db->order($sortfield, $sortorder);
-		if (!empty($limit)) {
-			$sql .= $this->db->plimit($limit + 1, $offset);
+		if (!$countonly) {
+			$sql .= $this->db->order($sortfield, $sortorder);
+			if (!empty($limit)) {
+				$sql .= $this->db->plimit($limit + 1, $offset);
+			}
 		}
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
-			$num = $this->db->num_rows($resql);
+			if ($countonly) {
+				$obj = $this->db->fetch_object($resql);
+				if ($obj) {
+					$num = $obj->nb;
+				}
+			} else {
+				$num = $this->db->num_rows($resql);
 
-			$i = 0;
-			while (($obj = $this->db->fetch_object($resql)) && (empty($limit) || $i < min($limit, $num))) {
-				$line = new BookKeepingLine();
+				$i = 0;
+				while (($obj = $this->db->fetch_object($resql)) && (empty($limit) || $i < min($limit, $num))) {
+					$line = new BookKeepingLine();
 
-				$line->id = $obj->rowid;
+					$line->id = $obj->rowid;
 
-				$line->doc_date = $this->db->jdate($obj->doc_date);
-				$line->doc_type = $obj->doc_type;
-				$line->doc_ref = $obj->doc_ref;
-				$line->fk_doc = $obj->fk_doc;
-				$line->fk_docdet = $obj->fk_docdet;
-				$line->thirdparty_code = $obj->thirdparty_code;
-				$line->subledger_account = $obj->subledger_account;
-				$line->subledger_label = $obj->subledger_label;
-				$line->numero_compte = $obj->numero_compte;
-				$line->label_compte = $obj->label_compte;
-				$line->label_operation = $obj->label_operation;
-				$line->debit = $obj->debit;
-				$line->credit = $obj->credit;
-				$line->montant = $obj->amount; // deprecated
-				$line->amount = $obj->amount;
-				$line->sens = $obj->sens;
-				$line->multicurrency_amount = $obj->multicurrency_amount;
-				$line->multicurrency_code = $obj->multicurrency_code;
-				$line->lettering_code = $obj->lettering_code;
-				$line->date_lettering = $obj->date_lettering;
-				$line->fk_user_author = $obj->fk_user_author;
-				$line->import_key = $obj->import_key;
-				$line->code_journal = $obj->code_journal;
-				$line->journal_label = $obj->journal_label;
-				$line->piece_num = $obj->piece_num;
-				$line->date_creation = $this->db->jdate($obj->date_creation);
-				$line->date_export = $this->db->jdate($obj->date_export);
-				$line->date_validation = $this->db->jdate($obj->date_validation);
-				$line->import_key = $obj->import_key;
+					$line->doc_date = $this->db->jdate($obj->doc_date);
+					$line->doc_type = $obj->doc_type;
+					$line->doc_ref = $obj->doc_ref;
+					$line->fk_doc = $obj->fk_doc;
+					$line->fk_docdet = $obj->fk_docdet;
+					$line->thirdparty_code = $obj->thirdparty_code;
+					$line->subledger_account = $obj->subledger_account;
+					$line->subledger_label = $obj->subledger_label;
+					$line->numero_compte = $obj->numero_compte;
+					$line->label_compte = $obj->label_compte;
+					$line->label_operation = $obj->label_operation;
+					$line->debit = $obj->debit;
+					$line->credit = $obj->credit;
+					$line->montant = $obj->amount; // deprecated
+					$line->amount = $obj->amount;
+					$line->sens = $obj->sens;
+					$line->multicurrency_amount = $obj->multicurrency_amount;
+					$line->multicurrency_code = $obj->multicurrency_code;
+					$line->lettering_code = $obj->lettering_code;
+					$line->date_lettering = $obj->date_lettering;
+					$line->fk_user_author = $obj->fk_user_author;
+					$line->import_key = $obj->import_key;
+					$line->code_journal = $obj->code_journal;
+					$line->journal_label = $obj->journal_label;
+					$line->piece_num = $obj->piece_num;
+					$line->date_creation = $this->db->jdate($obj->date_creation);
+					$line->date_export = $this->db->jdate($obj->date_export);
+					$line->date_validation = $this->db->jdate($obj->date_validation);
+					$line->import_key = $obj->import_key;
 
-				$this->lines[] = $line;
+					$this->lines[] = $line;
 
-				$i++;
+					$i++;
+				}
 			}
 			$this->db->free($resql);
 
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 8ebac3611cb..545d0da67a1 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -224,7 +224,7 @@ class FormAccounting extends Form
 	 * 	@param	int		$maxlen			Max length of text in combo box
 	 * 	@param	int		$help			Add or not the admin help picto
 	 *  @param  int     $allcountries   All countries
-	 * 	@return	void
+	 * 	@return	string					HTML component with the select
 	 */
 	public function select_accounting_category($selected = '', $htmlname = 'account_category', $useempty = 0, $maxlen = 0, $help = 1, $allcountries = 0)
 	{
@@ -295,7 +295,7 @@ class FormAccounting extends Form
 
 		$out .= ajax_combobox($htmlname, array());
 
-		print $out;
+		return $out;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index b6bf1b90aef..03af44134e2 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -217,7 +217,7 @@ Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Custom group
+AccountingCategory=Custom group of accounts
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.

From 474dd5197ff24dd61d60539bfa48cb0c998717d1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 29 Dec 2022 17:06:39 +0100
Subject: [PATCH 130/816] Fix tooltip in report

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

diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index 3f3e14e2d61..cb2158bb48b 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -320,9 +320,9 @@ if ($modecompta == 'CREANCES-DETTES') {
 				print '<tr class="liste_total">';
 
 				// Year NP
-				print '<td class="liste_total width200">';
+				print '<td class="liste_total tdoverflowmax100" title="'.dol_escape_htmltag($cat['code']).'">';
 				print dol_escape_htmltag($cat['code']);
-				print '</td><td>';
+				print '</td><td class="tdoverflowmax150" title="'.dol_escape_htmltag($cat['label']).'">';
 				print dol_escape_htmltag($cat['label']);
 				print '</td>';
 
@@ -399,8 +399,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 				print "</tr>\n";
 
 				//var_dump($sommes);
-			} else // normal category
-			{
+			} else { // normal category
 				$code = $cat['code']; // Category code we process
 
 				$totCat = array();
@@ -478,37 +477,38 @@ if ($modecompta == 'CREANCES-DETTES') {
 
 				// Now output columns for row $code ('VTE', 'MAR', ...)
 
-				print "<tr>";
+				print '<tr class="trforbreak">';
 
 				// Column group
-				print '<td class="width200">';
+				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($cat['code']).'">';
 				print dol_escape_htmltag($cat['code']);
 				print '</td>';
 
 				// Label of group
-				print '<td>';
-				print dol_escape_htmltag($cat['label']);
+				$labeltoshow = dol_escape_htmltag($cat['label']);
 				if (count($cpts) > 0 && !empty($cpts[0])) {    // Show example of 5 first accounting accounts
 					$i = 0;
 					foreach ($cpts as $cpt) {
 						if ($i > 5) {
-							print '...)';
+							$labeltoshow .= '...)';
 							break;
 						}
 						if ($i > 0) {
-							print ', ';
+							$labeltoshow .= ', ';
 						} else {
-							print ' (';
+							$labeltoshow .= ' (';
 						}
-						print dol_escape_htmltag($cpt['account_number']);
+						$labeltoshow .= dol_escape_htmltag($cpt['account_number']);
 						$i++;
 					}
 					if ($i <= 5) {
-						print ')';
+						$labeltoshow .= ')';
 					}
 				} else {
-					print ' - <span class="warning">'.$langs->trans("GroupIsEmptyCheckSetup").'</span>';
+					$labeltoshow .= ' - <span class="warning">'.$langs->trans("GroupIsEmptyCheckSetup").'</span>';
 				}
+				print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag(dol_string_nohtmltag($labeltoshow)).'">';
+				print $labeltoshow;
 				print '</td>';
 
 				print '<td class="right"><span class="amount">'.price($totCat['NP']).'</span></td>';

From 13a19037dd8f3df460bfe735a4b533df2b275c9c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 29 Dec 2022 17:23:56 +0100
Subject: [PATCH 131/816] NEW sort of column of custom group of account

---
 htdocs/accountancy/admin/categories.php | 41 +++++++++++++++++--------
 htdocs/compta/resultat/result.php       |  6 ++--
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php
index 3414c36cd52..2a15921243f 100644
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -45,6 +45,26 @@ if ($cat_id == 0) {
 	$cat_id = null;
 }
 
+// Load variable for pagination
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	// If $page is not defined, or '' or -1 or if we click on clear filters
+	$page = 0;
+}
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
+if (empty($sortfield)) {
+	$sortfield = 'account_number';
+}
+if (empty($sortorder)) {
+	$sortorder = 'ASC';
+}
+
 // Security check
 if (!$user->hasRight('accounting', 'chartofaccount')) {
 	accessforbidden();
@@ -137,14 +157,6 @@ if (!empty($cat_id)) {
 	if (is_array($accountingcategory->lines_cptbk) && count($accountingcategory->lines_cptbk) > 0) {
 		print img_picto($langs->trans("AccountingAccount"), 'accounting_account', 'class="pictofixedwith"');
 		print $form->multiselectarray('cpt_bk', $arraykeyvalue, GETPOST('cpt_bk', 'array'), null, null, '', 0, "80%", '', '', $langs->transnoentitiesnoconv("AddAccountFromBookKeepingWithNoCategories"));
-		//print '<br>';
-		/*print '<select class="flat minwidth200" size="8" name="cpt_bk[]" multiple>';
-		foreach ( $accountingcategory->lines_cptbk as $cpt ) {
-			print '<option value="' . length_accountg($cpt->numero_compte) . '">' . length_accountg($cpt->numero_compte) . ' (' . $cpt->label_compte . ' ' . $cpt->doc_ref . ')</option>';
-		}
-		print '</select><br>';
-		print ajax_combobox('cpt_bk');
-		*/
 		print '<input type="submit" class="button button-add small" id="" class="action-delete" value="'.$langs->trans("Add").'"> ';
 	}
 }
@@ -152,13 +164,16 @@ if (!empty($cat_id)) {
 print '</form>';
 
 
-if ($action == 'display' || $action == 'delete') {
+if ((empty($action) || $action == 'display' || $action == 'delete') && $cat_id > 0) {
+	$param = 'account_category='.((int) $cat_id);
+
 	print '<br>';
 	print '<table class="noborder centpercent">'."\n";
 	print '<tr class="liste_titre">';
-	print '<td class="liste_titre">'.$langs->trans("AccountAccounting")."</td>";
-	print '<td class="liste_titre" colspan="2">'.$langs->trans("Label")."</td>";
-	print "</tr>\n";
+	print getTitleFieldOfList('AccountAccounting', 0, $_SERVER['PHP_SELF'], 'account_number', '', $param, '', $sortfield, $sortorder, '')."\n";
+	print getTitleFieldOfList('Label', 0, $_SERVER['PHP_SELF'], 'label', '', $param, '', $sortfield, $sortorder, '')."\n";
+	print getTitleFieldOfList('', 0, $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, '')."\n";
+	print '</tr>'."\n";
 
 	if (!empty($cat_id)) {
 		$return = $accountingcategory->display($cat_id); // This load ->lines_display
@@ -167,6 +182,8 @@ if ($action == 'display' || $action == 'delete') {
 		}
 
 		if (is_array($accountingcategory->lines_display) && count($accountingcategory->lines_display) > 0) {
+			$accountingcategory->lines_display = dol_sort_array($accountingcategory->lines_display, $sortfield, $sortorder, 1, 0, 1);
+
 			foreach ($accountingcategory->lines_display as $cpt) {
 				print '<tr class="oddeven">';
 				print '<td>'.length_accountg($cpt->account_number).'</td>';
diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index cb2158bb48b..4bbb20b18a1 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -322,7 +322,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 				// Year NP
 				print '<td class="liste_total tdoverflowmax100" title="'.dol_escape_htmltag($cat['code']).'">';
 				print dol_escape_htmltag($cat['code']);
-				print '</td><td class="tdoverflowmax150" title="'.dol_escape_htmltag($cat['label']).'">';
+				print '</td><td class="tdoverflowmax250" title="'.dol_escape_htmltag($cat['label']).'">';
 				print dol_escape_htmltag($cat['label']);
 				print '</td>';
 
@@ -507,7 +507,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 				} else {
 					$labeltoshow .= ' - <span class="warning">'.$langs->trans("GroupIsEmptyCheckSetup").'</span>';
 				}
-				print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag(dol_string_nohtmltag($labeltoshow)).'">';
+				print '<td class="tdoverflowmax250" title="'.dol_escape_htmltag(dol_string_nohtmltag($labeltoshow)).'">';
 				print $labeltoshow;
 				print '</td>';
 
@@ -537,7 +537,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 						if ($showaccountdetail == 'all' || $resultN != 0) {
 							print '<tr>';
 							print '<td></td>';
-							print '<td class="tdoverflowmax200">';
+							print '<td class="tdoverflowmax250">';
 							print ' &nbsp; &nbsp; '.length_accountg($cpt['account_number']);
 							print ' - ';
 							print $cpt['account_label'];

From 429b38a2e64ef4cf753580ece0c63c9847df4518 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 29 Dec 2022 17:45:40 +0100
Subject: [PATCH 132/816] Fix sort

---
 htdocs/accountancy/admin/categories_list.php | 38 ++++++++++++--------
 htdocs/compta/resultat/result.php            |  2 +-
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 0e7bd908c9a..755a5a88aed 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -444,15 +444,37 @@ if ($search_country_id > 0) {
 if ($sortfield == 'country') {
 	$sortfield = 'country_code';
 }
+if (empty($sortfield)) {
+	$sortfield = 'position';
+}
+
 $sql .= $db->order($sortfield, $sortorder);
 $sql .= $db->plimit($listlimit + 1, $offset);
 //print $sql;
 
 $fieldlist = explode(',', $tabfield[$id]);
 
+$param = '&id='.$id;
+if ($search_country_id > 0) {
+	$param .= '&search_country_id='.urlencode($search_country_id);
+}
+$paramwithsearch = $param;
+if ($sortorder) {
+	$paramwithsearch .= '&sortorder='.urlencode($sortorder);
+}
+if ($sortfield) {
+	$paramwithsearch .= '&sortfield='.urlencode($sortfield);
+}
+if (GETPOST('from', 'alpha')) {
+	$paramwithsearch .= '&from='.urlencode(GETPOST('from', 'alpha'));
+}
+
 print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
+print '<input type="hidden" name="sortfield" value="'.dol_escape_htmltag($sortfield).'">';
+print '<input type="hidden" name="sortorder" value="'.dol_escape_htmltag($sortorder).'">';
+
 
 print '<div class="div-table-responsive">';
 print '<table class="noborder centpercent">';
@@ -571,20 +593,6 @@ if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
-	$param = '&id='.$id;
-	if ($search_country_id > 0) {
-		$param .= '&search_country_id='.urlencode($search_country_id);
-	}
-	$paramwithsearch = $param;
-	if ($sortorder) {
-		$paramwithsearch .= '&sortorder='.$sortorder;
-	}
-	if ($sortfield) {
-		$paramwithsearch .= '&sortfield='.$sortfield;
-	}
-	if (GETPOST('from', 'alpha')) {
-		$paramwithsearch .= '&from='.GETPOST('from', 'alpha');
-	}
 	// There is several pages
 	if ($num > $listlimit) {
 		print '<tr class="none"><td class="right" colspan="'.(3 + count($fieldlist)).'">';
@@ -822,7 +830,7 @@ if ($resql) {
 				}
 
 				// Link to setup the group
-				print '<td class="center">';
+				print '<td>';
 				if (empty($obj->formula)) {
 					print '<a href="'.DOL_URL_ROOT.'/accountancy/admin/categories.php?action=display&save_lastsearch_values=1&account_category='.$obj->rowid.'">';
 					print $langs->trans("ListOfAccounts");
diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index 4bbb20b18a1..07a82fc92ac 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -477,7 +477,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 
 				// Now output columns for row $code ('VTE', 'MAR', ...)
 
-				print '<tr class="trforbreak">';
+				print '<tr'.($showaccountdetail != 'no' ? ' class="trforbreak"' : '').'>';
 
 				// Column group
 				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($cat['code']).'">';

From 6db9425657e51e27c23a31066e71bc7bc7d058c0 Mon Sep 17 00:00:00 2001
From: Fabrice Mouhartem <fabrice.mouhartem@ens-lyon.org>
Date: Thu, 29 Dec 2022 17:54:15 +0100
Subject: [PATCH 133/816] Fixed some grammar in the French error translation
 file

---
 htdocs/langs/fr_FR/errors.lang | 85 ++++++++++++++++++----------------
 1 file changed, 45 insertions(+), 40 deletions(-)

diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index d407d7c91b8..0a2cde05bb8 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -14,6 +14,7 @@ ErrorLoginAlreadyExists=L'identifiant %s existe déjà.
 ErrorGroupAlreadyExists=Le groupe %s existe déjà.
 ErrorEmailAlreadyExists=L'e-mail %s existe déjà.
 ErrorRecordNotFound=Enregistrement non trouvé.
+ErrorRecordNotFoundShort=Non trouvé
 ErrorFailToCopyFile=Echec de la copie du fichier '<b>%s</b>' en '<b>%s</b>'.
 ErrorFailToCopyDir=Echec de copie du répertoire '<b>%s</b>' vers '<b>%s</b>'.
 ErrorFailToRenameFile=Echec du renommage du fichier '<b>%s</b>' en '<b>%s</b>'.
@@ -32,28 +33,28 @@ ForbiddenBySetupRules=Interdit par les règles de configuration
 ErrorProdIdIsMandatory=Le %s est obligatoire
 ErrorAccountancyCodeCustomerIsMandatory=Le code comptable du client %s est obligatoire
 ErrorBadCustomerCodeSyntax=La syntaxe du code client est incorrecte
-ErrorBadBarCodeSyntax=Mauvaise syntaxe pour le code barre. Peut être que vous avez défini un mauvais type de code-barres ou que vous avez défini un masque de code à barres pour la numérotation qui ne correspond pas à la valeur scannée.
+ErrorBadBarCodeSyntax=Mauvaise syntaxe pour le code-barres. Peut être que vous avez défini un mauvais type de code-barres ou que vous avez défini un masque de code à barres pour la numérotation qui ne correspond pas à la valeur scannée.
 ErrorCustomerCodeRequired=Code client obligatoire
-ErrorBarCodeRequired=Code-barre requis
+ErrorBarCodeRequired=Code-barres requis
 ErrorCustomerCodeAlreadyUsed=Code client déjà utilisé
-ErrorBarCodeAlreadyUsed=Code-barre déjà utilisé
-ErrorPrefixRequired=Préfix obligatoire
+ErrorBarCodeAlreadyUsed=Code-barres déjà utilisé
+ErrorPrefixRequired=Préfixe obligatoire
 ErrorBadSupplierCodeSyntax=Mauvaise syntaxe pour le code fournisseur
 ErrorSupplierCodeRequired=Code fournisseur obligatoire
 ErrorSupplierCodeAlreadyUsed=Code fournisseur déjà utilisé
 ErrorBadParameters=Paramètres incorrects
 ErrorWrongParameters=Paramètres incorrects ou manquants
 ErrorBadValueForParameter=Valeur '%s' incorrecte pour le paramètre '%s'
-ErrorBadImageFormat=Cet image est dans un format non pris en charge (Votre PHP ne prend pas en charge les fonctions de conversion de ce format d'image).
+ErrorBadImageFormat=Cette image est dans un format non pris en charge (Votre PHP ne prend pas en charge les fonctions de conversion de ce format d'image).
 ErrorBadDateFormat=La valeur '%s' a un format de date non reconnu
-ErrorWrongDate=La date est incorrecte
+ErrorWrongDate=La date est incorrecte !
 ErrorFailedToWriteInDir=Impossible d'écrire dans le répertoire %s
 ErrorFailedToBuildArchive=Échec de la création du fichier d'archive %s
 ErrorFoundBadEmailInFile=Syntaxe d'email incorrecte trouvée pour %s lignes dans le fichier (exemple ligne %s avec email=%s)
 ErrorUserCannotBeDelete=L'utilisateur ne peut pas être supprimé. Peut-être est-il associé à des éléments de Dolibarr.
 ErrorFieldsRequired=Des champs obligatoire n'ont pas été remplis.
 ErrorSubjectIsRequired=L'objet de l'e-mail est obligatoire
-ErrorFailedToCreateDir=Echec à la création d'un répertoire. Vérifiez que le user du serveur Web ait bien les droits d'écriture dans les répertoires documents de Dolibarr. Si le paramètre <b>safe_mode</b> a été activé sur ce PHP, vérifiez que les fichiers php dolibarr appartiennent à l'utilisateur du serveur Web.
+ErrorFailedToCreateDir=Echec à la création d'un répertoire. Vérifiez que l'utilisateur du serveur Web ait bien les droits d'écriture dans les répertoires documents de Dolibarr. Si le paramètre <b>safe_mode</b> a été activé sur ce PHP, vérifiez que les fichiers php dolibarr appartiennent à l'utilisateur du serveur Web.
 ErrorNoMailDefinedForThisUser=Email non défini pour cet utilisateur
 ErrorSetupOfEmailsNotComplete=La configuration de l'envoi des e-mails n'est pas terminée
 ErrorFeatureNeedJavascript=Cette fonctionnalité a besoin de javascript activé pour fonctionner. Modifiez dans configuration - affichage.
@@ -65,7 +66,7 @@ ErrorFunctionNotAvailableInPHP=La fonction <b>%s</b> est requise pour cette fonc
 ErrorDirAlreadyExists=Un répertoire portant ce nom existe déjà.
 ErrorFileAlreadyExists=Un fichier portant ce nom existe déjà.
 ErrorDestinationAlreadyExists=Un fichier portant le nom <b>%s</b> existe déjà.
-ErrorPartialFile=Fichier non reçu intégralement par le serveur.
+ErrorPartialFile=Fichier incomplet reçu par le serveur.
 ErrorNoTmpDir=Répertoire temporaire de réception %s inexistant.
 ErrorUploadBlockedByAddon=Upload bloqué par un plugin PHP/Apache.
 ErrorFileSizeTooLarge=La taille du fichier est trop grande ou le fichier n'est pas fourni.
@@ -96,6 +97,7 @@ ErrorWrongValueForField=Champ <b>%s</b>: '<b>%s</b>' ne respecte pas la règle <
 ErrorHtmlInjectionForField=Champ <b> %s </b> : La valeur ' <b> %s </b> ' contient une donnée malveillante non autorisée
 ErrorFieldValueNotIn=Champ <b>%s</b>: '<b>%s</b>' n'est pas une valeur disponible dans le champ <b>%s</b> de la table <b>%s</b>
 ErrorFieldRefNotIn=Champ <b>%s</b>: '<b>%s</b>' n'est pas une référence existante comme <b>%s</b>
+ErrorMultipleRecordFoundFromRef=Plusieurs enregistrements ont été trouvés en recherchant la référence <b>%s</b>. Il nous est impossible de déterminer quel ID utiliser.
 ErrorsOnXLines=Erreurs sur <b>%s</b> enregistrement(s) source
 ErrorFileIsInfectedWithAVirus=L'antivirus n'a pas pu valider ce fichier (il est probablement infecté par un virus) !
 ErrorNumRefModel=Une référence existe en base (%s) et est incompatible avec cette numérotation. Supprimez la ligne ou renommez la référence pour activer ce module.
@@ -106,7 +108,7 @@ ErrorBadMask=Erreur sur le masque
 ErrorBadMaskFailedToLocatePosOfSequence=Erreur, masque sans numéro de séquence
 ErrorBadMaskBadRazMonth=Erreur, mauvais valeur de remise à zéro
 ErrorMaxNumberReachForThisMask=Nombre maximum atteint pour ce masque
-ErrorCounterMustHaveMoreThan3Digits=Le compteur doit avoir au moins 3 positions
+ErrorCounterMustHaveMoreThan3Digits=Le compteur doit posséder au moins 3 chiffres
 ErrorSelectAtLeastOne=Erreur, sélectionnez au moins une entrée.
 ErrorDeleteNotPossibleLineIsConsolidated=Suppression impossible car l'enregistrement porte sur au moins une transaction bancaire rapprochée
 ErrorProdIdAlreadyExist=%s est attribué à un autre tiers
@@ -130,9 +132,9 @@ ErrorLoginHasNoEmail=Cet utilisateur n'a pas d'email. Impossible de continuer.
 ErrorBadValueForCode=Mauvaise valeur saisie pour le code. Réessayez avec une nouvelle valeur...
 ErrorBothFieldCantBeNegative=Les champs %s et %s ne peuvent être tous deux négatifs
 ErrorFieldCantBeNegativeOnInvoice=Le champ <strong> %s </strong> ne peut pas être négatif sur ce type de facture. Si vous devez ajouter une ligne de remise, créez d'abord la remise (à partir du champ '%s' dans la fiche du tiers) et appliquez-la à la facture.
-ErrorLinesCantBeNegativeForOneVATRate=Le total des lignes (HT) ne peut pas être négatif pour un taux de TVA non null donné (Un total négatif pour le taux de <b>%s</b>%% a été trouvé).
+ErrorLinesCantBeNegativeForOneVATRate=Le total des lignes (HT) ne peut pas être négatif pour un taux de TVA non nul donné (Un total négatif pour le taux de <b>%s</b>%% a été trouvé).
 ErrorLinesCantBeNegativeOnDeposits=Les lignes ne peuvent pas être négatives dans un acompte. Si vous le faites, vous rencontrerez des problèmes lorsque vous devrez consommer l'acompte dans la facture finale.
-ErrorQtyForCustomerInvoiceCantBeNegative=La quantité d'une ligne ne peut pas être négative dans les factures clients 
+ErrorQtyForCustomerInvoiceCantBeNegative=La quantité d'une ligne ne peut pas être négative dans les factures clients
 ErrorWebServerUserHasNotPermission=Le compte d'exécution du serveur web <b>%s</b> n'a pas les permissions pour cela
 ErrorNoActivatedBarcode=Aucun type de code-barres activé
 ErrUnzipFails=Impossible de décompresser le fichier %s avec ZipArchive
@@ -152,8 +154,8 @@ ErrorPaymentModeDefinedToWithoutSetup=Un mode de paiement a été défini de typ
 ErrorPHPNeedModule=Erreur, votre PHP doit avoir le module <b>%s</b> installé pour utiliser cette fonctionnalité.
 ErrorOpenIDSetupNotComplete=Vous avez configuré Dolibarr pour accepter l'authentication OpenID, mais l'URL du service OpenID n'est pas défini dans la constante %s
 ErrorWarehouseMustDiffers=Les entrepôts source et destination doivent être différents
-ErrorBadFormat=Mauvais format
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Erreur, cet adhérent n'ait pas encore lié à un tiers. Lier le tier à un tiers existant ou créer un nouveau tiers avant de créer une adhésion avec facture.
+ErrorBadFormat=Mauvais format !
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Erreur, cet adhérent n'est pas encore lié à un tiers. Liez le tiers à un tiers existant ou créez un nouveau tiers avant de créer une adhésion avec facture.
 ErrorThereIsSomeDeliveries=Erreur, il y a des bordereaux de réception liées à ces expéditions. La suppression est refusée.
 ErrorCantDeletePaymentReconciliated=Impossible d'effacer un paiement qui a généré une écriture sur le compte bancaire et qui a été rapprochée.
 ErrorCantDeletePaymentSharedWithPayedInvoice=Impossible d'effacer un paiement qui porte sur au moins une facture qui est à l'état payée.
@@ -161,11 +163,11 @@ ErrorPriceExpression1=Ne peut assigner la constante '%s'
 ErrorPriceExpression2=Ne peut redéfinir la fonction '%s'
 ErrorPriceExpression3=Variable '%s' non définie dans la définition de fonction
 ErrorPriceExpression4=Caractère illégal '%s'
-ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression5='%s' inattendu.
 ErrorPriceExpression6=Nombre incorrect d'arguments (%s donné,%s attendu)
 ErrorPriceExpression8=Operateur '%s' non attendu
 ErrorPriceExpression9=Une erreur inattendue s'est produite
-ErrorPriceExpression10=Il manque l'opérande à l'opérateur '%s' 
+ErrorPriceExpression10=Il manque l'opérande à l'opérateur '%s'
 ErrorPriceExpression11=Attendu '%s'
 ErrorPriceExpression14=Division par zéro
 ErrorPriceExpression17=Variable '%s' non définie
@@ -187,16 +189,16 @@ ErrorGlobalVariableUpdater2=Paramètre manquant '%s'
 ErrorGlobalVariableUpdater3=La donnée recherché n'a pas été trouvée
 ErrorGlobalVariableUpdater4=Le client SOAP a échoué avec l'erreur '%s'
 ErrorGlobalVariableUpdater5=Pas de variable globale
-ErrorFieldMustBeANumeric=Le champ <b>%s</b> doit être un numérique
-ErrorMandatoryParametersNotProvided=Paramètre(s) obligatoire(s) non fournis
-ErrorOppStatusRequiredIfAmount=Vous avez fixé un montant estimé pour cette opportunité. Aussi, vous devez également entrer son statut
+ErrorFieldMustBeANumeric=Le champ <b>%s</b> doit être une valeur numérique
+ErrorMandatoryParametersNotProvided=Paramètre(s) obligatoire(s) non fourni(s)
+ErrorOppStatusRequiredIfAmount=Vous avez fixé un montant estimé pour cette opportunité. De plus, vous devez également entrer son statut
 ErrorFailedToLoadModuleDescriptorForXXX=Échec de changement de la classe descripteur du module %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Mauvaise définition du tableau Menu dans le descripteur de module (mauvaise valeur pour la clé fk_menu)
 ErrorSavingChanges=Une erreur est survenue lors de la sauvegarde des modifications
 ErrorWarehouseRequiredIntoShipmentLine=L'entrepôt est requis sur la ligne de l'expédition
 ErrorFileMustHaveFormat=Le fichier doit avoir le format %s
 ErrorFilenameCantStartWithDot=Le nom de fichier ne peut pas commencer par un '.'
-ErrorSupplierCountryIsNotDefined=Le pays pour ce fournisseur n'est pas défini. Corriger cela.
+ErrorSupplierCountryIsNotDefined=Le pays pour ce fournisseur n'est pas défini. Corrigez cela.
 ErrorsThirdpartyMerge=Echec de la fusion de 2 enregistrements. Demande annulée.
 ErrorStockIsNotEnoughToAddProductOnOrder=Le stock du produit %s est insuffisant pour permettre un ajout dans une nouvelle commande.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Le stock du produit %s est insuffisant pour permettre un ajout dans une nouvelle facture.
@@ -214,7 +216,7 @@ ErrorTaskAlreadyAssigned=Tâche déjà assignée à l'utilisateur
 ErrorModuleFileSeemsToHaveAWrongFormat=Le package du module semble avoir un mauvais format.
 ErrorModuleFileSeemsToHaveAWrongFormat2=Au moins un dossier obligatoire doit être présent dans l'archive zip du module : <strong>%s</strong> ou <strong>%s</strong>
 ErrorFilenameDosNotMatchDolibarrPackageRules=Le nom du package du module (<strong>%s</strong>)  ne correspond pas à la syntaxe attendue: <strong>%s</strong>
-ErrorDuplicateTrigger=Erreur, doublon du trigger nommé %s. Déjà chargé à partir de %s.
+ErrorDuplicateTrigger=Erreur, doublon du déclencheur nommé %s. Déjà chargé à partir de %s.
 ErrorNoWarehouseDefined=Erreur, aucun entrepôts défini.
 ErrorBadLinkSourceSetButBadValueForRef=Le lien que vous utilisez n'est pas valide. Une 'source' pour le paiement est définie, mais la valeur pour 'ref' n'est pas valide.
 ErrorTooManyErrorsProcessStopped=Trop d'erreurs, Le processus a été arrêté.
@@ -223,12 +225,12 @@ ErrorObjectMustHaveStatusDraftToBeValidated=L'objet %s doit être au statut 'Bro
 ErrorObjectMustHaveLinesToBeValidated=L'objet %s doit contenir des lignes
 ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Seules les factures validées peuvent être envoyées à l'aide de l'action de masse "Envoyer par courrier électronique".
 ErrorChooseBetweenFreeEntryOrPredefinedProduct=Vous devez choisir si l'article est un produit prédéfini ou non
-ErrorDiscountLargerThanRemainToPaySplitItBefore=La réduction que vous essayez d'appliquer est supérieure au montant du paiement. Auparavant, divisez le rabais en 2 rabais plus petits.
+ErrorDiscountLargerThanRemainToPaySplitItBefore=La réduction que vous essayez d'appliquer est supérieure au montant du paiement. Auparavant, divisez la remise en 2 rabais plus petits.
 ErrorFileNotFoundWithSharedLink=Fichier non trouvé. Peut être que la clé de partage a été modifiée ou le fichier a été récemment supprimé.
-ErrorProductBarCodeAlreadyExists=Le code-barre du produit %s existe déjà sur une autre référence de produit
+ErrorProductBarCodeAlreadyExists=Le code-barres du produit %s existe déjà sur une autre référence de produit
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Notez également que l'utilisation d'un kit pour augmenter ou réduire automatiquement les sous-produits n'est pas possible lorsqu'au moins un sous-produit (ou sous-produit de sous-produits) a besoin d'un numéro de série/lot.
 ErrorDescRequiredForFreeProductLines=La description est obligatoire pour les lignes avec un produit non prédéfini
-ErrorAPageWithThisNameOrAliasAlreadyExists=La page / container <strong> %s </strong> a le même nom ou un autre alias que celui que vous tentez d'utiliser.
+ErrorAPageWithThisNameOrAliasAlreadyExists=La page/container <strong> %s </strong> a le même nom ou un autre alias que celui que vous tentez d'utiliser.
 ErrorDuringChartLoad=Erreur lors du chargement du tableau de compte. Si certains comptes n'ont pas été chargés, vous pouvez toujours les entrer manuellement.
 ErrorBadSyntaxForParamKeyForContent=Mauvaise syntaxe pour le paramètre keyforcontent. La valeur doit commencer par %s ou %s
 ErrorVariableKeyForContentMustBeSet=Erreur, la constante nommée %s (avec le contenu de texte à afficher) ou %s (avec l'adresse externe à afficher) doit être fixée.
@@ -237,11 +239,12 @@ ErrorURLMustStartWithHttp=L'URL %s doit commencer par http:// ou https://
 ErrorHostMustNotStartWithHttp=L'URL %s ne doit PAS commencer par http:// ou https://
 ErrorNewRefIsAlreadyUsed=Erreur, la nouvelle référence est déjà utilisée
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Erreur, supprimer le paiement lié à une facture clôturée n'est pas possible.
-ErrorSearchCriteriaTooSmall=Critère de recherche trop petit.
-ErrorObjectMustHaveStatusActiveToBeDisabled=Les objets doivent avoir le statut 'Actif' pour être désactivés 
-ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Les objets doivent avoir le statut 'Brouillon' ou 'Désactivé' pour être activés
+ErrorSearchCriteriaTooSmall=Critère de recherche trop court.
+ErrorObjectMustHaveStatusActiveToBeDisabled=Les objets doivent avoir le statut 'Actif' pour pouvoir être désactivés
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Les objets doivent avoir le statut 'Brouillon' ou 'Désactivé' pour pouvoir être activés
 ErrorNoFieldWithAttributeShowoncombobox=Aucun champ n'a la propriété 'showoncombobox' dans la définition de l'objet '%s'. Pas moyen d'afficher la liste de cases à cocher
 ErrorFieldRequiredForProduct=Le champ '%s' est obligatoire pour le produit %s
+AlreadyTooMuchPostOnThisIPAdress=Trop de requêtes ont déjà été envoyées depuis cette adresse IP.
 ProblemIsInSetupOfTerminal=Le problème est dans la configuration du terminal %s.
 ErrorAddAtLeastOneLineFirst=Ajouter d'abord au moins une ligne
 ErrorRecordAlreadyInAccountingDeletionNotPossible=Erreur, l'enregistrement est déjà transféré dans la comptabilité, la suppression n'est pas possible.
@@ -283,7 +286,7 @@ ErrorNotApproverForHoliday=Vous n'êtes pas l'approbateur du congé %s
 ErrorAttributeIsUsedIntoProduct=Cet attribut est utilisé dans une ou plusieurs variantes de produit
 ErrorAttributeValueIsUsedIntoProduct=Cette valeur d'attribut est utilisée dans une ou plusieurs variantes de produit
 ErrorPaymentInBothCurrency=Erreur, tous les montants doivent être entrés dans la même colonne.
-ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=Vous essayez de payer une facture en monnaie %s depuis un compte en %s
+ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=Vous essayez de payer une facture en devise %s depuis un compte en %s
 ErrorInvoiceLoadThirdParty=Impossible de charger l'objet tiers pour la facture "%s"
 ErrorInvoiceLoadThirdPartyKey=Clé tiers "%s" non définie pour la facture "%s"
 ErrorDeleteLineNotAllowedByObjectStatus=Supprimer une ligne n'est pas autorisée par l'état actuel de l'objet
@@ -298,10 +301,12 @@ ErrorCharPlusNotSupportedByImapForSearch=La recherche IMAP n'est pas en mesure d
 ErrorTableNotFound=Table <b>%s</b> introuvable
 ErrorValueForTooLow=La valeur pour <b>%s</b> est trop faible
 ErrorValueCantBeNull=La valeur pour <b>%s</b> ne peut pas être nulle
+ErrorDateOfMovementLowerThanDateOfFileTransmission=La date de la transaction bancaire ne peut êtse inférieure à la date d'envoi du fichier
+ErrorTooMuchFileInForm=Trop de fichier dans ce formulaire. Le nombre maximal de fichier est de %s fichier(s)
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Votre paramètre PHP upload_max_filesize (%s) est supérieur au paramètre PHP post_max_size (%s). Ceci n'est pas une configuration cohérente.
-WarningPasswordSetWithNoAccount=Un mot de passe a été fixé pour cet adhérent. Cependant, aucun compte d'utilisateur n'a été créé. Donc, ce mot de passe est stocké, mais ne peut être utilisé pour accéder à Dolibarr. Il peut être utilisé par un module/interface externe, mais si vous n'avez pas besoin de définir ni login ni mot de passe pour un adhérent, vous pouvez désactiver l'option «Gérer un login pour chaque adhérent" depuis la configuration du module Adhérents. Si vous avez besoin de gérer un login, mais pas de mot de passe, vous pouvez laisser ce champ vide pour éviter cet avertissement. Remarque: L'email peut également être utilisé comme login si l'adhérent est lié à un utilisateur.
+WarningPasswordSetWithNoAccount=Un mot de passe a défini pour cet adhérent. Cependant, aucun compte d'utilisateur n'a été créé. Ce mot de passe a donc été stocké, mais ne peut être utilisé pour accéder à Dolibarr. Il peut être utilisé par un module/interface externe, mais si vous n'avez pas besoin de définir ni login ni mot de passe pour un adhérent, vous pouvez désactiver l'option «Gérer un login pour chaque adhérent" depuis la configuration du module Adhérents. Si vous avez besoin de gérer un login, mais pas de mot de passe, vous pouvez laisser ce champ vide pour éviter cet avertissement. Remarque: L'email peut également être utilisé comme login si l'adhérent est lié à un utilisateur.
 WarningMandatorySetupNotComplete=Cliquez ici pour configurer les paramètres principaux
 WarningEnableYourModulesApplications=Cliquez ici pour activer vos modules et applications
 WarningSafeModeOnCheckExecDir=Attention, l'option PHP <b>safe_mode</b> est active, la commande doit dont être dans un répertoire déclaré dans le paramètre php <b>safe_mode_exec_dir</b>.
@@ -315,11 +320,11 @@ WarningUntilDirRemoved=Les alertes de sécurité sont visibles par les administr
 WarningCloseAlways=Attention, la fermeture se fait même lorsque le montant diffère. N'activez cette fonctionnalité qu'en connaissance de cause.
 WarningUsingThisBoxSlowDown=Attention, l'utilisation de cette boîte provoque de sérieux ralentissements des pages affichant cette boîte.
 WarningClickToDialUserSetupNotComplete=La configuration ClickToDial pour votre compte utilisateur n'est pas complète (voir l'onglet ClickToDial sur votre fiche utilisateur)
-WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Fonction désactivée quand l'affichage est en mode optimisé pour les personnes aveugles ou les navigateurs textes.
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Fonction désactivée quand l'affichage est en mode optimisé pour les personnes malvoyantes ou les navigateurs textes.
 WarningPaymentDateLowerThanInvoiceDate=La date de paiement (%s) est inférieure à la date de facturation (%s) de la facture %s.
 WarningTooManyDataPleaseUseMoreFilters=Trop de données (plus de %s lignes). Utilisez davantage de filtres ou régler la constante %s pour augmenter la limite à une valeur plus élevée.
 WarningSomeLinesWithNullHourlyRate=Des temps ont été enregistrés par des utilisateurs lorsque leur taux horaire n'était défini. Une valeur de 0 %s a été utilisée, mais cela peut entraîner une mauvaise évaluation du temps passé.
-WarningYourLoginWasModifiedPleaseLogin=Votre identifiant a été modifié. Par sécurité, vous devrez vous identifier avec votre nouvel identifiant avant l'action suivante.
+WarningYourLoginWasModifiedPleaseLogin=Votre identifiant a été modifié. Par sécurité, vous devrez vous identifier avec votre nouvel identifiant avant la prochaine action.
 WarningAnEntryAlreadyExistForTransKey=Une donnée identique existe déjà pour la traduction du code dans cette langue
 WarningNumberOfRecipientIsRestrictedInMassAction=Attention, le nombre de destinataires différents est limité à <b>%s</b> lorsque vous utilisez les actions en masse sur les listes
 WarningDateOfLineMustBeInExpenseReportRange=Attention, la date de la ligne n'est pas dans la plage de la note de frais
@@ -338,20 +343,20 @@ WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=La validation automati
 
 # Validate
 RequireValidValue = Valeur non valide
-RequireAtLeastXString = Requiert au moins %s caractère(s)
-RequireXStringMax = Requiert %s caractère(s) maximum
-RequireAtLeastXDigits = Requiert au moins %s caractère(s)
-RequireXDigitsMax = Requiert %scaractère(s) maximum
+RequireAtLeastXString = Nécessite au moins %s caractère(s)
+RequireXStringMax = Nécessite %s caractère(s) maximum
+RequireAtLeastXDigits = Nécessite au moins %s caractère(s)
+RequireXDigitsMax = Nécessite %scaractère(s) maximum
 RequireValidNumeric = Nécessite une valeur numérique
 RequireValidEmail = L'adresse email n'est pas valide
 RequireMaxLength = La longueur doit être inférieure à %s caractères
 RequireMinLength = La longueur doit être supérieure à %s caractère(s)
-RequireValidUrl = Une URL valide est requise
-RequireValidDate = Date valide requise
-RequireANotEmptyValue = Est requis
-RequireValidDuration = Une durée valide est requise
-RequireValidExistingElement = Une valeur existante est requise
-RequireValidBool = Un booléen valide est requis
+RequireValidUrl = Une URL valide est demandée
+RequireValidDate = Une date valide est nécessaire
+RequireANotEmptyValue = Est nécessaire
+RequireValidDuration = Une durée valide est nécessaire
+RequireValidExistingElement = Une valeur existante est nécessaire
+RequireValidBool = Un booléen valide est nécessaire
 BadSetupOfField = Erreur mauvaise configuration du champ
 BadSetupOfFieldClassNotFoundForValidation = Erreur mauvaise configuration du champ : Classe introuvable pour validation
 BadSetupOfFieldFileNotFound = Erreur mauvaise configuration du champ : Fichier introuvable pour l'inclusion

From f4476b905c7d65c3289ffa923938c84cd5fd1030 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 29 Dec 2022 18:11:57 +0100
Subject: [PATCH 134/816] Debug v17

---
 htdocs/compta/resultat/result.php | 117 ++++++++++++++++++------------
 1 file changed, 69 insertions(+), 48 deletions(-)

diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index 3f3e14e2d61..856eb8a5fe8 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -339,60 +339,81 @@ if ($modecompta == 'CREANCES-DETTES') {
 				}
 
 				$result = strtr($formula, $vars);
+				$result = str_replace('--', '+', $result);
 
-				//var_dump($result);
-				//$r = $AccCat->calculate($result);
-				$r = dol_eval($result, 1, 1, '1');
-				//var_dump($r);
-
-				print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
-
-				// Year N
-				$code = $cat['code']; // code of categorie ('VTE', 'MAR', ...)
-				$sommes[$code]['NP'] += $r;
-
-				// Current fiscal year (N)
-				if (is_array($sommes) && !empty($sommes)) {
-					foreach ($sommes as $code => $det) {
-						$vars[$code] = $det['N'];
-					}
-				}
-
-				$result = strtr($formula, $vars);
-
-				//$r = $AccCat->calculate($result);
-				$r = dol_eval($result, 1, 1, 1);
-
-				print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
-				$sommes[$code]['N'] += $r;
-
-				// Detail by month
-				foreach ($months as $k => $v) {
-					if (($k + 1) >= $date_startmonth) {
-						foreach ($sommes as $code => $det) {
-							$vars[$code] = $det['M'][$k];
+				if (preg_match('/[a-z]/i', $result)) {
+					$r = 'Error bad formula: '.$result;
+					$rshort = 'Err';
+					print '<td class="liste_total right"><span class="amount" title="'.dol_escape_htmltag($r).'">'.$rshort.'</span></td>';
+					print '<td class="liste_total right"><span class="amount" title="'.dol_escape_htmltag($r).'">'.$rshort.'</span></td>';
+					// Detail by month
+					foreach ($months as $k => $v) {
+						if (($k + 1) >= $date_startmonth) {
+							print '<td class="liste_total right"><span class="amount" title="'.dol_escape_htmltag($r).'">'.$rshort.'</span></td>';
 						}
-						$result = strtr($formula, $vars);
-
-						//$r = $AccCat->calculate($result);
-						$r = dol_eval($result, 1, 1, 1);
-
-						print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
-						$sommes[$code]['M'][$k] += $r;
 					}
-				}
-				foreach ($months as $k => $v) {
-					if (($k + 1) < $date_startmonth) {
-						foreach ($sommes as $code => $det) {
-							$vars[$code] = $det['M'][$k];
+					foreach ($months as $k => $v) {
+						if (($k + 1) < $date_startmonth) {
+							print '<td class="liste_total right"><span class="amount" title="'.dol_escape_htmltag($r).'">'.$rshort.'</span></td>';
 						}
-						$result = strtr($formula, $vars);
+					}
+				} else {
+					//var_dump($result);
+					//$r = $AccCat->calculate($result);
+					$r = dol_eval($result, 1, 1, '1');
+					//var_dump($r);
 
-						//$r = $AccCat->calculate($result);
-						$r = dol_eval($result, 1, 1, 1);
+					print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
 
-						print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
-						$sommes[$code]['M'][$k] += $r;
+					// Year N
+					$code = $cat['code']; // code of categorie ('VTE', 'MAR', ...)
+					$sommes[$code]['NP'] += $r;
+
+					// Current fiscal year (N)
+					if (is_array($sommes) && !empty($sommes)) {
+						foreach ($sommes as $code => $det) {
+							$vars[$code] = $det['N'];
+						}
+					}
+
+					$result = strtr($formula, $vars);
+
+					//$r = $AccCat->calculate($result);
+					$r = dol_eval($result, 1, 1, 1);
+
+					print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
+					$sommes[$code]['N'] += $r;
+
+					// Detail by month
+					foreach ($months as $k => $v) {
+						if (($k + 1) >= $date_startmonth) {
+							foreach ($sommes as $code => $det) {
+								$vars[$code] = $det['M'][$k];
+							}
+							$result = strtr($formula, $vars);
+
+							//$r = $AccCat->calculate($result);
+							$r = dol_eval($result, 1, 1, 1);
+
+							print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
+							$sommes[$code]['M'][$k] += $r;
+						}
+					}
+
+
+					foreach ($months as $k => $v) {
+						if (($k + 1) < $date_startmonth) {
+							foreach ($sommes as $code => $det) {
+								$vars[$code] = $det['M'][$k];
+							}
+							$result = strtr($formula, $vars);
+
+							//$r = $AccCat->calculate($result);
+							$r = dol_eval($result, 1, 1, 1);
+
+							print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
+							$sommes[$code]['M'][$k] += $r;
+						}
 					}
 				}
 

From bcd5c207cf7e57917116cac98091bc848891652d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 29 Dec 2022 20:25:53 +0100
Subject: [PATCH 135/816] Debug v17 - Fix the report on custom groups, column
 previous period

---
 .../class/accountancycategory.class.php       |  47 ++++--
 htdocs/compta/resultat/result.php             | 147 ++++++++----------
 2 files changed, 100 insertions(+), 94 deletions(-)

diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index 68662ccb610..300ccff9c09 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -678,6 +678,22 @@ class AccountancyCategory // extends CommonObject
 		$this->sdc = 0;
 		$this->sdcpermonth = array();
 
+		if (is_array($cpt)) {
+			$listofaccount = '';
+			foreach ($cpt as $cptcursor) {
+				if (! is_null($cptcursor)) {
+					if ($listofaccount) {
+						$listofaccount .= ",";
+					}
+					$listofaccount .= "'".$cptcursor."'";
+				}
+			}
+			if (empty($listofaccount)) {
+				// List of account is empty, so we do no try sql request, we can say result is empty.
+				return 0;
+			}
+		}
+
 		$sql = "SELECT SUM(t.debit) as debit, SUM(t.credit) as credit";
 		if (is_array($cpt)) {
 			$sql .= ", t.numero_compte as accountancy_account";
@@ -686,13 +702,6 @@ class AccountancyCategory // extends CommonObject
 		//if (in_array($this->db->type, array('mysql', 'mysqli'))) $sql.=' USE INDEX idx_accounting_bookkeeping_doc_date';
 		$sql .= " WHERE t.entity = ".$conf->entity;
 		if (is_array($cpt)) {
-			$listofaccount = '';
-			foreach ($cpt as $cptcursor) {
-				if ($listofaccount) {
-					$listofaccount .= ",";
-				}
-				$listofaccount .= "'".$cptcursor."'";
-			}
 			$sql .= " AND t.numero_compte IN (".$this->db->sanitize($listofaccount, 1).")";
 		} else {
 			$sql .= " AND t.numero_compte = '".$this->db->escape($cpt)."'";
@@ -709,22 +718,28 @@ class AccountancyCategory // extends CommonObject
 		if (is_array($cpt)) {
 			$sql .= " GROUP BY t.numero_compte";
 		}
-		//print $sql;
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			if ($num) {
-				$obj = $this->db->fetch_object($resql);
-				if ($sens == 1) {
-					$this->sdc = $obj->debit - $obj->credit;
-				} else {
-					$this->sdc = $obj->credit - $obj->debit;
-				}
-				if (is_array($cpt)) {
-					$this->sdcperaccount[$obj->accountancy_account] = $this->sdc;
+				$i = 0;
+				while ($i < $num) {
+					$obj = $this->db->fetch_object($resql);
+					if ($obj) {
+						if ($sens == 1) {
+							$this->sdc = $obj->debit - $obj->credit;
+						} else {
+							$this->sdc = $obj->credit - $obj->debit;
+						}
+						if (is_array($cpt)) {
+							$this->sdcperaccount[$obj->accountancy_account] = $this->sdc;
+						}
+					}
+					$i++;
 				}
 			}
+
 			return $num;
 		} else {
 			$this->error = "Error ".$this->db->lasterror();
diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index 856eb8a5fe8..8615e595200 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -184,8 +184,8 @@ llxheader('', $langs->trans('ReportInOut'));
 $formaccounting = new FormAccounting($db);
 $form = new Form($db);
 
-$textprevyear = '<a href="'.$_SERVER["PHP_SELF"].'?year='.($start_year - 1).'">'.img_previous().'</a>';
-$textnextyear = '&nbsp;<a href="'.$_SERVER["PHP_SELF"].'?year='.($start_year + 1).'">'.img_next().'</a>';
+$textprevyear = '<a href="'.$_SERVER["PHP_SELF"].'?year='.($start_year - 1).'&showaccountdetail='.urlencode($showaccountdetail).'">'.img_previous().'</a>';
+$textnextyear = ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'?year='.($start_year + 1).'&showaccountdetail='.urlencode($showaccountdetail).'">'.img_next().'</a>';
 
 
 
@@ -309,8 +309,8 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if (!is_array($cats) && $cats < 0) {
 		setEventMessages(null, $AccCat->errors, 'errors');
 	} elseif (is_array($cats) && count($cats) > 0) {
+		// Loop on each custom group of accounts
 		foreach ($cats as $cat) {
-			// Loop on each group
 			if (!empty($cat['category_type'])) {
 				// category calculed
 				// When we enter here, $sommes was filled by group of accounts
@@ -319,10 +319,10 @@ if ($modecompta == 'CREANCES-DETTES') {
 
 				print '<tr class="liste_total">';
 
-				// Year NP
-				print '<td class="liste_total width200">';
+				// Code and Label
+				print '<td class="liste_total tdoverflowmax100" title="'.dol_escape_htmltag($cat['code']).'">';
 				print dol_escape_htmltag($cat['code']);
-				print '</td><td>';
+				print '</td><td class="tdoverflowmax250" title="'.dol_escape_htmltag($cat['label']).'">';
 				print dol_escape_htmltag($cat['label']);
 				print '</td>';
 
@@ -345,83 +345,71 @@ if ($modecompta == 'CREANCES-DETTES') {
 					$r = 'Error bad formula: '.$result;
 					$rshort = 'Err';
 					print '<td class="liste_total right"><span class="amount" title="'.dol_escape_htmltag($r).'">'.$rshort.'</span></td>';
-					print '<td class="liste_total right"><span class="amount" title="'.dol_escape_htmltag($r).'">'.$rshort.'</span></td>';
-					// Detail by month
-					foreach ($months as $k => $v) {
-						if (($k + 1) >= $date_startmonth) {
-							print '<td class="liste_total right"><span class="amount" title="'.dol_escape_htmltag($r).'">'.$rshort.'</span></td>';
-						}
-					}
-					foreach ($months as $k => $v) {
-						if (($k + 1) < $date_startmonth) {
-							print '<td class="liste_total right"><span class="amount" title="'.dol_escape_htmltag($r).'">'.$rshort.'</span></td>';
-						}
-					}
 				} else {
 					//var_dump($result);
 					//$r = $AccCat->calculate($result);
 					$r = dol_eval($result, 1, 1, '1');
-					//var_dump($r);
 
 					print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
+				}
 
-					// Year N
-					$code = $cat['code']; // code of categorie ('VTE', 'MAR', ...)
-					$sommes[$code]['NP'] += $r;
+				// Year N
+				$code = $cat['code']; // code of categorie ('VTE', 'MAR', ...)
+				$sommes[$code]['NP'] += $r;
 
-					// Current fiscal year (N)
-					if (is_array($sommes) && !empty($sommes)) {
+				// Current fiscal year (N)
+				if (is_array($sommes) && !empty($sommes)) {
+					foreach ($sommes as $code => $det) {
+						$vars[$code] = $det['N'];
+					}
+				}
+
+				$result = strtr($formula, $vars);
+				$result = str_replace('--', '+', $result);
+
+				//$r = $AccCat->calculate($result);
+				$r = dol_eval($result, 1, 1, '1');
+
+				print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
+				$sommes[$code]['N'] += $r;
+
+				// Detail by month
+				foreach ($months as $k => $v) {
+					if (($k + 1) >= $date_startmonth) {
 						foreach ($sommes as $code => $det) {
-							$vars[$code] = $det['N'];
+							$vars[$code] = $det['M'][$k];
 						}
+						$result = strtr($formula, $vars);
+						$result = str_replace('--', '+', $result);
+
+						//$r = $AccCat->calculate($result);
+						$r = dol_eval($result, 1, 1, '1');
+
+						print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
+						$sommes[$code]['M'][$k] += $r;
 					}
+				}
 
-					$result = strtr($formula, $vars);
-
-					//$r = $AccCat->calculate($result);
-					$r = dol_eval($result, 1, 1, 1);
-
-					print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
-					$sommes[$code]['N'] += $r;
-
-					// Detail by month
-					foreach ($months as $k => $v) {
-						if (($k + 1) >= $date_startmonth) {
-							foreach ($sommes as $code => $det) {
-								$vars[$code] = $det['M'][$k];
-							}
-							$result = strtr($formula, $vars);
-
-							//$r = $AccCat->calculate($result);
-							$r = dol_eval($result, 1, 1, 1);
-
-							print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
-							$sommes[$code]['M'][$k] += $r;
+				foreach ($months as $k => $v) {
+					if (($k + 1) < $date_startmonth) {
+						foreach ($sommes as $code => $det) {
+							$vars[$code] = $det['M'][$k];
 						}
-					}
+						$result = strtr($formula, $vars);
+						$result = str_replace('--', '+', $result);
 
+						//$r = $AccCat->calculate($result);
+						$r = dol_eval($result, 1, 1, '1');
 
-					foreach ($months as $k => $v) {
-						if (($k + 1) < $date_startmonth) {
-							foreach ($sommes as $code => $det) {
-								$vars[$code] = $det['M'][$k];
-							}
-							$result = strtr($formula, $vars);
-
-							//$r = $AccCat->calculate($result);
-							$r = dol_eval($result, 1, 1, 1);
-
-							print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
-							$sommes[$code]['M'][$k] += $r;
-						}
+						print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
+						$sommes[$code]['M'][$k] += $r;
 					}
 				}
 
 				print "</tr>\n";
 
 				//var_dump($sommes);
-			} else // normal category
-			{
+			} else { // normal category
 				$code = $cat['code']; // Category code we process
 
 				$totCat = array();
@@ -435,23 +423,25 @@ 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();
-
+				if (empty($cpts)) {
+					$cpts[] = array();
+				}
 
 				$arrayofaccountforfilter = array();
 				foreach ($cpts as $i => $cpt) {    // Loop on each account.
-					$arrayofaccountforfilter[] = $cpt['account_number'];
+					if (!is_null($cpt['account_number'])) {
+						$arrayofaccountforfilter[] = $cpt['account_number'];
+					}
 				}
 
 				// N-1
 				if (!empty($arrayofaccountforfilter)) {
 					$return = $AccCat->getSumDebitCredit($arrayofaccountforfilter, $date_start_previous, $date_end_previous, $cat['dc'] ? $cat['dc'] : 0);
-
 					if ($return < 0) {
 						setEventMessages(null, $AccCat->errors, 'errors');
 						$resultNP = 0;
 					} else {
-						foreach ($cpts as $i => $cpt) {    // Loop on each account.
+						foreach ($cpts as $i => $cpt) {    // Loop on each account found
 							$resultNP = empty($AccCat->sdcperaccount[$cpt['account_number']]) ? 0 : $AccCat->sdcperaccount[$cpt['account_number']];
 
 							$totCat['NP'] += $resultNP;
@@ -499,37 +489,38 @@ if ($modecompta == 'CREANCES-DETTES') {
 
 				// Now output columns for row $code ('VTE', 'MAR', ...)
 
-				print "<tr>";
+				print '<tr'.($showaccountdetail != 'no' ? ' class="trforbreak"' : '').'>';
 
 				// Column group
-				print '<td class="width200">';
+				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($cat['code']).'">';
 				print dol_escape_htmltag($cat['code']);
 				print '</td>';
 
 				// Label of group
-				print '<td>';
-				print dol_escape_htmltag($cat['label']);
+				$labeltoshow = dol_escape_htmltag($cat['label']);
 				if (count($cpts) > 0 && !empty($cpts[0])) {    // Show example of 5 first accounting accounts
 					$i = 0;
 					foreach ($cpts as $cpt) {
 						if ($i > 5) {
-							print '...)';
+							$labeltoshow .= '...)';
 							break;
 						}
 						if ($i > 0) {
-							print ', ';
+							$labeltoshow .= ', ';
 						} else {
-							print ' (';
+							$labeltoshow .= ' (';
 						}
-						print dol_escape_htmltag($cpt['account_number']);
+						$labeltoshow .= dol_escape_htmltag($cpt['account_number']);
 						$i++;
 					}
 					if ($i <= 5) {
-						print ')';
+						$labeltoshow .= ')';
 					}
 				} else {
-					print ' - <span class="warning">'.$langs->trans("GroupIsEmptyCheckSetup").'</span>';
+					$labeltoshow .= ' - <span class="warning">'.$langs->trans("GroupIsEmptyCheckSetup").'</span>';
 				}
+				print '<td class="tdoverflowmax250" title="'.dol_escape_htmltag(dol_string_nohtmltag($labeltoshow)).'">';
+				print $labeltoshow;
 				print '</td>';
 
 				print '<td class="right"><span class="amount">'.price($totCat['NP']).'</span></td>';
@@ -558,7 +549,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 						if ($showaccountdetail == 'all' || $resultN != 0) {
 							print '<tr>';
 							print '<td></td>';
-							print '<td class="tdoverflowmax200">';
+							print '<td class="tdoverflowmax250">';
 							print ' &nbsp; &nbsp; '.length_accountg($cpt['account_number']);
 							print ' - ';
 							print $cpt['account_label'];

From 34c2b20f7705b0d44352d9c7ae0bec3537276542 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 29 Dec 2022 20:45:08 +0100
Subject: [PATCH 136/816] css

---
 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 8615e595200..743fd4c0506 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -322,7 +322,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 				// Code and Label
 				print '<td class="liste_total tdoverflowmax100" title="'.dol_escape_htmltag($cat['code']).'">';
 				print dol_escape_htmltag($cat['code']);
-				print '</td><td class="tdoverflowmax250" title="'.dol_escape_htmltag($cat['label']).'">';
+				print '</td><td class="tdoverflowmax250 borderright" title="'.dol_escape_htmltag($cat['label']).'">';
 				print dol_escape_htmltag($cat['label']);
 				print '</td>';
 
@@ -370,7 +370,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 				//$r = $AccCat->calculate($result);
 				$r = dol_eval($result, 1, 1, '1');
 
-				print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
+				print '<td class="liste_total right borderright"><span class="amount">'.price($r).'</span></td>';
 				$sommes[$code]['N'] += $r;
 
 				// Detail by month
@@ -519,12 +519,12 @@ if ($modecompta == 'CREANCES-DETTES') {
 				} else {
 					$labeltoshow .= ' - <span class="warning">'.$langs->trans("GroupIsEmptyCheckSetup").'</span>';
 				}
-				print '<td class="tdoverflowmax250" title="'.dol_escape_htmltag(dol_string_nohtmltag($labeltoshow)).'">';
+				print '<td class="tdoverflowmax250 borderright" title="'.dol_escape_htmltag(dol_string_nohtmltag($labeltoshow)).'">';
 				print $labeltoshow;
 				print '</td>';
 
 				print '<td class="right"><span class="amount">'.price($totCat['NP']).'</span></td>';
-				print '<td class="right"><span class="amount">'.price($totCat['N']).'</span></td>';
+				print '<td class="right borderright"><span class="amount">'.price($totCat['N']).'</span></td>';
 
 				// Each month
 				foreach ($totCat['M'] as $k => $v) {
@@ -549,13 +549,13 @@ if ($modecompta == 'CREANCES-DETTES') {
 						if ($showaccountdetail == 'all' || $resultN != 0) {
 							print '<tr>';
 							print '<td></td>';
-							print '<td class="tdoverflowmax250">';
+							print '<td class="tdoverflowmax250 borderright">';
 							print ' &nbsp; &nbsp; '.length_accountg($cpt['account_number']);
 							print ' - ';
 							print $cpt['account_label'];
 							print '</td>';
 							print '<td class="right"><span class="amount">'.price($resultNP).'</span></td>';
-							print '<td class="right"><span class="amount">'.price($resultN).'</span></td>';
+							print '<td class="right borderright"><span class="amount">'.price($resultN).'</span></td>';
 
 							// Make one call for each month
 							foreach ($months as $k => $v) {

From 9d777497db1f0cc7729303dd8d6e059d89d4ed1d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 29 Dec 2022 22:07:26 +0100
Subject: [PATCH 137/816] NEW dol_sort_array can sort on alphabetical order
 even if val is num

---
 htdocs/accountancy/admin/categories.php | 2 +-
 htdocs/core/lib/functions.lib.php       | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php
index 2a15921243f..7b660419daf 100644
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -182,7 +182,7 @@ if ((empty($action) || $action == 'display' || $action == 'delete') && $cat_id >
 		}
 
 		if (is_array($accountingcategory->lines_display) && count($accountingcategory->lines_display) > 0) {
-			$accountingcategory->lines_display = dol_sort_array($accountingcategory->lines_display, $sortfield, $sortorder, 1, 0, 1);
+			$accountingcategory->lines_display = dol_sort_array($accountingcategory->lines_display, $sortfield, $sortorder, -1, 0, 1);
 
 			foreach ($accountingcategory->lines_display as $cpt) {
 				print '<tr class="oddeven">';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index cc32224ff2b..85cb8a9cdfe 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8671,7 +8671,8 @@ function dol_htmloutput_errors($mesgstring = '', $mesgarray = array(), $keepembe
  *  @param      array		$array      		Array to sort (array of array('key1'=>val1,'key2'=>val2,'key3'...) or array of objects)
  *  @param      string		$index				Key in array to use for sorting criteria
  *  @param      int			$order				Sort order ('asc' or 'desc')
- *  @param      int			$natsort			1=use "natural" sort (natsort) for a search criteria thats is strings or unknown, 0=use "standard" sort (asort) for numbers
+ *  @param      int			$natsort			If values are strings (I said value not type): 0=Use alphabetical order, 1=use "natural" sort (natsort)
+ *   											If values are numeric (I said value not type): 0=Use numeric order (even if type is string) so use a "natural" sort, 1=use "natural" sort too (same than 0), -1=Force alphabetical order
  *  @param      int			$case_sensitive		1=sort is case sensitive, 0=not case sensitive
  *  @param		int			$keepindex			If 0 and index key of array to sort is a numeric, than index will be rewrote. If 1 or index key is not numeric, key for index is kept after sorting.
  *  @return     array							Sorted array
@@ -8691,9 +8692,12 @@ function dol_sort_array(&$array, $index, $order = 'asc', $natsort = 0, $case_sen
 				} else {
 					$temp[$key] = empty($array[$key][$index]) ? 0 : $array[$key][$index];
 				}
+				if ($natsort == -1) {
+					$temp[$key] = '___'.$temp[$key];        // We add a string at begin of value to force an alpha order when using asort.
+				}
 			}
 
-			if (!$natsort) {
+			if (empty($natsort) || $natsort == -1) {
 				if ($order == 'asc') {
 					asort($temp);
 				} else {

From 400a1686873fbc06ea924e8c321f522f5c7e8c73 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 29 Dec 2022 23:20:46 +0100
Subject: [PATCH 138/816] NEW Can modify the date of payment of a salary (if
 not reconciled)

---
 htdocs/compta/paiement/card.php               | 11 +--
 htdocs/compta/payment_sc/card.php             | 12 +++-
 htdocs/salaries/class/paymentsalary.class.php | 68 +++++++++++++++++--
 htdocs/salaries/paiement_salary.php           |  2 +-
 htdocs/salaries/payment_salary/card.php       | 37 +++++++---
 5 files changed, 105 insertions(+), 25 deletions(-)

diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index cc39a790527..073365fa876 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -84,7 +84,7 @@ if ($action == 'setnote' && $user->hasRight('facture', 'paiement')) {
 	}
 }
 
-if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->facture->paiement) {
+if ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight('facture', 'paiement')) {
 	$db->begin();
 
 	$result = $object->delete();
@@ -105,7 +105,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->facture->
 	}
 }
 
-if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->facture->paiement) {
+if ($action == 'confirm_validate' && $confirm == 'yes' && $user->hasRight('facture', 'paiement')) {
 	$db->begin();
 
 	if ($object->validate($user) > 0) {
@@ -175,7 +175,7 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->facture
 	}
 }
 
-if ($action == 'setnum_paiement' && GETPOST('num_paiement')) {
+if ($action == 'setnum_paiement' && GETPOST('num_paiement') && $user->hasRight('facture', 'paiement')) {
 	$res = $object->update_num(GETPOST('num_paiement'));
 	if ($res === 0) {
 		setEventMessages($langs->trans('PaymentNumberUpdateSucceeded'), null, 'mesgs');
@@ -184,7 +184,7 @@ if ($action == 'setnum_paiement' && GETPOST('num_paiement')) {
 	}
 }
 
-if ($action == 'setdatep' && GETPOST('datepday')) {
+if ($action == 'setdatep' && GETPOST('datepday') && $user->hasRight('facture', 'paiement')) {
 	$datepaye = dol_mktime(GETPOST('datephour', 'int'), GETPOST('datepmin', 'int'), GETPOST('datepsec', 'int'), GETPOST('datepmonth', 'int'), GETPOST('datepday', 'int'), GETPOST('datepyear', 'int'));
 	$res = $object->update_date($datepaye);
 	if ($res === 0) {
@@ -193,7 +193,8 @@ if ($action == 'setdatep' && GETPOST('datepday')) {
 		setEventMessages($langs->trans('PaymentDateUpdateFailed'), null, 'errors');
 	}
 }
-if ($action == 'createbankpayment' && !empty($user->rights->facture->paiement)) {
+
+if ($action == 'createbankpayment' && $user->hasRight('facture', 'paiement')) {
 	$db->begin();
 
 	// Create the record into bank for the amount of payment $object
diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
index 39bac75ba0c..7d7742c3f01 100644
--- a/htdocs/compta/payment_sc/card.php
+++ b/htdocs/compta/payment_sc/card.php
@@ -63,7 +63,7 @@ if ($id > 0) {
  */
 
 // Delete payment
-if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->tax->charges->supprimer) {
+if ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight('tax', 'charges', 'supprimer')) {
 	$db->begin();
 
 	$result = $object->delete($user);
@@ -77,6 +77,16 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->tax->char
 	}
 }
 
+if ($action == 'setdatep' && GETPOST('datepday') && $user->hasRight('tax', 'charges', 'creer')) {
+	$datepaye = dol_mktime(GETPOST('datephour', 'int'), GETPOST('datepmin', 'int'), GETPOST('datepsec', 'int'), GETPOST('datepmonth', 'int'), GETPOST('datepday', 'int'), GETPOST('datepyear', 'int'));
+	$res = $object->update_date($datepaye);
+	if ($res === 0) {
+		setEventMessages($langs->trans('PaymentDateUpdateSucceeded'), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans('PaymentDateUpdateFailed'), null, 'errors');
+	}
+}
+
 
 /*
  * View
diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index 029e5732f9b..a2de50aeed4 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -602,12 +602,66 @@ class PaymentSalary extends CommonObject
 		}
 	}
 
+	/**
+	 *	Updates the payment date.
+	 *  Old name of function is update_date()
+	 *
+	 *  @param	int	$date   		New date
+	 *  @return int					<0 if KO, 0 if OK
+	 */
+	public function updatePaymentDate($date)
+	{
+		$error = 0;
+
+		if (!empty($date)) {
+			$this->db->begin();
+
+			dol_syslog(get_class($this)."::updatePaymentDate with date = ".$date, LOG_DEBUG);
+
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " SET datep = '".$this->db->idate($date)."'";
+			$sql .= " WHERE rowid = ".((int) $this->id);
+
+			$result = $this->db->query($sql);
+			if (!$result) {
+				$error++;
+				$this->error = 'Error -1 '.$this->db->error();
+			}
+
+			$type = $this->element;
+
+			$sql = "UPDATE ".MAIN_DB_PREFIX.'bank';
+			$sql .= " SET dateo = '".$this->db->idate($date)."', datev = '".$this->db->idate($date)."'";
+			$sql .= " WHERE rowid IN (SELECT fk_bank FROM ".MAIN_DB_PREFIX."bank_url WHERE type = '".$this->db->escape($type)."' AND url_id = ".((int) $this->id).")";
+			$sql .= " AND rappro = 0";
+
+			$result = $this->db->query($sql);
+			if (!$result) {
+				$error++;
+				$this->error = 'Error -1 '.$this->db->error();
+			}
+
+			if (!$error) {
+			}
+
+			if (!$error) {
+				$this->datep = $date;
+
+				$this->db->commit();
+				return 0;
+			} else {
+				$this->db->rollback();
+				return -2;
+			}
+		}
+		return -1; //no date given or already validated
+	}
 
 	/**
-	 * Retourne le libelle du statut d'une facture (brouillon, validee, abandonnee, payee)
+	 *  Return the label of the status
 	 *
-	 * @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 * @return  string				Libelle
+	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *  @return	string 			       Label of status
 	 */
 	public function getLibStatut($mode = 0)
 	{
@@ -616,11 +670,11 @@ class PaymentSalary extends CommonObject
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 * Renvoi le libelle d'un statut donne
+	 *  Return the status
 	 *
-	 * @param   int		$status     Statut
-	 * @param   int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 * @return	string  		    Libelle du statut
+	 *  @param	int		$status        Id status
+	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *  @return string 			       Label of status
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
diff --git a/htdocs/salaries/paiement_salary.php b/htdocs/salaries/paiement_salary.php
index 30279ee3538..9f90e4c9ac9 100644
--- a/htdocs/salaries/paiement_salary.php
+++ b/htdocs/salaries/paiement_salary.php
@@ -57,7 +57,7 @@ restrictedArea($user, 'salaries', $object->id, 'salary', '');
  * Actions
  */
 
-if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'yes')) {
+if (($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'yes')) && $user->hasRight('salaries', 'write')) {
 	$error = 0;
 
 	if ($cancel) {
diff --git a/htdocs/salaries/payment_salary/card.php b/htdocs/salaries/payment_salary/card.php
index c9f0a151901..c6d73c5ec7f 100644
--- a/htdocs/salaries/payment_salary/card.php
+++ b/htdocs/salaries/payment_salary/card.php
@@ -20,10 +20,10 @@
  */
 
 /**
- *	    \file       htdocs/compta/payment_sc/card.php
- *		\ingroup    facture
- *		\brief      Onglet payment of a salary
- *		\remarks	Fichier presque identique a fournisseur/paiement/card.php
+ *	    \file       htdocs/salaries/payment_salary/card.php
+ *		\ingroup    salary
+ *		\brief      Tab to pay a salary
+ *		\remarks	File very similar with fournisseur/paiement/card.php
  */
 
 // Load Dolibarr environment
@@ -56,7 +56,7 @@ restrictedArea($user, 'salaries', $object->fk_salary, 'salary', '');	// $object
  */
 
 // Delete payment
-if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->salaries->delete) {
+if ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight('salaries', 'delete')) {
 	$db->begin();
 
 	$result = $object->delete($user);
@@ -70,6 +70,16 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->salaries-
 	}
 }
 
+if ($action == 'setdatep' && GETPOST('datepday') && $user->hasRight('salaries', 'write')) {
+	$datepaye = dol_mktime(GETPOST('datephour', 'int'), GETPOST('datepmin', 'int'), GETPOST('datepsec', 'int'), GETPOST('datepmonth', 'int'), GETPOST('datepday', 'int'), GETPOST('datepyear', 'int'), 'tzuserrel');
+	$res = $object->updatePaymentDate($datepaye);
+	if ($res === 0) {
+		setEventMessages($langs->trans('PaymentDateUpdateSucceeded'), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans('PaymentDateUpdateFailed'), null, 'errors');
+	}
+}
+
 
 /*
  * View
@@ -127,7 +137,7 @@ dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'id', '');
 print '<div class="fichecenter">';
 print '<div class="underbanner clearboth"></div>';
 
-print '<table class="border centpercent">';
+print '<table class="border centpercent tableforfield">';
 
 // Ref
 /*print '<tr><td class="titlefield">'.$langs->trans('Ref').'</td>';
@@ -136,21 +146,26 @@ print $form->showrefnav($object,'id','',1,'rowid','id');
 print '</td></tr>';*/
 
 // Date
-print '<tr><td>'.$langs->trans('Date').'</td><td colspan="3">'.dol_print_date($object->datep, 'day').'</td></tr>';
+print '<tr><td>';
+print $form->editfieldkey("Date", 'datep', $object->datep, $object, 1, 'datepicker');
+print '</td><td>';
+print $form->editfieldval("Date", 'datep', $object->datep, $object, 1, 'datepicker');
+print "</td>";
+print '</tr>';
 
 // Mode
-print '<tr><td>'.$langs->trans('Mode').'</td><td colspan="3">';
+print '<tr><td>'.$langs->trans('Mode').'</td><td>';
 print $langs->trans("PaymentType".$object->type_code);
 print '</td></tr>';
 
 // Numero
-print '<tr><td>'.$langs->trans('Numero').'</td><td colspan="3">'.$object->num_payment.'</td></tr>';
+print '<tr><td>'.$langs->trans('Numero').'</td><td>'.dol_escape_htmltag($object->num_payment).'</td></tr>';
 
 // Montant
-print '<tr><td>'.$langs->trans('Amount').'</td><td colspan="3">'.price($object->amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
+print '<tr><td>'.$langs->trans('Amount').'</td><td colspan="3">'.price($object->amount, 0, $langs, 1, -1, -1, $conf->currency).'</td></tr>';
 
 // Note
-print '<tr><td>'.$langs->trans('Note').'</td><td colspan="3">'.nl2br($object->note).'</td></tr>';
+print '<tr><td>'.$langs->trans('Note').'</td><td colspan="3">'.dol_nl2br($object->note).'</td></tr>';
 
 // Bank account
 if (isModEnabled("banque")) {

From 3cf90352bf20c4ec88870b7970fc484cd06294dc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 29 Dec 2022 23:51:47 +0100
Subject: [PATCH 139/816] Fix date timezone

---
 htdocs/salaries/class/paymentsalary.class.php |  1 +
 htdocs/salaries/payment_salary/card.php       | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index a2de50aeed4..ca4df1df4f9 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -266,6 +266,7 @@ class PaymentSalary extends CommonObject
 				$this->num_paiement = $obj->num_payment;
 				$this->num_payment = $obj->num_payment;
 				$this->note = $obj->note;
+				$this->note_private = $obj->note;
 				$this->fk_bank = $obj->fk_bank;
 				$this->fk_user_author = $obj->fk_user_author;
 				$this->fk_user_modif = $obj->fk_user_modif;
diff --git a/htdocs/salaries/payment_salary/card.php b/htdocs/salaries/payment_salary/card.php
index c6d73c5ec7f..25d28932a40 100644
--- a/htdocs/salaries/payment_salary/card.php
+++ b/htdocs/salaries/payment_salary/card.php
@@ -43,6 +43,8 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
 if ($user->socid) $socid = $user->socid;
 
+$salary = new Salary($db);
+
 $object = new PaymentSalary($db);
 if ($id > 0) {
 	$result = $object->fetch($id);
@@ -71,7 +73,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight('salarie
 }
 
 if ($action == 'setdatep' && GETPOST('datepday') && $user->hasRight('salaries', 'write')) {
-	$datepaye = dol_mktime(GETPOST('datephour', 'int'), GETPOST('datepmin', 'int'), GETPOST('datepsec', 'int'), GETPOST('datepmonth', 'int'), GETPOST('datepday', 'int'), GETPOST('datepyear', 'int'), 'tzuserrel');
+	$datepaye = dol_mktime(GETPOST('datephour', 'int'), GETPOST('datepmin', 'int'), GETPOST('datepsec', 'int'), GETPOST('datepmonth', 'int'), GETPOST('datepday', 'int'), GETPOST('datepyear', 'int'));	// field is a date in database, not a datetime, so we must use 'gmt' not 'tzuserrel'
 	$res = $object->updatePaymentDate($datepaye);
 	if ($res === 0) {
 		setEventMessages($langs->trans('PaymentDateUpdateSucceeded'), null, 'mesgs');
@@ -85,12 +87,10 @@ if ($action == 'setdatep' && GETPOST('datepday') && $user->hasRight('salaries',
  * View
  */
 
-llxHeader();
-
-$salary = new Salary($db);
-
 $form = new Form($db);
 
+llxHeader('', $langs->trans("SalaryPayment"));
+
 $h = 0;
 
 $head = array();

From 41f35d5947758b4f1f61907ea24601e8a2170c4d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 00:04:47 +0100
Subject: [PATCH 140/816] NEW Date for salary payment includes the hour/min

---
 htdocs/core/class/html.form.class.php              | 6 +++---
 htdocs/install/mysql/migration/17.0.0-18.0.0.sql   | 3 +++
 htdocs/install/mysql/tables/llx_payment_salary.sql | 2 +-
 htdocs/salaries/payment_salary/card.php            | 6 +++---
 htdocs/salaries/payments.php                       | 2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 9c193b90776..d766c74cde1 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -96,7 +96,7 @@ class Form
 	 * @param   string	$preselected    Value to show/edit (not used in this function)
 	 * @param	object	$object			Object
 	 * @param	boolean	$perm			Permission to allow button to edit parameter. Set it to 0 to have a not edited field.
-	 * @param	string	$typeofdata		Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols', 'datepicker' ('day' do not work, don't know why), 'checkbox:ckeditor:dolibarr_zzz:width:height:savemethod:1:rows:cols', 'select;xxx[:class]'...)
+	 * @param	string	$typeofdata		Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols', 'datepicker' ('day' do not work, don't know why), 'dayhour' or 'datehourpicker' 'checkbox:ckeditor:dolibarr_zzz:width:height:savemethod:1:rows:cols', 'select;xxx[:class]'...)
 	 * @param	string	$moreparam		More param to add on a href URL.
 	 * @param   int     $fieldrequired  1 if we want to show field as mandatory using the "fieldrequired" CSS.
 	 * @param   int     $notabletag     1=Do not output table tags but output a ':', 2=Do not output table tags and no ':', 3=Do not output table tags but output a ' '
@@ -192,7 +192,7 @@ class Form
 	 * @param	string	$value			Value to show/edit
 	 * @param	object	$object			Object
 	 * @param	boolean	$perm			Permission to allow button to edit parameter
-	 * @param	string	$typeofdata		Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols%', 'datepicker' ('day' do not work, don't know why), 'dayhour' or 'datepickerhour', 'ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols', 'select;xkey:xval,ykey:yval,...')
+	 * @param	string	$typeofdata		Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols%', 'datepicker' ('day' do not work, don't know why), 'dayhour' or 'datehourpicker', 'ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols', 'select;xkey:xval,ykey:yval,...')
 	 * @param	string	$editvalue		When in edit mode, use this value as $value instead of value (for example, you can provide here a formated price instead of numeric value). Use '' to use same than $value
 	 * @param	object	$extObject		External object
 	 * @param	mixed	$custommsg		String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')
@@ -200,7 +200,7 @@ class Form
 	 * @param   int     $notabletag     Do no output table tags
 	 * @param	string	$formatfunc		Call a specific function to output field in view mode (For example: 'dol_print_email')
 	 * @param	string	$paramid		Key of parameter for id ('id', 'socid')
-	 * @param	string	$gm				'auto' or 'tzuser' or 'tzserver' (when $typeofdata is a date)
+	 * @param	string	$gm				'auto' or 'tzuser' or 'tzuserrel' or 'tzserver' (when $typeofdata is a date)
 	 * @return  string					HTML edit field
 	 */
 	public function editfieldval($text, $htmlname, $value, $object, $perm, $typeofdata = 'string', $editvalue = '', $extObject = null, $custommsg = null, $moreparam = '', $notabletag = 0, $formatfunc = '', $paramid = 'id', $gm = 'auto')
diff --git a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
index 2910ccee23b..ae7d51a20dd 100644
--- a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
+++ b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
@@ -42,3 +42,6 @@ ALTER TABLE llx_facture DROP COLUMN amount;
 ALTER TABLE llx_socpeople CHANGE fk_prospectcontactlevel fk_prospectlevel varchar(12);
 
 ALTER TABLE llx_facture ADD COLUMN prorata_discount	real DEFAULT NULL;
+
+ALTER TABLE llx_payment_salary MODIFY COLUMN datep datetime;
+
diff --git a/htdocs/install/mysql/tables/llx_payment_salary.sql b/htdocs/install/mysql/tables/llx_payment_salary.sql
index 308e70effc2..0dd24eb199d 100644
--- a/htdocs/install/mysql/tables/llx_payment_salary.sql
+++ b/htdocs/install/mysql/tables/llx_payment_salary.sql
@@ -23,7 +23,7 @@ create table llx_payment_salary
   tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec           datetime,                   -- Create date
   fk_user         integer DEFAULT NULL,
-  datep           date,                       -- payment date
+  datep           datetime,                   -- payment date
   datev           date,                       -- value date (this field should not be here, only into bank tables)
   salary          double(24,8),               -- salary of user when payment was done
   amount          double(24,8) NOT NULL DEFAULT 0,
diff --git a/htdocs/salaries/payment_salary/card.php b/htdocs/salaries/payment_salary/card.php
index 25d28932a40..8e48dfb0d08 100644
--- a/htdocs/salaries/payment_salary/card.php
+++ b/htdocs/salaries/payment_salary/card.php
@@ -73,7 +73,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight('salarie
 }
 
 if ($action == 'setdatep' && GETPOST('datepday') && $user->hasRight('salaries', 'write')) {
-	$datepaye = dol_mktime(GETPOST('datephour', 'int'), GETPOST('datepmin', 'int'), GETPOST('datepsec', 'int'), GETPOST('datepmonth', 'int'), GETPOST('datepday', 'int'), GETPOST('datepyear', 'int'));	// field is a date in database, not a datetime, so we must use 'gmt' not 'tzuserrel'
+	$datepaye = dol_mktime(GETPOST('datephour', 'int'), GETPOST('datepmin', 'int'), GETPOST('datepsec', 'int'), GETPOST('datepmonth', 'int'), GETPOST('datepday', 'int'), GETPOST('datepyear', 'int'), 'tzuserrel');
 	$res = $object->updatePaymentDate($datepaye);
 	if ($res === 0) {
 		setEventMessages($langs->trans('PaymentDateUpdateSucceeded'), null, 'mesgs');
@@ -147,9 +147,9 @@ print '</td></tr>';*/
 
 // Date
 print '<tr><td>';
-print $form->editfieldkey("Date", 'datep', $object->datep, $object, 1, 'datepicker');
+print $form->editfieldkey("Date", 'datep', $object->datep, $object, 1, 'datehourpicker');
 print '</td><td>';
-print $form->editfieldval("Date", 'datep', $object->datep, $object, 1, 'datepicker');
+print $form->editfieldval("Date", 'datep', $object->datep, $object, 1, 'datehourpicker', '', null, null, '', 0, '', 'id', 'tzuserrel');
 print "</td>";
 print '</tr>';
 
diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
index 8fcc7183dae..75a18621ea1 100644
--- a/htdocs/salaries/payments.php
+++ b/htdocs/salaries/payments.php
@@ -575,7 +575,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	}
 
 	// Date payment
-	print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
+	print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'dayhour', 'tzuserrel')."</td>\n";
 	if (!$i) {
 		$totalarray['nbfield']++;
 	}

From e6035fee1cbb32c34ba00ebd9a17dd7523244758 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 00:12:48 +0100
Subject: [PATCH 141/816] NEW Can add the add now link on date into
 addfieldvalue()

---
 htdocs/core/class/html.form.class.php   | 13 ++++++++-----
 htdocs/salaries/payment_salary/card.php |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index d766c74cde1..678f34c52ad 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -194,16 +194,17 @@ class Form
 	 * @param	boolean	$perm			Permission to allow button to edit parameter
 	 * @param	string	$typeofdata		Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols%', 'datepicker' ('day' do not work, don't know why), 'dayhour' or 'datehourpicker', 'ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols', 'select;xkey:xval,ykey:yval,...')
 	 * @param	string	$editvalue		When in edit mode, use this value as $value instead of value (for example, you can provide here a formated price instead of numeric value). Use '' to use same than $value
-	 * @param	object	$extObject		External object
+	 * @param	object	$extObject		External object ???
 	 * @param	mixed	$custommsg		String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')
-	 * @param	string	$moreparam		More param to add on the form action href URL
+	 * @param	string	$moreparam		More param to add on the form on action href URL parameter
 	 * @param   int     $notabletag     Do no output table tags
 	 * @param	string	$formatfunc		Call a specific function to output field in view mode (For example: 'dol_print_email')
 	 * @param	string	$paramid		Key of parameter for id ('id', 'socid')
 	 * @param	string	$gm				'auto' or 'tzuser' or 'tzuserrel' or 'tzserver' (when $typeofdata is a date)
+	 * @param	array	$moreoptions	Array with more options. For example array('addnowlink'=>1)
 	 * @return  string					HTML edit field
 	 */
-	public function editfieldval($text, $htmlname, $value, $object, $perm, $typeofdata = 'string', $editvalue = '', $extObject = null, $custommsg = null, $moreparam = '', $notabletag = 0, $formatfunc = '', $paramid = 'id', $gm = 'auto')
+	public function editfieldval($text, $htmlname, $value, $object, $perm, $typeofdata = 'string', $editvalue = '', $extObject = null, $custommsg = null, $moreparam = '', $notabletag = 0, $formatfunc = '', $paramid = 'id', $gm = 'auto', $moreoptions = array())
 	{
 		global $conf, $langs;
 
@@ -276,9 +277,11 @@ class Form
 					$ret .= dol_string_neverthesehtmltags($valuetoshow, array('textarea'));
 					$ret .= '</textarea>';
 				} elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') {
-					$ret .= $this->selectDate($value, $htmlname, 0, 0, 1, 'form'.$htmlname, 1, 0, 0, '', '', '', '', 1, '', '', $gm);
+					$addnowlink = empty($moreoptions['addnowlink']) ? 0 : $moreoptions['addnowlink'];
+					$ret .= $this->selectDate($value, $htmlname, 0, 0, 1, 'form'.$htmlname, 1, $addnowlink, 0, '', '', '', '', 1, '', '', $gm);
 				} elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') {
-					$ret .= $this->selectDate($value, $htmlname, 1, 1, 1, 'form'.$htmlname, 1, 0, 0, '', '', '', '', 1, '', '', $gm);
+					$addnowlink = empty($moreoptions['addnowlink']) ? 0 : $moreoptions['addnowlink'];
+					$ret .= $this->selectDate($value, $htmlname, 1, 1, 1, 'form'.$htmlname, 1, $addnowlink, 0, '', '', '', '', 1, '', '', $gm);
 				} elseif (preg_match('/^select;/', $typeofdata)) {
 					$arraydata = explode(',', preg_replace('/^select;/', '', $typeofdata));
 					$arraylist = array();
diff --git a/htdocs/salaries/payment_salary/card.php b/htdocs/salaries/payment_salary/card.php
index 8e48dfb0d08..b35469ab27e 100644
--- a/htdocs/salaries/payment_salary/card.php
+++ b/htdocs/salaries/payment_salary/card.php
@@ -149,7 +149,7 @@ print '</td></tr>';*/
 print '<tr><td>';
 print $form->editfieldkey("Date", 'datep', $object->datep, $object, 1, 'datehourpicker');
 print '</td><td>';
-print $form->editfieldval("Date", 'datep', $object->datep, $object, 1, 'datehourpicker', '', null, null, '', 0, '', 'id', 'tzuserrel');
+print $form->editfieldval("Date", 'datep', $object->datep, $object, 1, 'datehourpicker', '', null, null, '', 0, '', 'id', 'tzuserrel', array('addnowlink'=>1));
 print "</td>";
 print '</tr>';
 

From fff3a492d5847b3eb6c27a6278f26b5902e31359 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 00:27:00 +0100
Subject: [PATCH 142/816] Fix date

---
 htdocs/salaries/card.php            | 11 +++++++----
 htdocs/salaries/paiement_salary.php |  6 +++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index 974407ff42d..0c4f3e57ff5 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -957,9 +957,12 @@ if ($id > 0) {
 			while ($i < $num) {
 				$objp = $db->fetch_object($resql);
 
-				print '<tr class="oddeven"><td>';
+				print '<tr class="oddeven">';
+				// Date
+				print '<td>';
 				print '<a href="'.DOL_URL_ROOT.'/salaries/payment_salary/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"), "payment").' '.$objp->rowid.'</a></td>';
-				print '<td>'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
+				// Date
+				print '<td>'.dol_print_date($db->jdate($objp->dp), 'dayhour', 'tzuserrel')."</td>\n";
 				$labeltype = $langs->trans("PaymentType".$objp->type_code) != ("PaymentType".$objp->type_code) ? $langs->trans("PaymentType".$objp->type_code) : $objp->paiement_type;
 				print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
 				if (isModEnabled("banque")) {
@@ -993,8 +996,8 @@ if ($id > 0) {
 			print '</tr>';
 		}
 
-		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";
+		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';
diff --git a/htdocs/salaries/paiement_salary.php b/htdocs/salaries/paiement_salary.php
index 9f90e4c9ac9..0c2c757e2dc 100644
--- a/htdocs/salaries/paiement_salary.php
+++ b/htdocs/salaries/paiement_salary.php
@@ -66,7 +66,7 @@ if (($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == '
 		exit;
 	}
 
-	$datepaye = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int'));
+	$datepaye = dol_mktime(GETPOST("rehour", 'int'), GETPOST("remin", 'int'), GETPOST("resec", 'int'), GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int'), 'tzuserrel');
 
 	if (!(GETPOST("paiementtype", 'int') > 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode")), null, 'errors');
@@ -210,9 +210,9 @@ if ($action == 'create') {
 	print '<tr><td class="tdtop">'.$langs->trans("RemainderToPay").'</td><td>'.price($total-$sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';*/
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
-	$datepaye = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int'));
+	$datepaye = dol_mktime(GETPOST("rehour", 'int'), GETPOST("remin", 'int'), GETPOST("resec", 'int'), GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int'));
 	$datepayment = empty($conf->global->MAIN_AUTOFILL_DATE) ? (GETPOST("remonth") ? $datepaye : -1) : '';
-	print $form->selectDate($datepayment, '', '', '', '', "add_payment", 1, 1);
+	print $form->selectDate($datepayment, '', 1, 1, 0, "add_payment", 1, 1);
 	print "</td>";
 	print '</tr>';
 

From f99fa791b2c9404317cf1fd49515389ca955640d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 01:24:24 +0100
Subject: [PATCH 143/816] Fix rounding

---
 .../accountancy/bookkeeping/listbyaccount.php | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index c24e509ff60..00626b2558c 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -962,8 +962,8 @@ while ($i < min($num, $limit)) {
 			} else {
 				print '<td class="right" colspan="' . $colspan . '">' . $langs->trans("TotalForAccount") . ' ' . length_accountg($displayed_account_number) . ':</td>';
 			}
-			print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
-			print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
+			print '<td class="nowrap right">'.price(price2num($sous_total_debit, 'MT')).'</td>';
+			print '<td class="nowrap right">'.price(price2num($sous_total_credit, 'MT')).'</td>';
 			print '<td colspan="'.$colspanend.'"></td>';
 			print '</tr>';
 			// Show balance of last shown account
@@ -972,13 +972,13 @@ while ($i < min($num, $limit)) {
 			print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("Balance").':</td>';
 			if ($balance > 0) {
 				print '<td class="nowraponall right">';
-				print price($sous_total_debit - $sous_total_credit);
+				print price(price2num($sous_total_debit - $sous_total_credit, 'MT'));
 				print '</td>';
 				print '<td></td>';
 			} else {
 				print '<td></td>';
 				print '<td class="nowraponall right">';
-				print price($sous_total_credit - $sous_total_debit);
+				print price(price2num($sous_total_credit - $sous_total_debit, 'MT'));
 				print '</td>';
 			}
 			print '<td colspan="'.$colspanend.'"></td>';
@@ -1233,8 +1233,8 @@ while ($i < min($num, $limit)) {
 if ($num > 0 && $colspan > 0) {
 	print '<tr class="liste_total">';
 	print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("TotalForAccount").' '.$accountg.':</td>';
-	print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
-	print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
+	print '<td class="nowrap right">'.price(price2num($sous_total_debit, 'MT')).'</td>';
+	print '<td class="nowrap right">'.price(price2num($sous_total_credit, 'MT')).'</td>';
 	print '<td colspan="'.$colspanend.'"></td>';
 	print '</tr>';
 	// Show balance of last shown account
@@ -1243,19 +1243,29 @@ if ($num > 0 && $colspan > 0) {
 	print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("Balance").':</td>';
 	if ($balance > 0) {
 		print '<td class="nowraponall right">';
-		print price($sous_total_debit - $sous_total_credit);
+		print price(price2num($sous_total_debit - $sous_total_credit, 'MT'));
 		print '</td>';
 		print '<td></td>';
 	} else {
 		print '<td></td>';
 		print '<td class="nowraponall right">';
-		print price($sous_total_credit - $sous_total_debit);
+		print price(price2num($sous_total_credit - $sous_total_debit, 'MT'));
 		print '</td>';
 	}
 	print '<td colspan="'.$colspanend.'"></td>';
 	print '</tr>';
 }
 
+
+// Clean total values to round them
+if (!empty($totalarray['val']['totaldebit'])) {
+	$totalarray['val']['totaldebit'] = price2num($totalarray['val']['totaldebit'], 'MT');
+}
+if (!empty($totalarray['val']['totalcredit'])) {
+	$totalarray['val']['totalcredit'] = price2num($totalarray['val']['totalcredit'], 'MT');
+}
+
+
 // Show total line
 include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 

From dd4810aef62901c33fbbba13dd49e13f1ffcc516 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 01:40:09 +0100
Subject: [PATCH 144/816] Fix escape

---
 htdocs/accountancy/bookkeeping/list.php          | 4 ++--
 htdocs/accountancy/bookkeeping/listbyaccount.php | 2 +-
 htdocs/accountancy/class/bookkeeping.class.php   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index ac1cc93cba7..eca5a1beadc 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -346,7 +346,7 @@ if (empty($reshook)) {
 		$listofaccountsforgroup2 = array();
 		if (is_array($listofaccountsforgroup)) {
 			foreach ($listofaccountsforgroup as $tmpval) {
-				$listofaccountsforgroup2[] = $tmpval['id'];
+				$listofaccountsforgroup2[] = "'".$db->escape($tmpval['id'])."'";
 			}
 		}
 		$filter['t.search_accounting_code_in'] = join(',', $listofaccountsforgroup2);
@@ -698,7 +698,7 @@ if (count($filter) > 0) {
 				$sqlwhere[] = natural_search("t.code_journal", $value, 3, 1);
 			}
 		} elseif ($key == 't.search_accounting_code_in' && !empty($value)) {
-			$sqlwhere[] = 't.numero_compte IN ('.$value.')';
+			$sqlwhere[] = 't.numero_compte IN ('.$db->sanitize($value, 1).')';
 		} else {
 			$sqlwhere[] = natural_search($key, $value, 0, 1);
 		}
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 00626b2558c..2e434550c25 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -291,7 +291,7 @@ if (empty($reshook)) {
 		$listofaccountsforgroup2 = array();
 		if (is_array($listofaccountsforgroup)) {
 			foreach ($listofaccountsforgroup as $tmpval) {
-				$listofaccountsforgroup2[] = $tmpval['id'];
+				$listofaccountsforgroup2[] = "'".$db->escape($tmpval['id'])."'";
 			}
 		}
 		$filter['t.search_accounting_code_in'] = join(',', $listofaccountsforgroup2);
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 0458250489f..bb5a6e472b1 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -903,7 +903,7 @@ class BookKeeping extends CommonObject
 						$sqlwhere[] = natural_search("t.code_journal", $value, 3, 1);
 					}
 				} elseif ($key == 't.search_accounting_code_in' && !empty($value)) {
-					$sqlwhere[] = 't.numero_compte IN ('.$value.')';
+					$sqlwhere[] = 't.numero_compte IN ('.$this->db->sanitize($value, 1).')';
 				} else {
 					$sqlwhere[] = natural_search($key, $value, 0, 1);
 				}

From 8d64f8617cfb86748874ef27ec861a10a0968df7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 01:52:41 +0100
Subject: [PATCH 145/816] Clean code

---
 .../class/accountingjournal.class.php         | 22 +------------------
 htdocs/comm/action/class/actioncomm.class.php |  4 ++--
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 4accf66e154..f56932d4985 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -454,27 +454,12 @@ class AccountingJournal extends CommonObject
 		}
 
 		$sql = "";
-
-		// FIXME sql error with Mysql 5.7
-		/*if ($in_bookkeeping == 'already' || $in_bookkeeping == 'notyet') {
-			$sql .= "WITH in_accounting_bookkeeping(fk_docdet) AS (";
-			$sql .= " SELECT DISTINCT fk_docdet";
-			$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping";
-			$sql .= " WHERE doc_type = 'asset'";
-			$sql .= ") ";
-		}*/
-
 		$sql .= "SELECT ad.fk_asset AS rowid, a.ref AS asset_ref, a.label AS asset_label, a.acquisition_value_ht AS asset_acquisition_value_ht";
 		$sql .= ", a.disposal_date AS asset_disposal_date, a.disposal_amount_ht AS asset_disposal_amount_ht, a.disposal_subject_to_vat AS asset_disposal_subject_to_vat";
 		$sql .= ", ad.rowid AS depreciation_id, ad.depreciation_mode, ad.ref AS depreciation_ref, ad.depreciation_date, ad.depreciation_ht, ad.accountancy_code_debit, ad.accountancy_code_credit";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "asset_depreciation as ad";
 		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "asset as a ON a.rowid = ad.fk_asset";
-		// FIXME sql error with Mysql 5.7
-		/*if ($in_bookkeeping == 'already' || $in_bookkeeping == 'notyet') {
-			$sql .= " LEFT JOIN in_accounting_bookkeeping as iab ON iab.fk_docdet = ad.rowid";
-		}*/
 		$sql .= " WHERE a.entity IN (" . getEntity('asset', 0) . ')'; // We don't share object for accountancy, we use source object sharing
-		// Compatibility with Mysql 5.7
 		if ($in_bookkeeping == 'already') {
 			$sql .= " AND EXISTS (SELECT iab.fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping AS iab WHERE iab.fk_docdet = ad.rowid AND doc_type = 'asset')";
 		} elseif ($in_bookkeeping == 'notyet') {
@@ -488,11 +473,6 @@ class AccountingJournal extends CommonObject
 		if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
 			$sql .= " AND ad.depreciation_date >= '" . $this->db->idate($conf->global->ACCOUNTING_DATE_START_BINDING) . "'";
 		}
-		// Already in bookkeeping or not
-		// FIXME sql error with Mysql 5.7
-		/*if ($in_bookkeeping == 'already' || $in_bookkeeping == 'notyet') {
-			$sql .= " AND iab.fk_docdet IS" . ($in_bookkeeping == 'already' ? " NOT" : "") . " NULL";
-		}*/
 		$sql .= " ORDER BY ad.depreciation_date";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -755,7 +735,7 @@ class AccountingJournal extends CommonObject
 				}
 			}
 
-			$journal_data[$pre_data_id] = $element;
+			$journal_data[(int) $pre_data_id] = $element;
 		}
 		unset($pre_data);
 
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index efe9374a748..244b3df9405 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -477,8 +477,8 @@ class ActionComm extends CommonObject
 			$this->elementtype = 'contract';
 		}
 
-		if (!is_array($this->userassigned) && !empty($this->userassigned)) {	// For backward compatibility when userassigned was an int instead fo array
-			$tmpid = $this->userassigned;
+		if (!is_array($this->userassigned) && !empty($this->userassigned)) {	// For backward compatibility when userassigned was an int instead of an array
+			$tmpid = (int) $this->userassigned;
 			$this->userassigned = array();
 			$this->userassigned[$tmpid] = array('id'=>$tmpid, 'transparency'=>$this->transparency);
 		}

From 8e82bb71482f12e28de447b7c01179d8d021e4a1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 02:00:31 +0100
Subject: [PATCH 146/816] Clean code

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

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 56e7868ec5a..9d0677a2fc9 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -565,7 +565,7 @@ if (empty($reshook)) {
 		}
 		if (!empty($object->url) && !isValidUrl($object->url)) {
 			$langs->load("errors");
-			setEventMessages('', $langs->trans("ErrorBadUrl", $object->url), 'errors');
+			setEventMessages($langs->trans("ErrorBadUrl", $object->url), null, 'errors');
 		}
 		$public = 0;
 		if (isset($public)) {
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 173c96fd297..2bfe94f418a 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -541,7 +541,7 @@ if (empty($reshook)) {
 			if ($result < 0) {
 				$error++;
 				$mesg = 'Failed to get bar code type information ';
-				setEventMessages($mesg.$stdobject->error, $mesg.$stdobject->errors, 'errors');
+				setEventMessages($mesg.$stdobject->error, $stdobject->errors, 'errors');
 			}
 			$object->barcode_type_code      = $stdobject->barcode_type_code;
 			$object->barcode_type_coder     = $stdobject->barcode_type_coder;
@@ -780,7 +780,7 @@ if (empty($reshook)) {
 				if ($result < 0) {
 					$error++;
 					$mesg = 'Failed to get bar code type information ';
-					setEventMessages($mesg.$stdobject->error, $mesg.$stdobject->errors, 'errors');
+					setEventMessages($mesg.$stdobject->error, $stdobject->errors, 'errors');
 				}
 				$object->barcode_type_code      = $stdobject->barcode_type_code;
 				$object->barcode_type_coder     = $stdobject->barcode_type_coder;
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index a7389c8949c..cb2b101307b 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -570,11 +570,11 @@ if (empty($reshook)) {
 				if (!empty($object->email) && !isValidEMail($object->email)) {
 					$langs->load("errors");
 					$error++;
-					setEventMessages('', $langs->trans("ErrorBadEMail", $object->email), 'errors');
+					setEventMessages($langs->trans("ErrorBadEMail", $object->email), null, 'errors');
 				}
 				if (!empty($object->url) && !isValidUrl($object->url)) {
 					$langs->load("errors");
-					setEventMessages('', $langs->trans("ErrorBadUrl", $object->url), 'errors');
+					setEventMessages($langs->trans("ErrorBadUrl", $object->url), null, 'errors');
 				}
 				if (!empty($object->webservices_url)) {
 					//Check if has transport, without any the soap client will give error

From 1afa3b4f81cbd195eca973e527c5f7c8627551f7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 01:58:13 +0100
Subject: [PATCH 147/816] Fix doxygen

---
 htdocs/core/class/ldap.class.php                          | 8 ++++----
 .../core/modules/stocktransfer/doc/pdf_eagle.modules.php  | 2 +-
 .../mymodule/doc/pdf_standard_myobject.modules.php        | 2 +-
 .../doc/pdf_standard_recruitmentjobposition.modules.php   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index 011d8a380ef..3dc45c753bc 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -1239,10 +1239,10 @@ class Ldap
 	/**
 	 * 		Load all attribute of a LDAP user
 	 *
-	 * 		@param	User	$user		User to search for. Not used if a filter is provided.
-	 *      @param  string	$filter		Filter for search. Must start with &.
-	 *                       	       	Examples: &(objectClass=inetOrgPerson) &(objectClass=user)(objectCategory=person) &(isMemberOf=cn=Sales,ou=Groups,dc=opencsi,dc=com)
-	 *		@return	int					>0 if OK, <0 if KO
+	 * 		@param	User|string	$user		Not used.
+	 *      @param  string		$filter		Filter for search. Must start with &.
+	 *                       		       	Examples: &(objectClass=inetOrgPerson) &(objectClass=user)(objectCategory=person) &(isMemberOf=cn=Sales,ou=Groups,dc=opencsi,dc=com)
+	 *		@return	int						>0 if OK, <0 if KO
 	 */
 	public function fetch($user, $filter)
 	{
diff --git a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
index 22601d93dae..35a52f35bd8 100644
--- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
@@ -895,7 +895,7 @@ class pdf_eagle extends ModelePdfStockTransfer
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
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 5c277b85ae4..b78a2a5f4d7 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
@@ -879,7 +879,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	Tcpdf			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
index 1a58085d8c9..61c2eb3ff20 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
@@ -798,7 +798,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	Tcpdf			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output

From 6c223eafc90994a95992102fd5c6b351d792bc2e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 01:58:13 +0100
Subject: [PATCH 148/816] Fix doxygen and warnings

---
 htdocs/admin/modules.php                                  | 4 ++--
 htdocs/core/class/html.form.class.php                     | 4 ++--
 htdocs/core/class/ldap.class.php                          | 8 ++++----
 htdocs/core/modules/modHoliday.class.php                  | 4 ----
 .../core/modules/stocktransfer/doc/pdf_eagle.modules.php  | 2 +-
 htdocs/fourn/commande/list.php                            | 2 +-
 .../class/api_knowledgemanagement.class.php               | 2 +-
 .../mymodule/doc/pdf_standard_myobject.modules.php        | 2 +-
 htdocs/product/class/api_products.class.php               | 6 +++---
 .../doc/pdf_standard_recruitmentjobposition.modules.php   | 2 +-
 10 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 8c9230d190c..45534aa66f5 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -844,10 +844,10 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 							}
 						}
 					}
-				} elseif (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs)) {
+				} elseif (preg_match('/^([^@]+)@([^@]+)$/i', (string) $objMod->config_page_url, $regs)) {
 					$codetoconfig .= '<a class="valignmiddle" href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1).'?save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').'</a>';
 				} else {
-					$codetoconfig .= '<a class="valignmiddle" href="'.$objMod->config_page_url.'?save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').'</a>';
+					$codetoconfig .= '<a class="valignmiddle" href="'.((string) $objMod->config_page_url).'?save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').'</a>';
 				}
 			} else {
 				$codetoconfig .= img_picto($langs->trans("NothingToSetup"), "setup", 'class="opacitytransp" style="padding-right: 6px"', false, 0, 0, '', 'fa-15');
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 678f34c52ad..f3a566b6014 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7755,7 +7755,7 @@ class Form
 			}
 		}
 		if (!is_object($objecttmp)) {
-			dol_syslog('Error bad setup of type for field '.$InfoFieldList, LOG_WARNING);
+			dol_syslog('Error bad setup of type for field '.join(',', $InfoFieldList), LOG_WARNING);
 			return 'Error bad setup of type for field '.join(',', $InfoFieldList);
 		}
 
@@ -9905,7 +9905,7 @@ class Form
 											method: "POST",
 											dataType: "json",
 											data: { fk_c_exp_tax_cat: $(this).val(), token: \''.currentToken().'\' },
-											url: "'.(DOL_URL_ROOT.'/expensereport/ajax/ajaxik.php?'.$params).'",
+											url: "'.(DOL_URL_ROOT.'/expensereport/ajax/ajaxik.php?'.join('&', $params)).'",
 										}).done(function( data, textStatus, jqXHR ) {
 											console.log(data);
 											if (typeof data.up != "undefined") {
diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index 011d8a380ef..3dc45c753bc 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -1239,10 +1239,10 @@ class Ldap
 	/**
 	 * 		Load all attribute of a LDAP user
 	 *
-	 * 		@param	User	$user		User to search for. Not used if a filter is provided.
-	 *      @param  string	$filter		Filter for search. Must start with &.
-	 *                       	       	Examples: &(objectClass=inetOrgPerson) &(objectClass=user)(objectCategory=person) &(isMemberOf=cn=Sales,ou=Groups,dc=opencsi,dc=com)
-	 *		@return	int					>0 if OK, <0 if KO
+	 * 		@param	User|string	$user		Not used.
+	 *      @param  string		$filter		Filter for search. Must start with &.
+	 *                       		       	Examples: &(objectClass=inetOrgPerson) &(objectClass=user)(objectCategory=person) &(isMemberOf=cn=Sales,ou=Groups,dc=opencsi,dc=com)
+	 *		@return	int						>0 if OK, <0 if KO
 	 */
 	public function fetch($user, $filter)
 	{
diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index 61bdc0e8f98..57ffe62e005 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -78,10 +78,6 @@ class modHoliday extends DolibarrModules
 		// Config pages
 		$this->config_page_url = array("holiday.php");
 
-
-		// Config pages. Put here list of php page names stored in admmin directory used to setup module.
-		// $this->config_page_url = array("holiday.php?leftmenu=setup@holiday");
-
 		// Dependencies
 		$this->hidden = false; // A condition to hide module
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
diff --git a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
index 22601d93dae..35a52f35bd8 100644
--- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
@@ -895,7 +895,7 @@ class pdf_eagle extends ModelePdfStockTransfer
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 3d458247bcf..3080a184abb 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -1208,7 +1208,7 @@ if ($resql) {
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 	if ($massaction == 'prevalidate') {
-		print $form->formconfirm($_SERVER["PHP_SELF"].$fieldstosearchall, $langs->trans("ConfirmMassValidation"), $langs->trans("ConfirmMassValidationQuestion"), "validate", null, '', 0, 200, 500, 1);
+		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassValidation"), $langs->trans("ConfirmMassValidationQuestion"), "validate", null, '', 0, 200, 500, 1);
 	}
 
 	if ($massaction == 'createbills') {
diff --git a/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php b/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
index ccf54b1d6d9..8232287b23b 100644
--- a/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
+++ b/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
@@ -114,7 +114,7 @@ class KnowledgeManagement extends DolibarrApi
 		}
 
 		if ($result < 0) {
-			throw new RestException(503, 'Error when retrieve category list : '.array_merge(array($categories->error), $categories->errors));
+			throw new RestException(503, 'Error when retrieve category list : '.join(',', array_merge(array($categories->error), $categories->errors)));
 		}
 
 		return $result;
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 5c277b85ae4..b78a2a5f4d7 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
@@ -879,7 +879,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	Tcpdf			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 76ee11f727e..7a10293d7e4 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -595,7 +595,7 @@ class Products extends DolibarrApi
 		}
 
 		if ($result < 0) {
-			throw new RestException(503, 'Error when retrieve category list : '.array_merge(array($categories->error), $categories->errors));
+			throw new RestException(503, 'Error when retrieve category list : '.join(',', array_merge(array($categories->error), $categories->errors)));
 		}
 
 		return $result;
@@ -628,7 +628,7 @@ class Products extends DolibarrApi
 		}
 
 		if ($result < 0) {
-			throw new RestException(503, 'Error when retrieve prices list : '.array_merge(array($this->product->error), $this->product->errors));
+			throw new RestException(503, 'Error when retrieve prices list : '.join(',', array_merge(array($this->product->error), $this->product->errors)));
 		}
 
 		return array(
@@ -719,7 +719,7 @@ class Products extends DolibarrApi
 		}
 
 		if ($result < 0) {
-			throw new RestException(503, 'Error when retrieve prices list : '.array_merge(array($this->product->error), $this->product->errors));
+			throw new RestException(503, 'Error when retrieve prices list : '.join(',', array_merge(array($this->product->error), $this->product->errors)));
 		}
 
 		return array(
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
index 1a58085d8c9..61c2eb3ff20 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
@@ -798,7 +798,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	Tcpdf			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output

From 3dfe09d1fee35d1de40411f6023d4b6d4b72c869 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 01:58:13 +0100
Subject: [PATCH 149/816] Fix doxygen

---
 htdocs/core/class/ldap.class.php                          | 8 ++++----
 .../core/modules/stocktransfer/doc/pdf_eagle.modules.php  | 2 +-
 .../mymodule/doc/pdf_standard_myobject.modules.php        | 2 +-
 .../doc/pdf_standard_recruitmentjobposition.modules.php   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index 011d8a380ef..3dc45c753bc 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -1239,10 +1239,10 @@ class Ldap
 	/**
 	 * 		Load all attribute of a LDAP user
 	 *
-	 * 		@param	User	$user		User to search for. Not used if a filter is provided.
-	 *      @param  string	$filter		Filter for search. Must start with &.
-	 *                       	       	Examples: &(objectClass=inetOrgPerson) &(objectClass=user)(objectCategory=person) &(isMemberOf=cn=Sales,ou=Groups,dc=opencsi,dc=com)
-	 *		@return	int					>0 if OK, <0 if KO
+	 * 		@param	User|string	$user		Not used.
+	 *      @param  string		$filter		Filter for search. Must start with &.
+	 *                       		       	Examples: &(objectClass=inetOrgPerson) &(objectClass=user)(objectCategory=person) &(isMemberOf=cn=Sales,ou=Groups,dc=opencsi,dc=com)
+	 *		@return	int						>0 if OK, <0 if KO
 	 */
 	public function fetch($user, $filter)
 	{
diff --git a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
index 22601d93dae..35a52f35bd8 100644
--- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
@@ -895,7 +895,7 @@ class pdf_eagle extends ModelePdfStockTransfer
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
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 bd5348b1566..05486989e1d 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
@@ -879,7 +879,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	Tcpdf			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
index 94e93c87baa..f4d2226d51d 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
@@ -798,7 +798,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	Tcpdf			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output

From b8092f1eae50f0bd987426564e6ad1930ca4ed77 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 01:58:13 +0100
Subject: [PATCH 150/816] Fix doxygen and warnings

---
 htdocs/admin/modules.php                                    | 4 ++--
 htdocs/core/class/html.form.class.php                       | 4 ++--
 htdocs/core/modules/modHoliday.class.php                    | 4 ----
 htdocs/fourn/commande/list.php                              | 2 +-
 .../class/api_knowledgemanagement.class.php                 | 2 +-
 htdocs/product/class/api_products.class.php                 | 6 +++---
 6 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 93eb5524a1d..46b711875b8 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -844,10 +844,10 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 							}
 						}
 					}
-				} elseif (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs)) {
+				} elseif (preg_match('/^([^@]+)@([^@]+)$/i', (string) $objMod->config_page_url, $regs)) {
 					$codetoconfig .= '<a class="valignmiddle" href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1).'?save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').'</a>';
 				} else {
-					$codetoconfig .= '<a class="valignmiddle" href="'.$objMod->config_page_url.'?save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').'</a>';
+					$codetoconfig .= '<a class="valignmiddle" href="'.((string) $objMod->config_page_url).'?save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').'</a>';
 				}
 			} else {
 				$codetoconfig .= img_picto($langs->trans("NothingToSetup"), "setup", 'class="opacitytransp" style="padding-right: 6px"', false, 0, 0, '', 'fa-15');
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index a9c17a2edba..3f4579340d0 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7720,7 +7720,7 @@ class Form
 			}
 		}
 		if (!is_object($objecttmp)) {
-			dol_syslog('Error bad setup of type for field '.$InfoFieldList, LOG_WARNING);
+			dol_syslog('Error bad setup of type for field '.join(',', $InfoFieldList), LOG_WARNING);
 			return 'Error bad setup of type for field '.join(',', $InfoFieldList);
 		}
 
@@ -9870,7 +9870,7 @@ class Form
 											method: "POST",
 											dataType: "json",
 											data: { fk_c_exp_tax_cat: $(this).val(), token: \''.currentToken().'\' },
-											url: "'.(DOL_URL_ROOT.'/expensereport/ajax/ajaxik.php?'.$params).'",
+											url: "'.(DOL_URL_ROOT.'/expensereport/ajax/ajaxik.php?'.join('&', $params)).'",
 										}).done(function( data, textStatus, jqXHR ) {
 											console.log(data);
 											if (typeof data.up != "undefined") {
diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index 61bdc0e8f98..57ffe62e005 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -78,10 +78,6 @@ class modHoliday extends DolibarrModules
 		// Config pages
 		$this->config_page_url = array("holiday.php");
 
-
-		// Config pages. Put here list of php page names stored in admmin directory used to setup module.
-		// $this->config_page_url = array("holiday.php?leftmenu=setup@holiday");
-
 		// Dependencies
 		$this->hidden = false; // A condition to hide module
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 3d458247bcf..3080a184abb 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -1208,7 +1208,7 @@ if ($resql) {
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 	if ($massaction == 'prevalidate') {
-		print $form->formconfirm($_SERVER["PHP_SELF"].$fieldstosearchall, $langs->trans("ConfirmMassValidation"), $langs->trans("ConfirmMassValidationQuestion"), "validate", null, '', 0, 200, 500, 1);
+		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassValidation"), $langs->trans("ConfirmMassValidationQuestion"), "validate", null, '', 0, 200, 500, 1);
 	}
 
 	if ($massaction == 'createbills') {
diff --git a/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php b/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
index ccf54b1d6d9..8232287b23b 100644
--- a/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
+++ b/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
@@ -114,7 +114,7 @@ class KnowledgeManagement extends DolibarrApi
 		}
 
 		if ($result < 0) {
-			throw new RestException(503, 'Error when retrieve category list : '.array_merge(array($categories->error), $categories->errors));
+			throw new RestException(503, 'Error when retrieve category list : '.join(',', array_merge(array($categories->error), $categories->errors)));
 		}
 
 		return $result;
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 76ee11f727e..7a10293d7e4 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -595,7 +595,7 @@ class Products extends DolibarrApi
 		}
 
 		if ($result < 0) {
-			throw new RestException(503, 'Error when retrieve category list : '.array_merge(array($categories->error), $categories->errors));
+			throw new RestException(503, 'Error when retrieve category list : '.join(',', array_merge(array($categories->error), $categories->errors)));
 		}
 
 		return $result;
@@ -628,7 +628,7 @@ class Products extends DolibarrApi
 		}
 
 		if ($result < 0) {
-			throw new RestException(503, 'Error when retrieve prices list : '.array_merge(array($this->product->error), $this->product->errors));
+			throw new RestException(503, 'Error when retrieve prices list : '.join(',', array_merge(array($this->product->error), $this->product->errors)));
 		}
 
 		return array(
@@ -719,7 +719,7 @@ class Products extends DolibarrApi
 		}
 
 		if ($result < 0) {
-			throw new RestException(503, 'Error when retrieve prices list : '.array_merge(array($this->product->error), $this->product->errors));
+			throw new RestException(503, 'Error when retrieve prices list : '.join(',', array_merge(array($this->product->error), $this->product->errors)));
 		}
 
 		return array(

From 9319f56599dec6a4686833e9f2d6ec5dcf1e04e9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 03:10:37 +0100
Subject: [PATCH 151/816] Fix css

---
 htdocs/asset/tpl/linkedobjectblock.tpl.php           |  4 ++--
 htdocs/bom/tpl/linkedobjectblock.tpl.php             |  4 ++--
 htdocs/comm/propal/tpl/linkedobjectblock.tpl.php     |  4 ++--
 htdocs/commande/tpl/linkedobjectblock.tpl.php        |  4 ++--
 htdocs/compta/facture/tpl/linkedobjectblock.tpl.php  |  2 +-
 .../facture/tpl/linkedobjectblockForRec.tpl.php      |  2 +-
 htdocs/mrp/tpl/linkedobjectblock.tpl.php             | 12 ++++++------
 htdocs/reception/tpl/linkedobjectblock.tpl.php       |  4 ++--
 htdocs/theme/eldy/global.inc.php                     |  3 +++
 htdocs/theme/md/style.css.php                        |  4 +++-
 htdocs/ticket/tpl/linkedobjectblock.tpl.php          |  4 ++--
 11 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/htdocs/asset/tpl/linkedobjectblock.tpl.php b/htdocs/asset/tpl/linkedobjectblock.tpl.php
index aef30995432..11d94714db8 100644
--- a/htdocs/asset/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/asset/tpl/linkedobjectblock.tpl.php
@@ -46,12 +46,12 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 		$trclass .= ' liste_sub_total';
 	}
 	echo '<tr class="'.$trclass.'" >';
-	echo '<td class="linkedcol-element" >'.$langs->trans("Asset");
+	echo '<td class="linkedcol-element tdoverflowmax100">'.$langs->trans("Asset");
 	if (!empty($showImportButton) && !empty($conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES)) {
 		print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines" data-element="'.$objectlink->element.'" data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
 	}
 	echo '</td>';
-	echo '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
+	echo '<td class="linkedcol-name tdoverflowmax150" >'.$objectlink->getNomUrl(1).'</td>';
 	echo '<td class="linkedcol-ref" align="center">'.$objectlink->label.'</td>';
 	echo '<td class="linkedcol-date" align="center">'.dol_print_date($objectlink->date_start, 'day').'</td>';
 	echo '<td class="linkedcol-amount right">';
diff --git a/htdocs/bom/tpl/linkedobjectblock.tpl.php b/htdocs/bom/tpl/linkedobjectblock.tpl.php
index 8a98c078bc5..1765e9a84c1 100644
--- a/htdocs/bom/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/bom/tpl/linkedobjectblock.tpl.php
@@ -47,12 +47,12 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 		$trclass .= ' liste_sub_total';
 	}
 	echo '<tr class="'.$trclass.'" >';
-	echo '<td class="linkedcol-element" >'.$langs->trans("Bom");
+	echo '<td class="linkedcol-element tdoverflowmax100">'.$langs->trans("Bom");
 	if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
 		print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines" data-element="'.$objectlink->element.'" data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
 	}
 	echo '</td>';
-	echo '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
+	echo '<td class="linkedcol-name tdoverflowmax150" >'.$objectlink->getNomUrl(1).'</td>';
 
 	echo '<td class="linkedcol-ref">';
 	$result = $product_static->fetch($objectlink->fk_product);
diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
index 613f06a6feb..6539efd6a27 100644
--- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
@@ -52,13 +52,13 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 		$trclass .= ' liste_sub_total';
 	}
 	print '<tr class="'.$trclass.'"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'" >';
-	print '<td class="linkedcol-element" >'.$langs->trans("Proposal");
+	print '<td class="linkedcol-element tdoverflowmax100">'.$langs->trans("Proposal");
 	if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
 		$url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$objectlink->id;
 		print '<a class="objectlinked_importbtn" href="'.$url.'&amp;action=selectlines"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a>';
 	}
 	print '</td>';
-	print '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
+	print '<td class="linkedcol-name tdoverflowmax150">'.$objectlink->getNomUrl(1).'</td>';
 	print '<td class="linkedcol-ref" >'.$objectlink->ref_client.'</td>';
 	print '<td class="linkedcol-date center">'.dol_print_date($objectlink->date, 'day').'</td>';
 	print '<td class="linkedcol-amount right">';
diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php
index 819a6ecb74f..a6a1fde3851 100644
--- a/htdocs/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php
@@ -46,12 +46,12 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 		$trclass .= ' liste_sub_total';
 	}
 	echo '<tr class="'.$trclass.'" >';
-	echo '<td class="linkedcol-element" >'.$langs->trans("CustomerOrder");
+	echo '<td class="linkedcol-element tdoverflowmax100">'.$langs->trans("CustomerOrder");
 	if (!empty($showImportButton) && !empty($conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES)) {
 		print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines" data-element="'.$objectlink->element.'" data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
 	}
 	echo '</td>';
-	echo '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
+	echo '<td class="linkedcol-name tdoverflowmax150" >'.$objectlink->getNomUrl(1).'</td>';
 	echo '<td class="linkedcol-ref">'.$objectlink->ref_client.'</td>';
 	echo '<td class="linkedcol-date center">'.dol_print_date($objectlink->date, 'day').'</td>';
 	echo '<td class="linkedcol-amount right">';
diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index 92204520b35..71cb16ec818 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -67,7 +67,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 			break;
 	}
 	print '</td>';
-	print '<td class="linkedcol-name nowraponall">'.$objectlink->getNomUrl(1).'</td>';
+	print '<td class="linkedcol-name tdoverflowmax150">'.$objectlink->getNomUrl(1).'</td>';
 	print '<td class="linkedcol-ref left">'.$objectlink->ref_client.'</td>';
 	print '<td class="linkedcol-date center">'.dol_print_date($objectlink->date, 'day').'</td>';
 	print '<td class="linkedcol-amount right">';
diff --git a/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
index d7e68e274fa..c3c774b79e7 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
@@ -47,7 +47,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	?>
 <tr class="<?php echo $trclass; ?>" >
 	<td class="linkedcol-element tdoverflowmax100"><?php echo $langs->trans("RepeatableInvoice"); ?></td>
-	<td class="linkedcol-name"><!-- nowraponall because ref is a label --><?php echo $objectlink->getNomUrl(1); ?></td>
+	<td class="linkedcol-name tdoverflowmax150"><?php echo $objectlink->getNomUrl(1); ?></td>
 	<td class="linkedcol-ref" align="center"></td>
 	<td class="linkedcol-date" align="center"><?php echo dol_print_date($objectlink->date_when, 'day'); ?></td>
 	<td class="linkedcol-amount right"><?php
diff --git a/htdocs/mrp/tpl/linkedobjectblock.tpl.php b/htdocs/mrp/tpl/linkedobjectblock.tpl.php
index dfa6d9797c2..918b49912ec 100644
--- a/htdocs/mrp/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/mrp/tpl/linkedobjectblock.tpl.php
@@ -51,17 +51,17 @@ if ($object->element == 'mo') {
 		$trclass = 'oddeven';
 
 		echo '<tr class="' . $trclass . '" >';
-		echo '<td class="linkedcol-element" >' . $langs->trans("ManufacturingOrder");
+		echo '<td class="linkedcol-element tdoverflowmax100">' . $langs->trans("ManufacturingOrder");
 		if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
 			print '<a class="objectlinked_importbtn" href="' . $objectlink->getNomUrl(0, '', 0, 1) . '&amp;action=selectlines" data-element="' . $objectlink->element . '" data-id="' . $objectlink->id . '"  > <i class="fa fa-indent"></i> </a';
 		}
 		echo '</td>';
-		echo '<td class="linkedcol-name nowraponall" >' . $objectlink->getNomUrl(1) . '</td>';
+		echo '<td class="linkedcol-name tdoverflowmax150">' . $objectlink->getNomUrl(1) . '</td>';
 
-		echo '<td class="linkedcol-ref" align="center">';
+		echo '<td class="linkedcol-ref center">';
 		//  $result = $product_static->fetch($objectlink->fk_product);
 		print '</td>';
-		echo '<td class="linkedcol-date" align="center">' . dol_print_date($objectlink->date_creation, 'day') . '</td>';
+		echo '<td class="linkedcol-date center">' . dol_print_date($objectlink->date_creation, 'day') . '</td>';
 		echo '<td class="linkedcol-amount right">-</td>';
 		echo '<td class="linkedcol-statut right">' . $objectlink->getLibStatut(3) . '</td>';
 		echo '<td class="linkedcol-action right">';
@@ -93,14 +93,14 @@ if ($object->element == 'mo') {
 			$trclass .= ' liste_sub_total';
 		}
 		print '<tr class="'.$trclass.'"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'" >';
-		print '<td class="linkedcol-element" >'.$langs->trans("ManufacturingOrder");
+		print '<td class="linkedcol-element tdoverflowmax100">'.$langs->trans("ManufacturingOrder");
 		if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
 			$url = DOL_URL_ROOT.'/mrp/mo_card.php?id='.$objectlink->id;
 			print '<a class="objectlinked_importbtn" href="'.$url.'&amp;action=selectlines"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a>';
 		}
 		print '</td>';
 
-		print '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
+		print '<td class="linkedcol-name tdoverflowmax150">'.$objectlink->getNomUrl(1).'</td>';
 		print '<td class="linkedcol-ref" >'.$objectlink->ref_client.'</td>';
 		print '<td class="linkedcol-date center">'.dol_print_date($objectlink->date_start_planned, 'day').'</td>';
 		print '<td class="linkedcol-amount right">-</td>';
diff --git a/htdocs/reception/tpl/linkedobjectblock.tpl.php b/htdocs/reception/tpl/linkedobjectblock.tpl.php
index 009534b91b5..341e30e3784 100644
--- a/htdocs/reception/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/reception/tpl/linkedobjectblock.tpl.php
@@ -50,12 +50,12 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	}
 	?>
 	<tr class="<?php echo $trclass; ?>">
-		<td class="linkedcol-element"><?php echo $langs->trans("Reception"); ?>
+		<td class="linkedcol-element tdoverflowmax100"><?php echo $langs->trans("Reception"); ?>
 		<?php if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
 			print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
 		} ?>
 		</td>
-		<td class="linkedcol-name nowraponall" ><?php echo $objectlink->getNomUrl(1); ?></td>
+		<td class="linkedcol-name tdoverflowmax150"><?php echo $objectlink->getNomUrl(1); ?></td>
 		<td class="linkedcol-ref tdoverflowmax100" title="<?php echo dol_escape_htmltag($objectlink->ref_supplier); ?>"><?php echo dol_escape_htmltag($objectlink->ref_supplier); ?></td>
 		<td class="linkedcol-date"><?php echo dol_print_date($objectlink->date_delivery, 'day'); ?></td>
 		<td class="linkedcol-amount right"><?php
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 1415f420e92..60235f66849 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1505,6 +1505,9 @@ table[summary="list_of_modules"] .fa-cog {
 .linkedcol-element {
 	min-width: 100px;
 }
+.linkedcol-amount {
+	white-space: nowrap;
+}
 
 .img-skinthumb {
 	width: 160px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index be49f427eae..2dcb5b84ed0 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1594,7 +1594,9 @@ table[summary="list_of_modules"] .fa-cog {
 .linkedcol-element {
 	min-width: 100px;
 }
-
+.linkedcol-amount {
+	white-space: nowrap;
+}
 .linkedcol-date {
 	text-align: center;
 }
diff --git a/htdocs/ticket/tpl/linkedobjectblock.tpl.php b/htdocs/ticket/tpl/linkedobjectblock.tpl.php
index 6a49597f1f4..4ba36894379 100644
--- a/htdocs/ticket/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/ticket/tpl/linkedobjectblock.tpl.php
@@ -46,12 +46,12 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	}
 	?>
 	<tr class="<?php echo $trclass; ?>" >
-		<td class="linkedcol-element" ><?php echo $langs->trans("Ticket"); ?>
+		<td class="linkedcol-element tdoverflowmax100"><?php echo $langs->trans("Ticket"); ?>
 		<?php if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
 			print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
 		} ?>
 		</td>
-		<td class="linkedcol-name nowraponall" ><?php echo $objectlink->getNomUrl(1); ?></td>
+		<td class="linkedcol-name tdoverflowmax150"><?php echo $objectlink->getNomUrl(1); ?></td>
 		<td class="linkedcol-ref center"><?php echo $objectlink->ref_client; ?></td>
 		<td class="linkedcol-date center"><?php echo dol_print_date($objectlink->datec, 'day'); ?></td>
 		<?php

From 534db40d87c70d806ced15d59d2b71abc7a62bda Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 04:15:10 +0100
Subject: [PATCH 152/816] Merge branch '16.0' of
 git@github.com:Dolibarr/dolibarr.git into 16.0

---
 htdocs/core/class/commonobject.class.php        | 17 ++++++++++++++++-
 ...ace_20_modWorkflow_WorkflowManager.class.php |  6 ++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 92fa8eff40b..b8cae867d71 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3789,7 +3789,7 @@ abstract class CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *	Add objects linked in llx_element_element.
+	 *	Add an object link into llx_element_element.
 	 *
 	 *	@param		string	$origin		Linked element type
 	 *	@param		int		$origin_id	Linked element id
@@ -4111,6 +4111,21 @@ abstract class CommonObject
 		}
 	}
 
+	/**
+	 *	Clear the cache saying that all linked object were already loaded. So next fetchObjectLinked will reload all links.
+	 *
+	 *	@return int						<0 if KO, >0 if OK
+	 *  @see	fetchObjectLinked()
+	 */
+	public function clearObjectLinkedCache()
+	{
+		if ($this->id > 0 && !empty($this->linkedObjectsFullLoaded[$this->id])) {
+			unset($this->linkedObjectsFullLoaded[$this->id]);
+		}
+
+		return 1;
+	}
+
 	/**
 	 *	Update object linked of a current object
 	 *
diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index 884790c990e..2fa476c25d8 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -90,6 +90,9 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 						$this->error = $newobject->error;
 						$this->errors[] = $newobject->error;
 					}
+
+					$object->clearObjectLinkedCache();
+
 					return $ret;
 				}
 			}
@@ -111,6 +114,9 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 					$this->error = $newobject->error;
 					$this->errors[] = $newobject->error;
 				}
+
+				$object->clearObjectLinkedCache();
+
 				return $ret;
 			}
 		}

From ed1c0897edf2f341acf6941c107fc5482fc9e3f0 Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Fri, 30 Dec 2022 10:59:45 +0100
Subject: [PATCH 153/816] NEW copyrights

---
 htdocs/accountancy/class/accountancyexport.class.php | 3 ++-
 htdocs/accountancy/tpl/export_journal.tpl.php        | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index e101c09abd3..a421d26eb70 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -5,7 +5,8 @@
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2016       Pierre-Henry Favre  <phf@atm-consulting.fr>
- * Copyright (C) 2016-2022  Open-DSI      		<support@open-dsi.fr>
+ * Copyright (C) 2016-2022  Alexandre Spangaro  <aspangaro@open-dsi.fr>
+ * Copyright (C) 2022  		Lionel Vessiller    <lvessiller@open-dsi.fr>
  * Copyright (C) 2013-2017  Olivier Geffroy     <jeff@jeffinfo.com>
  * Copyright (C) 2017       Elarifr. Ari Elbaz  <github@accedinfo.com>
  * Copyright (C) 2017-2019  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 f57d54fcfbd..8e3c914a6f5 100644
--- a/htdocs/accountancy/tpl/export_journal.tpl.php
+++ b/htdocs/accountancy/tpl/export_journal.tpl.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2015-2022  Open-DSI      		<support@open-dsi.fr>
+/* Copyright (C) 2015-2022  Alexandre Spangaro	<aspangaro@open-dsi.fr>
+ * Copyright (C) 2022  		Lionel Vessiller    <lvessiller@open-dsi.fr>
  * Copyright (C) 2016       Charlie Benke		<charlie@patas-monkey.com>
  * Copyright (C) 2022  		Progiseize         	<a.bisotti@progiseize.fr>
  *

From 44215be43443062881c48b645563ed00149e0083 Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Fri, 30 Dec 2022 11:10:11 +0100
Subject: [PATCH 154/816] FIX reload stickler-ci


From 5b94ee35daaf680089adf90b20db405c4cfaaacd Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 30 Dec 2022 12:04:55 +0100
Subject: [PATCH 155/816] update code toward php8 compliance

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

diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index e644c7813e7..96a179b93f3 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -73,7 +73,7 @@ if ($nolinesbefore) {
 	print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
 
 	if ($filtertype != 1) {
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			print '<td class="linecoluseunit left">';
 			print '<span id="title_units">';
 			print $langs->trans('Unit');
@@ -145,7 +145,7 @@ print '<td class="bordertop nobottom linecolqty right"><input type="text" size="
 print '</td>';
 
 if ($filtertype != 1) {
-	if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+	if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 		$coldisplay++;
 		print '<td class="nobottom linecoluseunit left">';
 		print '</td>';

From e5f08f69840a22e4a7cdd9e4a02a97f089b355e8 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 30 Dec 2022 12:07:05 +0100
Subject: [PATCH 156/816] update code toward php8 compliance

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

diff --git a/htdocs/bom/tpl/objectline_edit.tpl.php b/htdocs/bom/tpl/objectline_edit.tpl.php
index 88463996ebc..969b210e89b 100644
--- a/htdocs/bom/tpl/objectline_edit.tpl.php
+++ b/htdocs/bom/tpl/objectline_edit.tpl.php
@@ -126,7 +126,7 @@ if (($line->info_bits & 2) != 2) {
 print '</td>';
 
 if ($filtertype != 1) {
-	if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+	if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 		$coldisplay++;
 		print '<td class="nobottom linecoluseunit left">';
 		print '</td>';

From 32c161e576f40ab4100f9d35200528a7ed7ab486 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 12:10:23 +0100
Subject: [PATCH 157/816] Fix warnings

---
 htdocs/accountancy/class/accountancycategory.class.php | 4 ++--
 htdocs/api/index.php                                   | 4 ++--
 htdocs/blockedlog/class/authority.class.php            | 2 +-
 htdocs/core/class/dolgeoip.class.php                   | 4 ++--
 htdocs/emailcollector/class/emailcollector.class.php   | 2 +-
 htdocs/mailmanspip/class/mailmanspip.class.php         | 8 +++-----
 htdocs/product/class/html.formproduct.class.php        | 6 ++----
 htdocs/webservices/server_productorservice.php         | 2 +-
 8 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index 300ccff9c09..e6c4ff45922 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -446,7 +446,7 @@ class AccountancyCategory // extends CommonObject
 		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			$this->errors[] = $this->error;
-			dol_syslog(__METHOD__." ".implode(','.$this->errors), LOG_ERR);
+			dol_syslog(__METHOD__." ".implode(',', $this->errors), LOG_ERR);
 
 			return -1;
 		}
@@ -488,7 +488,7 @@ class AccountancyCategory // extends CommonObject
 		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			$this->errors[] = $this->error;
-			dol_syslog(__METHOD__." ".implode(','.$this->errors), LOG_ERR);
+			dol_syslog(__METHOD__." ".implode(',', $this->errors), LOG_ERR);
 
 			return -1;
 		}
diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index 085dd338e69..ba195b82c08 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -413,9 +413,9 @@ $result = $api->r->handle();
 
 if (Luracast\Restler\Defaults::$returnResponse) {
 	// We try to compress the data received data
-	if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'br') !== false && is_callable('brotli_compress')) {
+	if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'br') !== false && is_callable('brotli_compress') && defined('BROTLI_TEXT')) {
 		header('Content-Encoding: br');
-		$result = brotli_compress($result, 11, BROTLI_TEXT);
+		$result = brotli_compress($result, 11, constant('BROTLI_TEXT'));
 	} elseif (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'bz') !== false && is_callable('bzcompress')) {
 		header('Content-Encoding: bz');
 		$result = bzcompress($result, 9);
diff --git a/htdocs/blockedlog/class/authority.class.php b/htdocs/blockedlog/class/authority.class.php
index 7240aaf0151..0b665fedc3e 100644
--- a/htdocs/blockedlog/class/authority.class.php
+++ b/htdocs/blockedlog/class/authority.class.php
@@ -304,7 +304,7 @@ class BlockedLogAuthority
 				$url = $conf->global->BLOCKEDLOG_AUTHORITY_URL.'/blockedlog/ajax/authority.php?s='.$signature.'&b='.$block->signature;
 
 				$res = getURLContent($url);
-				echo $block->signature.' '.$url.' '.$res.'<br>';
+				echo $block->signature.' '.$url.' '.$res['content'].'<br>';
 				if ($res === 'blockalreadyadded' || $res === 'blockadded') {
 					$block->setCertified();
 				} else {
diff --git a/htdocs/core/class/dolgeoip.class.php b/htdocs/core/class/dolgeoip.class.php
index b4218bbfd40..24726fec7c3 100644
--- a/htdocs/core/class/dolgeoip.class.php
+++ b/htdocs/core/class/dolgeoip.class.php
@@ -86,8 +86,8 @@ class DolGeoIP
 				dol_syslog('DolGeoIP '.$this->errorlabel, LOG_ERR);
 				return 0;
 			}
-		} elseif (function_exists('geoip_open')) {
-			$this->gi = geoip_open($datfile, GEOIP_STANDARD);
+		} elseif (function_exists('geoip_open') && defined('GEOIP_STANDARD')) {
+			$this->gi = geoip_open($datfile, constant('GEOIP_STANDARD'));
 		} elseif (function_exists('geoip_country_code_by_name')) {
 			$this->gi = 'NOGI'; // We are using embedded php geoip functions
 			//print 'function_exists(geoip_country_code_by_name))='.function_exists('geoip_country_code_by_name');
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 8d72666ad53..4d7ef042e69 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -2305,7 +2305,7 @@ class EmailCollector extends CommonObject
 									'class' => 'compta/facture/class/facture.class.php',
 									'object' => 'Facture'),
 								'fournisseur/facture' => array('table' => 'facture_fourn',
-									'fields' => array('ref', ref_client),
+									'fields' => array('ref', 'ref_client'),
 									'class' => 'fourn/class/fournisseur.facture.class.php',
 									'object' => 'FactureFournisseur'),
 								'produit' => array('table' => 'product',
diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php
index bcfb1b83d6e..46701a459a6 100644
--- a/htdocs/mailmanspip/class/mailmanspip.class.php
+++ b/htdocs/mailmanspip/class/mailmanspip.class.php
@@ -77,7 +77,7 @@ class MailmanSpip
 	 */
 	public function isSpipEnabled()
 	{
-		if (defined("ADHERENT_USE_SPIP") && (ADHERENT_USE_SPIP == 1)) {
+		if (getDolGlobalInt("ADHERENT_USE_SPIP") == 1) {
 			return true;
 		}
 
@@ -91,10 +91,8 @@ class MailmanSpip
 	 */
 	public function checkSpipConfig()
 	{
-		if (defined('ADHERENT_SPIP_SERVEUR') && defined('ADHERENT_SPIP_USER') && defined('ADHERENT_SPIP_PASS') && defined('ADHERENT_SPIP_DB')) {
-			if (ADHERENT_SPIP_SERVEUR != '' && ADHERENT_SPIP_USER != '' && ADHERENT_SPIP_PASS != '' && ADHERENT_SPIP_DB != '') {
-				return true;
-			}
+		if (getDolGlobalString('ADHERENT_SPIP_SERVEUR') != '' && getDolGlobalString('ADHERENT_SPIP_USER') != '' && getDolGlobalString('ADHERENT_SPIP_PASS') != '' && getDolGlobalString('ADHERENT_SPIP_DB') != '') {
+			return true;
 		}
 
 		return false;
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 75a929f53e5..b4da53f4635 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -781,9 +781,7 @@ class FormProduct
 	 */
 	public function selectLotDataList($htmlname = 'batch_id', $empty = 0, $fk_product = 0, $fk_entrepot = 0, $objectLines = array())
 	{
-		global $conf, $langs;
-
-		dol_syslog(get_class($this)."::selectLotDataList $htmlname, $empty, $fk_product, $fk_entrepot,$objectLines", LOG_DEBUG);
+		dol_syslog(get_class($this)."::selectLotDataList $htmlname, $empty, $fk_product, $fk_entrepot", LOG_DEBUG);
 
 		$out = '';
 		$productIdArray = array();
@@ -817,7 +815,7 @@ class FormProduct
 					if (empty($fk_entrepot) || $fk_entrepot == $arraytypes['entrepot_id']) {
 						$label = $arraytypes['entrepot_label'] . ' - ';
 						$label .= $arraytypes['batch'];
-						$out .= '<option>' . $arraytypes['batch'] . '</option>';
+						$out .= '<option data-warehouse="'.dol_escape_htmltag($label).'">' . $arraytypes['batch'] . '</option>';
 					}
 				}
 			}
diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
index 25eeec6430f..bf46b063e64 100644
--- a/htdocs/webservices/server_productorservice.php
+++ b/htdocs/webservices/server_productorservice.php
@@ -962,7 +962,7 @@ function getListOfProductsOrServices($authentication, $filterproduct)
  * Get list of products for a category
  *
  * @param	array		$authentication		Array of authentication information
- * @param	array		$id					Category id
+ * @param	int			$id					Category id
  * @param	Translate	$lang				Force lang
  * @return	array							Array result
  */

From 8abde17e954f17ff94d84a32865cfa566c407aac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 12:15:18 +0100
Subject: [PATCH 158/816] Fix warning

---
 htdocs/core/modules/DolibarrModules.class.php | 4 ++--
 htdocs/product/card.php                       | 4 ++--
 qodana.yaml                                   | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 7297b17a6b7..afc19a12e92 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -299,10 +299,10 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	public $picto;
 
 	/**
-	 * @var string[] List of config pages
+	 * @var string[]|string 	List of config pages (Old modules uses a string. New one must use an array)
 	 *
 	 * Name of php pages stored into module/admin directory, used to setup module.
-	 * e.g.: "admin.php@module"
+	 * e.g.: array("setup.php@mymodule")
 	 */
 	public $config_page_url;
 
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 5574984b5fd..031dccadc53 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -541,7 +541,7 @@ if (empty($reshook)) {
 			if ($result < 0) {
 				$error++;
 				$mesg = 'Failed to get bar code type information ';
-				setEventMessages($mesg.$stdobject->error, $mesg.$stdobject->errors, 'errors');
+				setEventMessages($mesg.$stdobject->error, $stdobject->errors, 'errors');
 			}
 			$object->barcode_type_code      = $stdobject->barcode_type_code;
 			$object->barcode_type_coder     = $stdobject->barcode_type_coder;
@@ -780,7 +780,7 @@ if (empty($reshook)) {
 				if ($result < 0) {
 					$error++;
 					$mesg = 'Failed to get bar code type information ';
-					setEventMessages($mesg.$stdobject->error, $mesg.$stdobject->errors, 'errors');
+					setEventMessages($mesg.$stdobject->error, $stdobject->errors, 'errors');
 				}
 				$object->barcode_type_code      = $stdobject->barcode_type_code;
 				$object->barcode_type_coder     = $stdobject->barcode_type_coder;
diff --git a/qodana.yaml b/qodana.yaml
index 08dc6c18395..b1a76747a5b 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -61,4 +61,5 @@ exclude:
   - name: PhpClassConstantAccessedViaChildClassInspection
   - name: RegExpUnnecessaryNonCapturingGroup
   - name: PhpPregMatchReplaceWithComparisonInspection
-  - name: PhpArrayWriteIsNotUsedInspection
\ No newline at end of file
+  - name: PhpArrayWriteIsNotUsedInspection
+  - name: PhpUndefinedNamespaceInspection  
\ No newline at end of file

From c6dc5989445d78e9e47998ff3b4694799abedd10 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 12:39:09 +0100
Subject: [PATCH 159/816] Add qodana as github action

---
 .github/workflows/code_quality.yml             | 18 ++++++++++++++++++
 .../{exakat.yml => exakat.yml.disabled}        |  0
 2 files changed, 18 insertions(+)
 create mode 100644 .github/workflows/code_quality.yml
 rename .github/workflows/{exakat.yml => exakat.yml.disabled} (100%)

diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml
new file mode 100644
index 00000000000..ef097e161e7
--- /dev/null
+++ b/.github/workflows/code_quality.yml
@@ -0,0 +1,18 @@
+name: Qodana
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - main
+      - 'releases/*'
+
+jobs:
+  qodana:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: 'Qodana Scan'
+        uses: JetBrains/qodana-action@v2022.3.0
diff --git a/.github/workflows/exakat.yml b/.github/workflows/exakat.yml.disabled
similarity index 100%
rename from .github/workflows/exakat.yml
rename to .github/workflows/exakat.yml.disabled

From 218f1c8cc3968c43f2a3a04dee05263c3c9bd160 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 12:40:01 +0100
Subject: [PATCH 160/816] Fix qodana script

---
 .github/workflows/code_quality.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml
index ef097e161e7..e39ffc4fa12 100644
--- a/.github/workflows/code_quality.yml
+++ b/.github/workflows/code_quality.yml
@@ -4,8 +4,7 @@ on:
   pull_request:
   push:
     branches:
-      - main
-      - 'releases/*'
+      - develop
 
 jobs:
   qodana:

From 081cfcc137aadfe986b0e31ce291b8c198c9a566 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 12:42:45 +0100
Subject: [PATCH 161/816] Add missing secret key

---
 .github/workflows/code_quality.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml
index e39ffc4fa12..b27b64428e7 100644
--- a/.github/workflows/code_quality.yml
+++ b/.github/workflows/code_quality.yml
@@ -15,3 +15,5 @@ jobs:
           fetch-depth: 0
       - name: 'Qodana Scan'
         uses: JetBrains/qodana-action@v2022.3.0
+        env:
+          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
\ No newline at end of file

From f6765fcd982c1d65849fb79f1875c0d5a5ac913f Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 30 Dec 2022 12:43:12 +0100
Subject: [PATCH 162/816] update code toward php8 compliance

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

diff --git a/htdocs/bom/tpl/objectline_title.tpl.php b/htdocs/bom/tpl/objectline_title.tpl.php
index 5252baf61ca..0ede4190279 100644
--- a/htdocs/bom/tpl/objectline_title.tpl.php
+++ b/htdocs/bom/tpl/objectline_title.tpl.php
@@ -67,7 +67,7 @@ print '</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)) {
+	if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 		print '<td class="linecoluseunit left">' . $langs->trans('Unit') . '</td>';
 	}
 

From 4c51b2bb6bdca3d1ae70d720d569a9fbec117c49 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 30 Dec 2022 12:43:57 +0100
Subject: [PATCH 163/816] update code toward php8 compliance

---
 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 b7087b27288..d20692ac99a 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -119,7 +119,7 @@ echo price($line->qty, 0, '', 0, 0); // Yes, it is a quantity, not a price, but
 print '</td>';
 
 if ($filtertype != 1) {
-	if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+	if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 		print '<td class="linecoluseunit nowrap left">';
 		$label = $tmpproduct->getLabelOfUnit('long');
 		if ($label !== '') {

From 0710031b32afc9804980c99f80c371423663b7cc Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 30 Dec 2022 12:44:36 +0100
Subject: [PATCH 164/816] update code toward php8 compliance

---
 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 220356310fa..ae2302b55f5 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1513,7 +1513,7 @@ if ($action == 'create') {
 				//	print '<td width="80" class="right">'.$langs->trans("PriceUHTCurrency").'</td>';
 				//}
 				print '<td width="30" class="center">'.$langs->trans("Qty").'</td>';
-				if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+				if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 					print '<td width="30" class="left">'.$langs->trans("Unit").'</td>';
 				}
 				print '<td width="50" class="right">'.$langs->trans("ReductionShort").'</td>';
@@ -1594,7 +1594,7 @@ if ($action == 'create') {
 					// Quantity
 					print '<td class="center">'.$objp->qty.'</td>';
 					// Unit
-					if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+					if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 						print '<td class="left">'.$langs->trans($object->lines[$cursorline - 1]->getLabelOfUnit()).'</td>';
 					}
 					// Discount
@@ -1739,7 +1739,7 @@ if ($action == 'create') {
 					print '<td class="center"><input size="2" type="text" name="elqty" value="'.$objp->qty.'"></td>';
 
 					// Unit
-					if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+					if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 						print '<td class="left">';
 						print $form->selectUnits($objp->fk_unit, "unit");
 						print '</td>';
@@ -1765,7 +1765,7 @@ if ($action == 'create') {
 					if (isModEnabled('margin') && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) {
 						$colspan++;
 					}
-					if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+					if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 						$colspan++;
 					}
 

From c46e55aaeb503ad5a4d94dfda28eee67073f4ec2 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 30 Dec 2022 12:45:22 +0100
Subject: [PATCH 165/816] update code toward php8 compliance

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

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 82012400f68..076a9682ff5 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -651,7 +651,7 @@ abstract class CommonDocGenerator
 		);
 
 		// Units
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			  $resarray['line_unit'] = $outputlangs->trans($line->getLabelOfUnit('long'));
 			  $resarray['line_unit_short'] = $outputlangs->trans($line->getLabelOfUnit('short'));
 		}

From 5f3cea32f1d2ff8caf29f0d9331a8efd2a27e553 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 30 Dec 2022 12:45:54 +0100
Subject: [PATCH 166/816] update code toward php8 compliance

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index d9b86ae01da..2a7fb703dac 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -5100,7 +5100,7 @@ abstract class CommonObject
 			print '<td class="linecoluht_currency right">'.$langs->trans('PriceUHTCurrency').'</td>';
 		}
 		print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			print '<td class="linecoluseunit left">'.$langs->trans('Unit').'</td>';
 		}
 		print '<td class="linecoldiscount right">'.$langs->trans('ReductionShort').'</td>';
@@ -5238,7 +5238,7 @@ abstract class CommonObject
 		$this->tpl['total_ht'] = price($line->total_ht);
 		$this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);
 		$this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : '&nbsp;';
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));
 		}
 		$this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : '&nbsp;';

From 6617d595a6b1ed76e08aebdcfdf7280fee0cb96b Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 30 Dec 2022 12:46:43 +0100
Subject: [PATCH 167/816] update code toward php8 compliance

---
 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 f3a566b6014..d7ce577acb6 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2545,7 +2545,7 @@ class Form
 		$outarray = array();
 
 		// Units
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$langs->load('other');
 		}
 
@@ -2589,7 +2589,7 @@ class Form
 			$selectFields .= ", idprodcustprice, custprice, custprice_ttc, custprice_base_type, custtva_tx, custdefault_vat_code, custref";
 		}
 		// Units
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$sql .= ", u.label as unit_long, u.short_label as unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units";
 			$selectFields .= ', unit_long, unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units';
 		}
@@ -2634,7 +2634,7 @@ class Form
 			$sql .= " LEFT JOIN  ".$this->db->prefix()."product_customer_price as pcp ON pcp.fk_soc=".((int) $socid)." AND pcp.fk_product=p.rowid";
 		}
 		// Units
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$sql .= " LEFT JOIN ".$this->db->prefix()."c_units u ON u.rowid = p.fk_unit";
 		}
 		// Multilang : we add translation
@@ -2941,7 +2941,7 @@ class Form
 
 		// Units
 		$outvalUnits = '';
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			if (!empty($objp->unit_short)) {
 				$outvalUnits .= ' - '.$objp->unit_short;
 			}
@@ -3277,7 +3277,7 @@ class Form
 
 		$langs->load('stocks');
 		// Units
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$langs->load('other');
 		}
 
@@ -3292,7 +3292,7 @@ class Form
 			$sql .= ", p.description";
 		}
 		// Units
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$sql .= ", u.label as unit_long, u.short_label as unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units";
 		}
 		if (isModEnabled('barcode')) {
@@ -3305,7 +3305,7 @@ class Form
 		}
 		$sql .= " LEFT JOIN ".$this->db->prefix()."societe as s ON pfp.fk_soc = s.rowid";
 		// Units
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$sql .= " LEFT JOIN ".$this->db->prefix()."c_units u ON u.rowid = p.fk_unit";
 		}
 		$sql .= " WHERE p.entity IN (".getEntity('product').")";
@@ -3398,7 +3398,7 @@ class Form
 
 				// Units
 				$outvalUnits = '';
-				if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+				if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 					if (!empty($objp->unit_short)) {
 						$outvalUnits .= ' - '.$objp->unit_short;
 					}

From 19796c9db1da40a0a8ff51aa27e9accfe9b04d20 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 30 Dec 2022 12:47:18 +0100
Subject: [PATCH 168/816] update code toward php8 compliance

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

diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 5224f82a2f5..16906c95f86 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -233,7 +233,7 @@ class modProduct extends DolibarrModules
 		if (getDolGlobalInt('MAIN_MULTILANGS')) {
 			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('l.lang'=>'Language', 'l.label'=>'TranslatedLabel', 'l.description'=>'TranslatedDescription', 'l.note'=>'TranslatedNote'));
 		}
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$this->export_fields_array[$r]['p.fk_unit'] = 'Unit';
 		}
 		$this->export_TypeFields_array[$r] = array(
@@ -640,7 +640,7 @@ class modProduct extends DolibarrModules
 		if (isModEnabled('barcode')) {
 			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.barcode'=>'BarCode'));
 		}
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$this->import_fields_array[$r]['p.fk_unit'] = 'Unit';
 		}
 
@@ -724,7 +724,7 @@ class modProduct extends DolibarrModules
 		if (isModEnabled('barcode')) {
 			$import_sample = array_merge($import_sample, array('p.barcode'=>''));
 		}
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$import_sample = array_merge(
 				$import_sample,
 				array(

From 7cc97b2b09a11210d3e64906402ebe1418f75fc6 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 30 Dec 2022 12:47:52 +0100
Subject: [PATCH 169/816] update code toward php8 compliance

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

diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index 868303c231b..a316c746acb 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -198,7 +198,7 @@ class modService extends DolibarrModules
 		if (getDolGlobalInt('MAIN_MULTILANGS')) {
 			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('l.lang'=>'Language', 'l.label'=>'TranslatedLabel', 'l.description'=>'TranslatedDescription', 'l.note'=>'TranslatedNote'));
 		}
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$this->export_fields_array[$r]['p.fk_unit'] = 'Unit';
 		}
 		$this->export_TypeFields_array[$r] = array(
@@ -587,7 +587,7 @@ class modService extends DolibarrModules
 		if (isModEnabled('barcode')) {
 			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.barcode'=>'BarCode'));
 		}
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$this->import_fields_array[$r]['p.fk_unit'] = 'Unit';
 		}
 		// Add extra fields
@@ -678,7 +678,7 @@ class modService extends DolibarrModules
 		if (isModEnabled('barcode')) {
 			$import_sample = array_merge($import_sample, array('p.barcode'=>''));
 		}
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$import_sample = array_merge(
 				$import_sample,
 				array(

From 9d5670faa8a2849aed650cce66d25c08caa28be3 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 30 Dec 2022 12:48:27 +0100
Subject: [PATCH 170/816] update code toward php8 compliance

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

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 2bdda4421dc..8ebd1051a06 100644
--- a/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
+++ b/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
@@ -1319,7 +1319,7 @@ class pdf_standard_asset extends ModelePDFAsset
 			),
 			'border-left' => true, // add left line separator
 		);
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$this->cols['unit']['status'] = true;
 		}
 

From e8fe061071d0a322d8fa45ff78869993264612a3 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 30 Dec 2022 12:49:02 +0100
Subject: [PATCH 171/816] update code toward php8 compliance

---
 htdocs/core/modules/commande/doc/pdf_einstein.modules.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 4bfb6f93413..6fe07506958 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -173,7 +173,7 @@ class pdf_einstein extends ModelePDFCommandes
 
 		// Define position of columns
 		$this->posxdesc = $this->marge_gauche + 1;
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$this->posxtva = 101;
 			$this->posxup = 118;
 			$this->posxqty = 135;
@@ -509,7 +509,7 @@ class pdf_einstein extends ModelePDFCommandes
 					$pdf->MultiCell($this->posxunit - $this->posxqty - 0.8, 4, $qty, 0, 'R'); // Enough for 6 chars
 
 					// Unit
-					if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+					if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
 						$pdf->SetXY($this->posxunit, $curY);
 						$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
@@ -1238,7 +1238,7 @@ class pdf_einstein extends ModelePDFCommandes
 			$pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
 		}
 
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
 			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxunit - 1, $tab_top + 1);

From c3d75cb1d4ac561f8e5365b4f1d3994677595e91 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 30 Dec 2022 12:49:31 +0100
Subject: [PATCH 172/816] update code toward php8 compliance

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

diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index 584795d37e6..8614238c2c7 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -1866,7 +1866,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			),
 			'border-left' => true, // add left line separator
 		);
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$this->cols['unit']['status'] = true;
 		}
 

From 9ad1f6df196ceff263aca7490c8e4bed32a897fb Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 30 Dec 2022 12:50:17 +0100
Subject: [PATCH 173/816] update code toward php8 compliance

---
 htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 20504da255c..f223771900b 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -180,7 +180,7 @@ class pdf_crabe extends ModelePDFFactures
 
 		// Define position of columns
 		$this->posxdesc = $this->marge_gauche + 1;
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$this->posxtva = 101;
 			$this->posxup = 118;
 			$this->posxqty = 135;
@@ -677,7 +677,7 @@ class pdf_crabe extends ModelePDFFactures
 					$pdf->MultiCell($this->posxunit - $this->posxqty - 0.8, 4, $qty, 0, 'R'); // Enough for 6 chars
 
 					// Unit
-					if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+					if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
 						$pdf->SetXY($this->posxunit, $curY);
 						$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
@@ -1710,7 +1710,7 @@ class pdf_crabe extends ModelePDFFactures
 			$pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
 		}
 
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
 			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxunit - 1, $tab_top + 1);

From e3b724b6fa5022e4bd074db42a1778e3a806831c Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 30 Dec 2022 12:50:42 +0100
Subject: [PATCH 174/816] update code toward php8 compliance

---
 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 5a206410aa7..e61d438c8a5 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -2593,7 +2593,7 @@ class pdf_sponge extends ModelePDFFactures
 			),
 			'border-left' => true, // add left line separator
 		);
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$this->cols['unit']['status'] = true;
 		}
 

From a990d4df19c3e20749fdd3a31e45209d5d788b02 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 30 Dec 2022 12:52:20 +0100
Subject: [PATCH 175/816] update code toward php8 compliance

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

diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 6b16ac1c1b0..ff5283e2bb8 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -169,7 +169,7 @@ class pdf_azur extends ModelePDFPropales
 
 		// Define position of columns
 		$this->posxdesc = $this->marge_gauche + 1;
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$this->posxtva = 101;
 			$this->posxup = 118;
 			$this->posxqty = 135;
@@ -620,7 +620,7 @@ class pdf_azur extends ModelePDFPropales
 					$pdf->MultiCell($this->posxunit - $this->posxqty - 0.8, 4, $qty, 0, 'R'); // Enough for 6 chars
 
 					// Unit
-					if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+					if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
 						$pdf->SetXY($this->posxunit, $curY);
 						$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
@@ -1437,7 +1437,7 @@ class pdf_azur extends ModelePDFPropales
 			$pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
 		}
 
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
 			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxunit - 1, $tab_top + 1);

From 42e8740a8d9a501c972899dffceb4480309e6b45 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 30 Dec 2022 12:53:07 +0100
Subject: [PATCH 176/816] update code toward php8 compliance

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

diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 2cf90351cd0..753e1511197 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -2009,7 +2009,7 @@ class pdf_cyan extends ModelePDFPropales
 			),
 			'border-left' => true, // add left line separator
 		);
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$this->cols['unit']['status'] = true;
 		}
 

From 5f240db64d6e6adf4729ae9a06c9664d09c2014e Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 30 Dec 2022 12:53:42 +0100
Subject: [PATCH 177/816] update code toward php8 compliance

---
 .../modules/supplier_invoice/doc/pdf_canelle.modules.php    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
index f81cc03009b..802abd6a184 100644
--- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
@@ -161,7 +161,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$this->posxdiscount = 162;
 		$this->postotalht = 174;
 
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$this->posxtva = 99;
 			$this->posxup = 114;
 			$this->posxqty = 130;
@@ -480,7 +480,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					$pdf->MultiCell($this->posxunit - $this->posxqty - 0.8, 4, $qty, 0, 'R'); // Enough for 6 chars
 
 					// Unit
-					if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+					if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
 						$pdf->SetXY($this->posxunit, $curY);
 						$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
@@ -932,7 +932,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			$pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
 		}
 
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
 			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxunit - 1, $tab_top + 1);

From 44182f6e50dbda98b3fd8a1da15fc9366367286d Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 30 Dec 2022 12:54:28 +0100
Subject: [PATCH 178/816] update code toward php8 compliance

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

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 c83863339c2..186ea465568 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -1623,7 +1623,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			),
 			'border-left' => true, // add left line separator
 		);
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$this->cols['unit']['status'] = true;
 		}
 

From b2f1ac3c73e198d73509df4c18eb8c97b3535534 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 30 Dec 2022 12:55:00 +0100
Subject: [PATCH 179/816] update code toward php8 compliance

---
 .../modules/supplier_order/doc/pdf_muscadet.modules.php     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 5754561c707..226c9dc6efa 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -169,7 +169,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		$this->posxdiscount = 162;
 		$this->postotalht = 174;
 
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$this->posxtva = 95;
 			$this->posxup = 114;
 			$this->posxqty = 132;
@@ -552,7 +552,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					$pdf->MultiCell($this->posxunit - $this->posxqty - 0.8, 4, $qty, 0, 'R'); // Enough for 6 chars
 
 					// Unit
-					if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+					if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
 						$pdf->SetXY($this->posxunit, $curY);
 						$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
@@ -1097,7 +1097,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			$pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
 		}
 
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
 			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxunit - 1, $tab_top + 1);

From 5256f30c3d3dbbbb9d4a3c4733c024c5ecd965be Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 30 Dec 2022 12:55:28 +0100
Subject: [PATCH 180/816] update code toward php8 compliance

---
 .../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 c844aec2c61..8e25a227ad7 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -167,7 +167,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$this->posxdiscount = 162;
 		$this->postotalht = 174;
 
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$this->posxup = 112;
 			$this->posxqty = 135;
 			$this->posxunit = 151;
@@ -527,7 +527,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					$pdf->MultiCell($this->posxunit - $this->posxqty - 0.8, 4, $qty, 0, 'R'); // Enough for 6 chars
 
 					// Unit
-					if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+					if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
 						$pdf->SetXY($this->posxunit, $curY);
 						$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
@@ -1200,7 +1200,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			$pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
 		}
 
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
 			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxunit - 1, $tab_top + 1);

From b407712e5aae4996e12e6fca56ea6ffb90eb022c Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 30 Dec 2022 12:55:53 +0100
Subject: [PATCH 181/816] update code toward php8 compliance

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

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index f008aacc10e..8c6cf1b9b7a 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -127,7 +127,7 @@ if ($nolinesbefore) {
 		<?php } ?>
 		<td class="linecolqty right"><?php echo $langs->trans('Qty'); ?></td>
 		<?php
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			print '<td class="linecoluseunit left">';
 			print '<span id="title_units">';
 			print $langs->trans('Unit');
@@ -424,7 +424,7 @@ if ($nolinesbefore) {
 	<input type="text" name="qty" id="qty" class="flat width40 right" value="<?php echo (GETPOSTISSET("qty") ? GETPOST("qty", 'alpha', 2) : 1); ?>">
 	</td>
 	<?php
-	if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+	if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 		$coldisplay++;
 		print '<td class="nobottom linecoluseunit left">';
 		print $form->selectUnits(empty($line->fk_unit) ? $conf->global->PRODUCT_USE_UNITS : $line->fk_unit, "units");

From 2df271f76c6014c655b60cec349b1fb0fdbaa300 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 12:58:08 +0100
Subject: [PATCH 182/816] Fix qodana by cron only

---
 .github/workflows/code_quality.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml
index b27b64428e7..2b01a676db1 100644
--- a/.github/workflows/code_quality.yml
+++ b/.github/workflows/code_quality.yml
@@ -1,10 +1,11 @@
 name: Qodana
 on:
-  workflow_dispatch:
-  pull_request:
-  push:
-    branches:
-      - develop
+  schedule:
+  - cron: "0 20 * * *"
+#  workflow_dispatch:
+#  push:
+#    branches:
+#      - develop
 
 jobs:
   qodana:

From b4e76da867051167d26b392badf9eeb687f81df7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 13:41:12 +0100
Subject: [PATCH 183/816] Fix warning

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

diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 5f577421cae..12531a57c5e 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -1518,7 +1518,7 @@ class EmailCollector extends CommonObject
 				$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)) {
+				if (preg_match('/\+(thi|ctc|use|mem|sub|proj|tas|con|tic|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'
diff --git a/qodana.yaml b/qodana.yaml
index b1a76747a5b..9de5ffc19de 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -1,6 +1,6 @@
 version: "1.0"
 linter: jetbrains/qodana-php:2022.3-eap
-failThreshold: 0
+failThreshold: 20000
 profile:
   name: qodana.recommended
 exclude:

From e8ea213503be7bd550b40ec9c0774bf7c6dfa411 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 13:51:58 +0100
Subject: [PATCH 184/816] Fix warning

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 85cb8a9cdfe..9f67a0e3909 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5058,7 +5058,7 @@ function dol_print_error($db = '', $error = '', $errors = null)
 		} elseif (is_array($errors)) {
 			$errors = array_merge(array($error), $errors);
 		} else {
-			$errors = array_merge(array($error));
+			$errors = array_merge(array($error), array($errors));
 		}
 
 		foreach ($errors as $msg) {

From db877b0bcb0997ca68de67f6e257e4523e3e7976 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 14:23:24 +0100
Subject: [PATCH 185/816] Fix warning

---
 .../compta/prelevement/class/bonprelevement.class.php  | 10 ++++++++++
 htdocs/opensurvey/class/opensurveysondage.class.php    |  2 ++
 htdocs/website/class/websitepage.class.php             |  2 ++
 3 files changed, 14 insertions(+)

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 959630a5538..373615ecdfb 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -72,6 +72,7 @@ class BonPrelevement extends CommonObject
 
 	public $date_trans;
 	public $user_trans;
+	public $method_trans;
 
 	public $total;
 	public $fetched;
@@ -83,6 +84,15 @@ class BonPrelevement extends CommonObject
 	public $invoice_in_error = array();
 	public $thirdparty_in_error = array();
 
+	public $amount;
+	public $note;
+	public $datec;
+
+	public $date_credit;
+	public $user_credit;
+
+	public $type;
+
 	const STATUS_DRAFT = 0;
 	const STATUS_TRANSFERED = 1;
 	const STATUS_CREDITED = 2;		// STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index 2014e57f629..f5dadd90f2e 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -83,6 +83,8 @@ class Opensurveysondage extends CommonObject
 
 	public $date_fin = '';
 
+	public $date_m;
+
 	/**
 	 * @var int status
 	 */
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 8660ca0b0c1..55916fc4fe2 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -56,6 +56,8 @@ class WebsitePage extends CommonObject
 	 */
 	public $fk_website;
 
+	public $fk_page;		// If translation of another page
+
 	public $pageurl;
 	public $aliasalt;
 	public $type_container;

From 24e3e278ed2ac65fd0a530466e5f141359f2b1b1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 13:51:58 +0100
Subject: [PATCH 186/816] Fix warning

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 10eb7b389a8..5b791594fea 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5058,7 +5058,7 @@ function dol_print_error($db = '', $error = '', $errors = null)
 		} elseif (is_array($errors)) {
 			$errors = array_merge(array($error), $errors);
 		} else {
-			$errors = array_merge(array($error));
+			$errors = array_merge(array($error), array($errors));
 		}
 
 		foreach ($errors as $msg) {

From 5d840843965974ac65e85e5157afb1c08fe43d6d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 14:23:24 +0100
Subject: [PATCH 187/816] Fix warning

---
 .../compta/prelevement/class/bonprelevement.class.php  | 10 ++++++++++
 htdocs/opensurvey/class/opensurveysondage.class.php    |  2 ++
 htdocs/website/class/websitepage.class.php             |  2 ++
 3 files changed, 14 insertions(+)

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 959630a5538..373615ecdfb 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -72,6 +72,7 @@ class BonPrelevement extends CommonObject
 
 	public $date_trans;
 	public $user_trans;
+	public $method_trans;
 
 	public $total;
 	public $fetched;
@@ -83,6 +84,15 @@ class BonPrelevement extends CommonObject
 	public $invoice_in_error = array();
 	public $thirdparty_in_error = array();
 
+	public $amount;
+	public $note;
+	public $datec;
+
+	public $date_credit;
+	public $user_credit;
+
+	public $type;
+
 	const STATUS_DRAFT = 0;
 	const STATUS_TRANSFERED = 1;
 	const STATUS_CREDITED = 2;		// STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index 2014e57f629..f5dadd90f2e 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -83,6 +83,8 @@ class Opensurveysondage extends CommonObject
 
 	public $date_fin = '';
 
+	public $date_m;
+
 	/**
 	 * @var int status
 	 */
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 8660ca0b0c1..55916fc4fe2 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -56,6 +56,8 @@ class WebsitePage extends CommonObject
 	 */
 	public $fk_website;
 
+	public $fk_page;		// If translation of another page
+
 	public $pageurl;
 	public $aliasalt;
 	public $type_container;

From 95986647b411827fa05496533c85f0753ad0ab13 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 14:56:55 +0100
Subject: [PATCH 188/816] Fix php8 compatibility

---
 .../actions_adherentcard_default.class.php    |  25 ----
 .../actions_contactcard_default.class.php     |  25 ----
 htdocs/core/class/canvas.class.php            |   1 +
 .../product/actions_card_product.class.php    | 139 ------------------
 .../service/actions_card_service.class.php    | 100 -------------
 htdocs/product/card.php                       |   1 -
 6 files changed, 1 insertion(+), 290 deletions(-)

diff --git a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
index c79143ab345..d5465abfcdd 100644
--- a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
+++ b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
@@ -116,30 +116,5 @@ class ActionsAdherentCardDefault extends ActionsAdherentCardCommon
 				$this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$this->object->id, $langs->trans("DeleteAdherent"), $langs->trans("ConfirmDeleteAdherent"), "confirm_delete", '', 0, 1);
 			}
 		}
-
-		if ($action == 'list') {
-			$this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
-		}
-	}
-
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 * 	Fetch datas list and save into ->list_datas
-	 *
-	 *  @param	int		$limit		Limit number of responses
-	 *  @param	int		$offset		Offset for first response
-	 *  @param	string	$sortfield	Sort field
-	 *  @param	string	$sortorder	Sort order ('ASC' or 'DESC')
-	 *  @return	void
-	 */
-	public function LoadListDatas($limit, $offset, $sortfield, $sortorder)
-	{
-		// phpcs:enable
-		global $conf, $langs;
-
-		//$this->getFieldList();
-
-		$this->list_datas = array();
 	}
 }
diff --git a/htdocs/contact/canvas/default/actions_contactcard_default.class.php b/htdocs/contact/canvas/default/actions_contactcard_default.class.php
index 846f7440f97..f126b8c32a0 100644
--- a/htdocs/contact/canvas/default/actions_contactcard_default.class.php
+++ b/htdocs/contact/canvas/default/actions_contactcard_default.class.php
@@ -115,30 +115,5 @@ class ActionsContactCardDefault extends ActionsContactCardCommon
 				$this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$this->object->id, $langs->trans("DeleteContact"), $langs->trans("ConfirmDeleteContact"), "confirm_delete", '', 0, 1);
 			}
 		}
-
-		if ($action == 'list') {
-			$this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
-		}
-	}
-
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 * 	Fetch datas list and save into ->list_datas
-	 *
-	 *  @param	int		$limit		Limit number of responses
-	 *  @param	int		$offset		Offset for first response
-	 *  @param	string	$sortfield	Sort field
-	 *  @param	string	$sortorder	Sort order ('ASC' or 'DESC')
-	 *  @return	void
-	 */
-	public function LoadListDatas($limit, $offset, $sortfield, $sortorder)
-	{
-		// phpcs:enable
-		global $conf, $langs;
-
-		//$this->getFieldList();
-
-		$this->list_datas = array();
 	}
 }
diff --git a/htdocs/core/class/canvas.class.php b/htdocs/core/class/canvas.class.php
index 67443a7bdb8..b40f086a1aa 100644
--- a/htdocs/core/class/canvas.class.php
+++ b/htdocs/core/class/canvas.class.php
@@ -164,6 +164,7 @@ class Canvas
 	 */
 	public function displayCanvasExists($action)
 	{
+		// template_dir should be '/'.$this->dirmodule.'/canvas/'.$this->canvas.'/tpl/', for example '/mymodule/canvas/product/tpl'
 		if (empty($this->template_dir)) {
 			return 0;
 		}
diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php
index 9e6db35754e..56ebab13344 100644
--- a/htdocs/product/canvas/product/actions_card_product.class.php
+++ b/htdocs/product/canvas/product/actions_card_product.class.php
@@ -39,7 +39,6 @@ class ActionsCardProduct
 
 	// List of fiels for action=list
 	public $field_list = array();
-	public $list_datas = array();
 
 
 	/**
@@ -88,8 +87,6 @@ class ActionsCardProduct
 		}
 		$this->object = $tmpobject;
 
-		//parent::assign_values($action);
-
 		foreach ($this->object as $key => $value) {
 			$this->tpl[$key] = $value;
 		}
@@ -227,10 +224,6 @@ class ActionsCardProduct
 
 			$this->tpl['fiche_end'] = dol_get_fiche_end();
 		}
-
-		if ($action == 'list') {
-			$this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
-		}
 	}
 
 
@@ -281,136 +274,4 @@ class ActionsCardProduct
 			dol_print_error($this->db, $sql);
 		}
 	}
-
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 * 	Fetch datas list and save into ->list_datas
-	 *
-	 *  @param	int		$limit		Limit number of responses
-	 *  @param	int		$offset		Offset for first response
-	 *  @param	string	$sortfield	Sort field
-	 *  @param	string	$sortorder	Sort order ('ASC' or 'DESC')
-	 *  @return	void
-	 */
-	public function LoadListDatas($limit, $offset, $sortfield, $sortorder)
-	{
-		// phpcs:enable
-		global $conf, $langs;
-
-		$this->getFieldListCanvas();
-
-		$this->list_datas = array();
-
-		// Clean parameters
-		$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
-
-		foreach ($this->field_list as $field) {
-			if ($field['enabled']) {
-				$fieldname = "s".$field['alias'];
-				$$fieldname = GETPOST($fieldname);
-			}
-		}
-
-		$sql = 'SELECT DISTINCT ';
-
-		// Fields requiered
-		$sql .= 'p.rowid, p.price_base_type, p.fk_product_type, p.seuil_stock_alerte, p.entity';
-
-		// Fields not requiered
-		foreach ($this->field_list as $field) {
-			if ($field['enabled']) {
-				$sql .= ", ".$field['name']." as ".$field['alias'];
-			}
-		}
-
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
-		$sql .= " WHERE p.entity IN (".getEntity('product').")";
-
-		if ($sall) {
-			$clause = '';
-			$sql .= " AND (";
-			foreach ($this->field_list as $field) {
-				if ($field['enabled']) {
-					$sql .= $clause." ".$field['name']." LIKE '%".$this->db->escape($sall)."%'";
-					if ($clause == '') {
-						$clause = ' OR';
-					}
-				}
-			}
-			$sql .= ")";
-		}
-
-		// Search fields
-		foreach ($this->field_list as $field) {
-			if ($field['enabled']) {
-				$fieldname = "s".$field['alias'];
-				if (${$fieldname}) {
-					$sql .= " AND ".$field['name']." LIKE '%".$this->db->escape(${$fieldname})."%'";
-				}
-			}
-		}
-
-		if (GETPOSTISSET("tosell")) {
-			$sql .= " AND p.tosell = ".((int) GETPOST("tosell", "int"));
-		}
-		if (GETPOSTISSET("canvas")) {
-			$sql .= " AND p.canvas = '".$this->db->escape(GETPOST("canvas"))."'";
-		}
-		$sql .= $this->db->order($sortfield, $sortorder);
-		$sql .= $this->db->plimit($limit + 1, $offset);
-		//print $sql;
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-
-			$i = 0;
-			while ($i < min($num, $limit)) {
-				$datas = array();
-
-				$obj = $this->db->fetch_object($resql);
-
-				$datas["id"] = $obj->rowid;
-
-				foreach ($this->field_list as $field) {
-					if ($field['enabled']) {
-						$alias = $field['alias'];
-
-						if ($alias == 'ref') {
-							$this->id = $obj->rowid;
-							$this->ref 		= $obj->$alias;
-							$this->type 	= $obj->fk_product_type;
-							$this->entity = $obj->entity;
-							$datas[$alias] = $this->getNomUrl(1, '', 24);
-						} elseif ($alias == 'stock') {
-							$this->load_stock();
-							if ($this->stock_reel < $obj->seuil_stock_alerte) {
-								$datas[$alias] = $this->stock_reel.' '.img_warning($langs->trans("StockTooLow"));
-							} else {
-								$datas[$alias] = $this->stock_reel;
-							}
-						} elseif ($alias == 'label') {
-							$datas[$alias] = dol_trunc($obj->$alias, 40);
-						} elseif (preg_match('/price/i', $alias)) {
-							$datas[$alias] = price($obj->$alias);
-						} elseif ($alias == 'datem') {
-							$datas[$alias] = dol_print_date($this->db->jdate($obj->$alias), 'day');
-						} elseif ($alias == 'status') {
-							$datas[$alias] = $this->LibStatut($obj->$alias, 5);
-						} else {
-							$datas[$alias] = $obj->$alias;
-						}
-					}
-				}
-
-				array_push($this->list_datas, $datas);
-
-				$i++;
-			}
-			$this->db->free($resql);
-		} else {
-			dol_print_error($this->db);
-		}
-	}
 }
diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php
index b07c3d96a52..021de9b215e 100644
--- a/htdocs/product/canvas/service/actions_card_service.class.php
+++ b/htdocs/product/canvas/service/actions_card_service.class.php
@@ -37,7 +37,6 @@ class ActionsCardService
 
 	// List of fiels for action=list
 	public $field_list = array();
-	public $list_datas = array();
 
 	public $id;
 	public $ref;
@@ -92,8 +91,6 @@ class ActionsCardService
 		}
 		$this->object = $tmpobject;
 
-		//parent::assign_values($action);
-
 		foreach ($this->object as $key => $value) {
 			$this->tpl[$key] = $value;
 		}
@@ -213,10 +210,6 @@ class ActionsCardService
 
 			$this->tpl['fiche_end'] = dol_get_fiche_end();
 		}
-
-		if ($action == 'list') {
-			$this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
-		}
 	}
 
 
@@ -267,97 +260,4 @@ class ActionsCardService
 			dol_print_error($this->db, $sql);
 		}
 	}
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 * 	Fetch datas list and save into ->list_datas
-	 *
-	 *  @param	int		$limit		Limit number of responses
-	 *  @param	int		$offset		Offset for first response
-	 *  @param	string	$sortfield	Sort field
-	 *  @param	string	$sortorder	Sort order ('ASC' or 'DESC')
-	 *  @return	void
-	 */
-	public function LoadListDatas($limit, $offset, $sortfield, $sortorder)
-	{
-		// phpcs:enable
-		global $conf;
-		global $search_categ, $sall, $sref, $search_barcode, $snom, $catid;
-
-		$this->getFieldListCanvas();
-
-		$sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,';
-		$sql .= ' p.fk_product_type, p.tms as datem,';
-		$sql .= ' p.duration, p.tosell as statut, p.seuil_stock_alerte';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
-		// We'll need this table joined to the select in order to filter by categ
-		if ($search_categ) {
-			$sql .= ", ".MAIN_DB_PREFIX."categorie_product as cp";
-		}
-		$fourn_id = 0;
-		if (GETPOST("fourn_id", 'int') > 0) {
-			$fourn_id = GETPOST("fourn_id", 'int');
-			$sql .= ", ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
-		}
-		$sql .= " WHERE p.entity IN (".getEntity('product').")";
-		if ($search_categ) {
-			$sql .= " AND p.rowid = cp.fk_product"; // Join for the needed table to filter by categ
-		}
-		if ($sall) {
-			$sql .= " AND (p.ref LIKE '%".$this->db->escape($sall)."%' OR p.label LIKE '%".$this->db->escape($sall)."%' OR p.description LIKE '%".$this->db->escape($sall)."%' OR p.note LIKE '%".$this->db->escape($sall)."%')";
-		}
-		if ($sref) {
-			$sql .= " AND p.ref LIKE '%".$this->db->escape($sref)."%'";
-		}
-		if ($search_barcode) {
-			$sql .= " AND p.barcode LIKE '%".$this->db->escape($search_barcode)."%'";
-		}
-		if ($snom) {
-			$sql .= " AND p.label LIKE '%".$this->db->escape($snom)."%'";
-		}
-		if (GETPOSTISSET("tosell")) {
-			$sql .= " AND p.tosell = ".((int) GETPOST("tosell", 'int'));
-		}
-		if (GETPOSTISSET("canvas")) {
-			$sql .= " AND p.canvas = '".$this->db->escape(GETPOST("canvas"))."'";
-		}
-		if ($catid) {
-			$sql .= " AND cp.fk_categorie = ".((int) $catid);
-		}
-		if ($fourn_id > 0) {
-			$sql .= " AND p.rowid = pfp.fk_product AND pfp.fk_soc = ".((int) $fourn_id);
-		}
-		// Insert categ filter
-		if ($search_categ) {
-			$sql .= " AND cp.fk_categorie = ".((int) $search_categ);
-		}
-		$sql .= $this->db->order($sortfield, $sortorder);
-		$sql .= $this->db->plimit($limit + 1, $offset);
-
-		$this->list_datas = array();
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-
-			$i = 0;
-			while ($i < min($num, $limit)) {
-				$datas = array();
-				$obj = $this->db->fetch_object($resql);
-
-				$datas["id"]        = $obj->rowid;
-				$datas["ref"]       = $obj->ref;
-				$datas["label"]     = $obj->label;
-				$datas["barcode"]   = $obj->barcode;
-				$datas["statut"]    = $obj->statut;
-
-				array_push($this->list_datas, $datas);
-
-				$i++;
-			}
-			$this->db->free($resql);
-		} else {
-			print $sql;
-		}
-	}
 }
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 2bfe94f418a..a7b3c1958b5 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1250,7 +1250,6 @@ if (isModEnabled('barcode') && !empty($conf->global->BARCODE_PRODUCT_ADDON_NUM))
 	}
 }
 
-
 if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 	// -----------------------------------------
 	// When used with CANVAS

From 65e465fefbb3cbd919dd063fde8896470e560b16 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 14:59:20 +0100
Subject: [PATCH 189/816] Fix threshold

---
 qodana.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qodana.yaml b/qodana.yaml
index 79ca8d5af59..d63f7b16999 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -1,6 +1,6 @@
 version: "1.0"
 linter: jetbrains/qodana-php:2022.3-eap
-failThreshold: 20000
+failThreshold: 0
 profile:
   name: qodana.recommended
 exclude:

From 10445b1e987c3beb437ea660c9b09fa5e3079521 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 14:59:32 +0100
Subject: [PATCH 190/816] Doc

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

diff --git a/htdocs/core/class/canvas.class.php b/htdocs/core/class/canvas.class.php
index 67443a7bdb8..a0f5a5f1fe4 100644
--- a/htdocs/core/class/canvas.class.php
+++ b/htdocs/core/class/canvas.class.php
@@ -157,7 +157,7 @@ class Canvas
 	}
 
 	/**
-	 *	Return the template to display canvas (if it exists)
+	 *	Return if a template exists to display as canvas (if it exists)
 	 *
 	 *	@param	string	$action		Action code
 	 *	@return	int		0=Canvas template file does not exist, 1=Canvas template file exists

From 2130587613a51674f6be8a83ee3995a3a4af2bf8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 15:14:01 +0100
Subject: [PATCH 191/816] Fix warnings

---
 htdocs/core/class/html.form.class.php                | 2 +-
 htdocs/emailcollector/class/emailcollector.class.php | 5 +++--
 htdocs/societe/class/companybankaccount.class.php    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index f3a566b6014..686d500875a 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4203,7 +4203,7 @@ class Form
 		if ($deposit_percent >= 0) {
 			$out .= ' <span id="'.$htmlname.'_deposit_percent_container"' . (empty($selectedDepositPercent) ? ' style="display: none"' : '') . '>';
 			$out .= $langs->trans('DepositPercent') . ' : ';
-			$out .= '<input id="'.$htmlname.'_deposit_percent" name="'.$htmlname.'_deposit_percent" class="maxwidth50" value="' . strval($deposit_percent) . '" />';
+			$out .= '<input id="'.$htmlname.'_deposit_percent" name="'.$htmlname.'_deposit_percent" class="maxwidth50" value="' . $deposit_percent . '" />';
 			$out .= '</span>';
 			$out .= '
 				<script>
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 12531a57c5e..505bcf4f619 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -3025,13 +3025,14 @@ class EmailCollector extends CommonObject
 			 * Check if the same file name already exists in the upload folder,
 			 * append increment number to the original filename
 			 */
-			while (file_exists($destdir."/" . $file_name . "." . $extension)) {
-				$file_name = (string) $file_name_original . ' (' . $num . ')';
+			while (file_exists($destdir."/".$file_name.".".$extension)) {
+				$file_name = $file_name_original . ' (' . $num . ')';
 				$file_name_complete = $file_name . "." . $extension;
 				$destination = $destdir.'/'.$file_name_complete;
 				$num++;
 			}
 
+			$destination = dol_sanitizePathName($destination);
 
 			file_put_contents($destination, $data);
 		}
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index d81a360e7d2..5b2240502a4 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -349,7 +349,7 @@ class CompanyBankAccount extends Account
 				$rib = $this->label." : ";
 			}
 
-			$rib .= (string) $this;
+			$rib .= (string) $this->iban;
 		}
 
 		return $rib;

From 9442c1f28930b1888e0c3341aab3ef6afc316151 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 15:18:18 +0100
Subject: [PATCH 192/816] Try to allow run of qobana trigger manually.

---
 .github/workflows/code_quality.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml
index 2b01a676db1..2b8ea0b3551 100644
--- a/.github/workflows/code_quality.yml
+++ b/.github/workflows/code_quality.yml
@@ -2,7 +2,9 @@ name: Qodana
 on:
   schedule:
   - cron: "0 20 * * *"
-#  workflow_dispatch:
+  workflow_dispatch:
+    branches:
+      - develop
 #  push:
 #    branches:
 #      - develop

From e02aa8ab60c3992fc7adfe9aab799d9f9e8af55e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 15:22:09 +0100
Subject: [PATCH 193/816] Clean setup

---
 .github/workflows/exakat.yml.disabled | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/exakat.yml.disabled b/.github/workflows/exakat.yml.disabled
index 528626e0308..f5ecdb8c614 100644
--- a/.github/workflows/exakat.yml.disabled
+++ b/.github/workflows/exakat.yml.disabled
@@ -4,6 +4,9 @@ name: "Exakat analysis"
 on:
   schedule:
   - cron: "0 20 * * *"
+  workflow_dispatch:
+    branches:
+      - develop
 
 permissions:
   contents: read

From e80425ec75d11f76abbc09c2f67cf98a89ca4b94 Mon Sep 17 00:00:00 2001
From: Je2fb <46494485+Je2fb@users.noreply.github.com>
Date: Fri, 30 Dec 2022 16:07:10 +0100
Subject: [PATCH 194/816] Fix issue #23345

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

diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index 357683ef35a..0536215d57c 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -686,6 +686,11 @@ class Shipments extends DolibarrApi
 
 		if (!empty($object->lines) && is_array($object->lines)) {
 			foreach ($object->lines as $line) {
+				if (is_array($line->detail_batch)) {
+        			foreach($line->detail_batch as $keytmp2 => $valtmp2) {
+        				unset($line->detail_batch[$keytmp2]->db);
+        			}
+        		}
 				unset($line->tva_tx);
 				unset($line->vat_src_code);
 				unset($line->total_ht);

From 8196cfac8a5baa551b8e828dc10ae6799e058962 Mon Sep 17 00:00:00 2001
From: Je2fb <46494485+Je2fb@users.noreply.github.com>
Date: Fri, 30 Dec 2022 16:13:38 +0100
Subject: [PATCH 195/816] Create api_multicurrencies.class.php

Add API for retrieves curriences information with the last rate
---
 .../class/api_multicurrencies.class.php       | 126 ++++++++++++++++++
 1 file changed, 126 insertions(+)
 create mode 100644 htdocs/multicurrency/class/api_multicurrencies.class.php

diff --git a/htdocs/multicurrency/class/api_multicurrencies.class.php b/htdocs/multicurrency/class/api_multicurrencies.class.php
new file mode 100644
index 00000000000..2ef1ba519b4
--- /dev/null
+++ b/htdocs/multicurrency/class/api_multicurrencies.class.php
@@ -0,0 +1,126 @@
+<?php
+/* Copyright (C) 2022   J-F Bouculat     <jfbouculat@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+use Luracast\Restler\RestException;
+
+//require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/multicurrency.lib.php';
+
+/**
+ * API class for MultiCurrency
+ *
+ * @access protected
+ * @class  DolibarrApiAccess {@requires user,external}
+ */
+class MultiCurrencies extends DolibarrApi
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+	}
+
+	/**
+	 * Get a list of currencies
+	 *
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.product_id:=:1) and (t.date_creation:<:'20160101')"
+	 * @return array                Array of warehouse objects
+	 *
+	 * @throws RestException
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $sqlfilters = '')
+	{
+		global $db, $conf;
+
+		$obj_ret = array();
+
+		$sql = "SELECT t.rowid";
+		$sql .= " FROM ".$this->db->prefix()."multicurrency as t";
+		$sql .= ' WHERE 1 = 1';
+		// Add sql filters
+		if ($sqlfilters) {
+			$errormessage = '';
+			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
+
+		$result = $this->db->query($sql);
+		if ($result) {
+			$i = 0;
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			while ($i < $min) {
+				$obj = $this->db->fetch_object($result);
+				$multicurrency_static = new MultiCurrency($this->db);
+				if ($multicurrency_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($multicurrency_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve currencies list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No currencies found');
+		}
+    
+		return $obj_ret;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   MultiCurrency $object     Object to clean
+	 * @return  Object                     Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
+    
+    	// Clear all fields out of interrest
+    	foreach($object as $key => $value){
+        	if ($key == "rate") $object->$key = $this->_cleanObjectDatas($object->$key);
+        	if ($key == "id" || $key == "code" || $key == "rate" || $key == "date_sync")
+            	continue;
+    		unset($object->$key);
+		}
+		
+		return $object;
+	}
+
+}

From ab0e069ae16c53c4b6cdd01c64a37cf9197a7a20 Mon Sep 17 00:00:00 2001
From: Je2fb <46494485+Je2fb@users.noreply.github.com>
Date: Fri, 30 Dec 2022 16:16:29 +0100
Subject: [PATCH 196/816] Update functions2.lib.php

Add the moduledirforclass "multicurrency" to add a API to get the currencies
---
 htdocs/core/lib/functions2.lib.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 05ed388d41f..692d01f9ef0 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -2652,6 +2652,8 @@ function getModuleDirForApiClass($moduleobject)
 		$moduledirforclass = 'commande';
 	} elseif ($moduleobject == 'shipments') {
 		$moduledirforclass = 'expedition';
+	} elseif ($moduleobject == 'multicurrencies') {
+		$moduledirforclass = 'multicurrency';
 	} elseif ($moduleobject == 'facture' || $moduleobject == 'invoice' || $moduleobject == 'invoices') {
 		$moduledirforclass = 'compta/facture';
 	} elseif ($moduleobject == 'project' || $moduleobject == 'projects' || $moduleobject == 'task' || $moduleobject == 'tasks') {

From 8a2f44aec485cd4e817c27c083fdc709b0f0b548 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 30 Dec 2022 15:20:12 +0000
Subject: [PATCH 197/816] Fixing style errors.

---
 .../expedition/class/api_shipments.class.php  |  8 ++++----
 .../class/api_multicurrencies.class.php       | 19 +++++++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index 0536215d57c..450fe943d7e 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -687,10 +687,10 @@ class Shipments extends DolibarrApi
 		if (!empty($object->lines) && is_array($object->lines)) {
 			foreach ($object->lines as $line) {
 				if (is_array($line->detail_batch)) {
-        			foreach($line->detail_batch as $keytmp2 => $valtmp2) {
-        				unset($line->detail_batch[$keytmp2]->db);
-        			}
-        		}
+					foreach ($line->detail_batch as $keytmp2 => $valtmp2) {
+						unset($line->detail_batch[$keytmp2]->db);
+					}
+				}
 				unset($line->tva_tx);
 				unset($line->vat_src_code);
 				unset($line->total_ht);
diff --git a/htdocs/multicurrency/class/api_multicurrencies.class.php b/htdocs/multicurrency/class/api_multicurrencies.class.php
index 2ef1ba519b4..e88f936c571 100644
--- a/htdocs/multicurrency/class/api_multicurrencies.class.php
+++ b/htdocs/multicurrency/class/api_multicurrencies.class.php
@@ -96,7 +96,7 @@ class MultiCurrencies extends DolibarrApi
 		if (!count($obj_ret)) {
 			throw new RestException(404, 'No currencies found');
 		}
-    
+
 		return $obj_ret;
 	}
 
@@ -111,16 +111,15 @@ class MultiCurrencies extends DolibarrApi
 	{
 		// phpcs:enable
 		$object = parent::_cleanObjectDatas($object);
-    
-    	// Clear all fields out of interrest
-    	foreach($object as $key => $value){
-        	if ($key == "rate") $object->$key = $this->_cleanObjectDatas($object->$key);
-        	if ($key == "id" || $key == "code" || $key == "rate" || $key == "date_sync")
-            	continue;
-    		unset($object->$key);
+
+		// Clear all fields out of interrest
+		foreach ($object as $key => $value) {
+			if ($key == "rate") $object->$key = $this->_cleanObjectDatas($object->$key);
+			if ($key == "id" || $key == "code" || $key == "rate" || $key == "date_sync")
+				continue;
+			unset($object->$key);
 		}
-		
+
 		return $object;
 	}
-
 }

From 596cb4caa6e987fe6642c2623a3ea340d44d345a Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Fri, 30 Dec 2022 18:16:42 +0100
Subject: [PATCH 198/816] Add box_members_by_tags.php in modAdherent.class.php

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

diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index 2422cead7bb..0df5284eaed 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -198,6 +198,7 @@ class modAdherent extends DolibarrModules
 			4 => array('file'=>'box_members_last_subscriptions.php', 'enabledbydefaulton'=>'membersindex'),
 			5 => array('file'=>'box_members_subscriptions_by_year.php', 'enabledbydefaulton'=>'membersindex'),
 			6 => array('file'=>'box_members_by_type.php', 'enabledbydefaulton'=>'membersindex'),
+			7 => array('file'=>'box_members_by_tags.php', 'enabledbydefaulton'=>'membersindex'),
 		);
 
 		// Permissions

From ea42fc7605fcc7d2b29d7124fbe597dcf6d9b688 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 18:43:43 +0100
Subject: [PATCH 199/816] Clean code, fix warnings

---
 htdocs/accountancy/admin/accountmodel.php     |  3 +-
 htdocs/accountancy/admin/categories_list.php  |  3 +-
 htdocs/accountancy/admin/journals_list.php    |  3 +-
 htdocs/admin/delais.php                       |  2 +-
 htdocs/admin/dict.php                         | 42 +++++++++----------
 htdocs/admin/hrm.php                          | 16 +++----
 htdocs/admin/knowledgemanagement.php          | 22 +++++-----
 htdocs/admin/mails_templates.php              | 11 ++---
 htdocs/admin/modules.php                      |  4 +-
 htdocs/admin/system/database.php              |  3 +-
 htdocs/admin/webhook.php                      | 26 ++++++------
 htdocs/asset/admin/setup.php                  | 40 +++++++++---------
 htdocs/comm/action/card.php                   |  4 +-
 htdocs/commande/card.php                      |  2 +-
 htdocs/compta/bank/treso.php                  |  4 +-
 htdocs/compta/facture/card.php                |  4 +-
 htdocs/compta/tva/card.php                    |  2 +-
 .../core/class/commondocgenerator.class.php   |  2 +-
 htdocs/core/class/html.form.class.php         |  6 +--
 htdocs/core/class/html.formactions.class.php  |  2 +-
 htdocs/core/class/html.formcompany.class.php  |  2 +-
 htdocs/core/class/html.formsetup.class.php    |  2 +-
 htdocs/core/class/html.formticket.class.php   |  4 +-
 .../modules/import/import_csv.modules.php     |  2 +-
 htdocs/core/tpl/objectline_create.tpl.php     |  2 +-
 htdocs/fourn/facture/card.php                 |  2 +-
 htdocs/hrm/compare.php                        |  4 +-
 htdocs/imports/import.php                     |  4 +-
 htdocs/index.php                              | 18 +++-----
 ..._99_modMyModule_MyModuleTriggers.class.php |  2 +-
 .../class/multicurrency.class.php             |  4 +-
 htdocs/product/price.php                      |  2 +-
 htdocs/product/stock/replenish.php            |  4 +-
 htdocs/projet/card.php                        |  8 ++--
 htdocs/projet/class/task.class.php            |  6 ++-
 htdocs/projet/jsgantt_language.js.php         |  2 +-
 htdocs/public/members/new.php                 |  2 +-
 htdocs/public/payment/newpayment.php          |  6 +--
 htdocs/societe/card.php                       |  6 +--
 htdocs/takepos/admin/terminal.php             |  2 +-
 htdocs/takepos/index.php                      |  2 +-
 htdocs/takepos/invoice.php                    | 13 ++----
 htdocs/takepos/smpcb.php                      |  2 +-
 htdocs/user/class/user.class.php              | 40 +++++++++++-------
 htdocs/webservices/server_thirdparty.php      |  2 +-
 htdocs/website/index.php                      |  2 +-
 46 files changed, 175 insertions(+), 171 deletions(-)

diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index 02921a78cb2..c5b8fd20045 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -640,7 +640,8 @@ if ($id) {
 						foreach ($fieldlist as $field => $value) {
 							$showfield = 1;
 							$class = "left";
-							$valuetoshow = $obj->{$fieldlist[$field]};
+							$tmpvar = $fieldlist[$field];
+							$valuetoshow = $obj->$tmpvar;
 							if ($value == 'type_template') {
 								$valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
 							}
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 755a5a88aed..0fd7b9012eb 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -751,7 +751,8 @@ if ($resql) {
 					foreach ($fieldlist as $field => $value) {
 						$showfield = 1;
 						$class = "left";
-						$valuetoshow = $obj->{$fieldlist[$field]};
+						$tmpvar = $fieldlist[$field];
+						$valuetoshow = $obj->$tmpvar;
 						if ($value == 'category_type') {
 							$valuetoshow = yn($valuetoshow);
 						} elseif ($valuetoshow == 'all') {
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index e1a07fef5fc..ba2d867ebd6 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -587,7 +587,8 @@ if ($id) {
 						foreach ($fieldlist as $field => $value) {
 							$showfield = 1;
 							$class = "left";
-							$valuetoshow = $obj->{$fieldlist[$field]};
+							$tmpvar = $fieldlist[$field];
+							$valuetoshow = $obj->$tmpvar;
 							if ($valuetoshow == 'all') {
 								$valuetoshow = $langs->trans('All');
 							} elseif ($fieldlist[$field] == 'nature' && $tabname[$id] == MAIN_DB_PREFIX.'accounting_journal') {
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 59c826413aa..a3b790525ef 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -459,7 +459,7 @@ if ($action == 'edit') {
 	print '</form>';
 } else {
 	print '<br><br><div class="tabsAction">';
-	print '<a class="butAction" href="delais.php?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
+	print '<a class="butAction reposition" href="delais.php?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
 	print '</div>';
 }
 
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index d928931c9ab..abf62b51fa7 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1944,7 +1944,7 @@ if ($id > 0) {
 							//var_dump($fieldlist);
 							$class = '';
 							$showfield = 1;
-							$valuetoshow = empty($obj->{$value}) ? '' : $obj->{$value};
+							$valuetoshow = empty($obj->$value) ? '' : $obj->$value;
 							$titletoshow = '';
 
 							if ($value == 'entity') {
@@ -1985,76 +1985,76 @@ if ($id > 0) {
 							} elseif ($value == 'libelle_facture') {
 								$langs->load("bills");
 								$key = $langs->trans("PaymentCondition".strtoupper($obj->code));
-								$valuetoshow = ($obj->code && $key != "PaymentCondition".strtoupper($obj->code) ? $key : $obj->{$value});
+								$valuetoshow = ($obj->code && $key != "PaymentCondition".strtoupper($obj->code) ? $key : $obj->$value);
 								$valuetoshow = nl2br($valuetoshow);
 							} elseif ($value == 'label' && $tabname[$id] == 'c_country') {
 								$key = $langs->trans("Country".strtoupper($obj->code));
-								$valuetoshow = ($obj->code && $key != "Country".strtoupper($obj->code) ? $key : $obj->{$value});
+								$valuetoshow = ($obj->code && $key != "Country".strtoupper($obj->code) ? $key : $obj->$value);
 							} elseif ($value == 'label' && $tabname[$id] == 'c_availability') {
 								$langs->load("propal");
 								$key = $langs->trans("AvailabilityType".strtoupper($obj->code));
-								$valuetoshow = ($obj->code && $key != "AvailabilityType".strtoupper($obj->code) ? $key : $obj->{$value});
+								$valuetoshow = ($obj->code && $key != "AvailabilityType".strtoupper($obj->code) ? $key : $obj->$value);
 							} elseif ($value == 'libelle' && $tabname[$id] == 'c_actioncomm') {
 								$key = $langs->trans("Action".strtoupper($obj->code));
-								$valuetoshow = ($obj->code && $key != "Action".strtoupper($obj->code) ? $key : $obj->{$value});
+								$valuetoshow = ($obj->code && $key != "Action".strtoupper($obj->code) ? $key : $obj->$value);
 							} elseif (!empty($obj->code_iso) && $value == 'label' && $tabname[$id] == 'c_currencies') {
 								$key = $langs->trans("Currency".strtoupper($obj->code_iso));
-								$valuetoshow = ($obj->code_iso && $key != "Currency".strtoupper($obj->code_iso) ? $key : $obj->{$value});
+								$valuetoshow = ($obj->code_iso && $key != "Currency".strtoupper($obj->code_iso) ? $key : $obj->$value);
 							} elseif ($value == 'libelle' && $tabname[$id] == 'c_typent') {
 								$key = $langs->trans(strtoupper($obj->code));
-								$valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->{$value});
+								$valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->$value);
 							} elseif ($value == 'libelle' && $tabname[$id] == 'c_prospectlevel') {
 								$key = $langs->trans(strtoupper($obj->code));
-								$valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->{$value});
+								$valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->$value);
 							} elseif ($value == 'label' && $tabname[$id] == 'c_civility') {
 								$key = $langs->trans("Civility".strtoupper($obj->code));
-								$valuetoshow = ($obj->code && $key != "Civility".strtoupper($obj->code) ? $key : $obj->{$value});
+								$valuetoshow = ($obj->code && $key != "Civility".strtoupper($obj->code) ? $key : $obj->$value);
 							} elseif ($value == 'libelle' && $tabname[$id] == 'c_type_contact') {
 								$langs->load('agenda');
 								$key = $langs->trans("TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code));
-								$valuetoshow = ($obj->code && $key != "TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code) ? $key : $obj->{$value});
+								$valuetoshow = ($obj->code && $key != "TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code) ? $key : $obj->$value);
 							} elseif ($value == 'libelle' && $tabname[$id] == 'c_payment_term') {
 								$langs->load("bills");
 								$key = $langs->trans("PaymentConditionShort".strtoupper($obj->code));
-								$valuetoshow = ($obj->code && $key != "PaymentConditionShort".strtoupper($obj->code) ? $key : $obj->{$value});
+								$valuetoshow = ($obj->code && $key != "PaymentConditionShort".strtoupper($obj->code) ? $key : $obj->$value);
 							} elseif ($value == 'libelle' && $tabname[$id] == 'c_paiement') {
 								$langs->load("bills");
 								$key = $langs->trans("PaymentType".strtoupper($obj->code));
-								$valuetoshow = ($obj->code && $key != "PaymentType".strtoupper($obj->code) ? $key : $obj->{$value});
+								$valuetoshow = ($obj->code && $key != "PaymentType".strtoupper($obj->code) ? $key : $obj->$value);
 							} elseif ($value == 'type' && $tabname[$id] == 'c_paiement') {
 								$payment_type_list = array(0=>$langs->trans('PaymentTypeCustomer'), 1=>$langs->trans('PaymentTypeSupplier'), 2=>$langs->trans('PaymentTypeBoth'));
 								$valuetoshow = $payment_type_list[$valuetoshow];
 							} elseif ($value == 'label' && $tabname[$id] == 'c_input_reason') {
 								$key = $langs->trans("DemandReasonType".strtoupper($obj->code));
-								$valuetoshow = ($obj->code && $key != "DemandReasonType".strtoupper($obj->code) ? $key : $obj->{$value});
+								$valuetoshow = ($obj->code && $key != "DemandReasonType".strtoupper($obj->code) ? $key : $obj->$value);
 							} elseif ($value == 'libelle' && $tabname[$id] == 'c_input_method') {
 								$langs->load("orders");
 								$key = $langs->trans($obj->code);
-								$valuetoshow = ($obj->code && $key != $obj->code) ? $key : $obj->{$value};
+								$valuetoshow = ($obj->code && $key != $obj->code) ? $key : $obj->$value;
 							} elseif ($value == 'libelle' && $tabname[$id] == 'c_shipment_mode') {
 								$langs->load("sendings");
 								$key = $langs->trans("SendingMethod".strtoupper($obj->code));
-								$valuetoshow = ($obj->code && $key != "SendingMethod".strtoupper($obj->code) ? $key : $obj->{$value});
+								$valuetoshow = ($obj->code && $key != "SendingMethod".strtoupper($obj->code) ? $key : $obj->$value);
 							} elseif ($value == 'libelle' && $tabname[$id] == 'c_paper_format') {
 								$key = $langs->trans('PaperFormat'.strtoupper($obj->code));
-								$valuetoshow = ($obj->code && $key != 'PaperFormat'.strtoupper($obj->code) ? $key : $obj->{$value});
+								$valuetoshow = ($obj->code && $key != 'PaperFormat'.strtoupper($obj->code) ? $key : $obj->$value);
 							} elseif ($value == 'label' && $tabname[$id] == 'c_type_fees') {
 								$langs->load('trips');
 								$key = $langs->trans(strtoupper($obj->code));
-								$valuetoshow = ($obj->code && $key != strtoupper($obj->code) ? $key : $obj->{$value});
+								$valuetoshow = ($obj->code && $key != strtoupper($obj->code) ? $key : $obj->$value);
 							} elseif ($value == 'region_id' || $value == 'country_id') {
 								$showfield = 0;
 							} elseif ($value == 'unicode') {
 								$valuetoshow = $langs->getCurrencySymbol($obj->code, 1);
 							} elseif ($value == 'label' && $tabname[GETPOST("id", 'int')] == 'c_units') {
 								$langs->load("products");
-								$valuetoshow = $langs->trans($obj->{$value});
+								$valuetoshow = $langs->trans($obj->$value);
 							} elseif ($value == 'short_label' && $tabname[GETPOST("id", 'int')] == 'c_units') {
 								$langs->load("products");
-								$valuetoshow = $langs->trans($obj->{$value});
+								$valuetoshow = $langs->trans($obj->$value);
 							} elseif (($value == 'unit') && ($tabname[$id] == 'c_paper_format')) {
 								$key = $langs->trans('SizeUnit'.strtolower($obj->unit));
-								$valuetoshow = ($obj->code && $key != 'SizeUnit'.strtolower($obj->unit) ? $key : $obj->{$value});
+								$valuetoshow = ($obj->code && $key != 'SizeUnit'.strtolower($obj->unit) ? $key : $obj->$value);
 							} elseif ($value == 'localtax1' || $value == 'localtax2') {
 								$class = "center";
 							} elseif ($value == 'localtax1_type') {
@@ -2357,7 +2357,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 
 	foreach ($fieldlist as $field => $value) {
 		if ($value == 'entity') {
-			$withentity = $obj->{$value};
+			$withentity = $obj->$value;
 			continue;
 		}
 
diff --git a/htdocs/admin/hrm.php b/htdocs/admin/hrm.php
index 73931ebf83d..22e56e98ba3 100644
--- a/htdocs/admin/hrm.php
+++ b/htdocs/admin/hrm.php
@@ -491,16 +491,16 @@ if ($action == 'edit') {
 
 			if ($val['type'] == 'textarea') {
 				print '<textarea class="flat" name="' . $constname . '" id="' . $constname . '" cols="50" rows="5" wrap="soft">' . "\n";
-				print $conf->global->{$constname};
+				print getDolGlobalString($constname);
 				print "</textarea>\n";
 			} elseif ($val['type'] == 'integer') {
-				print '<input  class="flat" name="' . $constname . '" id="' . $constname . '" value="' . $conf->global->$constname . '" type="number" step="1" min="0" max="50" >' . "\n";
+				print '<input  class="flat" name="' . $constname . '" id="' . $constname . '" value="' . getDolGlobalString($constname) . '" type="number" step="1" min="0" max="50" >' . "\n";
 			} elseif ($val['type'] == 'html') {
 				require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
-				$doleditor = new DolEditor($constname, $conf->global->{$constname}, '', 160, 'dolibarr_notes', '', false, false, isModEnabled('fckeditor'), ROWS_5, '90%');
+				$doleditor = new DolEditor($constname, getDolGlobalString($constname), '', 160, 'dolibarr_notes', '', false, false, isModEnabled('fckeditor'), ROWS_5, '90%');
 				$doleditor->Create();
 			} elseif ($val['type'] == 'yesno') {
-				print $form->selectyesno($constname, $conf->global->{$constname}, 1);
+				print $form->selectyesno($constname, getDolGlobalString($constname), 1);
 			} elseif (preg_match('/emailtemplate:/', $val['type'])) {
 				include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
 				$formmail = new FormMail($db);
@@ -575,9 +575,9 @@ if ($action == 'edit') {
 				print '</td><td>';
 
 				if ($val['type'] == 'textarea') {
-					print dol_nl2br($conf->global->{$constname});
+					print dol_nl2br(getDolGlobalString($constname));
 				} elseif ($val['type']== 'html') {
-					print  $conf->global->{$constname};
+					print getDolGlobalString($constname);
 				} elseif ($val['type'] == 'yesno') {
 					print ajax_constantonoff($constname);
 				} elseif (preg_match('/emailtemplate:/', $val['type'])) {
@@ -586,14 +586,14 @@ if ($action == 'edit') {
 
 					$tmp = explode(':', $val['type']);
 
-					$template = $formmail->getEMailTemplate($db, $tmp[1], $user, $langs, $conf->global->{$constname});
+					$template = $formmail->getEMailTemplate($db, $tmp[1], $user, $langs, getDolGlobalString($constname));
 					if ($template<0) {
 						setEventMessages(null, $formmail->errors, 'errors');
 					}
 					print $langs->trans($template->label);
 				} elseif (preg_match('/category:/', $val['type'])) {
 					$c = new Categorie($db);
-					$result = $c->fetch($conf->global->{$constname});
+					$result = $c->fetch(getDolGlobalString($constname));
 					if ($result < 0) {
 						setEventMessages(null, $c->errors, 'errors');
 					}
diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index b1710a53839..77b7c819142 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -209,14 +209,14 @@ if ($action == 'edit') {
 
 			if ($val['type'] == 'textarea') {
 				print '<textarea class="flat" name="' . $constname . '" id="' . $constname . '" cols="50" rows="5" wrap="soft">' . "\n";
-				print $conf->global->{$constname};
+				print getDolGlobalString($constname);
 				print "</textarea>\n";
 			} elseif ($val['type'] == 'html') {
 				require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
-				$doleditor = new DolEditor($constname, $conf->global->{$constname}, '', 160, 'dolibarr_notes', '', false, false, isModEnabled('fckeditor'), ROWS_5, '90%');
+				$doleditor = new DolEditor($constname, getDolGlobalString($constname), '', 160, 'dolibarr_notes', '', false, false, isModEnabled('fckeditor'), ROWS_5, '90%');
 				$doleditor->Create();
 			} elseif ($val['type'] == 'yesno') {
-				print $form->selectyesno($constname, $conf->global->{$constname}, 1);
+				print $form->selectyesno($constname, getDolGlobalString($constname), 1);
 			} elseif (preg_match('/emailtemplate:/', $val['type'])) {
 				include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
 				$formmail = new FormMail($db);
@@ -275,9 +275,9 @@ if ($action == 'edit') {
 				print '</td><td>';
 
 				if ($val['type'] == 'textarea') {
-					print dol_nl2br($conf->global->{$constname});
+					print dol_nl2br(getDolGlobalString($constname));
 				} elseif ($val['type']== 'html') {
-					print  $conf->global->{$constname};
+					print getDolGlobalString($constname);
 				} elseif ($val['type'] == 'yesno') {
 					print ajax_constantonoff($constname);
 				} elseif (preg_match('/emailtemplate:/', $val['type'])) {
@@ -286,7 +286,7 @@ if ($action == 'edit') {
 
 					$tmp = explode(':', $val['type']);
 
-					$template = $formmail->getEMailTemplate($db, $tmp[1], $user, $langs, $conf->global->{$constname});
+					$template = $formmail->getEMailTemplate($db, $tmp[1], $user, $langs, getDolGlobalString($constname));
 					if ($template<0) {
 						setEventMessages(null, $formmail->errors, 'errors');
 					}
@@ -304,17 +304,17 @@ if ($action == 'edit') {
 					}
 					print '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
 				} elseif (preg_match('/thirdparty_type/', $val['type'])) {
-					if ($conf->global->{$constname}==2) {
+					if (getDolGlobalString($constname)==2) {
 						print $langs->trans("Prospect");
-					} elseif ($conf->global->{$constname}==3) {
+					} elseif (getDolGlobalString($constname)==3) {
 						print $langs->trans("ProspectCustomer");
-					} elseif ($conf->global->{$constname}==1) {
+					} elseif (getDolGlobalInt($constname)==1) {
 						print $langs->trans("Customer");
-					} elseif ($conf->global->{$constname}==0) {
+					} elseif (getDolGlobalInt($constname)==0) {
 						print $langs->trans("NorProspectNorCustomer");
 					}
 				} else {
-					print  $conf->global->{$constname};
+					print getDolGlobalString($constname);
 				}
 				print '</td></tr>';
 			}
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index a42c2283d13..16929336565 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -1134,7 +1134,8 @@ if ($num) {
 						$align = "";
 						$class = "tddict";
 						$title = '';
-						$valuetoshow = $obj->{$fieldlist[$field]};
+						$tmpvar = $fieldlist[$field];
+						$valuetoshow = $obj->$tmpvar;
 						if ($value == 'label' || $value == 'topic') {
 							if ($langs->trans($valuetoshow) != $valuetoshow) {
 								$valuetoshow = $langs->trans($valuetoshow);
@@ -1282,19 +1283,19 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 		if ($value == 'fk_user') {
 			print '<td>';
 			if ($user->admin) {
-				print $form->select_dolusers(empty($obj->{$value}) ? '' : $obj->{$value}, 'fk_user', 1, null, 0, ($user->admin ? '' : 'hierarchyme'), null, 0, 0, 0, '', 0, '', 'minwidth150 maxwidth200');
+				print $form->select_dolusers(empty($obj->$value) ? '' : $obj->$value, 'fk_user', 1, null, 0, ($user->admin ? '' : 'hierarchyme'), null, 0, 0, 0, '', 0, '', 'minwidth150 maxwidth200');
 			} else {
 				if ($context == 'add') {	// I am not admin and we show the add form
 					print $user->getNomUrl(1); // Me
 					$forcedvalue = $user->id;
 				} else {
-					if ($obj && !empty($obj->{$value}) && $obj->{$value} > 0) {
+					if ($obj && !empty($obj->$value) && $obj->$value > 0) {
 						$fuser = new User($db);
-						$fuser->fetch($obj->{$value});
+						$fuser->fetch($obj->$value);
 						print $fuser->getNomUrl(1);
 						$forcedvalue = $fuser->id;
 					} else {
-						$forcedvalue = $obj->{$value};
+						$forcedvalue = $obj->$value;
 					}
 				}
 				$keyname = $value;
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 45534aa66f5..b39576a8d44 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -1216,10 +1216,10 @@ if ($mode == 'deploy') {
 				print '<script type="text/javascript">
 				$(document).ready(function() {
 					jQuery("#fileinstall").on("change", function() {
-						if(this.files[0].size > '.($maxmin * 1024).'){
+						if(this.files[0].size > '.($maxmin * 1024).') {
 							alert("'.dol_escape_js($langs->trans("ErrorFileSizeTooLarge")).'");
 							this.value = "";
-						};
+						}
 					});
 				});
 				</script>'."\n";
diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index 8cd1ad3d597..fd983a10924 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -113,7 +113,8 @@ if (!count($listofvars) && !count($listofstatus)) {
 				if ($key != $param) {
 					continue;
 				}
-				$val2 = ${$val['var']};
+				$tmpvar = $val['var'];
+				$val2 = ${$tmpvar};
 				$text = 'Should be in line with value of param <b>'.$val['var'].'</b> thas is <b>'.($val2 ? $val2 : "'' (=".$val['valifempty'].")").'</b>';
 				$show = 1;
 			}
diff --git a/htdocs/admin/webhook.php b/htdocs/admin/webhook.php
index b589eac4079..6ba932c007b 100644
--- a/htdocs/admin/webhook.php
+++ b/htdocs/admin/webhook.php
@@ -293,14 +293,14 @@ if ($action == 'edit') {
 
 				if ($val['type'] == 'textarea') {
 					print '<textarea class="flat" name="'.$constname.'" id="'.$constname.'" cols="50" rows="5" wrap="soft">' . "\n";
-					print $conf->global->{$constname};
+					print getDolGlobalString($constname);
 					print "</textarea>\n";
 				} elseif ($val['type']== 'html') {
 					require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
-					$doleditor = new DolEditor($constname, $conf->global->{$constname}, '', 160, 'dolibarr_notes', '', false, false, $conf->fckeditor->enabled, ROWS_5, '90%');
+					$doleditor = new DolEditor($constname, getDolGlobalString($constname), '', 160, 'dolibarr_notes', '', false, false, $conf->fckeditor->enabled, ROWS_5, '90%');
 					$doleditor->Create();
 				} elseif ($val['type'] == 'yesno') {
-					print $form->selectyesno($constname, $conf->global->{$constname}, 1);
+					print $form->selectyesno($constname, getDolGlobalString($constname), 1);
 				} elseif (preg_match('/emailtemplate:/', $val['type'])) {
 					include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
 					$formmail = new FormMail($db);
@@ -382,9 +382,9 @@ if ($action == 'edit') {
 					print '</td><td>';
 
 					if ($val['type'] == 'textarea') {
-						print dol_nl2br($conf->global->{$constname});
+						print dol_nl2br(getDolGlobalString($constname));
 					} elseif ($val['type']== 'html') {
-						print  $conf->global->{$constname};
+						print getDolGlobalString($constname);
 					} elseif ($val['type'] == 'yesno') {
 						print ajax_constantonoff($constname);
 					} elseif (preg_match('/emailtemplate:/', $val['type'])) {
@@ -393,14 +393,14 @@ if ($action == 'edit') {
 
 						$tmp = explode(':', $val['type']);
 
-						$template = $formmail->getEMailTemplate($db, $tmp[1], $user, $langs, $conf->global->{$constname});
+						$template = $formmail->getEMailTemplate($db, $tmp[1], $user, $langs, getDolGlobalString($constname));
 						if ($template<0) {
 							setEventMessages(null, $formmail->errors, 'errors');
 						}
 						print $langs->trans($template->label);
 					} elseif (preg_match('/category:/', $val['type'])) {
 						$c = new Categorie($db);
-						$result = $c->fetch($conf->global->{$constname});
+						$result = $c->fetch(getDolGlobalString($constname));
 						if ($result < 0) {
 							setEventMessages(null, $c->errors, 'errors');
 						} elseif ($result > 0 ) {
@@ -412,25 +412,25 @@ if ($action == 'edit') {
 							print '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
 						}
 					} elseif (preg_match('/thirdparty_type/', $val['type'])) {
-						if ($conf->global->{$constname}==2) {
+						if (getDolGlobalInt($constname)==2) {
 							print $langs->trans("Prospect");
-						} elseif ($conf->global->{$constname}==3) {
+						} elseif (getDolGlobalInt($constname)==3) {
 							print $langs->trans("ProspectCustomer");
-						} elseif ($conf->global->{$constname}==1) {
+						} elseif (getDolGlobalInt($constname)==1) {
 							print $langs->trans("Customer");
-						} elseif ($conf->global->{$constname}==0) {
+						} elseif (getDolGlobalInt($constname)==0) {
 							print $langs->trans("NorProspectNorCustomer");
 						}
 					} elseif ($val['type'] == 'product') {
 						$product = new Product($db);
-						$resprod = $product->fetch($conf->global->{$constname});
+						$resprod = $product->fetch(getDolGlobalInt($constname));
 						if ($resprod > 0) {
 							print $product->ref;
 						} elseif ($resprod < 0) {
 							setEventMessages(null, $object->errors, "errors");
 						}
 					} else {
-						print $conf->global->{$constname};
+						print getDolGlobalString($constname);
 					}
 					print '</td></tr>';
 				}
diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index 965566c3a74..deb4b0da346 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -473,14 +473,14 @@ if ($action == 'edit') {
 
 			if ($val['type'] == 'textarea') {
 				print '<textarea class="flat" name="'.$constname.'" id="'.$constname.'" cols="50" rows="5" wrap="soft">' . "\n";
-				print $conf->global->{$constname};
+				print getDolGlobalString($constname);
 				print "</textarea>\n";
 			} elseif ($val['type']== 'html') {
 				require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
-				$doleditor = new DolEditor($constname, $conf->global->{$constname}, '', 160, 'dolibarr_notes', '', false, false, $conf->fckeditor->enabled, ROWS_5, '90%');
+				$doleditor = new DolEditor($constname, getDolGlobalString($constname), '', 160, 'dolibarr_notes', '', false, false, $conf->fckeditor->enabled, ROWS_5, '90%');
 				$doleditor->Create();
 			} elseif ($val['type'] == 'yesno') {
-				print $form->selectyesno($constname, $conf->global->{$constname}, 1);
+				print $form->selectyesno($constname, getDolGlobalString($constname), 1);
 			} elseif (preg_match('/emailtemplate:/', $val['type'])) {
 				include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
 				$formmail = new FormMail($db);
@@ -500,7 +500,7 @@ if ($action == 'edit') {
 						$arrayofmessagename[$modelmail->id] = $langs->trans(preg_replace('/\(|\)/', '', $modelmail->label)) . $moreonlabel;
 					}
 				}
-				print $form->selectarray($constname, $arrayofmessagename, $conf->global->{$constname}, 'None', 0, 0, '', 0, 0, 0, '', '', 1);
+				print $form->selectarray($constname, $arrayofmessagename, getDolGlobalString($constname), 'None', 0, 0, '', 0, 0, 0, '', '', 1);
 			} elseif (preg_match('/category:/', $val['type'])) {
 				require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 				require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
@@ -508,11 +508,11 @@ if ($action == 'edit') {
 
 				$tmp = explode(':', $val['type']);
 				print img_picto('', 'category', 'class="pictofixedwidth"');
-				print $formother->select_categories($tmp[1],  $conf->global->{$constname}, $constname, 0, $langs->trans('CustomersProspectsCategoriesShort'));
+				print $formother->select_categories($tmp[1], getDolGlobalString($constname), $constname, 0, $langs->trans('CustomersProspectsCategoriesShort'));
 			} elseif (preg_match('/thirdparty_type/', $val['type'])) {
 				require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 				$formcompany = new FormCompany($db);
-				print $formcompany->selectProspectCustomerType($conf->global->{$constname}, $constname);
+				print $formcompany->selectProspectCustomerType(getDolGlobalString($constname), $constname);
 			} elseif ($val['type'] == 'securekey') {
 				print '<input required="required" type="text" class="flat" id="'.$constname.'" name="'.$constname.'" value="'.(GETPOST($constname, 'alpha') ?GETPOST($constname, 'alpha') : $conf->global->{$constname}).'" size="40">';
 				if (!empty($conf->use_javascript_ajax)) {
@@ -524,11 +524,11 @@ if ($action == 'edit') {
 				print dolJSToSetRandomPassword($constname, 'generate_token'.$constname);
 			} elseif ($val['type'] == 'product') {
 				if (isModEnabled("product") || isModEnabled("service")) {
-					$selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
+					$selected = getDolGlobalString($constname);
 					$form->select_produits($selected, $constname, '', 0);
 				}
 			} elseif ($val['type'] == 'accountancy_code') {
-				$selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
+				$selected = getDolGlobalString($constname);
 				if (isModEnabled('accounting')) {
 					require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 					$formaccounting = new FormAccounting($db);
@@ -537,7 +537,7 @@ if ($action == 'edit') {
 					print '<input name="' . $constname . '" class="maxwidth200" value="' . dol_escape_htmltag($selected) . '">';
 				}
 			} elseif ($val['type'] == 'accountancy_category') {
-				$selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
+				$selected = getDolGlobalString($constname);
 				if (isModEnabled('accounting')) {
 					print '<input type="text" name="' . $constname . '" list="pcg_type_datalist" value="' . $selected . '">';
 					// autosuggest from existing account types if found
@@ -587,9 +587,9 @@ if ($action == 'edit') {
 				print '</td><td>';
 
 				if ($val['type'] == 'textarea') {
-					print dol_nl2br($conf->global->{$constname});
+					print dol_nl2br(getDolGlobalString($constname));
 				} elseif ($val['type']== 'html') {
-					print  $conf->global->{$constname};
+					print getDolGlobalString($constname);
 				} elseif ($val['type'] == 'yesno') {
 					print ajax_constantonoff($constname);
 				} elseif (preg_match('/emailtemplate:/', $val['type'])) {
@@ -598,14 +598,14 @@ if ($action == 'edit') {
 
 					$tmp = explode(':', $val['type']);
 
-					$template = $formmail->getEMailTemplate($db, $tmp[1], $user, $langs, $conf->global->{$constname});
+					$template = $formmail->getEMailTemplate($db, $tmp[1], $user, $langs, getDolGlobalString($constname));
 					if ($template<0) {
 						setEventMessages(null, $formmail->errors, 'errors');
 					}
 					print $langs->trans($template->label);
 				} elseif (preg_match('/category:/', $val['type'])) {
 					$c = new Categorie($db);
-					$result = $c->fetch($conf->global->{$constname});
+					$result = $c->fetch(getDolGlobalInt($constname));
 					if ($result < 0) {
 						setEventMessages(null, $c->errors, 'errors');
 					} elseif ($result > 0 ) {
@@ -617,18 +617,18 @@ if ($action == 'edit') {
 						print '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
 					}
 				} elseif (preg_match('/thirdparty_type/', $val['type'])) {
-					if ($conf->global->{$constname}==2) {
+					if (getDolGlobalInt($constname)==2) {
 						print $langs->trans("Prospect");
-					} elseif ($conf->global->{$constname}==3) {
+					} elseif (getDolGlobalInt($constname)==3) {
 						print $langs->trans("ProspectCustomer");
-					} elseif ($conf->global->{$constname}==1) {
+					} elseif (getDolGlobalInt($constname)==1) {
 						print $langs->trans("Customer");
-					} elseif ($conf->global->{$constname}==0) {
+					} elseif (getDolGlobalInt($constname)==0) {
 						print $langs->trans("NorProspectNorCustomer");
 					}
 				} elseif ($val['type'] == 'product') {
 					$product = new Product($db);
-					$resprod = $product->fetch($conf->global->{$constname});
+					$resprod = $product->fetch(getDolGlobalInt($constname));
 					if ($resprod > 0) {
 						print $product->ref;
 					} elseif ($resprod < 0) {
@@ -638,11 +638,11 @@ if ($action == 'edit') {
 					if (isModEnabled('accounting')) {
 						require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 						$accountingaccount = new AccountingAccount($db);
-						$accountingaccount->fetch('', $conf->global->{$constname}, 1);
+						$accountingaccount->fetch('', getDolGlobalString($constname), 1);
 
 						print $accountingaccount->getNomUrl(0, 1, 1, '', 1);
 					} else {
-						print $conf->global->{$constname};
+						print getDolGlobalString($constname);
 					}
 				} else {
 					print $conf->global->{$constname};
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index f0399fa6350..d1329e40454 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1602,7 +1602,7 @@ if ($action == 'create') {
 	            		        $("#select_actioncommsendmodel_mail").closest("tr").show();
 	            		    } else {
 	            			    $("#select_actioncommsendmodel_mail").closest("tr").hide();
-	            		    };
+	            		    }
 	            		});
                    })';
 		print '</script>'."\n";
@@ -2104,7 +2104,7 @@ if ($id > 0) {
 	            		        $("#select_actioncommsendmodel_mail").closest("tr").show();
 	            		    } else {
 	            			    $("#select_actioncommsendmodel_mail").closest("tr").hide();
-	            		    };
+	            		    }
 	            		});
 
                    })';
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 383cf7581e9..a644880282b 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1898,7 +1898,7 @@ if ($action == 'create' && $usercancreate) {
 			if ($soc->fetch_optionals() > 0) {
 				$object->array_options = array_merge($object->array_options, $soc->array_options);
 			}
-		};
+		}
 
 		print $object->showOptionals($extrafields, 'create', $parameters);
 	}
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index d3e573f21bf..e75402ba429 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -353,10 +353,10 @@ if (GETPOST("account") || GETPOST("ref")) {
 				print "<td>".$refcomp."</td>";
 				if ($tmpobj->total_ttc < 0) {
 					print '<td class="nowrap right">'.price(abs($total_ttc))."</td><td>&nbsp;</td>";
-				};
+				}
 				if ($tmpobj->total_ttc >= 0) {
 					print '<td>&nbsp;</td><td class="nowrap right">'.price($total_ttc)."</td>";
-				};
+				}
 				print '<td class="nowrap right">'.price($solde).'</td>';
 				print "</tr>";
 			}
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index e28e5427c0b..14f82abe1a4 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3357,7 +3357,7 @@ if ($action == 'create') {
 						jQuery(".checkforselect").prop("disabled", false);
 						jQuery(".checkforselect").prop("checked", true);
 					}
-				};
+				}
     		});
     		</script>';
 
@@ -3780,7 +3780,7 @@ if ($action == 'create') {
 			if ($soc->fetch_optionals() > 0) {
 				$object->array_options = array_merge($object->array_options, $soc->array_options);
 			}
-		};
+		}
 
 		print $object->showOptionals($extrafields, 'create', $parameters);
 	}
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index e7c7678b818..1cd655603bc 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -405,7 +405,7 @@ if ($action == 'create') {
 						$("#label_type_payment").removeClass("fieldrequired");
 						$(".hide_if_no_auto_create_payment").hide();
 					}
-				};
+				}
 				$("#radiopayment").click(function() {
 					$("#label").val($(this).data("label"));
 				});
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 82012400f68..88ee43fd713 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -687,7 +687,7 @@ abstract class CommonDocGenerator
 						$resql = $this->db->fetch_object($resql);
 
 						foreach ($extralabels as $key => $label) {
-							$resarray['line_product_supplier_'.$key] = $resql->{$key};
+							$resarray['line_product_supplier_'.$key] = $resql->$key;
 						}
 					}
 				}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 686d500875a..a6eac03cadc 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8228,7 +8228,7 @@ class Form
 					    		return {
 							    	q: params.term, 	// search term
 					    			page: params.page
-					    		};
+					    		}
 				    		},
 				    		processResults: function (data) {
 				    			// parse the results into the format expected by Select2.
@@ -8480,14 +8480,14 @@ class Form
 				$out .= 'function formatResult(record, container) {'."\n";
 				$out .= '	if ($(record.element).attr("data-html") != undefined) return htmlEntityDecodeJs($(record.element).attr("data-html"));		// If property html set, we decode html entities and use this'."\n";
 				$out .= '	return record.text;';
-				$out .= '};'."\n";
+				$out .= '}'."\n";
 				$out .= 'function formatSelection(record) {'."\n";
 				if ($elemtype == 'category') {
 					$out .= 'return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png"> \'+record.text+\'</span>\';';
 				} else {
 					$out .= 'return record.text;';
 				}
-				$out .= '};'."\n";
+				$out .= '}'."\n";
 				$out .= '$(document).ready(function () {
 							$(\'#'.$htmlname.'\').'.$tmpplugin.'({';
 				if ($placeholder) {
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 364a638e13f..90c9857992a 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -115,7 +115,7 @@ class FormActions
                         $('.hideifna').show();
                     }
                     else {
-                    	if (defaultvalue == 50 && (percentage.val() == 0 || percentage.val() == 100)) { percentage.val(50) };
+                    	if (defaultvalue == 50 && (percentage.val() == 0 || percentage.val() == 100)) { percentage.val(50); }
                     	percentage.removeAttr('disabled');
                         $('.hideifna').show();
                     }
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 5f27cbf3477..82ab8031155 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -690,7 +690,7 @@ class FormCompany extends Form
 								}
 							}
 						);
-					};
+					}
 				});
 				</script>';
 			}
diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
index c57ee0c5106..eb389454f82 100644
--- a/htdocs/core/class/html.formsetup.class.php
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -662,7 +662,7 @@ class FormSetupItem
 	{
 		global $conf;
 		if (isset($conf->global->{$this->confKey})) {
-			$this->fieldValue = $conf->global->{$this->confKey};
+			$this->fieldValue = getDolGlobalString($this->confKey);
 			return true;
 		} else {
 			$this->fieldValue = null;
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index eb0c7668d8c..0aa2c39de91 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -362,7 +362,7 @@ class FormTicket
 			print '<!-- Script to manage change of ticket group -->
 			<script>
 			jQuery(document).ready(function() {
-				function groupticketchange(){
+				function groupticketchange() {
 					console.log("We called groupticketchange, so we try to load list KM linked to event");
 					$("#KWwithajax").html("");
 					idgroupticket = $("#selectcategory_code").val();
@@ -1095,7 +1095,7 @@ class FormTicket
 				$levelid++;
 				foreach ($tabscript as $script) {
 					$stringtoprint .= $script;
-				};
+				}
 				$stringtoprint .='})';
 				$stringtoprint .='</script>';
 			}
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index e1699660acc..f204acd4747 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -1039,4 +1039,4 @@ class ImportCsv extends ModeleImports
 function cleansep($value)
 {
 	return str_replace(array(',', ';'), '/', $value);
-};
+}
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index f008aacc10e..69e5795a881 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -511,7 +511,7 @@ if ((isModEnabled("service") || ($object->element == 'contrat')) && $dateSelecto
 		print $form->selectDate($date_start, 'date_start', empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, 1, "addproduct", 1, 0);
 		print ' '.$langs->trans('to').' ';
 		print $form->selectDate($date_end, 'date_end', empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, 1, "addproduct", 1, 0);
-	};
+	}
 
 	if ($prefillDates) {
 		echo ' <span class="small"><a href="#" id="prefill_service_dates">'.$langs->trans('FillWithLastServiceDates').'</a></span>';
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index b193048047a..43262e4f3e3 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2212,7 +2212,7 @@ if ($action == 'create') {
 						jQuery(".checkforselect").prop("disabled", false);
 						jQuery(".checkforselect").prop("checked", true);
 					}
-				};
+				}
     		});
     		</script>';
 
diff --git a/htdocs/hrm/compare.php b/htdocs/hrm/compare.php
index 686d5820695..d1dde23a63c 100644
--- a/htdocs/hrm/compare.php
+++ b/htdocs/hrm/compare.php
@@ -319,11 +319,11 @@ function rate(&$TMergedSkills, $field)
 	foreach ($TMergedSkills as $id => &$sk) {
 		$class = "note";
 		$how_many = 0;
-		if (empty($sk->{$field})) {
+		if (empty($sk->$field)) {
 			$note = 'x';
 			$class .= ' none';
 		} else {
-			$note = $sk->{$field};
+			$note = $sk->$field;
 			$how_many = ($field === 'rate1') ? $sk->how_many_max1 : $sk->how_many_max2;
 		}
 
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 9a33bd25c05..579fdb74c4a 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -1354,7 +1354,7 @@ if ($step == 4 && $datatoimport) {
 		print '				$("select.targetselectchange").find(\'option[value="\'+value+\'"]:not(:selected)\').prop("disabled", true);'."\n";	// Set to disabled except if currently selected
 		print '         }'."\n";
 		print '     });'."\n";
-		print '};'."\n";
+		print '}'."\n";
 
 		// Function to save the selection in database
 		print 'function saveSelection() {'."\n";
@@ -1402,7 +1402,7 @@ if ($step == 4 && $datatoimport) {
 					}
 		";
 
-		print '};'."\n";
+		print '}'."\n";
 
 		// If we make a change on a selectbox
 		print '$(".targetselectchange").change(function(){'."\n";
diff --git a/htdocs/index.php b/htdocs/index.php
index 06a829ea4b5..e0001adba5e 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -806,23 +806,15 @@ function getWeatherStatus($totallate)
 
 	$used_conf = empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? 'MAIN_METEO_LEVEL' : 'MAIN_METEO_PERCENTAGE_LEVEL';
 
-	$level0 = $offset;
 	$weather->level = 0;
-	if (!empty($conf->global->{$used_conf.'0'})) {
-		$level0 = $conf->global->{$used_conf.'0'};
-	}
+	$level0 = $offset;
+	$level0 = getDolGlobalString($used_conf.'0', $level0);
 	$level1 = $offset + 1 * $factor;
-	if (!empty($conf->global->{$used_conf.'1'})) {
-		$level1 = $conf->global->{$used_conf.'1'};
-	}
+	$level1 = getDolGlobalString($used_conf.'1', $level1);
 	$level2 = $offset + 2 * $factor;
-	if (!empty($conf->global->{$used_conf.'2'})) {
-		$level2 = $conf->global->{$used_conf.'2'};
-	}
+	$level2 = getDolGlobalString($used_conf.'2', $level2);
 	$level3 = $offset + 3 * $factor;
-	if (!empty($conf->global->{$used_conf.'3'})) {
-		$level3 = $conf->global->{$used_conf.'3'};
-	}
+	$level3 = getDolGlobalString($used_conf.'3', $level3);
 
 	if ($totallate <= $level0) {
 		$weather->picto = 'weather-clear.png';
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 8f7764ad100..c51bc01376c 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
@@ -107,7 +107,7 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
 			);
 
 			return call_user_func($callback, $action, $object, $user, $langs, $conf);
-		};
+		}
 
 		// Or you can execute some code here
 		switch ($action) {
diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index 8b42f7cb25b..4305aed6f3b 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -615,8 +615,8 @@ class MultiCurrency extends CommonObject
 
 		if ($conf->currency != $conf->global->MULTICURRENCY_APP_SOURCE) {
 			$alternate_source = 'USD'.$conf->currency;
-			if (!empty($TRate->{$alternate_source})) {
-				$coef = $TRate->USDUSD / $TRate->{$alternate_source};
+			if (!empty($TRate->$alternate_source)) {
+				$coef = $TRate->USDUSD / $TRate->$alternate_source;
 				foreach ($TRate as $attr => &$rate) {
 					$rate *= $coef;
 				}
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 0424ddaf830..788857dfd47 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1529,7 +1529,7 @@ if ($action == 'edit_price' && $object->getRights()->creer) {
 					otherPrices.show();
 					minPrice1.show();
 				}
-			};
+			}
 
 			jQuery(document).ready(function () {
 				showHidePriceRules();
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index d1644623ce1..2520eb8f559 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -78,12 +78,12 @@ while ($tmpobj = $db->fetch_object($resWar)) {
 	$listofqualifiedwarehousesid .= $tmpobj->rowid;
 	$lastWarehouseID = $tmpobj->rowid;
 	$count++;
-};
+}
 
 //MultiCompany : If only 1 Warehouse is visible, filter will automatically be set to it.
 if ($count == 1 && (empty($fk_entrepot) || $fk_entrepot <= 0) && !empty($conf->global->MULTICOMPANY_PRODUCT_SHARING_ENABLED)) {
 	$fk_entrepot = $lastWarehouseID;
-};
+}
 
 $texte = '';
 
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index e7467176c10..96b4aa0b03b 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -968,7 +968,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 							console.log("Hide opportunities fields "+jQuery("#usage_opportunity").prop("checked"));
 							jQuery(".classuseopportunity").hide();
 						}
-					};
+					}
 				});';
 				print '</script>';
 				print '<br>';
@@ -994,7 +994,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 							console.log("Hide task fields "+jQuery("#usage_task").prop("checked"));
 							jQuery(".classusetask").hide();
 						}
-					};
+					}
 				});';
 				print '</script>';
 				print '<br>';
@@ -1020,7 +1020,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 							console.log("Hide bill time fields "+jQuery("#usage_bill_time").prop("checked"));
 							jQuery(".classusebilltime").hide();
 						}
-					};
+					}
 				});';
 				print '</script>';
 				print '<br>';
@@ -1046,7 +1046,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 							console.log("Hide organize event fields "+jQuery("#usage_organize_event").prop("checked"));
 							jQuery(".classuseorganizeevent").hide();
 						}
-					};
+					}
 				});';
 				print '</script>';
 			}
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 91333c153f8..458921adfc6 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1025,7 +1025,8 @@ class Task extends CommonObjectLine
 					if (!empty($extrafields->attributes['projet']['label'])) {
 						foreach ($extrafields->attributes['projet']['label'] as $key => $val) {
 							if ($extrafields->attributes['projet']['type'][$key] != 'separate') {
-								$tasks[$i]->{'options_'.$key} = $obj->{'options_'.$key};
+								$tmpvar = 'options_'.$key;
+								$tasks[$i]->{'options_'.$key} = $obj->$tmpvar;
 							}
 						}
 					}
@@ -1033,7 +1034,8 @@ class Task extends CommonObjectLine
 					if (!empty($extrafields->attributes['projet_task']['label'])) {
 						foreach ($extrafields->attributes['projet_task']['label'] as $key => $val) {
 							if ($extrafields->attributes['projet_task']['type'][$key] != 'separate') {
-								$tasks[$i]->{'options_'.$key} = $obj->{'options_'.$key};
+								$tmpvar = 'options_'.$key;
+								$tasks[$i]->{'options_'.$key} = $obj->$tmpvar;
 							}
 						}
 					}
diff --git a/htdocs/projet/jsgantt_language.js.php b/htdocs/projet/jsgantt_language.js.php
index 35ab1132ae7..93b9ee5505f 100644
--- a/htdocs/projet/jsgantt_language.js.php
+++ b/htdocs/projet/jsgantt_language.js.php
@@ -67,7 +67,7 @@ var vLangs={'<?php print $langs->getDefaultLang(1); ?>':
 	'sunday':'<?php print $langs->transnoentities('Sunday'); ?>','monday':'<?php print $langs->transnoentities('Monday'); ?>','tuesday':'<?php print $langs->transnoentities('Tuesday'); ?>','wednesday':'<?php print $langs->transnoentities('Wednesday'); ?>','thursday':'<?php print $langs->transnoentities('Thursday'); ?>','friday':'<?php print $langs->transnoentities('Friday'); ?>','saturday':'<?php print $langs->transnoentities('Saturday'); ?>',
 	'sun':'<?php print $langs->transnoentities('SundayMin'); ?>','mon':'<?php print $langs->transnoentities('MondayMin'); ?>','tue':'<?php print $langs->transnoentities('TuesdayMin'); ?>','wed':'<?php print $langs->transnoentities('WednesdayMin'); ?>','thu':'<?php print $langs->transnoentities('ThursdayMin'); ?>','fri':'<?php print $langs->transnoentities('FridayMin'); ?>','sat':'<?php print $langs->transnoentities('SaturdayMin'); ?>'
 	}
-};
+}
 var vLang='<?php print $langs->getDefaultLang(1); ?>';
 <?php
 if (is_object($db)) {
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index c0758c4a64d..7931c6a37c1 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -561,7 +561,7 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 				if (jQuery("#morphy").val() == \'mor\') {
 					jQuery("#trcompany").show();
 				}
-			};
+			}
 			initmorphy();
 			jQuery("#morphy").change(function() {
 				initmorphy();
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 79104817e77..e9823f2d0f7 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -2395,7 +2395,7 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
 				color: '#fa755a',
 				iconColor: '#fa755a'
 			  }
-			};
+			}
 
 			var cardElement = elements.create('card', {style: style});
 
@@ -2435,7 +2435,7 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
 					?>
 			var cardButton = document.getElementById('buttontopay');
 			var clientSecret = cardButton.dataset.secret;
-			var options = { clientSecret: clientSecret,};
+			var options = { clientSecret: clientSecret };
 
 			// Create an instance of Elements
 			var elements = stripe.elements(options);
@@ -2465,7 +2465,7 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
 				color: '#fa755a',
 				iconColor: '#fa755a'
 			  }
-			};
+			}
 
 				<?php
 				if (getDolGlobalInt('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION') == 2) {
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 09e6f4b6eaa..a5b6f21b31b 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1381,12 +1381,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				  data: function (params) {
 						return {
 							newcompany: params.term // search term
-						};
+						}
 				  },
 				  processResults: function (data, params) {
 					  return {
 						results: data
-					  };
+					  }
 				  },
 				  cache: true
 				},
@@ -2150,7 +2150,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					{
 						jQuery(".visibleifsupplier").show();
 					}
-				};
+				}
 
        			$("#selectcountry_id").change(function() {
        				document.formsoc.action.value="edit";
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index fe03139c8a3..f93608d20b8 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -268,7 +268,7 @@ if (isModEnabled('stock')) {
 	}
 	print '</td></tr>';
 
-	$disabled = $conf->global->{'CASHDESK_NO_DECREASE_STOCK'.$terminal};
+	$disabled = getDolGlobalString('CASHDESK_NO_DECREASE_STOCK'.$terminal);
 
 
 	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskIdWareHouse").'</td>'; // Force warehouse (this is not a default value)
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index dc2bd8b684a..fb3049715cf 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -956,7 +956,7 @@ $( document ).ready(function() {
 		return {
 			vertical:container.scrollHeight > container.clientHeight,
 			horizontal:container.scrollWidth > container.clientWidth
-		};
+		}
 	}
 
 	$(window).resize(function(){
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index ccc1fde97eb..ea262a1562f 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -174,12 +174,12 @@ if (empty($reshook)) {
 			$bankaccount = GETPOST('accountid', 'int');
 		} else {
 			if ($pay == 'LIQ') {
-				$bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CASH'.$_SESSION["takeposterminal"]};            // For backward compatibility
+				$bankaccount = getDolGlobalString('CASHDESK_ID_BANKACCOUNT_CASH'.$_SESSION["takeposterminal"]);            // For backward compatibility
 			} elseif ($pay == "CHQ") {
-				$bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$_SESSION["takeposterminal"]};    // For backward compatibility
+				$bankaccount = getDolGlobalString('CASHDESK_ID_BANKACCOUNT_CHEQUE'.$_SESSION["takeposterminal"]);    // For backward compatibility
 			} else {
 				$accountname = "CASHDESK_ID_BANKACCOUNT_".$pay.$_SESSION["takeposterminal"];
-				$bankaccount = $conf->global->$accountname;
+				$bankaccount = getDolGlobalString($accountname);
 			}
 		}
 
@@ -217,13 +217,6 @@ if (empty($reshook)) {
 			$invoice->update($user);
 		}
 
-		//$sav_FACTURE_ADDON = '';
-		//if (!empty($conf->global->TAKEPOS_ADDON)) {
-		//	$sav_FACTURE_ADDON = $conf->global->FACTURE_ADDON;
-		//	if ($conf->global->TAKEPOS_ADDON == "terminal") $conf->global->FACTURE_ADDON = $conf->global->{'TAKEPOS_ADDON'.$_SESSION["takeposterminal"]};
-		//	else $conf->global->FACTURE_ADDON = $conf->global->TAKEPOS_ADDON;
-		//}
-
 		$constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.$_SESSION["takeposterminal"];
 		if ($error) {
 			dol_htmloutput_errors($errormsg, null, 1);
diff --git a/htdocs/takepos/smpcb.php b/htdocs/takepos/smpcb.php
index 505ec27c1b0..6ce39d39bf0 100644
--- a/htdocs/takepos/smpcb.php
+++ b/htdocs/takepos/smpcb.php
@@ -71,7 +71,7 @@ if (GETPOST('smp-status')) {
 	print '<script type="application/javascript">
                 window.onload = function() {
                     window.close();
-                };
+                }
             </script>';
 
 	print "Transaction status registered, you can close this";
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 52a9f941cfe..4e90bbb1bd9 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -3371,24 +3371,36 @@ class User extends CommonObject
 
 		$socialnetworks = getArrayOfSocialNetworks();
 
-		$this->firstname = $ldapuser->{$conf->global->LDAP_FIELD_FIRSTNAME};
-		$this->lastname = $ldapuser->{$conf->global->LDAP_FIELD_NAME};
-		$this->login = $ldapuser->{$conf->global->LDAP_FIELD_LOGIN};
-		$this->pass = $ldapuser->{$conf->global->LDAP_FIELD_PASSWORD};
-		$this->pass_indatabase_crypted = $ldapuser->{$conf->global->LDAP_FIELD_PASSWORD_CRYPTED};
+		$tmpvar = getDolGlobalString('LDAP_FIELD_FIRSTNAME');
+		$this->firstname = $ldapuser->$tmpvar;
+		$tmpvar = getDolGlobalString('LDAP_FIELD_NAME');
+		$this->lastname = $ldapuser->$tmpvar;
+		$tmpvar = getDolGlobalString('LDAP_FIELD_LOGIN');
+		$this->login = $ldapuser->$tmpvar;
+		$tmpvar = getDolGlobalString('LDAP_FIELD_PASSWORD');
+		$this->pass = $ldapuser->$tmpvar;
+		$tmpvar = getDolGlobalString('LDAP_FIELD_PASSWORD_CRYPTED');
+		$this->pass_indatabase_crypted = $ldapuser->$tmpvar;
 
-		$this->office_phone = $ldapuser->{$conf->global->LDAP_FIELD_PHONE};
-		$this->user_mobile = $ldapuser->{$conf->global->LDAP_FIELD_MOBILE};
-		$this->office_fax = $ldapuser->{$conf->global->LDAP_FIELD_FAX};
-		$this->email = $ldapuser->{$conf->global->LDAP_FIELD_MAIL};
+		$tmpvar = getDolGlobalString('LDAP_FIELD_PHONE');
+		$this->office_phone = $ldapuser->$tmpvar;
+		$tmpvar = getDolGlobalString('LDAP_FIELD_MOBILE');
+		$this->user_mobile = $ldapuser->$tmpvar;
+		$tmpvar = getDolGlobalString('LDAP_FIELD_FAX');
+		$this->office_fax = $ldapuser->$tmpvar;
+		$tmpvar = getDolGlobalString('LDAP_FIELD_MAIL');
+		$this->email = $ldapuser->$tmpvar;
 		foreach ($socialnetworks as $key => $value) {
-			$tmpkey = 'LDAP_FIELD_'.strtoupper($value['label']);
-			$this->socialnetworks[$value['label']] = $ldapuser->{$conf->global->$tmpkey};
+			$tmpvar = getDolGlobalString('LDAP_FIELD_'.strtoupper($value['label']));
+			$this->socialnetworks[$value['label']] = $ldapuser->$tmpvar;
 		}
-		$this->ldap_sid = $ldapuser->{$conf->global->LDAP_FIELD_SID};
+		$tmpvar = getDolGlobalString('LDAP_FIELD_SID');
+		$this->ldap_sid = $ldapuser->$tmpvar;
 
-		$this->job = $ldapuser->{$conf->global->LDAP_FIELD_TITLE};
-		$this->note_public = $ldapuser->{$conf->global->LDAP_FIELD_DESCRIPTION};
+		$tmpvar = getDolGlobalString('LDAP_FIELD_TITLE');
+		$this->job = $ldapuser->$tmpvar;
+		$tmpvar = getDolGlobalString('LDAP_FIELD_DESCRIPTION');
+		$this->note_public = $ldapuser->$tmpvar;
 
 		$result = $this->update($user);
 
diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index 800c2e0e2a2..1fe15576860 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -736,7 +736,7 @@ function getListOfThirdParties($authentication, $filterthirdparty)
 				if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label'])) {
 					foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label) {
 						if (isset($obj->{$key})) {
-							$extrafieldsOptions['options_'.$key] = $obj->{$key};
+							$extrafieldsOptions['options_'.$key] = $obj->$key;
 						}
 					}
 				}
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index ae3362ab9d6..2cb775019e6 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -3294,7 +3294,7 @@ if (!GETPOST('hide_websitemenu')) {
 									}
 									isEditingEnabled = false;
 								}
-							};
+							}
 						});
 						</script>';
 				print $langs->trans("EditInLine");

From 0db5c98941af8e63aa64b2fb67d952f16a8222bf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 18:46:36 +0100
Subject: [PATCH 200/816] Clean code

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

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index a5b6f21b31b..bb9d2376a47 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -3313,11 +3313,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
 					$result = show_contacts($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id);
 				}
-
-				// Addresses list
-				if (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT)) {
-					$result = show_addresses($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id);
-				}
 			}
 		}
 

From 67fea77e07023e9c9e3d7c368d3891d536193783 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 18:48:45 +0100
Subject: [PATCH 201/816] Fix warning

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

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index ccc1fde97eb..4dcd9645350 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -174,12 +174,12 @@ if (empty($reshook)) {
 			$bankaccount = GETPOST('accountid', 'int');
 		} else {
 			if ($pay == 'LIQ') {
-				$bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CASH'.$_SESSION["takeposterminal"]};            // For backward compatibility
+				$bankaccount = getDolGlobalString('CASHDESK_ID_BANKACCOUNT_CASH'.$_SESSION["takeposterminal"]);            // For backward compatibility
 			} elseif ($pay == "CHQ") {
-				$bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$_SESSION["takeposterminal"]};    // For backward compatibility
+				$bankaccount = getDolGlobalString('CASHDESK_ID_BANKACCOUNT_CHEQUE'.$_SESSION["takeposterminal"]);    // For backward compatibility
 			} else {
 				$accountname = "CASHDESK_ID_BANKACCOUNT_".$pay.$_SESSION["takeposterminal"];
-				$bankaccount = $conf->global->$accountname;
+				$bankaccount = getDolGlobalString($accountname);
 			}
 		}
 

From c593d990e458305ca1efc967effa7356befe5d60 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 18:52:19 +0100
Subject: [PATCH 202/816] Clean deprecated code for adodbtime

---
 htdocs/core/lib/functions.lib.php             | 102 +++++++-----------
 .../class/partnershiputils.class.php          |   2 +-
 2 files changed, 42 insertions(+), 62 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 9f67a0e3909..de329ee515f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2647,12 +2647,6 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 		$format = str_replace('%A', '__A__', $format);
 	}
 
-	$useadodb = getDolGlobalInt('MAIN_USE_LEGACY_ADODB_FOR_DATE', 0);
-	//$useadodb = 1;	// To switch to adodb
-	if (!empty($useadodb)) {
-		include_once DOL_DOCUMENT_ROOT.'/includes/adodbtime/adodb-time.inc.php';
-	}
-
 	// Analyze date
 	$reg = array();
 	if (preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])$/i', $time, $reg)) {	// Deprecated. Ex: 1970-01-01, 1970-01-01 01:00:00, 19700101010000
@@ -2671,14 +2665,37 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 		$ssec	= (!empty($reg[6]) ? $reg[6] : '');
 
 		$time = dol_mktime($shour, $smin, $ssec, $smonth, $sday, $syear, true);
-		if (empty($useadodb)) {
+
+		if ($to_gmt) {
+			$tzo = new DateTimeZone('UTC');	// when to_gmt is true, base for offsettz and offsetdst (so timetouse) is UTC
+		} else {
+			$tzo = new DateTimeZone(date_default_timezone_get());	// when to_gmt is false, base for offsettz and offsetdst (so timetouse) is PHP server
+		}
+		$dtts = new DateTime();
+		$dtts->setTimestamp($time);
+		$dtts->setTimezone($tzo);
+		$newformat = str_replace(
+			array('%Y', '%y', '%m', '%d', '%H', '%I', '%M', '%S', '%p', 'T', 'Z', '__a__', '__A__', '__b__', '__B__'),
+			array('Y', 'y', 'm', 'd', 'H', 'h', 'i', 's', 'A', '__£__', '__$__', '__{__', '__}__', '__[__', '__]__'),
+			$format);
+		$ret = $dtts->format($newformat);
+		$ret = str_replace(
+			array('__£__', '__$__', '__{__', '__}__', '__[__', '__]__'),
+			array('T', 'Z', '__a__', '__A__', '__b__', '__B__'),
+			$ret
+		);
+	} else {
+		// Date is a timestamps
+		if ($time < 100000000000) {	// Protection against bad date values
+			$timetouse = $time + $offsettz + $offsetdst; // TODO We could be able to disable use of offsettz and offsetdst to use only offsettzstring.
+
 			if ($to_gmt) {
 				$tzo = new DateTimeZone('UTC');	// when to_gmt is true, base for offsettz and offsetdst (so timetouse) is UTC
 			} else {
 				$tzo = new DateTimeZone(date_default_timezone_get());	// when to_gmt is false, base for offsettz and offsetdst (so timetouse) is PHP server
 			}
 			$dtts = new DateTime();
-			$dtts->setTimestamp($time);
+			$dtts->setTimestamp($timetouse);
 			$dtts->setTimezone($tzo);
 			$newformat = str_replace(
 				array('%Y', '%y', '%m', '%d', '%H', '%I', '%M', '%S', '%p', 'T', 'Z', '__a__', '__A__', '__b__', '__B__'),
@@ -2688,36 +2705,8 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 			$ret = str_replace(
 				array('__£__', '__$__', '__{__', '__}__', '__[__', '__]__'),
 				array('T', 'Z', '__a__', '__A__', '__b__', '__B__'),
-				$ret);
-		} else {
-			$ret = adodb_strftime($format, $time + $offsettz + $offsetdst, $to_gmt);
-		}
-	} else {
-		// Date is a timestamps
-		if ($time < 100000000000) {	// Protection against bad date values
-			$timetouse = $time + $offsettz + $offsetdst; // TODO We could be able to disable use of offsettz and offsetdst to use only offsettzstring.
-
-			if (empty($useadodb)) {
-				if ($to_gmt) {
-					$tzo = new DateTimeZone('UTC');	// when to_gmt is true, base for offsettz and offsetdst (so timetouse) is UTC
-				} else {
-					$tzo = new DateTimeZone(date_default_timezone_get());	// when to_gmt is false, base for offsettz and offsetdst (so timetouse) is PHP server
-				}
-				$dtts = new DateTime();
-				$dtts->setTimestamp($timetouse);
-				$dtts->setTimezone($tzo);
-				$newformat = str_replace(
-					array('%Y', '%y', '%m', '%d', '%H', '%I', '%M', '%S', '%p', 'T', 'Z', '__a__', '__A__', '__b__', '__B__'),
-					array('Y', 'y', 'm', 'd', 'H', 'h', 'i', 's', 'A', '__£__', '__$__', '__{__', '__}__', '__[__', '__]__'),
-					$format);
-				$ret = $dtts->format($newformat);
-				$ret = str_replace(
-					array('__£__', '__$__', '__{__', '__}__', '__[__', '__]__'),
-					array('T', 'Z', '__a__', '__A__', '__b__', '__B__'),
-					$ret);
-			} else {
-				$ret = adodb_strftime($format, $timetouse, $to_gmt);	// If to_gmt = false then adodb_strftime use TZ of server
-			}
+				$ret
+			);
 			//var_dump($ret);exit;
 		} else {
 			$ret = 'Bad value '.$time.' for date';
@@ -2727,20 +2716,15 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 	if (preg_match('/__b__/i', $format)) {
 		$timetouse = $time + $offsettz + $offsetdst; // TODO We could be able to disable use of offsettz and offsetdst to use only offsettzstring.
 
-		if (empty($useadodb)) {
-			if ($to_gmt) {
-				$tzo = new DateTimeZone('UTC');	// when to_gmt is true, base for offsettz and offsetdst (so timetouse) is UTC
-			} else {
-				$tzo = new DateTimeZone(date_default_timezone_get());	// when to_gmt is false, base for offsettz and offsetdst (so timetouse) is PHP server
-			}
-			$dtts = new DateTime();
-			$dtts->setTimestamp($timetouse);
-			$dtts->setTimezone($tzo);
-			$month = $dtts->format("m");
+		if ($to_gmt) {
+			$tzo = new DateTimeZone('UTC');	// when to_gmt is true, base for offsettz and offsetdst (so timetouse) is UTC
 		} else {
-			// After this ret is string in PHP setup language (strftime was used). Now we convert to $outputlangs.
-			$month = adodb_strftime('%m', $timetouse, $to_gmt);		// If to_gmt = false then adodb_strftime use TZ of server
+			$tzo = new DateTimeZone(date_default_timezone_get());	// when to_gmt is false, base for offsettz and offsetdst (so timetouse) is PHP server
 		}
+		$dtts = new DateTime();
+		$dtts->setTimestamp($timetouse);
+		$dtts->setTimezone($tzo);
+		$month = $dtts->format("m");
 		$month = sprintf("%02d", $month); // $month may be return with format '06' on some installation and '6' on other, so we force it to '06'.
 		if ($encodetooutput) {
 			$monthtext = $outputlangs->transnoentities('Month'.$month);
@@ -2759,19 +2743,15 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 		//print "time=$time offsettz=$offsettz offsetdst=$offsetdst offsettzstring=$offsettzstring";
 		$timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
 
-		if (empty($useadodb)) {
-			if ($to_gmt) {
-				$tzo = new DateTimeZone('UTC');
-			} else {
-				$tzo = new DateTimeZone(date_default_timezone_get());
-			}
-			$dtts = new DateTime();
-			$dtts->setTimestamp($timetouse);
-			$dtts->setTimezone($tzo);
-			$w = $dtts->format("w");
+		if ($to_gmt) {
+			$tzo = new DateTimeZone('UTC');
 		} else {
-			$w = adodb_strftime('%w', $timetouse, $to_gmt);		// If to_gmt = false then adodb_strftime use TZ of server
+			$tzo = new DateTimeZone(date_default_timezone_get());
 		}
+		$dtts = new DateTime();
+		$dtts->setTimestamp($timetouse);
+		$dtts->setTimezone($tzo);
+		$w = $dtts->format("w");
 		$dayweek = $outputlangs->transnoentitiesnoconv('Day'.$w);
 
 		$ret = str_replace('__A__', $dayweek, $ret);
diff --git a/htdocs/partnership/class/partnershiputils.class.php b/htdocs/partnership/class/partnershiputils.class.php
index 647d1492ced..86722ed1da2 100644
--- a/htdocs/partnership/class/partnershiputils.class.php
+++ b/htdocs/partnership/class/partnershiputils.class.php
@@ -395,7 +395,7 @@ class PartnershipUtils
 	/**
 	 * Action to check if Dolibarr backlink not found on partner website
 	 *
-	 * @param  $website      Website	Partner's website
+	 * @param  	string	$website      	Partner's website URL
 	 * @return  int                 	0 if KO, 1 if OK
 	 */
 	private function checkDolibarrBacklink($website = null)

From 9e235f916f98f1e5ebdad7323e8425c7709bde26 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 19:06:04 +0100
Subject: [PATCH 203/816] Fix var

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

diff --git a/htdocs/core/modules/modWorkflow.class.php b/htdocs/core/modules/modWorkflow.class.php
index 58da4876d32..1fd6a89e66a 100644
--- a/htdocs/core/modules/modWorkflow.class.php
+++ b/htdocs/core/modules/modWorkflow.class.php
@@ -95,7 +95,7 @@ class modWorkflow extends DolibarrModules
 			8=>array('WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER', 'chaine', '1', 'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER', 0, 'current', 0),
 			10=>array('WORKFLOW_TICKET_LINK_CONTRACT', 'chaine', '0', 'Automatically link a ticket to available contracts', 0, 'current', 0),
 			11=>array('WORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS', 'chaine', '0', 'Search among parent companies contracts when automatically linking a ticket to available contracts', 0, 'current', 0),
-			11=>array('WORKFLOW_TICKET_CREATE_INTERVENTION', 'chaine', '1', 'WORKFLOW_TICKET_CREATE_INTERVENTION', 0, 'current', 0)
+			12=>array('WORKFLOW_TICKET_CREATE_INTERVENTION', 'chaine', '0', 'WORKFLOW_TICKET_CREATE_INTERVENTION', 0, 'current', 0)
 		);
 
 		// Boxes

From c5ca50b5db78fa3298420fefcfac7f7ad9f3d7b9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 19:27:13 +0100
Subject: [PATCH 204/816] Fix warning

---
 htdocs/compta/facture/class/facture-rec.class.php | 3 +--
 htdocs/ticket/class/ticket.class.php              | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 3a586dfc3e5..f02850492b5 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -188,13 +188,12 @@ class FactureRec extends CommonInvoice
 		'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),
 		'date_when' =>array('type'=>'datetime', 'label'=>'Date when', 'enabled'=>1, 'visible'=>-1, 'position'=>130),
 		'date_last_gen' =>array('type'=>'datetime', 'label'=>'Date last gen', 'enabled'=>1, 'visible'=>-1, 'position'=>135),
 		'nb_gen_done' =>array('type'=>'integer', 'label'=>'Nb gen done', 'enabled'=>1, 'visible'=>-1, 'position'=>140),
 		'nb_gen_max' =>array('type'=>'integer', 'label'=>'Nb gen max', 'enabled'=>1, 'visible'=>-1, 'position'=>145),
 		'frequency' =>array('type'=>'integer', 'label'=>'Frequency', 'enabled'=>1, 'visible'=>-1, 'position'=>150),
+		'unit_frequency' =>array('type'=>'varchar(2)', 'label'=>'UnitFrequency', 'enabled'=>1, 'visible'=>-1, 'position'=>152),
 		'usenewprice' =>array('type'=>'integer', 'label'=>'UseNewPrice', 'enabled'=>1, 'visible'=>0, 'position'=>155),
 		'revenuestamp' =>array('type'=>'double(24,8)', 'label'=>'RevenueStamp', 'enabled'=>1, 'visible'=>-1, 'position'=>160, 'isameasure'=>1),
 		'auto_validate' =>array('type'=>'integer', 'label'=>'Auto validate', 'enabled'=>1, 'visible'=>-1, 'position'=>165),
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 6763ce02e84..d077ed3e777 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -270,7 +270,7 @@ class Ticket extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	public $fields = array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'position'=>1, 'visible'=>-2, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id"),
+		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-2, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id"),
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>5, 'notnull'=>1, 'index'=>1),
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'visible'=>1, 'enabled'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'css'=>'', 'showoncombobox'=>1),
 		'track_id' => array('type'=>'varchar(255)', 'label'=>'TicketTrackId', 'visible'=>-2, 'enabled'=>1, 'position'=>11, 'notnull'=>-1, 'searchall'=>1, 'help'=>"Help text"),

From f816587cfb235040c1c24c3c1489e7271aa73fa4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 19:28:05 +0100
Subject: [PATCH 205/816] Fix warning

---
 htdocs/adherents/list.php                 | 1 -
 htdocs/core/modules/modCommande.class.php | 4 ++--
 htdocs/core/modules/modSociete.class.php  | 1 -
 htdocs/projet/list.php                    | 2 +-
 htdocs/user/class/user.class.php          | 1 -
 5 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index a1d929ec3e9..0c61f94a93d 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -126,7 +126,6 @@ $fieldstosearchall = array(
 	'd.login'=>'Login',
 	'd.lastname'=>'Lastname',
 	'd.firstname'=>'Firstname',
-	'd.login'=>'Login',
 	'd.societe'=>"Company",
 	'd.email'=>'EMail',
 	'd.address'=>'Address',
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index f0486b5cb58..38b81cdb4fb 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -204,7 +204,7 @@ class modCommande extends DolibarrModules
 			'co.code'=>"CountryCode", 's.phone'=>'Phone', 's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 'c.rowid'=>"Id",
 			'c.ref'=>"Ref", 'c.ref_client'=>"RefCustomer", 'c.fk_soc'=>"IdCompany", 'c.date_creation'=>"DateCreation", 'c.date_commande'=>"OrderDate",
 			'c.date_livraison'=>"DateDeliveryPlanned", 'c.amount_ht'=>"Amount", 'c.total_ht'=>"TotalHT",
-			'c.total_ttc'=>"TotalTTC", 'c.facture'=>"Billed", 'c.fk_statut'=>'Status', 'c.note_public'=>"Note", 'c.date_livraison'=>'DeliveryDate',
+			'c.total_ttc'=>"TotalTTC", 'c.facture'=>"Billed", 'c.fk_statut'=>'Status', 'c.note_public'=>"Note",
 			'c.fk_user_author'=>'CreatedById', 'uc.login'=>'CreatedByLogin', 'c.fk_user_valid'=>'ValidatedById', 'uv.login'=>'ValidatedByLogin',
 			'pj.ref'=>'ProjectRef', 'cd.rowid'=>'LineId', 'cd.description'=>"LineDescription", 'cd.product_type'=>'TypeOfLineServiceOrProduct',
 			'cd.tva_tx'=>"LineVATRate", 'cd.qty'=>"LineQty", 'cd.total_ht'=>"LineTotalHT", 'cd.total_tva'=>"LineTotalVAT", 'cd.total_ttc'=>"LineTotalTTC",
@@ -236,7 +236,7 @@ class modCommande extends DolibarrModules
 			's.nom'=>'Text', 'ps.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'co.label'=>'List:c_country:label:label', 'co.code'=>'Text', 's.phone'=>'Text',
 			's.siren'=>'Text', 's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 'c.ref'=>"Text", 'c.ref_client'=>"Text", 'c.date_creation'=>"Date",
 			'c.date_commande'=>"Date", 'c.date_livraison'=>"Date", 'c.amount_ht'=>"Numeric", 'c.total_ht'=>"Numeric",
-			'c.total_ttc'=>"Numeric", 'c.facture'=>"Boolean", 'c.fk_statut'=>'Status', 'c.note_public'=>"Text", 'c.date_livraison'=>'Date', 'pj.ref'=>'Text',
+			'c.total_ttc'=>"Numeric", 'c.facture'=>"Boolean", 'c.fk_statut'=>'Status', 'c.note_public'=>"Text", 'pj.ref'=>'Text',
 			'cd.description'=>"Text", 'cd.product_type'=>'Boolean', 'cd.tva_tx'=>"Numeric", 'cd.qty'=>"Numeric", 'cd.total_ht'=>"Numeric", 'cd.total_tva'=>"Numeric",
 			'cd.total_ttc'=>"Numeric", 'p.rowid'=>'List:product:ref::product', 'p.ref'=>'Text', 'p.label'=>'Text', 'd.nom'=>'Text',
 			'c.entity'=>'List:entity:label:rowid',
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 70729f5c9dc..d63084ac5b5 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -571,7 +571,6 @@ class modSociete extends DolibarrModules
 				'dict' => 'DictionaryCompanyType'
 			),
 			's.capital' => array('rule' => 'numeric'),
-			's.fk_stcomm' => array('rule' => 'zeroifnull'),
 			's.parent' => array(
 				'rule' => 'fetchidfromref',
 				'file' => '/societe/class/societe.class.php',
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 23ff9be793f..411e6d5fcd8 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -210,7 +210,7 @@ $arrayfields['s.nom'] = array('label'=>$langs->trans("ThirdParty"), 'checked'=>1
 $arrayfields['s.name_alias'] = array('label'=>"AliasNameShort", 'checked'=>0, 'position'=>22);
 $arrayfields['commercial'] = array('label'=>$langs->trans("SaleRepresentativesOfThirdParty"), 'checked'=>0, 'position'=>23);
 $arrayfields['c.assigned'] = array('label'=>$langs->trans("AssignedTo"), 'checked'=>-1, 'position'=>120);
-$arrayfields['opp_weighted_amount'] = array('label'=>$langs->trans('OpportunityWeightedAmountShort'), 'checked'=>0, 'position'=> 116, 'enabled'=>(empty($conf->global->PROJECT_USE_OPPORTUNITIES) ? 0 : 1), 'position'=>106);
+$arrayfields['opp_weighted_amount'] = array('label'=>$langs->trans('OpportunityWeightedAmountShort'), 'checked'=>0, 'enabled'=>(empty($conf->global->PROJECT_USE_OPPORTUNITIES) ? 0 : 1), 'position'=>106);
 $arrayfields['u.login'] = array('label'=>"Author", 'checked'=>1, 'position'=>165);
 // Force some fields according to search_usage filter...
 if (GETPOST('search_usage_opportunity')) {
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 4e90bbb1bd9..81739943ae2 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -717,7 +717,6 @@ class User extends CommonObject
 			'shipping' => 'expedition',
 			'task' => 'task@projet',
 			'fichinter' => 'ficheinter',
-			'propale' => 'propal',
 			'inventory' => 'stock',
 			'invoice' => 'facture',
 			'invoice_supplier' => 'fournisseur',

From 73e776a44167ce0b94c98adc67e3d50dae94ec7a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 19:29:19 +0100
Subject: [PATCH 206/816] Add option to start manually

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

diff --git a/.github/workflows/stale-issues-safe.yml b/.github/workflows/stale-issues-safe.yml
index 4ac9fa8f5b9..af04675d48d 100644
--- a/.github/workflows/stale-issues-safe.yml
+++ b/.github/workflows/stale-issues-safe.yml
@@ -6,7 +6,8 @@ on:
   - cron: "0 21 * * *"
   issue_comment:
     types: [created]
-    
+  workflow_dispatch:
+  
 permissions: {} # none
 
 jobs:

From 1fde0a70f5bbb0492f79b0421ce808094f19228e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 19:39:08 +0100
Subject: [PATCH 207/816] Fix cast bad type

---
 htdocs/societe/class/companybankaccount.class.php | 2 +-
 htdocs/user/class/userbankaccount.class.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index d81a360e7d2..26305bb0013 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -349,7 +349,7 @@ class CompanyBankAccount extends Account
 				$rib = $this->label." : ";
 			}
 
-			$rib .= (string) $this;
+			$rib .= $this->iban;
 		}
 
 		return $rib;
diff --git a/htdocs/user/class/userbankaccount.class.php b/htdocs/user/class/userbankaccount.class.php
index 271609139b1..6e9cc8e52af 100644
--- a/htdocs/user/class/userbankaccount.class.php
+++ b/htdocs/user/class/userbankaccount.class.php
@@ -241,7 +241,7 @@ class UserBankAccount extends Account
 				$rib = $this->label." : ";
 			}
 
-			$rib .= (string) $this;
+			$rib .= $this->iban;
 		}
 
 		return $rib;

From 41c3d9da05225e6709362efb8e76a09d06fa8bfa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 19:40:16 +0100
Subject: [PATCH 208/816] Fix warning

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

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index deff1af567c..88fc7d27eaa 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -367,7 +367,7 @@ function restrictedArea(User $user, $features, $object = 0, $tableandshare = '',
 	if ($features == 'subscription') {
 		$features = 'adherent';
 		$feature2 = 'cotisation';
-	};
+	}
 	if ($features == 'websitepage') {
 		$features = 'website';
 		$tableandshare = 'website_page';

From 8dc89e9a9a57ce678367765b7c8f1049796eb7f4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Dec 2022 19:51:07 +0100
Subject: [PATCH 209/816] Fix warning

---
 htdocs/admin/system/dolibarr.php                            | 2 +-
 htdocs/blockedlog/class/authority.class.php                 | 2 +-
 htdocs/compta/facture/class/facture.class.php               | 2 +-
 htdocs/core/filemanagerdol/connectors/php/connector.lib.php | 5 +++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 4a55c1a1160..afe5d4d3520 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -264,7 +264,7 @@ $daylight = round($c - $b);
 $val = ($a >= 0 ? '+' : '').$a;
 $val .= ' ('.($a == 'unknown' ? 'unknown' : ($a >= 0 ? '+' : '').($a * 3600)).')';
 $val .= ' &nbsp; &nbsp; &nbsp; '.getServerTimeZoneString();
-$val .= ' &nbsp; &nbsp; &nbsp; '.$langs->trans("DaylingSavingTime").': '.($daylight === 'unknown' ? 'unknown' : ($a == $c ?yn($daylight) : yn(0).($daylight ? '  &nbsp; &nbsp; ('.$langs->trans('YesInSummer').')' : '')));
+$val .= ' &nbsp; &nbsp; &nbsp; '.$langs->trans("DaylingSavingTime").': '.(is_null($daylight) ? 'unknown' : ($a == $c ?yn($daylight) : yn(0).($daylight ? '  &nbsp; &nbsp; ('.$langs->trans('YesInSummer').')' : '')));
 print $form->textwithtooltip($val, $txt, 2, 1, img_info(''));
 print '</td></tr>'."\n"; // value defined in http://fr3.php.net/manual/en/timezones.europe.php
 print '<tr class="oddeven"><td>&nbsp; => '.$langs->trans("CurrentHour").'</td><td>'.dol_print_date(dol_now('gmt'), 'dayhour', 'tzserver').'</td></tr>'."\n";
diff --git a/htdocs/blockedlog/class/authority.class.php b/htdocs/blockedlog/class/authority.class.php
index 0b665fedc3e..b3dd9b45f47 100644
--- a/htdocs/blockedlog/class/authority.class.php
+++ b/htdocs/blockedlog/class/authority.class.php
@@ -305,7 +305,7 @@ class BlockedLogAuthority
 
 				$res = getURLContent($url);
 				echo $block->signature.' '.$url.' '.$res['content'].'<br>';
-				if ($res === 'blockalreadyadded' || $res === 'blockadded') {
+				if ($res['content'] === 'blockalreadyadded' || $res['content'] === 'blockadded') {
 					$block->setCertified();
 				} else {
 					$this->error = $langs->trans('ImpossibleToContactAuthority ', $url);
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 87d28de8756..0a3c1445745 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -6264,7 +6264,7 @@ class FactureLigne extends CommonInvoiceLine
 			$sql .= ", total_localtax2=".price2num($this->total_localtax2);
 		}
 		$sql .= ", fk_product_fournisseur_price=".(!empty($this->fk_fournprice) ? "'".$this->db->escape($this->fk_fournprice)."'" : "null");
-		$sql .= ", buy_price_ht=".(($this->pa_ht || $this->pa_ht === 0 || $this->pa_ht === '0') ? price2num($this->pa_ht) : "null"); // $this->pa_ht should always be defined (set to 0 or to sell price depending on option)
+		$sql .= ", buy_price_ht=".(($this->pa_ht || (string) $this->pa_ht === '0') ? price2num($this->pa_ht) : "null"); // $this->pa_ht should always be defined (set to 0 or to sell price depending on option)
 		$sql .= ", fk_parent_line=".($this->fk_parent_line > 0 ? $this->fk_parent_line : "null");
 		if (!empty($this->rang)) {
 			$sql .= ", rang=".((int) $this->rang);
diff --git a/htdocs/core/filemanagerdol/connectors/php/connector.lib.php b/htdocs/core/filemanagerdol/connectors/php/connector.lib.php
index 608c2ba4cd6..75c4d1e3e08 100644
--- a/htdocs/core/filemanagerdol/connectors/php/connector.lib.php
+++ b/htdocs/core/filemanagerdol/connectors/php/connector.lib.php
@@ -343,7 +343,8 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 		//var_dump($sFileName); var_dump(image_format_supported($sFileName));exit;
-		$isImageValid = (image_format_supported($sFileName) >= 0 ? true : false);
+		$imgsupported = image_format_supported($sFileName);
+		$isImageValid = ($imgsupported >= 0 ? true : false);
 		if (!$isImageValid) {
 			$sErrorNumber = '202';
 		}
@@ -387,7 +388,7 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
 
 				if (file_exists($sFilePath)) {
 					//previous checks failed, try once again
-					if (isset($isImageValid) && $isImageValid === -1 && IsImageValid($sFilePath, $sExtension) === false) {
+					if (isset($isImageValid) && $imgsupported === -1 && IsImageValid($sFilePath, $sExtension) === false) {
 						dol_syslog("connector.lib.php IsImageValid is ko");
 						@unlink($sFilePath);
 						$sErrorNumber = '202';

From 15c05d9b7d5c6d953b1d3395fc17130b7e4c29a7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 31 Dec 2022 12:39:42 +0100
Subject: [PATCH 210/816] Fix warnings

---
 htdocs/comm/action/class/actioncomm.class.php | 10 ++++-----
 htdocs/core/class/extrafields.class.php       | 18 ++++++++--------
 htdocs/modulebuilder/index.php                | 12 +++++------
 htdocs/mrp/mo_card.php                        | 10 ++++-----
 htdocs/printing/admin/printing.php            |  8 +++----
 htdocs/product/admin/product.php              | 11 +++++-----
 htdocs/projet/activity/permonth.php           | 20 ++++++++++--------
 htdocs/projet/activity/perweek.php            | 21 ++++++++++---------
 qodana.yaml                                   |  1 +
 9 files changed, 57 insertions(+), 54 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 244b3df9405..e77052e0690 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -225,22 +225,22 @@ class ActionComm extends CommonObject
 	public $transparency;
 
 	/**
-	 * @var int (0 By default)
+	 * @var int 	(0 By default)
 	 */
 	public $priority;
 
 	/**
-	 * @var int[] Array of user ids
+	 * @var int[] 	Array of user ids
 	 */
 	public $userassigned = array();
 
 	/**
-	 * @var int Id of user owner = fk_user_action into table
+	 * @var int 	Id of user owner = fk_user_action into table
 	 */
 	public $userownerid;
 
 	/**
-	 * @var int Id of user that has done the event. Used only if AGENDA_ENABLE_DONEBY is set.
+	 * @var int 	Id of user that has done the event. Used only if AGENDA_ENABLE_DONEBY is set.
 	 */
 	public $userdoneid;
 
@@ -429,7 +429,7 @@ class ActionComm extends CommonObject
 		$now = dol_now();
 
 		// Check parameters
-		if (!isset($this->userownerid) || $this->userownerid === '') {	// $this->userownerid may be 0 (anonymous event) of > 0
+		if (!isset($this->userownerid) || (string) $this->userownerid === '') {	// $this->userownerid may be 0 (anonymous event) or > 0
 			dol_syslog("You tried to create an event but mandatory property ownerid was not defined", LOG_WARNING);
 			$this->errors[] = 'ErrorActionCommPropertyUserowneridNotDefined';
 			return -1;
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index b0bc0e55c06..e9817a36d6a 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1141,24 +1141,24 @@ class ExtraFields
 
 				$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
 				$out .= '<option value="0">&nbsp;</option>';
-				foreach ($param['options'] as $key => $val) {
-					if ((string) $key == '') {
+				foreach ($param['options'] as $key2 => $val2) {
+					if ((string) $key2 == '') {
 						continue;
 					}
-					$valarray = explode('|', $val);
-					$val = $valarray[0];
+					$valarray = explode('|', $val2);
+					$val2 = $valarray[0];
 					$parent = '';
 					if (!empty($valarray[1])) {
 						$parent = $valarray[1];
 					}
-					$out .= '<option value="'.$key.'"';
-					$out .= (((string) $value == (string) $key) ? ' selected' : '');
+					$out .= '<option value="'.$key2.'"';
+					$out .= (((string) $value == (string) $key2) ? ' selected' : '');
 					$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
 					$out .= '>';
-					if ($langfile && $val) {
-						$out .= $langs->trans($val);
+					if ($langfile && $val2) {
+						$out .= $langs->trans($val2);
 					} else {
-						$out .= $val;
+						$out .= $val2;
 					}
 					$out .= '</option>';
 				}
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 8b87d84c10e..a14467c0184 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -135,13 +135,13 @@ if ($dirread != DOL_DOCUMENT_ROOT && ($conf->global->MAIN_FEATURES_LEVEL >= 2 ||
 $textforlistofdirs = '<!-- Directory scanned -->'."\n";
 $listofmodules = array();
 $i = 0;
-foreach ($dirsrootforscan as $dirread) {
+foreach ($dirsrootforscan as $tmpdirread) {
 	$moduletype = 'external';
-	if ($dirread == DOL_DOCUMENT_ROOT) {
+	if ($tmpdirread == DOL_DOCUMENT_ROOT) {
 		$moduletype = 'internal';
 	}
 
-	$dirsincustom = dol_dir_list($dirread, 'directories');
+	$dirsincustom = dol_dir_list($tmpdirread, 'directories');
 	if (is_array($dirsincustom) && count($dirsincustom) > 0) {
 		foreach ($dirsincustom as $dircustomcursor) {
 			$fullname = $dircustomcursor['fullname'];
@@ -170,7 +170,7 @@ foreach ($dirsrootforscan as $dirread) {
 						'modulenamewithcase'=>$modulenamewithcase,
 						'moduledescriptorrelpath'=> $moduledescriptorrelpath,
 						'moduledescriptorfullpath'=>$moduledescriptorfullpath,
-						'moduledescriptorrootpath'=>$dirread,
+						'moduledescriptorrootpath'=>$tmpdirread,
 						'moduletype'=>$moduletype
 					);
 				}
@@ -200,8 +200,8 @@ foreach ($dirsrootforscan as $dirread) {
 	} else {
 		$textforlistofdirs .= ', ';
 	}
-	$textforlistofdirs .= '<strong class="wordbreakimp">'.$dirread.'</strong>';
-	if ($dirread == DOL_DOCUMENT_ROOT) {
+	$textforlistofdirs .= '<strong class="wordbreakimp">'.$tmpdirread.'</strong>';
+	if ($tmpdirread == DOL_DOCUMENT_ROOT) {
 		if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 			$textforlistofdirs .= $form->textwithpicto('', $langs->trans("ConstantIsOn", "MAIN_FEATURES_LEVEL"));
 		}
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index b1d12be0c8d..1f89e931415 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -148,17 +148,17 @@ if (empty($reshook)) {
 		$objectbomchildline = new BOMLine($db);
 
 		foreach ($TBomLineId as $id_bom_line) {
-			$object = new Mo($db);
+			$object = new Mo($db);	// modified by the actions_addupdatedelete.inc.php
 
 			$objectbomchildline->fetch($id_bom_line);
 
 			$TMoLines = $moline->fetchAll('DESC', 'rowid', '1', '', array('origin_id' => $id_bom_line));
 
-			foreach ($TMoLines as $moline) {
+			foreach ($TMoLines as $tmpmoline) {
 				$_POST['fk_bom'] = $objectbomchildline->fk_bom_child;
-				$_POST['fk_parent_line'] = $moline->id;
-				$_POST['qty'] = $moline->qty;
-				$_POST['fk_product'] = $moline->fk_product;
+				$_POST['fk_parent_line'] = $tmpmoline->id;
+				$_POST['qty'] = $tmpmoline->qty;
+				$_POST['fk_product'] = $tmpmoline->fk_product;
 			}
 
 			include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php
index c81272e6a55..45f9a2269b1 100644
--- a/htdocs/printing/admin/printing.php
+++ b/htdocs/printing/admin/printing.php
@@ -266,15 +266,15 @@ if ($mode == 'config' && $user->admin) {
 		$dirmodels = array('/core/modules/printing/');
 	}
 
-	foreach ($result as $driver) {
+	foreach ($result as $tmpdriver) {
 		foreach ($dirmodels as $dir) {
-			if (file_exists(dol_buildpath($dir, 0).$driver.'.modules.php')) {
-				$classfile = dol_buildpath($dir, 0).$driver.'.modules.php';
+			if (file_exists(dol_buildpath($dir, 0).$tmpdriver.'.modules.php')) {
+				$classfile = dol_buildpath($dir, 0).$tmpdriver.'.modules.php';
 				break;
 			}
 		}
 		require_once $classfile;
-		$classname = 'printing_'.$driver;
+		$classname = 'printing_'.$tmpdriver;
 		$printer = new $classname($db);
 		$langs->load($printer::LANGFILE);
 		//print '<pre>'.print_r($printer, true).'</pre>';
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 40f67137acd..92897c45aa5 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -106,8 +106,8 @@ if ($action == 'other' && GETPOST('value_PRODUIT_MULTIPRICES_LIMIT') > 0) {
 }
 if ($action == 'other') {
 	$princingrules = GETPOST('princingrule', 'alpha');
-	foreach ($select_pricing_rules as $rule => $label) { // Loop on each possible mode
-		if ($rule == $princingrules) { // We are on selected rule, we enable it
+	foreach ($select_pricing_rules as $tmprule => $tmplabel) { // Loop on each possible mode
+		if ($tmprule == $princingrules) { // We are on selected rule, we enable it
 			if ($princingrules == 'PRODUCT_PRICE_UNIQ') { // For this case, we disable entries manually
 				$res = dolibarr_set_const($db, 'PRODUIT_MULTIPRICES', 0, 'chaine', 0, '', $conf->entity);
 				$res = dolibarr_set_const($db, 'PRODUIT_CUSTOMER_PRICES_BY_QTY', 0, 'chaine', 0, '', $conf->entity);
@@ -119,10 +119,9 @@ if ($action == 'other') {
 					$res = dolibarr_set_const($db, $rulesselected, 1, 'chaine', 0, '', $conf->entity);
 				}
 			}
-		} else // We clear this mode
-		{
-			if (strpos($rule, '&') === false) {
-				$res = dolibarr_set_const($db, $rule, 0, 'chaine', 0, '', $conf->entity);
+		} else { // We clear this mode
+			if (strpos($tmprule, '&') === false) {
+				$res = dolibarr_set_const($db, $tmprule, 0, 'chaine', 0, '', $conf->entity);
 			}
 		}
 	}
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index f54b4e78cd2..066621f3083 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -102,6 +102,8 @@ if (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id) {
 
 $object = new Task($db);
 
+$error = 0;
+
 
 /*
  * Actions
@@ -201,10 +203,10 @@ if ($action == 'addtime' && $user->rights->projet->lire) {
 	if (empty($timetoadd)) {
 		setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors');
 	} else {
-		foreach ($timetoadd as $taskid => $value) {     // Loop on each task
+		foreach ($timetoadd as $tmptaskid => $tmpvalue) {     // Loop on each task
 			$updateoftaskdone = 0;
-			foreach ($value as $key => $val) {          // Loop on each day
-				$amountoadd = $timetoadd[$taskid][$key];
+			foreach ($tmpvalue as $key => $val) {          // Loop on each day
+				$amountoadd = $timetoadd[$tmptaskid][$key];
 				if (!empty($amountoadd)) {
 					$tmpduration = explode(':', $amountoadd);
 					$newduration = 0;
@@ -219,8 +221,8 @@ if ($action == 'addtime' && $user->rights->projet->lire) {
 					}
 
 					if ($newduration > 0) {
-						$object->fetch($taskid);
-						$object->progress = GETPOST($taskid.'progress', 'int');
+						$object->fetch($tmptaskid);
+						$object->progress = GETPOST($tmptaskid.'progress', 'int');
 						$object->timespent_duration = $newduration;
 						$object->timespent_fk_user = $usertoprocess->id;
 						$object->timespent_date = dol_time_plus_duree($firstdaytoshow, $key, 'd');
@@ -239,11 +241,11 @@ if ($action == 'addtime' && $user->rights->projet->lire) {
 			}
 
 			if (!$updateoftaskdone) {  // Check to update progress if no update were done on task.
-				$object->fetch($taskid);
+				$object->fetch($tmptaskid);
 				//var_dump($object->progress);
-				//var_dump(GETPOST($taskid . 'progress', 'int')); exit;
-				if ($object->progress != GETPOST($taskid.'progress', 'int')) {
-					$object->progress = GETPOST($taskid.'progress', 'int');
+				//var_dump(GETPOST($tmptaskid . 'progress', 'int')); exit;
+				if ($object->progress != GETPOST($tmptaskid.'progress', 'int')) {
+					$object->progress = GETPOST($tmptaskid.'progress', 'int');
 					$result = $object->update($user);
 					if ($result < 0) {
 						setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 5f83b9889bf..d2cb15791b1 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -152,6 +152,7 @@ $search_array_options = array();
 $search_array_options_project = $extrafields->getOptionalsFromPost('projet', '', 'search_');
 $search_array_options_task = $extrafields->getOptionalsFromPost('projet_task', '', 'search_task_');
 
+$error = 0;
 
 
 /*
@@ -263,10 +264,10 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 	if (empty($timetoadd)) {
 		setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors');
 	} else {
-		foreach ($timetoadd as $taskid => $value) {     // Loop on each task
+		foreach ($timetoadd as $tmptaskid => $tmpvalue) {     // Loop on each task
 			$updateoftaskdone = 0;
-			foreach ($value as $key => $val) {          // Loop on each day
-				$amountoadd = $timetoadd[$taskid][$key];
+			foreach ($tmpvalue as $key => $val) {          // Loop on each day
+				$amountoadd = $timetoadd[$tmptaskid][$key];
 				if (!empty($amountoadd)) {
 					$tmpduration = explode(':', $amountoadd);
 					$newduration = 0;
@@ -281,10 +282,10 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 					}
 
 					if ($newduration > 0) {
-						$object->fetch($taskid);
+						$object->fetch($tmptaskid);
 
-						if (GETPOSTISSET($taskid.'progress')) {
-							$object->progress = GETPOST($taskid.'progress', 'int');
+						if (GETPOSTISSET($tmptaskid.'progress')) {
+							$object->progress = GETPOST($tmptaskid.'progress', 'int');
 						} else {
 							unset($object->progress);
 						}
@@ -308,11 +309,11 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 			}
 
 			if (!$updateoftaskdone) {  // Check to update progress if no update were done on task.
-				$object->fetch($taskid);
+				$object->fetch($tmptaskid);
 				//var_dump($object->progress);
-				//var_dump(GETPOST($taskid . 'progress', 'int')); exit;
-				if ($object->progress != GETPOST($taskid.'progress', 'int')) {
-					$object->progress = GETPOST($taskid.'progress', 'int');
+				//var_dump(GETPOST($tmptaskid . 'progress', 'int')); exit;
+				if ($object->progress != GETPOST($tmptaskid.'progress', 'int')) {
+					$object->progress = GETPOST($tmptaskid.'progress', 'int');
 					$result = $object->update($user);
 					if ($result < 0) {
 						setEventMessages($object->error, $object->errors, 'errors');
diff --git a/qodana.yaml b/qodana.yaml
index d63f7b16999..5ed80e029f3 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -64,3 +64,4 @@ exclude:
   - name: PhpArrayWriteIsNotUsedInspection
   - name: PhpUndefinedNamespaceInspection
   - name: PhpArraySearchInBooleanContextInspection
+  - name: PhpPropertyOnlyWrittenInspection
\ No newline at end of file

From e977a95cc717a5664f11c3c624b5ffbd7365b86c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 31 Dec 2022 13:23:09 +0100
Subject: [PATCH 211/816] Fix warning

---
 htdocs/admin/translation.php                        |  2 +-
 htdocs/core/class/html.form.class.php               |  4 ++--
 htdocs/core/lib/company.lib.php                     |  2 +-
 htdocs/core/lib/cron.lib.php                        |  4 ++--
 htdocs/eventorganization/conferenceorbooth_card.php |  4 ++--
 htdocs/holiday/class/holiday.class.php              |  2 +-
 htdocs/modulebuilder/index.php                      |  2 +-
 htdocs/product/stock/class/mouvementstock.class.php |  2 +-
 htdocs/stripe/class/stripe.class.php                |  8 ++++----
 htdocs/takepos/invoice.php                          |  2 +-
 htdocs/ticket/list.php                              |  6 +++---
 htdocs/webservices/server_order.php                 |  6 +++---
 qodana.yaml                                         |  4 +++-
 scripts/user/sync_groups_ldap2dolibarr.php          | 12 ++++++------
 14 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index abb5ebfd6ba..fcbc01abef1 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -427,7 +427,7 @@ if ($mode == 'overwrite') {
 				print ' &nbsp; ';
 				print '<input type="submit" class="button buttongen button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 			} else {
-				print '<a class="reposition editfielda paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.urlencode($mode).'&action=edit&token='.newToken().''.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
+				print '<a class="reposition editfielda paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.urlencode($mode).'&action=edit&token='.newToken().((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
 				print ' &nbsp; ';
 				print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.urlencode($mode).'&action=delete&token='.newToken().((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
 			}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index a6eac03cadc..a8a96fb7c07 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -751,7 +751,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 ($type == 'info' || $type == 'help') return '<a href="'..'">'.$text.''</a>';
+		//if ($type == 'info' || $type == 'help') return '<a href="'..'">'.$text.'</a>';
 		//}
 
 		$img = '';
@@ -3041,7 +3041,7 @@ class Form
 			$sql .= " ORDER BY date_price DESC, rowid DESC"; // Warning DESC must be both on date_price and rowid.
 			$sql .= " LIMIT 1";
 
-			dol_syslog(get_class($this).'::constructProductListOption search price for product '.$objp->rowid.' AND level '.$price_level.'', LOG_DEBUG);
+			dol_syslog(get_class($this).'::constructProductListOption search price for product '.$objp->rowid.' AND level '.$price_level, LOG_DEBUG);
 			$result2 = $this->db->query($sql);
 			if ($result2) {
 				$objp2 = $this->db->fetch_object($result2);
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 25393c6ee56..47525ab5328 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -1988,7 +1988,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 			if (isset($histo[$key]['socpeopleassigned']) && is_array($histo[$key]['socpeopleassigned']) && count($histo[$key]['socpeopleassigned']) > 0) {
 				$out .= '<td class="valignmiddle">';
 				$contact = new Contact($db);
-				foreach ($histo[$key]['socpeopleassigned'] as $cid => $value) {
+				foreach ($histo[$key]['socpeopleassigned'] as $cid => $cvalue) {
 					$result = $contact->fetch($cid);
 
 					if ($result < 0) {
diff --git a/htdocs/core/lib/cron.lib.php b/htdocs/core/lib/cron.lib.php
index 7078d7488ad..ccce2ec7f94 100644
--- a/htdocs/core/lib/cron.lib.php
+++ b/htdocs/core/lib/cron.lib.php
@@ -128,7 +128,7 @@ function dol_print_cron_urls()
 		$pathtoscript = $conf->global->MAIN_DOL_SCRIPTS_ROOT;
 	}
 
-	$file = $pathtoscript.'/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY) ? 'securitykey' : ''.$conf->global->CRON_KEY.'').' '.$logintouse.' [cronjobid]';
+	$file = $pathtoscript.'/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY) ? 'securitykey' : ''.$conf->global->CRON_KEY).' '.$logintouse.' [cronjobid]';
 	print '<textarea class="quatrevingtpercent">'.$file."</textarea><br>\n";
 	print '<br>';
 
@@ -145,7 +145,7 @@ function dol_print_cron_urls()
 		if ($linuxlike) {
 			print $langs->trans("CronExplainHowToRunUnix");
 			print '<br>';
-			print '<textarea class="quatrevingtpercent">*/5 * * * * '.$pathtoscript.'/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY) ? 'securitykey' : ''.$conf->global->CRON_KEY.'').' '.$logintouse.' &gt; '.DOL_DATA_ROOT.'/cron_run_jobs.php.log</textarea><br>';
+			print '<textarea class="quatrevingtpercent">*/5 * * * * '.$pathtoscript.'/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY) ? 'securitykey' : ''.$conf->global->CRON_KEY).' '.$logintouse.' &gt; '.DOL_DATA_ROOT.'/cron_run_jobs.php.log</textarea><br>';
 		} else {
 			print $langs->trans("CronExplainHowToRunWin");
 		}
diff --git a/htdocs/eventorganization/conferenceorbooth_card.php b/htdocs/eventorganization/conferenceorbooth_card.php
index b6932c2cf09..9928b8af33b 100644
--- a/htdocs/eventorganization/conferenceorbooth_card.php
+++ b/htdocs/eventorganization/conferenceorbooth_card.php
@@ -568,13 +568,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.$withProjectUrl.'&action=presend&token='.newToken().'&mode=init#formmailbeforetitle');
 			}
 
-			print dolGetButtonAction('', $langs->trans('Modify'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.$withProjectUrl.'&action=edit&token='.newToken().'', '', $permissiontoadd);
+			print dolGetButtonAction('', $langs->trans('Modify'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.$withProjectUrl.'&action=edit&token='.newToken(), '', $permissiontoadd);
 
 			// Clone
 			print dolGetButtonAction('', $langs->trans('ToClone'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.$withProjectUrl.'&socid='.$object->socid.'&action=clone&token='.newToken().'&object=scrumsprint', '', $permissiontoadd);
 
 			// Delete (need delete permission, or if draft, just need create/modify permission)
-			print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.$withProjectUrl.'&action=delete&token='.newToken().'', '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
+			print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.$withProjectUrl.'&action=delete&token='.newToken(), '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
 		}
 		print '</div>'."\n";
 	}
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 0125becd21c..81da058b919 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -1470,7 +1470,7 @@ class Holiday extends CommonObject
 		$sql .= " value = '".$this->db->escape($value)."'";
 		$sql .= " WHERE name = '".$this->db->escape($name)."'";
 
-		dol_syslog(get_class($this).'::updateConfCP name='.$name.'', LOG_DEBUG);
+		dol_syslog(get_class($this).'::updateConfCP name='.$name, LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
 			return true;
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index a14467c0184..b804f3d9c8f 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -281,7 +281,7 @@ if ($dirins && $action == 'initmodule' && $modulename) {
 		// Delete dir and files that can be generated in sub tabs later if we need them (we want a minimal module first)
 		dol_delete_dir_recursive($destdir.'/build/doxygen');
 		dol_delete_dir_recursive($destdir.'/core/modules/mailings');
-		dol_delete_dir_recursive($destdir.'/core/modules/'.strtolower($modulename).'');
+		dol_delete_dir_recursive($destdir.'/core/modules/'.strtolower($modulename));
 		dol_delete_dir_recursive($destdir.'/core/tpl');
 		dol_delete_dir_recursive($destdir.'/core/triggers');
 		dol_delete_dir_recursive($destdir.'/doc');
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index ac5d612394b..43760d808b2 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -834,7 +834,7 @@ class MouvementStock extends CommonObject
 		$sql .= " WHERE fk_product = ".((int) $productidselected);
 		$sql .= " AND datem < '".$this->db->idate($datebefore)."'";
 
-		dol_syslog(get_class($this).__METHOD__.'', LOG_DEBUG);
+		dol_syslog(get_class($this).__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index ffe59b01d61..1f9ad46cdb0 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -279,9 +279,9 @@ class Stripe extends CommonObject
 			global $stripearrayofkeysbyenv;
 			\Stripe\Stripe::setApiKey($stripearrayofkeysbyenv[$status]['secret_key']);
 			if (empty($key)) {				// If the Stripe connect account not set, we use common API usage
-				$stripepaymentmethod = \Stripe\PaymentMethod::retrieve(''.$paymentmethod->id.'');
+				$stripepaymentmethod = \Stripe\PaymentMethod::retrieve((string) $paymentmethod->id);
 			} else {
-				$stripepaymentmethod = \Stripe\PaymentMethod::retrieve(''.$paymentmethod->id.'', array("stripe_account" => $key));
+				$stripepaymentmethod = \Stripe\PaymentMethod::retrieve((string) $paymentmethod->id, array("stripe_account" => $key));
 			}
 		} catch (Exception $e) {
 			$this->error = $e->getMessage();
@@ -307,9 +307,9 @@ class Stripe extends CommonObject
 			global $stripearrayofkeysbyenv;
 			\Stripe\Stripe::setApiKey($stripearrayofkeysbyenv[$status]['secret_key']);
 			if (empty($key)) {				// If the Stripe connect account not set, we use common API usage
-				$selectedreader = \Stripe\Terminal\Reader::retrieve(''.$reader.'');
+				$selectedreader = \Stripe\Terminal\Reader::retrieve((string) $reader);
 			} else {
-				$stripepaymentmethod = \Stripe\Terminal\Reader::retrieve(''.$reader.'', array("stripe_account" => $key));
+				$stripepaymentmethod = \Stripe\Terminal\Reader::retrieve((string) $reader, array("stripe_account" => $key));
 			}
 		} catch (Exception $e) {
 			$this->error = $e->getMessage();
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index ea262a1562f..27b340249c3 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -1424,7 +1424,7 @@ if (!empty($_SESSION["basiclayout"]) && $_SESSION["basiclayout"] == 1) {
 			$htmlforlines .= '" onclick="AddProduct(\''.$place.'\', '.$row->id.')">';
 			if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 				$htmlforlines .= '<img class="imgwrapper" width="33%" src="'.DOL_URL_ROOT.'/takepos/public/auto_order.php?genimg=pro&query=pro&id='.$row->id.'"><br>';
-				$htmlforlines .= $row->label.''.price($row->price_ttc, 1, $langs, 1, -1, -1, $conf->currency);
+				$htmlforlines .= $row->label.' '.price($row->price_ttc, 1, $langs, 1, -1, -1, $conf->currency);
 				$htmlforlines .= '</div>'."\n";
 			} else {
 				$htmlforlines .= '<td class="left">';
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 4c4dce5a428..79db9e0e73e 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -836,15 +836,15 @@ foreach ($object->fields as $key => $val) {
 			print '</td>';
 		} elseif ($key == 'type_code') {
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-			$formTicket->selectTypesTickets(dol_escape_htmltag(empty($search[$key]) ? '' : $search[$key]), 'search_'.$key.'', '', 2, 1, 1, 0, (!empty($val['css']) ? $val['css'] : 'maxwidth150'), 1);
+			$formTicket->selectTypesTickets(dol_escape_htmltag(empty($search[$key]) ? '' : $search[$key]), 'search_'.$key, '', 2, 1, 1, 0, (!empty($val['css']) ? $val['css'] : 'maxwidth150'), 1);
 			print '</td>';
 		} elseif ($key == 'category_code') {
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-			$formTicket->selectGroupTickets(dol_escape_htmltag(empty($search[$key]) ? '' : $search[$key]), 'search_'.$key.'', '', 2, 1, 1, 0, (!empty($val['css']) ? $val['css'] : 'maxwidth150'));
+			$formTicket->selectGroupTickets(dol_escape_htmltag(empty($search[$key]) ? '' : $search[$key]), 'search_'.$key, '', 2, 1, 1, 0, (!empty($val['css']) ? $val['css'] : 'maxwidth150'));
 			print '</td>';
 		} elseif ($key == 'severity_code') {
 			print '<td class="liste_titre center'.($cssforfield ? ' '.$cssforfield : '').'">';
-			$formTicket->selectSeveritiesTickets(dol_escape_htmltag(empty($search[$key]) ? '' : $search[$key]), 'search_'.$key.'', '', 2, 1, 1, 0, (!empty($val['css']) ? $val['css'] : 'maxwidth150'));
+			$formTicket->selectSeveritiesTickets(dol_escape_htmltag(empty($search[$key]) ? '' : $search[$key]), 'search_'.$key, '', 2, 1, 1, 0, (!empty($val['css']) ? $val['css'] : 'maxwidth150'));
 			print '</td>';
 		} elseif ($key == 'fk_user_assign' || $key == 'fk_user_create') {
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php
index 65357174019..0f0eb79d10e 100644
--- a/htdocs/webservices/server_order.php
+++ b/htdocs/webservices/server_order.php
@@ -741,9 +741,9 @@ function createOrder($authentication, $order)
 			$extrafields = new ExtraFields($db);
 			$extrafields->fetch_name_optionals_label($elementtype, true);
 			if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label'])) {
-				foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label) {
-					$key = 'options_'.$key;
-					$newline->array_options[$key] = $line[$key];
+				foreach ($extrafields->attributes[$elementtype]['label'] as $tmpkey => $tmplabel) {
+					$tmpkey = 'options_'.$tmpkey;
+					$newline->array_options[$tmpkey] = $line[$tmpkey];
 				}
 			}
 
diff --git a/qodana.yaml b/qodana.yaml
index 5ed80e029f3..853ee69fab5 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -64,4 +64,6 @@ exclude:
   - name: PhpArrayWriteIsNotUsedInspection
   - name: PhpUndefinedNamespaceInspection
   - name: PhpArraySearchInBooleanContextInspection
-  - name: PhpPropertyOnlyWrittenInspection
\ No newline at end of file
+  - name: PhpLoopCanBeReplacedWithStrRepeatInspection  
+  - name: PhpPropertyOnlyWrittenInspection
+  - name: PhpCoveredCharacterInClassInspection  
\ No newline at end of file
diff --git a/scripts/user/sync_groups_ldap2dolibarr.php b/scripts/user/sync_groups_ldap2dolibarr.php
index 67c14a4ee5d..2fe89b92ccb 100755
--- a/scripts/user/sync_groups_ldap2dolibarr.php
+++ b/scripts/user/sync_groups_ldap2dolibarr.php
@@ -176,17 +176,17 @@ if ($result >= 0) {
 			// 1 - Association des utilisateurs du groupe LDAP au groupe Dolibarr
 			$userList = array();
 			$userIdList = array();
-			foreach ($ldapgroup[$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS] as $key => $userdn) {
-				if ($key === 'count') {
+			foreach ($ldapgroup[getDolGlobalString('LDAP_GROUP_FIELD_GROUPMEMBERS')] as $tmpkey => $userdn) {
+				if ($tmpkey === 'count') {
 					continue;
 				}
 				if (empty($userList[$userdn])) { // Récupération de l'utilisateur
 												 // Schéma rfc2307: les membres sont listés dans l'attribut memberUid sous form de login uniquement
-					if ($conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS === 'memberUid') {
+					if (getDolGlobalString('LDAP_GROUP_FIELD_GROUPMEMBERS') === 'memberUid') {
 						$userKey = array($userdn);
 					} else { // Pour les autres schémas, les membres sont listés sous forme de DN complets
 						$userFilter = explode(',', $userdn);
-						$userKey = $ldap->getAttributeValues('('.$userFilter[0].')', $conf->global->LDAP_KEY_USERS);
+						$userKey = $ldap->getAttributeValues('('.$userFilter[0].')', getDolGlobalString('LDAP_KEY_USERS'));
 					}
 					if (!is_array($userKey)) {
 						continue;
@@ -194,9 +194,9 @@ if ($result >= 0) {
 
 					$fuser = new User($db);
 
-					if ($conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_SID) {
+					if (getDolGlobalString('LDAP_KEY_USERS') == getDolGlobalString('LDAP_FIELD_SID')) {
 						$fuser->fetch('', '', $userKey[0]); // Chargement du user concerné par le SID
-					} elseif ($conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_LOGIN) {
+					} elseif (getDolGlobalString('LDAP_KEY_USERS') == getDolGlobalString('LDAP_FIELD_LOGIN')) {
 						$fuser->fetch('', $userKey[0]); // Chargement du user concerné par le login
 					}
 

From cef9a8e8d48e525ab63e561ceace90ca24b2ab7d Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Sat, 31 Dec 2022 13:36:31 +0100
Subject: [PATCH 212/816] Fix Price by qty for multiprices

---
 htdocs/core/lib/ajax.lib.php              | 2 +-
 htdocs/core/tpl/objectline_create.tpl.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index a6d269a6bb2..63d4605b8fb 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -187,7 +187,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLen
 							$("#'.$htmlnamejquery.'").attr("data-ref-customer", ui.item.ref_customer);
 							$("#'.$htmlnamejquery.'").attr("data-tvatx", ui.item.tva_tx);
 	';
-	if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
+	if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
 		$script .= '
 							// For customer price when PRODUIT_CUSTOMER_PRICES_BY_QTY is on
 							$("#'.$htmlnamejquery.'").attr("data-pbq", ui.item.pbq);
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 5ce4ab76448..f4e83192ac4 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -911,7 +911,7 @@ if (!empty($usemargins) && $user->rights->margins->creer) {
 		?>
 
 		<?php
-		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {?>
+		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {?>
 		/* To process customer price per quantity (PRODUIT_CUSTOMER_PRICES_BY_QTY works only if combo product is not an ajax after x key pressed) */
 		var pbq = parseInt($('option:selected', this).attr('data-pbq'));				// When select is done from HTML select
 		if (isNaN(pbq)) { pbq = jQuery('#idprod').attr('data-pbq');	}					// When select is done from HTML input with autocomplete

From 8774f4f092021d4cd548bec6cc683e9dad199dc8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 31 Dec 2022 13:44:11 +0100
Subject: [PATCH 213/816] Fix warning qodana

---
 htdocs/core/lib/functions.lib.php                  | 14 +++++++-------
 htdocs/core/lib/project.lib.php                    |  6 ++++--
 .../asset/doc/doc_generic_asset_odt.modules.php    |  2 +-
 .../bom/doc/doc_generic_bom_odt.modules.php        |  2 +-
 .../commande/doc/doc_generic_order_odt.modules.php |  2 +-
 .../doc/doc_generic_contract_odt.modules.php       |  2 +-
 .../doc/doc_generic_shipment_odt.modules.php       |  2 +-
 .../doc/doc_generic_invoice_odt.modules.php        |  2 +-
 .../member/doc/doc_generic_member_odt.class.php    |  2 +-
 .../modules/mrp/doc/doc_generic_mo_odt.modules.php |  2 +-
 .../doc/doc_generic_product_odt.modules.php        |  2 +-
 .../doc/doc_generic_project_odt.modules.php        |  2 +-
 .../doc/doc_generic_proposal_odt.modules.php       |  2 +-
 .../doc/doc_generic_reception_odt.modules.php      |  2 +-
 .../stock/doc/doc_generic_stock_odt.modules.php    |  2 +-
 .../doc_generic_supplier_invoice_odt.modules.php   |  2 +-
 .../doc/doc_generic_supplier_order_odt.modules.php |  2 +-
 .../doc_generic_supplier_proposal_odt.modules.php  |  2 +-
 .../ticket/doc/doc_generic_ticket_odt.modules.php  |  2 +-
 .../user/doc/doc_generic_user_odt.modules.php      |  2 +-
 .../doc/doc_generic_usergroup_odt.modules.php      |  2 +-
 .../doc/doc_generic_myobject_odt.modules.php       |  2 +-
 ..._generic_recruitmentjobposition_odt.modules.php |  2 +-
 qodana.yaml                                        |  6 +++++-
 test/phpunit/FunctionsLibTest.php                  |  7 +++++++
 25 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index de329ee515f..6241eaaa8b1 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -368,7 +368,7 @@ function getBrowserInfo($user_agent)
 		// MS products at end
 		$name = 'ie';
 		$version = end($reg);
-	} elseif (preg_match('/l(i|y)n(x|ks)(\(|\/|\s)*([\d\.]+)/i', $user_agent, $reg)) {
+	} elseif (preg_match('/l[iy]n(x|ks)(\(|\/|\s)*([\d\.]+)/i', $user_agent, $reg)) {
 		// MS products at end
 		$name = 'lynxlinks';
 		$version = $reg[4];
@@ -3804,7 +3804,7 @@ function isValidMXRecord($domain)
 		}
 	}
 
-	// function idn_to_ascii or checkdnsrr does not exists
+	// function idn_to_ascii or checkdnsrr or getmxrr does not exists
 	return -1;
 }
 
@@ -10208,12 +10208,12 @@ function dol_mimetype($file, $default = 'application/octet-stream', $mode = 0)
 		$imgmime = 'mdb.png';
 		$famime = 'file-o';
 	}
-	if (preg_match('/\.doc(x|m)?$/i', $tmpfile)) {
+	if (preg_match('/\.doc[xm]?$/i', $tmpfile)) {
 		$mime = 'application/msword';
 		$imgmime = 'doc.png';
 		$famime = 'file-word-o';
 	}
-	if (preg_match('/\.dot(x|m)?$/i', $tmpfile)) {
+	if (preg_match('/\.dot[xm]?$/i', $tmpfile)) {
 		$mime = 'application/msword';
 		$imgmime = 'doc.png';
 		$famime = 'file-word-o';
@@ -10233,17 +10233,17 @@ function dol_mimetype($file, $default = 'application/octet-stream', $mode = 0)
 		$imgmime = 'xls.png';
 		$famime = 'file-excel-o';
 	}
-	if (preg_match('/\.xls(b|m|x)$/i', $tmpfile)) {
+	if (preg_match('/\.xls[bmx]$/i', $tmpfile)) {
 		$mime = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
 		$imgmime = 'xls.png';
 		$famime = 'file-excel-o';
 	}
-	if (preg_match('/\.pps(m|x)?$/i', $tmpfile)) {
+	if (preg_match('/\.pps[mx]?$/i', $tmpfile)) {
 		$mime = 'application/vnd.ms-powerpoint';
 		$imgmime = 'ppt.png';
 		$famime = 'file-powerpoint-o';
 	}
-	if (preg_match('/\.ppt(m|x)?$/i', $tmpfile)) {
+	if (preg_match('/\.ppt[mx]?$/i', $tmpfile)) {
 		$mime = 'application/x-mspowerpoint';
 		$imgmime = 'ppt.png';
 		$famime = 'file-powerpoint-o';
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 7fdb3aecda1..a59ebe658b0 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -1624,8 +1624,10 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 
 				// Duration
 				print '<td class="center duration'.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'">';
-				$dayWorkLoad = !empty($projectstatic->weekWorkLoadPerTask[$preselectedday][$lines[$i]->id]) ? $projectstatic->weekWorkLoadPerTask[$preselectedday][$lines[$i]->id] : 0;
-				if (!isset($totalforeachday[$preselectedday])) $totalforeachday[$preselectedday] = 0;
+				$dayWorkLoad = empty($projectstatic->weekWorkLoadPerTask[$preselectedday][$lines[$i]->id]) ? 0 : $projectstatic->weekWorkLoadPerTask[$preselectedday][$lines[$i]->id];
+				if (!isset($totalforeachday[$preselectedday])) {
+					$totalforeachday[$preselectedday] = 0;
+				}
 				$totalforeachday[$preselectedday] += $dayWorkLoad;
 
 				$alreadyspent = '';
diff --git a/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php b/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
index 8be86dda944..ba4f39919bf 100644
--- a/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
+++ b/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
@@ -262,7 +262,7 @@ class doc_generic_asset_odt extends ModelePDFAsset
 			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
-				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 				$newfiletmp = $objectref.'_'.$newfiletmp;
diff --git a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
index bec28b941aa..ea877432c17 100644
--- a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
+++ b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
@@ -273,7 +273,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
-				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 				$newfiletmp = $objectref . '_' . $newfiletmp;
diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index 5e94397bc91..bbace838183 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -279,7 +279,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
-				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 				$newfiletmp = $objectref . '_' . $newfiletmp;
diff --git a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
index dad1ebc9122..83e8f2551f7 100644
--- a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
+++ b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
@@ -276,7 +276,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
-				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 
diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
index 73793c5a757..f8280aab301 100644
--- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
+++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
@@ -277,7 +277,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
-				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 				$newfiletmp = $objectref . '_' . $newfiletmp;
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index 0b8fa2d4621..f5dcfb86936 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -276,7 +276,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
-				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 
diff --git a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
index ed48c93c4de..2d125d2743a 100644
--- a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
+++ b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
@@ -266,7 +266,7 @@ class doc_generic_member_odt extends ModelePDFMember
 			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
-				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 
diff --git a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
index b89c4eab2cd..90d1f2f8d6b 100644
--- a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
+++ b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
@@ -266,7 +266,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
-				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 				$newfiletmp = $objectref . '_' . $newfiletmp;
diff --git a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
index d5321b92ceb..6fde0ce16c4 100644
--- a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
+++ b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
@@ -274,7 +274,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
-				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 
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 2015da21f61..f08a93b4339 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
@@ -557,7 +557,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
-				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 				$newfiletmp = $objectref . '_' . $newfiletmp;
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 6715b2e39a5..de6554137df 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
@@ -307,7 +307,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
-				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 
diff --git a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
index 4ebc742b4bb..84d95a5036c 100644
--- a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
+++ b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
@@ -270,7 +270,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
-				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 				$newfiletmp = $objectref . '_' . $newfiletmp;
diff --git a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
index eb6ba838d7a..358369d1f43 100644
--- a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
+++ b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
@@ -277,7 +277,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
-				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 
diff --git a/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php b/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
index 8d1f9713c00..c9e18e7c4ab 100644
--- a/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
@@ -266,7 +266,7 @@ class doc_generic_supplier_invoice_odt extends ModelePDFSuppliersInvoices
 			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
-				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 				$newfiletmp = $objectref.'_'.$newfiletmp;
diff --git a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
index 12bbcc12edc..ca7d1b3d61b 100644
--- a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
@@ -261,7 +261,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
-				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 				$newfiletmp = $objectref . '_' . $newfiletmp;
diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
index 55a7710c5a4..8fca5110896 100644
--- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
@@ -295,7 +295,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
-				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 
diff --git a/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php b/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
index 1a2d1e537cc..3ae972fef49 100644
--- a/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
+++ b/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
@@ -264,7 +264,7 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
-				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 
diff --git a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
index 1c3e346203b..00edf04fac0 100644
--- a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
+++ b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
@@ -295,7 +295,7 @@ class doc_generic_user_odt extends ModelePDFUser
 			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
-				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 
diff --git a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
index 4bbb39c0086..a5447260a2f 100644
--- a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
+++ b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
@@ -277,7 +277,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
-				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
index b7dfc374a52..f89360e8774 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
@@ -278,7 +278,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
-				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
index cfbf91463e8..147e8ec3519 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
@@ -264,7 +264,7 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
-				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 				$newfiletmp = $objectref.'_'.$newfiletmp;
diff --git a/qodana.yaml b/qodana.yaml
index 853ee69fab5..53cf1a04586 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -66,4 +66,8 @@ exclude:
   - name: PhpArraySearchInBooleanContextInspection
   - name: PhpLoopCanBeReplacedWithStrRepeatInspection  
   - name: PhpPropertyOnlyWrittenInspection
-  - name: PhpCoveredCharacterInClassInspection  
\ No newline at end of file
+  - name: PhpCoveredCharacterInClassInspection
+  - name: PhpSameParameterValueInspection  
+  - name: PhpConditionCheckedByNextConditionInspection
+  - name: PhpSuspiciousNameCombinationInspection
+  
\ No newline at end of file
diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index 12c8683bb8f..ef5507d8601 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -442,6 +442,13 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
 		$this->assertEquals('ios', $tmp['browseros']);
 		$this->assertEquals('tablet', $tmp['layout']);
 		$this->assertEquals('iphone', $tmp['phone']);
+
+		//iPad
+		$user_agent = 'Lynx/2.8.8dev.3 libwww‑FM/2.14 SSL‑MM/1.4.1';
+		$tmp=getBrowserInfo($user_agent);
+		$this->assertEquals('lynxlinks', $tmp['browsername']);
+		$this->assertEquals('unknown', $tmp['browseros']);
+		$this->assertEquals('classic', $tmp['layout']);
 	}
 
 

From 3ca8e8c4935251250c39e01ff4d7b50d103753ed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 31 Dec 2022 13:47:09 +0100
Subject: [PATCH 214/816] Fix warning

---
 htdocs/comm/propal/card.php | 2 +-
 htdocs/commande/card.php    | 3 ++-
 qodana.yaml                 | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index a21e227d822..a3896f7de3c 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1830,7 +1830,7 @@ if ($action == 'create') {
 		}
 		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');
+		$form->selectShippingMethod($shipping_method_id, 'shipping_method_id', '', 1, '', 0, 'maxwidth200 widthcentpercentminusx');
 		print '</td></tr>';
 	}
 
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index a644880282b..96c8740a006 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1833,7 +1833,8 @@ if ($action == 'create' && $usercancreate) {
 	// Shipping Method
 	if (isModEnabled('expedition')) {
 		print '<tr><td>'.$langs->trans('SendingMethod').'</td><td>';
-		print img_picto('', 'object_dolly', 'class="pictofixedwidth"').$form->selectShippingMethod($shipping_method_id, 'shipping_method_id', '', 1, '', 0, 'maxwidth200 widthcentpercentminusx');
+		print img_picto('', 'object_dolly', 'class="pictofixedwidth"');
+		$form->selectShippingMethod($shipping_method_id, 'shipping_method_id', '', 1, '', 0, 'maxwidth200 widthcentpercentminusx');
 		print '</td></tr>';
 	}
 
diff --git a/qodana.yaml b/qodana.yaml
index 53cf1a04586..361afb8967f 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -69,5 +69,6 @@ exclude:
   - name: PhpCoveredCharacterInClassInspection
   - name: PhpSameParameterValueInspection  
   - name: PhpConditionCheckedByNextConditionInspection
+  - name: RegExpSingleCharAlternation  
   - name: PhpSuspiciousNameCombinationInspection
   
\ No newline at end of file

From 751f79b672a75fa5b99cb1e17f21a50aed3fba10 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 31 Dec 2022 14:01:03 +0100
Subject: [PATCH 215/816] Debug v17

---
 htdocs/adherents/class/adherent.class.php     |    4 +-
 htdocs/admin/chequereceipts.php               |    2 +-
 htdocs/comm/action/class/actioncomm.class.php |    6 +-
 htdocs/comm/propal/card.php                   |    4 +-
 htdocs/commande/card.php                      |    5 +-
 htdocs/compta/bank/class/account.class.php    |    4 +-
 htdocs/compta/facture/card-rec.php            |    2 +-
 htdocs/compta/facture/card.php                |    2 +-
 htdocs/contact/class/contact.class.php        |    4 +-
 htdocs/contrat/card.php                       |    2 +-
 htdocs/core/class/commonobject.class.php      |    2 +-
 htdocs/core/class/html.form.class.php         |   12 +-
 .../browser/default/frmfolders.php            |    2 +-
 htdocs/core/lib/security.lib.php              |    6 +-
 htdocs/core/tpl/login.tpl.php                 |    2 +-
 htdocs/core/tpl/objectline_create.tpl.php     |    2 +-
 htdocs/core/tpl/objectline_edit.tpl.php       |    2 +-
 htdocs/core/tpl/passwordforgotten.tpl.php     |    4 +-
 htdocs/core/tpl/passwordreset.tpl.php         |    4 +-
 htdocs/expedition/card.php                    | 1474 ++++++++---------
 htdocs/expedition/shipment.php                |   12 +-
 htdocs/fourn/commande/card.php                |    2 +-
 htdocs/fourn/facture/card.php                 |    2 +-
 .../class/knowledgerecord.class.php           |    4 +-
 htdocs/product/class/product.class.php        |    4 +-
 htdocs/product/stock/class/entrepot.class.php |    4 +-
 htdocs/projet/class/project.class.php         |    4 +-
 htdocs/societe/class/societe.class.php        |    2 +-
 htdocs/supplier_proposal/card.php             |    5 +-
 htdocs/ticket/class/ticket.class.php          |    4 +-
 htdocs/user/class/user.class.php              |    4 +-
 31 files changed, 798 insertions(+), 794 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 4c68b3e91ec..c17a8c1207b 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -2871,8 +2871,8 @@ class Adherent extends CommonObject
 	 * Adds it to non existing supplied categories.
 	 * Existing categories are left untouch.
 	 *
-	 * @param int[]|int $categories Category or categories IDs
-	 * @return void
+	 * @param 	int[]|int 	$categories 	Category or categories IDs
+	 * @return 	int							<0 if KO, >0 if OK
 	 */
 	public function setCategories($categories)
 	{
diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index cf93155b814..ed05180ef24 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -211,7 +211,7 @@ foreach ($dirmodels as $reldir) {
 							print '<td class="center">';
 							print $form->textwithpicto('', $htmltooltip, 1, 0);
 
-							if ($conf->global->CHEQUERECEIPTS_ADDON.'.php' == $file) {  // If module is the one used, we show existing errors
+							if (getDolGlobalString('CHEQUERECEIPTS_ADDON').'.php' == $file) {  // If module is the one used, we show existing errors
 								if (!empty($module->error)) {
 									dol_htmloutput_mesg($module->error, '', 'error', 1);
 								}
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 64d01817c85..cc43d0fb818 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1800,8 +1800,8 @@ class ActionComm extends CommonObject
 	 * Adds it to non existing supplied categories.
 	 * Existing categories are left untouch.
 	 *
-	 * @param  int[]|int $categories Category or categories IDs
-	 * @return void
+	 * @param  int[]|int 	$categories 	Category or categories IDs
+	 * @return int							<0 if KO, >0 if OK
 	 */
 	public function setCategories($categories)
 	{
@@ -1835,7 +1835,7 @@ class ActionComm extends CommonObject
 				$c->add_type($this, Categorie::TYPE_ACTIONCOMM);
 			}
 		}
-		return;
+		return 1;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 07729fd55de..e4cd4f9491f 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1830,7 +1830,7 @@ if ($action == 'create') {
 		}
 		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');
+		$form->selectShippingMethod($shipping_method_id, 'shipping_method_id', '', 1, '', 0, 'maxwidth200 widthcentpercentminusx');
 		print '</td></tr>';
 	}
 
@@ -2776,7 +2776,7 @@ if ($action == 'create') {
 	}
 
 	if (!empty($object->lines)) {
-		$ret = $object->printObjectLines($action, $mysoc, $soc, $lineid, 1);
+		$object->printObjectLines($action, $mysoc, $soc, $lineid, 1);
 	}
 
 	// Form to add new line
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 383cf7581e9..66e673abf2d 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1833,7 +1833,8 @@ if ($action == 'create' && $usercancreate) {
 	// Shipping Method
 	if (isModEnabled('expedition')) {
 		print '<tr><td>'.$langs->trans('SendingMethod').'</td><td>';
-		print img_picto('', 'object_dolly', 'class="pictofixedwidth"').$form->selectShippingMethod($shipping_method_id, 'shipping_method_id', '', 1, '', 0, 'maxwidth200 widthcentpercentminusx');
+		print img_picto('', 'object_dolly', 'class="pictofixedwidth"');
+		$form->selectShippingMethod($shipping_method_id, 'shipping_method_id', '', 1, '', 0, 'maxwidth200 widthcentpercentminusx');
 		print '</td></tr>';
 	}
 
@@ -2736,7 +2737,7 @@ if ($action == 'create' && $usercancreate) {
 
 		// Show object lines
 		if (!empty($object->lines)) {
-			$ret = $object->printObjectLines($action, $mysoc, $soc, $lineid, 1);
+			$object->printObjectLines($action, $mysoc, $soc, $lineid, 1);
 		}
 
 		$numlines = count($object->lines);
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index a73fd2b5f2c..4aea92a510e 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1060,8 +1060,8 @@ class Account extends CommonObject
 	 * Adds it to non existing supplied categories.
 	 * Existing categories are left untouch.
 	 *
-	 * @param int[]|int $categories Category or categories IDs
-	 * @return void
+	 * @param 	int[]|int 	$categories 	Category or categories IDs
+	 * @return 	int							<0 if KO, >0 if OK
 	 */
 	public function setCategories($categories)
 	{
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 64a37dcbed4..26fb26d4cdb 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -1635,7 +1635,7 @@ if ($action == 'create') {
 		// Show object lines
 		if (!empty($object->lines)) {
 			$canchangeproduct = 1;
-			$ret = $object->printObjectLines($action, $mysoc, $object->thirdparty, $lineid, 0); // No date selector for template invoice
+			$object->printObjectLines($action, $mysoc, $object->thirdparty, $lineid, 0); // No date selector for template invoice
 		}
 
 		// Form to add new line
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 36c98a495ec..0589ad18c05 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -5423,7 +5423,7 @@ if ($action == 'create') {
 
 	// Show object lines
 	if (!empty($object->lines)) {
-		$ret = $object->printObjectLines($action, $mysoc, $soc, $lineid, 1);
+		$object->printObjectLines($action, $mysoc, $soc, $lineid, 1);
 	}
 
 	// Form to add new line
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index d535da76199..caea7e0c8d5 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -1700,8 +1700,8 @@ class Contact extends CommonObject
 	 * Adds it to non existing supplied categories.
 	 * Existing categories are left untouch.
 	 *
-	 * @param int[]|int $categories Category or categories IDs
-	 * @return void
+	 * @param 	int[]|int 	$categories 	Category or categories IDs
+	 * @return 	int							<0 if KO, >0 if OK
 	 */
 	public function setCategories($categories)
 	{
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 7aad6ca9c54..38efdb3cca9 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1701,7 +1701,7 @@ if ($action == 'create') {
 							if (empty($senderissupplier)) {
 								print $form->select_produits((!empty($object->lines[$cursorline - 1]->fk_product) ? $object->lines[$cursorline - 1]->fk_product : 0), 'idprod');
 							} else {
-								print $form->select_produits_fournisseurs((!empty($object->lines[$cursorline - 1]->fk_product) ? $object->lines[$cursorline - 1]->fk_product : 0), 'idprod');
+								$form->select_produits_fournisseurs((!empty($object->lines[$cursorline - 1]->fk_product) ? $object->lines[$cursorline - 1]->fk_product : 0), 'idprod');
 							}
 						}
 						print '<br>';
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 599a7866da4..f1920c74931 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -9957,7 +9957,7 @@ abstract class CommonObject
 	 * @param 	int[]|int 	$categories 		Category ID or array of Categories IDs
 	 * @param 	string 		$type_categ 		Category type ('customer', 'supplier', 'website_page', ...) definied into const class Categorie type
 	 * @param 	boolean		$remove_existing 	True: Remove existings categories from Object if not supplies by $categories, False: let them
-	 * @return	int							<0 if KO, >0 if OK
+	 * @return	int								<0 if KO, >0 if OK
 	 */
 	public function setCategoriesCommon($categories, $type_categ = '', $remove_existing = true)
 	{
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 3f4579340d0..c33ffe28551 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3256,7 +3256,7 @@ class Form
 	 *  @param	string	$morecss			Add more CSS
 	 *  @param	int		$showstockinlist	Show stock information (slower).
 	 *  @param	string	$placeholder		Placeholder
-	 *  @return array           			Array of keys for json
+	 *  @return array|string       			Array of keys for json or HTML component
 	 */
 	public function select_produits_fournisseurs_list($socid, $selected = '', $htmlname = 'productid', $filtertype = '', $filtre = '', $filterkey = '', $statut = -1, $outputmode = 0, $limit = 100, $alsoproductwithnosupplierprice = 0, $morecss = '', $showstockinlist = 0, $placeholder = '')
 	{
@@ -3658,14 +3658,14 @@ class Form
 
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 			$out .= ajax_combobox($htmlname);
-
-			if (empty($outputmode)) {
-				return $out;
-			}
-			return $outarray;
 		} else {
 			dol_print_error($this->db);
 		}
+
+		if (empty($outputmode)) {
+			return $out;
+		}
+		return $outarray;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/core/filemanagerdol/browser/default/frmfolders.php b/htdocs/core/filemanagerdol/browser/default/frmfolders.php
index d8d1fae179a..a1b03693324 100644
--- a/htdocs/core/filemanagerdol/browser/default/frmfolders.php
+++ b/htdocs/core/filemanagerdol/browser/default/frmfolders.php
@@ -53,7 +53,7 @@ top_httphead();
 -->
 <?php
 //$arrayofjs=array('js/common.js');
-//echo top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);	// Show html headers
+//top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);	// Show html headers
 ?>
 <html>
 	<head>
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index deff1af567c..0a7e9615a70 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -723,7 +723,11 @@ function restrictedArea(User $user, $features, $object = 0, $tableandshare = '',
 		if ($mode) {
 			return $ok ? 1 : 0;
 		} else {
-			return $ok ? 1 : accessforbidden('', 1, 1, 0, $params);
+			if ($ok) {
+				return 1;
+			} else {
+				accessforbidden('', 1, 1, 0, $params);
+			}
 		}
 	}
 
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index eaf2d602571..7f97e751ded 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -98,7 +98,7 @@ if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 	$disablenofollow = 0;
 }
 
-print top_htmlhead('', $titleofloginpage, 0, 0, $arrayofjs, array(), 1, $disablenofollow);
+top_htmlhead('', $titleofloginpage, 0, 0, $arrayofjs, array(), 1, $disablenofollow);
 
 
 $colorbackhmenu1 = '60,70,100'; // topmenu
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index c3b94332909..ef6987e0e6c 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -214,7 +214,7 @@ if ($nolinesbefore) {
 					echo ' ';
 				}
 			}
-			echo $form->select_type_of_lines(GETPOSTISSET("type") ? GETPOST("type", 'alpha', 2) : -1, 'type', 1, 1, $forceall);
+			$form->select_type_of_lines(GETPOSTISSET("type") ? GETPOST("type", 'alpha', 2) : -1, 'type', 1, 1, $forceall);
 			echo '</span>';
 		}
 		// Predefined product/service
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index 5520215d89a..dbc8b407fa5 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -120,7 +120,7 @@ $coldisplay++;
 			print '<input type="hidden" id="product_id" name="productid" value="'.(!empty($line->fk_product) ? $line->fk_product : 0).'">';
 		} else {
 			if ($senderissupplier) {
-				print $form->select_produits_fournisseurs(!empty($line->fk_product) ? $line->fk_product : 0, 'productid');
+				$form->select_produits_fournisseurs(!empty($line->fk_product) ? $line->fk_product : 0, 'productid');
 			} else {
 				print $form->select_produits(!empty($line->fk_product) ? $line->fk_product : 0, 'productid');
 			}
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 3fdbcd14ef3..e9d7de9a1bf 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -76,7 +76,7 @@ if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 	$disablenofollow = 0;
 }
 
-print top_htmlhead('', $titleofpage, 0, 0, $arrayofjs, array(), 1, $disablenofollow);
+top_htmlhead('', $titleofpage, 0, 0, $arrayofjs, array(), 1, $disablenofollow);
 
 
 $colorbackhmenu1 = '60,70,100'; // topmenu
@@ -253,7 +253,7 @@ if ($mode == 'dolibarr' || !$disabled) {
 
 <?php if (!empty($message)) { ?>
 	<div class="center login_main_message">
-	<?php echo dol_htmloutput_mesg($message, '', '', 1); ?>
+	<?php dol_htmloutput_mesg($message, '', '', 1); ?>
 	</div>
 <?php } ?>
 
diff --git a/htdocs/core/tpl/passwordreset.tpl.php b/htdocs/core/tpl/passwordreset.tpl.php
index 1f35b1a251a..e9d518dba64 100644
--- a/htdocs/core/tpl/passwordreset.tpl.php
+++ b/htdocs/core/tpl/passwordreset.tpl.php
@@ -77,7 +77,7 @@ if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 	$disablenofollow = 0;
 }
 
-print top_htmlhead('', $titleofpage, 0, 0, $arrayofjs, array(), 1, $disablenofollow);
+top_htmlhead('', $titleofpage, 0, 0, $arrayofjs, array(), 1, $disablenofollow);
 
 
 $colorbackhmenu1 = '60,70,100'; // topmenu
@@ -292,7 +292,7 @@ if ($mode == 'dolibarr' || !$disabled) {
 
 <?php if (!empty($message)) { ?>
 	<div class="center login_main_message">
-	<?php echo dol_htmloutput_mesg($message, '', '', 1); ?>
+	<?php dol_htmloutput_mesg($message, '', '', 1); ?>
 	</div>
 <?php } ?>
 
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index ab8c4a28cbc..3e096bcc55d 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1647,7 +1647,7 @@ if ($action == 'create') {
 			dol_print_error($db);
 		}
 	}
-} elseif ($id || $ref) {
+} elseif ($object->id > 0) {
 	/* *************************************************************************** */
 	/*                                                                             */
 	/* Edit and view mode                                                          */
@@ -1657,828 +1657,826 @@ if ($action == 'create') {
 
 	$num_prod = count($lines);
 
-	if ($object->id > 0) {
-		if (!empty($object->origin) && $object->origin_id > 0) {
-			$typeobject = $object->origin;
-			$origin = $object->origin;
-			$origin_id = $object->origin_id;
-			$object->fetch_origin(); // Load property $object->commande, $object->propal, ...
+	if (!empty($object->origin) && $object->origin_id > 0) {
+		$typeobject = $object->origin;
+		$origin = $object->origin;
+		$origin_id = $object->origin_id;
+		$object->fetch_origin(); // Load property $object->commande, $object->propal, ...
+	}
+
+	$soc = new Societe($db);
+	$soc->fetch($object->socid);
+
+	$res = $object->fetch_optionals();
+
+	$head = shipping_prepare_head($object);
+	print dol_get_fiche_head($head, 'shipping', $langs->trans("Shipment"), -1, $object->picto);
+
+	$formconfirm = '';
+
+	// Confirm deleteion
+	if ($action == 'delete') {
+		$formquestion = array();
+		if ($object->statut == Expedition::STATUS_CLOSED && !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
+			$formquestion = array(
+					array(
+						'label' => $langs->trans('ShipmentIncrementStockOnDelete'),
+						'name' => 'alsoUpdateStock',
+						'type' => 'checkbox',
+						'value' => 0
+					),
+				);
+		}
+		$formconfirm = $form->formconfirm(
+			$_SERVER['PHP_SELF'].'?id='.$object->id,
+			$langs->trans('DeleteSending'),
+			$langs->trans("ConfirmDeleteSending", $object->ref),
+			'confirm_delete',
+			$formquestion,
+			0,
+			1
+		);
+	}
+
+	// Confirmation validation
+	if ($action == 'valid') {
+		$objectref = substr($object->ref, 1, 4);
+		if ($objectref == 'PROV') {
+			$numref = $object->getNextNumRef($soc);
+		} else {
+			$numref = $object->ref;
 		}
 
-		$soc = new Societe($db);
-		$soc->fetch($object->socid);
+		$text = $langs->trans("ConfirmValidateSending", $numref);
 
-		$res = $object->fetch_optionals();
+		if (isModEnabled('notification')) {
+			require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
+			$notify = new Notify($db);
+			$text .= '<br>';
+			$text .= $notify->confirmMessage('SHIPPING_VALIDATE', $object->socid, $object);
+		}
 
-		$head = shipping_prepare_head($object);
-		print dol_get_fiche_head($head, 'shipping', $langs->trans("Shipment"), -1, $object->picto);
+		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('ValidateSending'), $text, 'confirm_valid', '', 0, 1);
+	}
+	// Confirm cancelation
+	if ($action == 'cancel') {
+		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('CancelSending'), $langs->trans("ConfirmCancelSending", $object->ref), 'confirm_cancel', '', 0, 1);
+	}
 
-		$formconfirm = '';
+	// Call Hook formConfirm
+	$parameters = array('formConfirm' => $formconfirm);
+	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	if (empty($reshook)) {
+		$formconfirm .= $hookmanager->resPrint;
+	} elseif ($reshook > 0) {
+		$formconfirm = $hookmanager->resPrint;
+	}
 
-		// Confirm deleteion
-		if ($action == 'delete') {
-			$formquestion = array();
-			if ($object->statut == Expedition::STATUS_CLOSED && !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
-				$formquestion = array(
-						array(
-							'label' => $langs->trans('ShipmentIncrementStockOnDelete'),
-							'name' => 'alsoUpdateStock',
-							'type' => 'checkbox',
-							'value' => 0
-						),
-					);
+	// Print form confirm
+	print $formconfirm;
+
+	// Calculate totalWeight and totalVolume for all products
+	// by adding weight and volume of each product line.
+	$tmparray = $object->getTotalWeightVolume();
+	$totalWeight = $tmparray['weight'];
+	$totalVolume = $tmparray['volume'];
+
+
+	if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
+		$objectsrc = new Commande($db);
+		$objectsrc->fetch($object->$typeobject->id);
+	}
+	if ($typeobject == 'propal' && $object->$typeobject->id && isModEnabled("propal")) {
+		$objectsrc = new Propal($db);
+		$objectsrc->fetch($object->$typeobject->id);
+	}
+
+	// Shipment card
+	$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$morehtmlref = '<div class="refidno">';
+	// Ref customer shipment
+	$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->expedition->creer, 'string'.(isset($conf->global->THIRDPARTY_REF_INPUT_SIZE) ? ':'.$conf->global->THIRDPARTY_REF_INPUT_SIZE : ''), '', null, null, '', 1);
+	// Thirdparty
+	$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
+	// Project
+	if (isModEnabled('project')) {
+		$langs->load("projects");
+		$morehtmlref .= '<br>';
+		if (0) {	// Do not change on shipment
+			$morehtmlref .= img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth"');
+			if ($action != 'classify') {
+				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 			}
-			$formconfirm = $form->formconfirm(
-				$_SERVER['PHP_SELF'].'?id='.$object->id,
-				$langs->trans('DeleteSending'),
-				$langs->trans("ConfirmDeleteSending", $object->ref),
-				'confirm_delete',
-				$formquestion,
-				0,
-				1
-			);
-		}
-
-		// Confirmation validation
-		if ($action == 'valid') {
-			$objectref = substr($object->ref, 1, 4);
-			if ($objectref == 'PROV') {
-				$numref = $object->getNextNumRef($soc);
-			} else {
-				$numref = $object->ref;
-			}
-
-			$text = $langs->trans("ConfirmValidateSending", $numref);
-
-			if (isModEnabled('notification')) {
-				require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
-				$notify = new Notify($db);
-				$text .= '<br>';
-				$text .= $notify->confirmMessage('SHIPPING_VALIDATE', $object->socid, $object);
-			}
-
-			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('ValidateSending'), $text, 'confirm_valid', '', 0, 1);
-		}
-		// Confirm cancelation
-		if ($action == 'cancel') {
-			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('CancelSending'), $langs->trans("ConfirmCancelSending", $object->ref), 'confirm_cancel', '', 0, 1);
-		}
-
-		// Call Hook formConfirm
-		$parameters = array('formConfirm' => $formconfirm);
-		$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-		if (empty($reshook)) {
-			$formconfirm .= $hookmanager->resPrint;
-		} elseif ($reshook > 0) {
-			$formconfirm = $hookmanager->resPrint;
-		}
-
-		// Print form confirm
-		print $formconfirm;
-
-		// Calculate totalWeight and totalVolume for all products
-		// by adding weight and volume of each product line.
-		$tmparray = $object->getTotalWeightVolume();
-		$totalWeight = $tmparray['weight'];
-		$totalVolume = $tmparray['volume'];
-
-
-		if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
-			$objectsrc = new Commande($db);
-			$objectsrc->fetch($object->$typeobject->id);
-		}
-		if ($typeobject == 'propal' && $object->$typeobject->id && isModEnabled("propal")) {
-			$objectsrc = new Propal($db);
-			$objectsrc->fetch($object->$typeobject->id);
-		}
-
-		// Shipment card
-		$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
-		$morehtmlref = '<div class="refidno">';
-		// Ref customer shipment
-		$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', 0, 1);
-		$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->expedition->creer, 'string'.(isset($conf->global->THIRDPARTY_REF_INPUT_SIZE) ? ':'.$conf->global->THIRDPARTY_REF_INPUT_SIZE : ''), '', null, null, '', 1);
-		// Thirdparty
-		$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
-		// Project
-		if (isModEnabled('project')) {
-			$langs->load("projects");
-			$morehtmlref .= '<br>';
-			if (0) {	// Do not change on shipment
-				$morehtmlref .= img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth"');
-				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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $objectsrc->socid, $objectsrc->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
-			} else {
-				if (!empty($objectsrc) && !empty($objectsrc->fk_project)) {
-					$proj = new Project($db);
-					$proj->fetch($objectsrc->fk_project);
-					$morehtmlref .= $proj->getNomUrl(1);
-					if ($proj->title) {
-						$morehtmlref .= '<span class="opacitymedium"> - '.dol_escape_htmltag($proj->title).'</span>';
-					}
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $objectsrc->socid, $objectsrc->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+		} else {
+			if (!empty($objectsrc) && !empty($objectsrc->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($objectsrc->fk_project);
+				$morehtmlref .= $proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= '<span class="opacitymedium"> - '.dol_escape_htmltag($proj->title).'</span>';
 				}
 			}
 		}
-		$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 '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
 
-		print '<table class="border tableforfield" width="100%">';
+	print '<table class="border tableforfield" width="100%">';
 
-		// Linked documents
-		if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
-			print '<tr><td>';
-			print $langs->trans("RefOrder").'</td>';
-			print '<td colspan="3">';
-			print $objectsrc->getNomUrl(1, 'commande');
-			print "</td>\n";
-			print '</tr>';
-		}
-		if ($typeobject == 'propal' && $object->$typeobject->id && isModEnabled("propal")) {
-			print '<tr><td>';
-			print $langs->trans("RefProposal").'</td>';
-			print '<td colspan="3">';
-			print $objectsrc->getNomUrl(1, 'expedition');
-			print "</td>\n";
-			print '</tr>';
-		}
-
-		// 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 '</tr>';
-
-		// Delivery date planned
-		print '<tr><td height="10">';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('DateDeliveryPlanned');
-		print '</td>';
-
-		if ($action != 'editdate_livraison') {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
-		}
-		print '</tr></table>';
-		print '</td><td colspan="2">';
-		if ($action == 'editdate_livraison') {
-			print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-			print '<input type="hidden" name="token" value="'.newToken().'">';
-			print '<input type="hidden" name="action" value="setdate_livraison">';
-			print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
-			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
-			print '</form>';
-		} else {
-			print $object->date_delivery ? dol_print_date($object->date_delivery, 'dayhour') : '&nbsp;';
-		}
-		print '</td>';
-		print '</tr>';
-
-		// Weight
+	// Linked documents
+	if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
 		print '<tr><td>';
-		print $form->editfieldkey("Weight", 'trueWeight', $object->trueWeight, $object, $user->rights->expedition->creer);
-		print '</td><td colspan="3">';
-
-		if ($action == 'edittrueWeight') {
-			print '<form name="settrueweight" action="'.$_SERVER["PHP_SELF"].'" method="post">';
-			print '<input name="action" value="settrueWeight" type="hidden">';
-			print '<input name="id" value="'.$object->id.'" type="hidden">';
-			print '<input type="hidden" name="token" value="'.newToken().'">';
-			print '<input id="trueWeight" name="trueWeight" value="'.$object->trueWeight.'" type="text" class="width50">';
-			print $formproduct->selectMeasuringUnits("weight_units", "weight", $object->weight_units, 0, 2);
-			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
-			print ' <input class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
-			print '</form>';
-		} else {
-			print $object->trueWeight;
-			print ($object->trueWeight && $object->weight_units != '') ? ' '.measuringUnitString(0, "weight", $object->weight_units) : '';
-		}
-
-		// Calculated
-		if ($totalWeight > 0) {
-			if (!empty($object->trueWeight)) {
-				print ' ('.$langs->trans("SumOfProductWeights").': ';
-			}
-			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');
-			if (!empty($object->trueWeight)) {
-				print ')';
-			}
-		}
-		print '</td></tr>';
-
-		// Width
-		print '<tr><td>'.$form->editfieldkey("Width", 'trueWidth', $object->trueWidth, $object, $user->rights->expedition->creer).'</td><td colspan="3">';
-		print $form->editfieldval("Width", 'trueWidth', $object->trueWidth, $object, $user->rights->expedition->creer);
-		print ($object->trueWidth && $object->width_units != '') ? ' '.measuringUnitString(0, "size", $object->width_units) : '';
-		print '</td></tr>';
-
-		// Height
-		print '<tr><td>'.$form->editfieldkey("Height", 'trueHeight', $object->trueHeight, $object, $user->rights->expedition->creer).'</td><td colspan="3">';
-		if ($action == 'edittrueHeight') {
-			print '<form name="settrueHeight" action="'.$_SERVER["PHP_SELF"].'" method="post">';
-			print '<input name="action" value="settrueHeight" type="hidden">';
-			print '<input name="id" value="'.$object->id.'" type="hidden">';
-			print '<input type="hidden" name="token" value="'.newToken().'">';
-			print '<input id="trueHeight" name="trueHeight" value="'.$object->trueHeight.'" type="text" class="width50">';
-			print $formproduct->selectMeasuringUnits("size_units", "size", $object->size_units, 0, 2);
-			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
-			print ' <input class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
-			print '</form>';
-		} else {
-			print $object->trueHeight;
-			print ($object->trueHeight && $object->height_units != '') ? ' '.measuringUnitString(0, "size", $object->height_units) : '';
-		}
-
-		print '</td></tr>';
-
-		// Depth
-		print '<tr><td>'.$form->editfieldkey("Depth", 'trueDepth', $object->trueDepth, $object, $user->rights->expedition->creer).'</td><td colspan="3">';
-		print $form->editfieldval("Depth", 'trueDepth', $object->trueDepth, $object, $user->rights->expedition->creer);
-		print ($object->trueDepth && $object->depth_units != '') ? ' '.measuringUnitString(0, "size", $object->depth_units) : '';
-		print '</td></tr>';
-
-		// Volume
-		print '<tr><td>';
-		print $langs->trans("Volume");
-		print '</td>';
+		print $langs->trans("RefOrder").'</td>';
 		print '<td colspan="3">';
-		$calculatedVolume = 0;
-		$volumeUnit = 0;
-		if ($object->trueWidth && $object->trueHeight && $object->trueDepth) {
-			$calculatedVolume = ($object->trueWidth * $object->trueHeight * $object->trueDepth);
-			$volumeUnit = $object->size_units * 3;
-		}
-		// If sending volume not defined we use sum of products
-		if ($calculatedVolume > 0) {
-			if ($volumeUnit < 50) {
-				print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "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');
-			} else {
-				print $calculatedVolume.' '.measuringUnitString(0, "volume", $volumeUnit);
-			}
-		}
-		if ($totalVolume > 0) {
-			if ($calculatedVolume) {
-				print ' ('.$langs->trans("SumOfProductVolumes").': ';
-			}
-			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');
-			//if (empty($calculatedVolume)) print ' ('.$langs->trans("Calculated").')';
-			if ($calculatedVolume) {
-				print ')';
-			}
-		}
+		print $objectsrc->getNomUrl(1, 'commande');
 		print "</td>\n";
 		print '</tr>';
-
-		// Other attributes
-		$cols = 2;
-		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
-
-		print '</table>';
-
-		print '</div>';
-		print '<div class="fichehalfright">';
-		print '<div class="underbanner clearboth"></div>';
-
-		print '<table class="border centpercent tableforfield">';
-
-		// Sending method
-		print '<tr><td height="10">';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('SendingMethod');
-		print '</td>';
-
-		if ($action != 'editshipping_method_id') {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshipping_method_id&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetSendingMethod'), 1).'</a></td>';
-		}
-		print '</tr></table>';
-		print '</td><td colspan="2">';
-		if ($action == 'editshipping_method_id') {
-			print '<form name="setshipping_method_id" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-			print '<input type="hidden" name="token" value="'.newToken().'">';
-			print '<input type="hidden" name="action" value="setshipping_method_id">';
-			$object->fetch_delivery_methods();
-			print $form->selectarray("shipping_method_id", $object->meths, $object->shipping_method_id, 1, 0, 0, "", 1);
-			if ($user->admin) {
-				print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-			}
-			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
-			print '</form>';
-		} else {
-			if ($object->shipping_method_id > 0) {
-				// Get code using getLabelFromKey
-				$code = $langs->getLabelFromKey($db, $object->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
-				print $langs->trans("SendingMethod".strtoupper($code));
-			}
-		}
-		print '</td>';
+	}
+	if ($typeobject == 'propal' && $object->$typeobject->id && isModEnabled("propal")) {
+		print '<tr><td>';
+		print $langs->trans("RefProposal").'</td>';
+		print '<td colspan="3">';
+		print $objectsrc->getNomUrl(1, 'expedition');
+		print "</td>\n";
 		print '</tr>';
+	}
 
-		// Tracking Number
-		print '<tr><td class="titlefield">'.$form->editfieldkey("TrackingNumber", 'tracking_number', $object->tracking_number, $object, $user->rights->expedition->creer).'</td><td colspan="3">';
-		print $form->editfieldval("TrackingNumber", 'tracking_number', $object->tracking_url, $object, $user->rights->expedition->creer, 'safehtmlstring', $object->tracking_number);
-		print '</td></tr>';
+	// 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 '</tr>';
 
-		// Incoterms
-		if (isModEnabled('incoterm')) {
-			print '<tr><td>';
-			print '<table width="100%" class="nobordernopadding"><tr><td>';
-			print $langs->trans('IncotermLabel');
-			print '<td><td class="right">';
-			if ($user->rights->expedition->creer) {
-				print '<a class="editfielda" href="'.DOL_URL_ROOT.'/expedition/card.php?id='.$object->id.'&action=editincoterm&token='.newToken().'">'.img_edit().'</a>';
-			} else {
-				print '&nbsp;';
-			}
-			print '</td></tr></table>';
-			print '</td>';
-			print '<td colspan="3">';
-			if ($action != 'editincoterm') {
-				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-			} else {
-				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
-			}
-			print '</td></tr>';
+	// Delivery date planned
+	print '<tr><td height="10">';
+	print '<table class="nobordernopadding" width="100%"><tr><td>';
+	print $langs->trans('DateDeliveryPlanned');
+	print '</td>';
+
+	if ($action != 'editdate_livraison') {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
+	}
+	print '</tr></table>';
+	print '</td><td colspan="2">';
+	if ($action == 'editdate_livraison') {
+		print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="action" value="setdate_livraison">';
+		print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
+		print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
+		print '</form>';
+	} else {
+		print $object->date_delivery ? dol_print_date($object->date_delivery, 'dayhour') : '&nbsp;';
+	}
+	print '</td>';
+	print '</tr>';
+
+	// Weight
+	print '<tr><td>';
+	print $form->editfieldkey("Weight", 'trueWeight', $object->trueWeight, $object, $user->rights->expedition->creer);
+	print '</td><td colspan="3">';
+
+	if ($action == 'edittrueWeight') {
+		print '<form name="settrueweight" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+		print '<input name="action" value="settrueWeight" type="hidden">';
+		print '<input name="id" value="'.$object->id.'" type="hidden">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input id="trueWeight" name="trueWeight" value="'.$object->trueWeight.'" type="text" class="width50">';
+		print $formproduct->selectMeasuringUnits("weight_units", "weight", $object->weight_units, 0, 2);
+		print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
+		print ' <input class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
+		print '</form>';
+	} else {
+		print $object->trueWeight;
+		print ($object->trueWeight && $object->weight_units != '') ? ' '.measuringUnitString(0, "weight", $object->weight_units) : '';
+	}
+
+	// Calculated
+	if ($totalWeight > 0) {
+		if (!empty($object->trueWeight)) {
+			print ' ('.$langs->trans("SumOfProductWeights").': ';
 		}
-
-		// Other attributes
-		$parameters = array('colspan' => ' colspan="3"', 'cols' => '3');
-		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-		print $hookmanager->resPrint;
-
-		print "</table>";
-
-		print '</div>';
-		print '</div>';
-
-		print '<div class="clearboth"></div>';
-
-
-		// Lines of products
-
-		if ($action == 'editline') {
-			print '	<form name="updateline" id="updateline" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;lineid='.$line_id.'" method="POST">
-			<input type="hidden" name="token" value="' . newToken().'">
-			<input type="hidden" name="action" value="updateline">
-			<input type="hidden" name="mode" value="">
-			<input type="hidden" name="id" value="' . $object->id.'">
-			';
+		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');
+		if (!empty($object->trueWeight)) {
+			print ')';
 		}
-		print '<br>';
+	}
+	print '</td></tr>';
 
-		print '<div class="div-table-responsive-no-min">';
-		print '<table class="noborder" width="100%" id="tablelines" >';
-		print '<thead>';
-		print '<tr class="liste_titre">';
-		// Adds a line numbering column
-		if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
-			print '<td width="5" class="center linecolnum">&nbsp;</td>';
-		}
-		// Product/Service
-		print '<td  class="linecoldescription" >'.$langs->trans("Products").'</td>';
-		// Qty
-		print '<td class="center linecolqty">'.$langs->trans("QtyOrdered").'</td>';
-		if ($origin && $origin_id > 0) {
-			print '<td class="center linecolqtyinothershipments">'.$langs->trans("QtyInOtherShipments").'</td>';
-		}
-		if ($action == 'editline') {
-			$editColspan = 3;
-			if (!isModEnabled('stock')) {
-				$editColspan--;
-			}
-			if (empty($conf->productbatch->enabled)) {
-				$editColspan--;
-			}
-			print '<td class="center linecoleditlineotherinfo" colspan="'.$editColspan.'">';
-			if ($object->statut <= 1) {
-				print $langs->trans("QtyToShip").' - ';
-			} else {
-				print $langs->trans("QtyShipped").' - ';
-			}
-			if (isModEnabled('stock')) {
-				print $langs->trans("WarehouseSource").' - ';
-			}
-			if (isModEnabled('productbatch')) {
-				print $langs->trans("Batch");
-			}
-			print '</td>';
+	// Width
+	print '<tr><td>'.$form->editfieldkey("Width", 'trueWidth', $object->trueWidth, $object, $user->rights->expedition->creer).'</td><td colspan="3">';
+	print $form->editfieldval("Width", 'trueWidth', $object->trueWidth, $object, $user->rights->expedition->creer);
+	print ($object->trueWidth && $object->width_units != '') ? ' '.measuringUnitString(0, "size", $object->width_units) : '';
+	print '</td></tr>';
+
+	// Height
+	print '<tr><td>'.$form->editfieldkey("Height", 'trueHeight', $object->trueHeight, $object, $user->rights->expedition->creer).'</td><td colspan="3">';
+	if ($action == 'edittrueHeight') {
+		print '<form name="settrueHeight" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+		print '<input name="action" value="settrueHeight" type="hidden">';
+		print '<input name="id" value="'.$object->id.'" type="hidden">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input id="trueHeight" name="trueHeight" value="'.$object->trueHeight.'" type="text" class="width50">';
+		print $formproduct->selectMeasuringUnits("size_units", "size", $object->size_units, 0, 2);
+		print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
+		print ' <input class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
+		print '</form>';
+	} else {
+		print $object->trueHeight;
+		print ($object->trueHeight && $object->height_units != '') ? ' '.measuringUnitString(0, "size", $object->height_units) : '';
+	}
+
+	print '</td></tr>';
+
+	// Depth
+	print '<tr><td>'.$form->editfieldkey("Depth", 'trueDepth', $object->trueDepth, $object, $user->rights->expedition->creer).'</td><td colspan="3">';
+	print $form->editfieldval("Depth", 'trueDepth', $object->trueDepth, $object, $user->rights->expedition->creer);
+	print ($object->trueDepth && $object->depth_units != '') ? ' '.measuringUnitString(0, "size", $object->depth_units) : '';
+	print '</td></tr>';
+
+	// Volume
+	print '<tr><td>';
+	print $langs->trans("Volume");
+	print '</td>';
+	print '<td colspan="3">';
+	$calculatedVolume = 0;
+	$volumeUnit = 0;
+	if ($object->trueWidth && $object->trueHeight && $object->trueDepth) {
+		$calculatedVolume = ($object->trueWidth * $object->trueHeight * $object->trueDepth);
+		$volumeUnit = $object->size_units * 3;
+	}
+	// If sending volume not defined we use sum of products
+	if ($calculatedVolume > 0) {
+		if ($volumeUnit < 50) {
+			print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "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');
 		} else {
-			if ($object->statut <= 1) {
-				print '<td class="center linecolqtytoship">'.$langs->trans("QtyToShip").'</td>';
-			} else {
-				print '<td class="center linecolqtyshipped">'.$langs->trans("QtyShipped").'</td>';
-			}
-			if (isModEnabled('stock')) {
-				print '<td class="left linecolwarehousesource">'.$langs->trans("WarehouseSource").'</td>';
-			}
-
-			if (isModEnabled('productbatch')) {
-				print '<td class="left linecolbatch">'.$langs->trans("Batch").'</td>';
-			}
+			print $calculatedVolume.' '.measuringUnitString(0, "volume", $volumeUnit);
 		}
-		print '<td class="center linecolweight">'.$langs->trans("CalculatedWeight").'</td>';
-		print '<td class="center linecolvolume">'.$langs->trans("CalculatedVolume").'</td>';
-		//print '<td class="center">'.$langs->trans("Size").'</td>';
-		if ($object->statut == 0) {
-			print '<td class="linecoledit"></td>';
-			print '<td class="linecoldelete" width="10"></td>';
+	}
+	if ($totalVolume > 0) {
+		if ($calculatedVolume) {
+			print ' ('.$langs->trans("SumOfProductVolumes").': ';
 		}
-		print "</tr>\n";
-		print '</thead>';
+		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');
+		//if (empty($calculatedVolume)) print ' ('.$langs->trans("Calculated").')';
+		if ($calculatedVolume) {
+			print ')';
+		}
+	}
+	print "</td>\n";
+	print '</tr>';
 
-		$outputlangs = $langs;
+	// Other attributes
+	$cols = 2;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
-		if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
-			$object->fetch_thirdparty();
-			$newlang = '';
-			if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
-				$newlang = GETPOST('lang_id', 'aZ09');
-			}
-			if (empty($newlang)) {
-				$newlang = $object->thirdparty->default_lang;
-			}
-			if (!empty($newlang)) {
-				$outputlangs = new Translate("", $conf);
-				$outputlangs->setDefaultLang($newlang);
-			}
+	print '</table>';
+
+	print '</div>';
+	print '<div class="fichehalfright">';
+	print '<div class="underbanner clearboth"></div>';
+
+	print '<table class="border centpercent tableforfield">';
+
+	// Sending method
+	print '<tr><td height="10">';
+	print '<table class="nobordernopadding" width="100%"><tr><td>';
+	print $langs->trans('SendingMethod');
+	print '</td>';
+
+	if ($action != 'editshipping_method_id') {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshipping_method_id&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetSendingMethod'), 1).'</a></td>';
+	}
+	print '</tr></table>';
+	print '</td><td colspan="2">';
+	if ($action == 'editshipping_method_id') {
+		print '<form name="setshipping_method_id" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="action" value="setshipping_method_id">';
+		$object->fetch_delivery_methods();
+		print $form->selectarray("shipping_method_id", $object->meths, $object->shipping_method_id, 1, 0, 0, "", 1);
+		if ($user->admin) {
+			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		}
+		print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
+		print '</form>';
+	} else {
+		if ($object->shipping_method_id > 0) {
+			// Get code using getLabelFromKey
+			$code = $langs->getLabelFromKey($db, $object->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
+			print $langs->trans("SendingMethod".strtoupper($code));
+		}
+	}
+	print '</td>';
+	print '</tr>';
+
+	// Tracking Number
+	print '<tr><td class="titlefield">'.$form->editfieldkey("TrackingNumber", 'tracking_number', $object->tracking_number, $object, $user->rights->expedition->creer).'</td><td colspan="3">';
+	print $form->editfieldval("TrackingNumber", 'tracking_number', $object->tracking_url, $object, $user->rights->expedition->creer, 'safehtmlstring', $object->tracking_number);
+	print '</td></tr>';
+
+	// Incoterms
+	if (isModEnabled('incoterm')) {
+		print '<tr><td>';
+		print '<table width="100%" class="nobordernopadding"><tr><td>';
+		print $langs->trans('IncotermLabel');
+		print '<td><td class="right">';
+		if ($user->rights->expedition->creer) {
+			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/expedition/card.php?id='.$object->id.'&action=editincoterm&token='.newToken().'">'.img_edit().'</a>';
+		} else {
+			print '&nbsp;';
+		}
+		print '</td></tr></table>';
+		print '</td>';
+		print '<td colspan="3">';
+		if ($action != 'editincoterm') {
+			print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
+		} else {
+			print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
+		}
+		print '</td></tr>';
+	}
+
+	// Other attributes
+	$parameters = array('colspan' => ' colspan="3"', 'cols' => '3');
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+
+	print "</table>";
+
+	print '</div>';
+	print '</div>';
+
+	print '<div class="clearboth"></div>';
+
+
+	// Lines of products
+
+	if ($action == 'editline') {
+		print '	<form name="updateline" id="updateline" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;lineid='.$line_id.'" method="POST">
+		<input type="hidden" name="token" value="' . newToken().'">
+		<input type="hidden" name="action" value="updateline">
+		<input type="hidden" name="mode" value="">
+		<input type="hidden" name="id" value="' . $object->id.'">
+		';
+	}
+	print '<br>';
+
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder" width="100%" id="tablelines" >';
+	print '<thead>';
+	print '<tr class="liste_titre">';
+	// Adds a line numbering column
+	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+		print '<td width="5" class="center linecolnum">&nbsp;</td>';
+	}
+	// Product/Service
+	print '<td  class="linecoldescription" >'.$langs->trans("Products").'</td>';
+	// Qty
+	print '<td class="center linecolqty">'.$langs->trans("QtyOrdered").'</td>';
+	if ($origin && $origin_id > 0) {
+		print '<td class="center linecolqtyinothershipments">'.$langs->trans("QtyInOtherShipments").'</td>';
+	}
+	if ($action == 'editline') {
+		$editColspan = 3;
+		if (!isModEnabled('stock')) {
+			$editColspan--;
+		}
+		if (empty($conf->productbatch->enabled)) {
+			$editColspan--;
+		}
+		print '<td class="center linecoleditlineotherinfo" colspan="'.$editColspan.'">';
+		if ($object->statut <= 1) {
+			print $langs->trans("QtyToShip").' - ';
+		} else {
+			print $langs->trans("QtyShipped").' - ';
+		}
+		if (isModEnabled('stock')) {
+			print $langs->trans("WarehouseSource").' - ';
+		}
+		if (isModEnabled('productbatch')) {
+			print $langs->trans("Batch");
+		}
+		print '</td>';
+	} else {
+		if ($object->statut <= 1) {
+			print '<td class="center linecolqtytoship">'.$langs->trans("QtyToShip").'</td>';
+		} else {
+			print '<td class="center linecolqtyshipped">'.$langs->trans("QtyShipped").'</td>';
+		}
+		if (isModEnabled('stock')) {
+			print '<td class="left linecolwarehousesource">'.$langs->trans("WarehouseSource").'</td>';
 		}
 
-		// Get list of products already sent for same source object into $alreadysent
-		$alreadysent = array();
-		if ($origin && $origin_id > 0) {
-			$sql = "SELECT obj.rowid, obj.fk_product, obj.label, obj.description, obj.product_type as fk_product_type, obj.qty as qty_asked, obj.fk_unit, obj.date_start, obj.date_end";
-			$sql .= ", ed.rowid as shipmentline_id, ed.qty as qty_shipped, ed.fk_expedition as expedition_id, ed.fk_origin_line, ed.fk_entrepot";
-			$sql .= ", e.rowid as shipment_id, e.ref as shipment_ref, e.date_creation, e.date_valid, e.date_delivery, e.date_expedition";
-			//if ($conf->delivery_note->enabled) $sql .= ", l.rowid as livraison_id, l.ref as livraison_ref, l.date_delivery, ld.qty as qty_received";
-			$sql .= ', p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.tosell as product_tosell, p.tobuy as product_tobuy, p.tobatch as product_tobatch';
-			$sql .= ', p.description as product_desc';
-			$sql .= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed";
-			$sql .= ", ".MAIN_DB_PREFIX."expedition as e";
-			$sql .= ", ".MAIN_DB_PREFIX.$origin."det as obj";
-			//if ($conf->delivery_note->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."deliverydet as ld ON ld.fk_delivery = l.rowid  AND obj.rowid = ld.fk_origin_line";
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
-			$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
-			$sql .= " AND obj.fk_".$origin." = ".((int) $origin_id);
-			$sql .= " AND obj.rowid = ed.fk_origin_line";
-			$sql .= " AND ed.fk_expedition = e.rowid";
-			//if ($filter) $sql.= $filter;
-			$sql .= " ORDER BY obj.fk_product";
+		if (isModEnabled('productbatch')) {
+			print '<td class="left linecolbatch">'.$langs->trans("Batch").'</td>';
+		}
+	}
+	print '<td class="center linecolweight">'.$langs->trans("CalculatedWeight").'</td>';
+	print '<td class="center linecolvolume">'.$langs->trans("CalculatedVolume").'</td>';
+	//print '<td class="center">'.$langs->trans("Size").'</td>';
+	if ($object->statut == 0) {
+		print '<td class="linecoledit"></td>';
+		print '<td class="linecoldelete" width="10"></td>';
+	}
+	print "</tr>\n";
+	print '</thead>';
 
-			dol_syslog("expedition/card.php get list of shipment lines", LOG_DEBUG);
-			$resql = $db->query($sql);
-			if ($resql) {
-				$num = $db->num_rows($resql);
-				$i = 0;
+	$outputlangs = $langs;
 
-				while ($i < $num) {
-					$obj = $db->fetch_object($resql);
-					if ($obj) {
-						// $obj->rowid is rowid in $origin."det" table
-						$alreadysent[$obj->rowid][$obj->shipmentline_id] = array(
-							'shipment_ref'=>$obj->shipment_ref, 'shipment_id'=>$obj->shipment_id, 'warehouse'=>$obj->fk_entrepot, 'qty_shipped'=>$obj->qty_shipped,
-							'product_tosell'=>$obj->product_tosell, 'product_tobuy'=>$obj->product_tobuy, 'product_tobatch'=>$obj->product_tobatch,
-							'date_valid'=>$db->jdate($obj->date_valid), 'date_delivery'=>$db->jdate($obj->date_delivery));
-					}
-					$i++;
+	if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+		$object->fetch_thirdparty();
+		$newlang = '';
+		if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+			$newlang = GETPOST('lang_id', 'aZ09');
+		}
+		if (empty($newlang)) {
+			$newlang = $object->thirdparty->default_lang;
+		}
+		if (!empty($newlang)) {
+			$outputlangs = new Translate("", $conf);
+			$outputlangs->setDefaultLang($newlang);
+		}
+	}
+
+	// Get list of products already sent for same source object into $alreadysent
+	$alreadysent = array();
+	if ($origin && $origin_id > 0) {
+		$sql = "SELECT obj.rowid, obj.fk_product, obj.label, obj.description, obj.product_type as fk_product_type, obj.qty as qty_asked, obj.fk_unit, obj.date_start, obj.date_end";
+		$sql .= ", ed.rowid as shipmentline_id, ed.qty as qty_shipped, ed.fk_expedition as expedition_id, ed.fk_origin_line, ed.fk_entrepot";
+		$sql .= ", e.rowid as shipment_id, e.ref as shipment_ref, e.date_creation, e.date_valid, e.date_delivery, e.date_expedition";
+		//if ($conf->delivery_note->enabled) $sql .= ", l.rowid as livraison_id, l.ref as livraison_ref, l.date_delivery, ld.qty as qty_received";
+		$sql .= ', p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.tosell as product_tosell, p.tobuy as product_tobuy, p.tobatch as product_tobatch';
+		$sql .= ', p.description as product_desc';
+		$sql .= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed";
+		$sql .= ", ".MAIN_DB_PREFIX."expedition as e";
+		$sql .= ", ".MAIN_DB_PREFIX.$origin."det as obj";
+		//if ($conf->delivery_note->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."deliverydet as ld ON ld.fk_delivery = l.rowid  AND obj.rowid = ld.fk_origin_line";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
+		$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
+		$sql .= " AND obj.fk_".$origin." = ".((int) $origin_id);
+		$sql .= " AND obj.rowid = ed.fk_origin_line";
+		$sql .= " AND ed.fk_expedition = e.rowid";
+		//if ($filter) $sql.= $filter;
+		$sql .= " ORDER BY obj.fk_product";
+
+		dol_syslog("expedition/card.php get list of shipment lines", LOG_DEBUG);
+		$resql = $db->query($sql);
+		if ($resql) {
+			$num = $db->num_rows($resql);
+			$i = 0;
+
+			while ($i < $num) {
+				$obj = $db->fetch_object($resql);
+				if ($obj) {
+					// $obj->rowid is rowid in $origin."det" table
+					$alreadysent[$obj->rowid][$obj->shipmentline_id] = array(
+						'shipment_ref'=>$obj->shipment_ref, 'shipment_id'=>$obj->shipment_id, 'warehouse'=>$obj->fk_entrepot, 'qty_shipped'=>$obj->qty_shipped,
+						'product_tosell'=>$obj->product_tosell, 'product_tobuy'=>$obj->product_tobuy, 'product_tobatch'=>$obj->product_tobatch,
+						'date_valid'=>$db->jdate($obj->date_valid), 'date_delivery'=>$db->jdate($obj->date_delivery));
 				}
+				$i++;
 			}
-			//var_dump($alreadysent);
+		}
+		//var_dump($alreadysent);
+	}
+
+	print '<tbody>';
+
+	// Loop on each product to send/sent
+	for ($i = 0; $i < $num_prod; $i++) {
+		$parameters = array('i' => $i, 'line' => $lines[$i], 'line_id' => $line_id, 'num' => $num_prod, 'alreadysent' => $alreadysent, 'editColspan' => !empty($editColspan) ? $editColspan : 0, 'outputlangs' => $outputlangs);
+		$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $object, $action);
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 		}
 
-		print '<tbody>';
+		if (empty($reshook)) {
+			print '<!-- origin line id = '.$lines[$i]->origin_line_id.' -->'; // id of order line
+			print '<tr class="oddeven" id="row-'.$lines[$i]->id.'" data-id="'.$lines[$i]->id.'" data-element="'.$lines[$i]->element.'" >';
 
-		// Loop on each product to send/sent
-		for ($i = 0; $i < $num_prod; $i++) {
-			$parameters = array('i' => $i, 'line' => $lines[$i], 'line_id' => $line_id, 'num' => $num_prod, 'alreadysent' => $alreadysent, 'editColspan' => !empty($editColspan) ? $editColspan : 0, 'outputlangs' => $outputlangs);
-			$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $object, $action);
-			if ($reshook < 0) {
-				setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+			// #
+			if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+				print '<td class="center linecolnum">'.($i + 1).'</td>';
 			}
 
-			if (empty($reshook)) {
-				print '<!-- origin line id = '.$lines[$i]->origin_line_id.' -->'; // id of order line
-				print '<tr class="oddeven" id="row-'.$lines[$i]->id.'" data-id="'.$lines[$i]->id.'" data-element="'.$lines[$i]->element.'" >';
-
-				// #
-				if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
-					print '<td class="center linecolnum">'.($i + 1).'</td>';
-				}
-
-				// Predefined product or service
-				if ($lines[$i]->fk_product > 0) {
-					// Define output language
-					if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
-						$prod = new Product($db);
-						$prod->fetch($lines[$i]->fk_product);
-						$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product_label;
-					} else {
-						$label = (!empty($lines[$i]->label) ? $lines[$i]->label : $lines[$i]->product_label);
-					}
-
-					print '<td class="linecoldescription">';
-
-					// Show product and description
-					$product_static->type = $lines[$i]->fk_product_type;
-					$product_static->id = $lines[$i]->fk_product;
-					$product_static->ref = $lines[$i]->ref;
-					$product_static->status = $lines[$i]->product_tosell;
-					$product_static->status_buy = $lines[$i]->product_tobuy;
-					$product_static->status_batch = $lines[$i]->product_tobatch;
-
-					$product_static->weight = $lines[$i]->weight;
-					$product_static->weight_units = $lines[$i]->weight_units;
-					$product_static->length = $lines[$i]->length;
-					$product_static->length_units = $lines[$i]->length_units;
-					$product_static->width = !empty($lines[$i]->width) ? $lines[$i]->width : 0;
-					$product_static->width_units = !empty($lines[$i]->width_units) ? $lines[$i]->width_units : 0;
-					$product_static->height = !empty($lines[$i]->height) ? $lines[$i]->height : 0;
-					$product_static->height_units = !empty($lines[$i]->height_units) ? $lines[$i]->height_units : 0;
-					$product_static->surface = $lines[$i]->surface;
-					$product_static->surface_units = $lines[$i]->surface_units;
-					$product_static->volume = $lines[$i]->volume;
-					$product_static->volume_units = $lines[$i]->volume_units;
-
-					$text = $product_static->getNomUrl(1);
-					$text .= ' - '.$label;
-					$description = (getDolGlobalInt('PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE') ? '' : dol_htmlentitiesbr($lines[$i]->description));
-					print $form->textwithtooltip($text, $description, 3, '', '', $i);
-					print_date_range(!empty($lines[$i]->date_start) ? $lines[$i]->date_start : '', !empty($lines[$i]->date_end) ? $lines[$i]->date_end : '');
-					if (getDolGlobalInt('PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE')) {
-						print (!empty($lines[$i]->description) && $lines[$i]->description != $lines[$i]->product) ? '<br>'.dol_htmlentitiesbr($lines[$i]->description) : '';
-					}
-					print "</td>\n";
+			// Predefined product or service
+			if ($lines[$i]->fk_product > 0) {
+				// Define output language
+				if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+					$prod = new Product($db);
+					$prod->fetch($lines[$i]->fk_product);
+					$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product_label;
 				} else {
-					print '<td class="linecoldescription" >';
-					if ($lines[$i]->product_type == Product::TYPE_SERVICE) {
-						$text = img_object($langs->trans('Service'), 'service');
-					} else {
-						$text = img_object($langs->trans('Product'), 'product');
-					}
-
-					if (!empty($lines[$i]->label)) {
-						$text .= ' <strong>'.$lines[$i]->label.'</strong>';
-						print $form->textwithtooltip($text, $lines[$i]->description, 3, '', '', $i);
-					} else {
-						print $text.' '.nl2br($lines[$i]->description);
-					}
-
-					print_date_range($lines[$i]->date_start, $lines[$i]->date_end);
-					print "</td>\n";
+					$label = (!empty($lines[$i]->label) ? $lines[$i]->label : $lines[$i]->product_label);
 				}
 
-				$unit_order = '';
-				if (!empty($conf->global->PRODUCT_USE_UNITS)) {
-					$unit_order = measuringUnitString($lines[$i]->fk_unit);
+				print '<td class="linecoldescription">';
+
+				// Show product and description
+				$product_static->type = $lines[$i]->fk_product_type;
+				$product_static->id = $lines[$i]->fk_product;
+				$product_static->ref = $lines[$i]->ref;
+				$product_static->status = $lines[$i]->product_tosell;
+				$product_static->status_buy = $lines[$i]->product_tobuy;
+				$product_static->status_batch = $lines[$i]->product_tobatch;
+
+				$product_static->weight = $lines[$i]->weight;
+				$product_static->weight_units = $lines[$i]->weight_units;
+				$product_static->length = $lines[$i]->length;
+				$product_static->length_units = $lines[$i]->length_units;
+				$product_static->width = !empty($lines[$i]->width) ? $lines[$i]->width : 0;
+				$product_static->width_units = !empty($lines[$i]->width_units) ? $lines[$i]->width_units : 0;
+				$product_static->height = !empty($lines[$i]->height) ? $lines[$i]->height : 0;
+				$product_static->height_units = !empty($lines[$i]->height_units) ? $lines[$i]->height_units : 0;
+				$product_static->surface = $lines[$i]->surface;
+				$product_static->surface_units = $lines[$i]->surface_units;
+				$product_static->volume = $lines[$i]->volume;
+				$product_static->volume_units = $lines[$i]->volume_units;
+
+				$text = $product_static->getNomUrl(1);
+				$text .= ' - '.$label;
+				$description = (getDolGlobalInt('PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE') ? '' : dol_htmlentitiesbr($lines[$i]->description));
+				print $form->textwithtooltip($text, $description, 3, '', '', $i);
+				print_date_range(!empty($lines[$i]->date_start) ? $lines[$i]->date_start : '', !empty($lines[$i]->date_end) ? $lines[$i]->date_end : '');
+				if (getDolGlobalInt('PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE')) {
+					print (!empty($lines[$i]->description) && $lines[$i]->description != $lines[$i]->product) ? '<br>'.dol_htmlentitiesbr($lines[$i]->description) : '';
+				}
+				print "</td>\n";
+			} else {
+				print '<td class="linecoldescription" >';
+				if ($lines[$i]->product_type == Product::TYPE_SERVICE) {
+					$text = img_object($langs->trans('Service'), 'service');
+				} else {
+					$text = img_object($langs->trans('Product'), 'product');
 				}
 
-				// Qty ordered
-				print '<td class="center linecolqty">'.$lines[$i]->qty_asked.' '.$unit_order.'</td>';
+				if (!empty($lines[$i]->label)) {
+					$text .= ' <strong>'.$lines[$i]->label.'</strong>';
+					print $form->textwithtooltip($text, $lines[$i]->description, 3, '', '', $i);
+				} else {
+					print $text.' '.nl2br($lines[$i]->description);
+				}
 
-				// Qty in other shipments (with shipment and warehouse used)
-				if ($origin && $origin_id > 0) {
-					print '<td class="linecolqtyinothershipments center nowrap">';
-					foreach ($alreadysent as $key => $val) {
-						if ($lines[$i]->fk_origin_line == $key) {
-							$j = 0;
-							foreach ($val as $shipmentline_id => $shipmentline_var) {
-								if ($shipmentline_var['shipment_id'] == $lines[$i]->fk_expedition) {
-									continue; // We want to show only "other shipments"
-								}
+				print_date_range($lines[$i]->date_start, $lines[$i]->date_end);
+				print "</td>\n";
+			}
 
-								$j++;
-								if ($j > 1) {
-									print '<br>';
-								}
-								$shipment_static->fetch($shipmentline_var['shipment_id']);
-								print $shipment_static->getNomUrl(1);
-								print ' - '.$shipmentline_var['qty_shipped'];
-								$htmltext = $langs->trans("DateValidation").' : '.(empty($shipmentline_var['date_valid']) ? $langs->trans("Draft") : dol_print_date($shipmentline_var['date_valid'], 'dayhour'));
-								if (isModEnabled('stock') && $shipmentline_var['warehouse'] > 0) {
-									$warehousestatic->fetch($shipmentline_var['warehouse']);
-									$htmltext .= '<br>'.$langs->trans("FromLocation").' : '.$warehousestatic->getNomUrl(1, '', 0, 1);
-								}
-								print ' '.$form->textwithpicto('', $htmltext, 1);
+			$unit_order = '';
+			if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+				$unit_order = measuringUnitString($lines[$i]->fk_unit);
+			}
+
+			// Qty ordered
+			print '<td class="center linecolqty">'.$lines[$i]->qty_asked.' '.$unit_order.'</td>';
+
+			// Qty in other shipments (with shipment and warehouse used)
+			if ($origin && $origin_id > 0) {
+				print '<td class="linecolqtyinothershipments center nowrap">';
+				foreach ($alreadysent as $key => $val) {
+					if ($lines[$i]->fk_origin_line == $key) {
+						$j = 0;
+						foreach ($val as $shipmentline_id => $shipmentline_var) {
+							if ($shipmentline_var['shipment_id'] == $lines[$i]->fk_expedition) {
+								continue; // We want to show only "other shipments"
 							}
+
+							$j++;
+							if ($j > 1) {
+								print '<br>';
+							}
+							$shipment_static->fetch($shipmentline_var['shipment_id']);
+							print $shipment_static->getNomUrl(1);
+							print ' - '.$shipmentline_var['qty_shipped'];
+							$htmltext = $langs->trans("DateValidation").' : '.(empty($shipmentline_var['date_valid']) ? $langs->trans("Draft") : dol_print_date($shipmentline_var['date_valid'], 'dayhour'));
+							if (isModEnabled('stock') && $shipmentline_var['warehouse'] > 0) {
+								$warehousestatic->fetch($shipmentline_var['warehouse']);
+								$htmltext .= '<br>'.$langs->trans("FromLocation").' : '.$warehousestatic->getNomUrl(1, '', 0, 1);
+							}
+							print ' '.$form->textwithpicto('', $htmltext, 1);
 						}
 					}
-					print '</td>';
 				}
+				print '</td>';
+			}
 
-				if ($action == 'editline' && $lines[$i]->id == $line_id) {
-					// edit mode
-					print '<td colspan="'.$editColspan.'" class="center"><table class="nobordernopadding centpercent">';
-					if (is_array($lines[$i]->detail_batch) && count($lines[$i]->detail_batch) > 0) {
-						print '<!-- case edit 1 -->';
-						$line = new ExpeditionLigne($db);
-						foreach ($lines[$i]->detail_batch as $detail_batch) {
-							print '<tr>';
-							// Qty to ship or shipped
-							print '<td><input class="qtyl" name="qtyl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->id.'" id="qtyl'.$line_id.'_'.$detail_batch->id.'" type="text" size="4" value="'.$detail_batch->qty.'"></td>';
-							// Batch number managment
-							if ($lines[$i]->entrepot_id == 0) {
-								// only show lot numbers from src warehouse when shipping from multiple warehouses
-								$line->fetch($detail_batch->fk_expeditiondet);
-							}
-							$entrepot_id = !empty($detail_batch->entrepot_id)?$detail_batch->entrepot_id:$lines[$i]->entrepot_id;
-							print '<td>'.$formproduct->selectLotStock($detail_batch->fk_origin_stock, 'batchl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->fk_origin_stock, '', 1, 0, $lines[$i]->fk_product, $entrepot_id).'</td>';
-							print '</tr>';
-						}
-						// add a 0 qty lot row to be able to add a lot
+			if ($action == 'editline' && $lines[$i]->id == $line_id) {
+				// edit mode
+				print '<td colspan="'.$editColspan.'" class="center"><table class="nobordernopadding centpercent">';
+				if (is_array($lines[$i]->detail_batch) && count($lines[$i]->detail_batch) > 0) {
+					print '<!-- case edit 1 -->';
+					$line = new ExpeditionLigne($db);
+					foreach ($lines[$i]->detail_batch as $detail_batch) {
 						print '<tr>';
 						// Qty to ship or shipped
-						print '<td><input class="qtyl" name="qtyl'.$line_id.'_0" id="qtyl'.$line_id.'_0" type="text" size="4" value="0"></td>';
+						print '<td><input class="qtyl" name="qtyl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->id.'" id="qtyl'.$line_id.'_'.$detail_batch->id.'" type="text" size="4" value="'.$detail_batch->qty.'"></td>';
 						// Batch number managment
-						print '<td>'.$formproduct->selectLotStock('', 'batchl'.$line_id.'_0', '', 1, 0, $lines[$i]->fk_product).'</td>';
+						if ($lines[$i]->entrepot_id == 0) {
+							// only show lot numbers from src warehouse when shipping from multiple warehouses
+							$line->fetch($detail_batch->fk_expeditiondet);
+						}
+						$entrepot_id = !empty($detail_batch->entrepot_id)?$detail_batch->entrepot_id:$lines[$i]->entrepot_id;
+						print '<td>'.$formproduct->selectLotStock($detail_batch->fk_origin_stock, 'batchl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->fk_origin_stock, '', 1, 0, $lines[$i]->fk_product, $entrepot_id).'</td>';
 						print '</tr>';
-					} elseif (isModEnabled('stock')) {
-						if ($lines[$i]->fk_product > 0) {
-							if ($lines[$i]->entrepot_id > 0) {
-								print '<!-- case edit 2 -->';
-								print '<tr>';
-								// Qty to ship or shipped
-								print '<td><input class="qtyl" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">'.$unit_order.'</td>';
-								// Warehouse source
-								print '<td>'.$formproduct->selectWarehouses($lines[$i]->entrepot_id, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).'</td>';
-								// Batch number managment
-								print '<td> - '.$langs->trans("NA").'</td>';
-								print '</tr>';
-							} elseif (count($lines[$i]->details_entrepot) > 1) {
-								print '<!-- case edit 3 -->';
-								foreach ($lines[$i]->details_entrepot as $detail_entrepot) {
-									print '<tr>';
-									// Qty to ship or shipped
-									print '<td><input class="qtyl" name="qtyl'.$detail_entrepot->line_id.'" id="qtyl'.$detail_entrepot->line_id.'" type="text" size="4" value="'.$detail_entrepot->qty_shipped.'">'.$unit_order.'</td>';
-									// Warehouse source
-									print '<td>'.$formproduct->selectWarehouses($detail_entrepot->entrepot_id, 'entl'.$detail_entrepot->line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).'</td>';
-									// Batch number managment
-									print '<td> - '.$langs->trans("NA").'</td>';
-									print '</tr>';
-								}
-							} else {
-								print '<!-- case edit 4 -->';
-								print '<tr><td colspan="3">'.$langs->trans("NotEnoughStock").'</td></tr>';
-							}
-						} else {
-							print '<!-- case edit 5 -->';
+					}
+					// add a 0 qty lot row to be able to add a lot
+					print '<tr>';
+					// Qty to ship or shipped
+					print '<td><input class="qtyl" name="qtyl'.$line_id.'_0" id="qtyl'.$line_id.'_0" type="text" size="4" value="0"></td>';
+					// Batch number managment
+					print '<td>'.$formproduct->selectLotStock('', 'batchl'.$line_id.'_0', '', 1, 0, $lines[$i]->fk_product).'</td>';
+					print '</tr>';
+				} elseif (isModEnabled('stock')) {
+					if ($lines[$i]->fk_product > 0) {
+						if ($lines[$i]->entrepot_id > 0) {
+							print '<!-- case edit 2 -->';
 							print '<tr>';
 							// Qty to ship or shipped
 							print '<td><input class="qtyl" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">'.$unit_order.'</td>';
 							// Warehouse source
-							print '<td></td>';
+							print '<td>'.$formproduct->selectWarehouses($lines[$i]->entrepot_id, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).'</td>';
 							// Batch number managment
-							print '<td></td>';
+							print '<td> - '.$langs->trans("NA").'</td>';
 							print '</tr>';
+						} elseif (count($lines[$i]->details_entrepot) > 1) {
+							print '<!-- case edit 3 -->';
+							foreach ($lines[$i]->details_entrepot as $detail_entrepot) {
+								print '<tr>';
+								// Qty to ship or shipped
+								print '<td><input class="qtyl" name="qtyl'.$detail_entrepot->line_id.'" id="qtyl'.$detail_entrepot->line_id.'" type="text" size="4" value="'.$detail_entrepot->qty_shipped.'">'.$unit_order.'</td>';
+								// Warehouse source
+								print '<td>'.$formproduct->selectWarehouses($detail_entrepot->entrepot_id, 'entl'.$detail_entrepot->line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).'</td>';
+								// Batch number managment
+								print '<td> - '.$langs->trans("NA").'</td>';
+								print '</tr>';
+							}
+						} else {
+							print '<!-- case edit 4 -->';
+							print '<tr><td colspan="3">'.$langs->trans("NotEnoughStock").'</td></tr>';
 						}
-					} elseif (!isModEnabled('stock') && empty($conf->productbatch->enabled)) { // both product batch and stock are not activated.
-						print '<!-- case edit 6 -->';
+					} else {
+						print '<!-- case edit 5 -->';
 						print '<tr>';
 						// Qty to ship or shipped
-						print '<td><input class="qtyl" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'"></td>';
+						print '<td><input class="qtyl" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">'.$unit_order.'</td>';
 						// Warehouse source
 						print '<td></td>';
 						// Batch number managment
 						print '<td></td>';
 						print '</tr>';
 					}
-
-					print '</table></td>';
-				} else {
+				} elseif (!isModEnabled('stock') && empty($conf->productbatch->enabled)) { // both product batch and stock are not activated.
+					print '<!-- case edit 6 -->';
+					print '<tr>';
 					// Qty to ship or shipped
-					print '<td class="linecolqtytoship center">'.$lines[$i]->qty_shipped.' '.$unit_order.'</td>';
-
+					print '<td><input class="qtyl" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'"></td>';
 					// Warehouse source
-					if (isModEnabled('stock')) {
-						print '<td class="linecolwarehousesource left">';
-						if ($lines[$i]->entrepot_id > 0) {
-							$entrepot = new Entrepot($db);
-							$entrepot->fetch($lines[$i]->entrepot_id);
-							print $entrepot->getNomUrl(1);
-						} elseif (count($lines[$i]->details_entrepot) > 1) {
-							$detail = '';
-							foreach ($lines[$i]->details_entrepot as $detail_entrepot) {
-								if ($detail_entrepot->entrepot_id > 0) {
-									$entrepot = new Entrepot($db);
-									$entrepot->fetch($detail_entrepot->entrepot_id);
-									$detail .= $langs->trans("DetailWarehouseFormat", $entrepot->libelle, $detail_entrepot->qty_shipped).'<br>';
-								}
+					print '<td></td>';
+					// Batch number managment
+					print '<td></td>';
+					print '</tr>';
+				}
+
+				print '</table></td>';
+			} else {
+				// Qty to ship or shipped
+				print '<td class="linecolqtytoship center">'.$lines[$i]->qty_shipped.' '.$unit_order.'</td>';
+
+				// Warehouse source
+				if (isModEnabled('stock')) {
+					print '<td class="linecolwarehousesource left">';
+					if ($lines[$i]->entrepot_id > 0) {
+						$entrepot = new Entrepot($db);
+						$entrepot->fetch($lines[$i]->entrepot_id);
+						print $entrepot->getNomUrl(1);
+					} elseif (count($lines[$i]->details_entrepot) > 1) {
+						$detail = '';
+						foreach ($lines[$i]->details_entrepot as $detail_entrepot) {
+							if ($detail_entrepot->entrepot_id > 0) {
+								$entrepot = new Entrepot($db);
+								$entrepot->fetch($detail_entrepot->entrepot_id);
+								$detail .= $langs->trans("DetailWarehouseFormat", $entrepot->libelle, $detail_entrepot->qty_shipped).'<br>';
 							}
-							print $form->textwithtooltip(img_picto('', 'object_stock').' '.$langs->trans("DetailWarehouseNumber"), $detail);
+						}
+						print $form->textwithtooltip(img_picto('', 'object_stock').' '.$langs->trans("DetailWarehouseNumber"), $detail);
+					}
+					print '</td>';
+				}
+
+				// Batch number managment
+				if (isModEnabled('productbatch')) {
+					if (isset($lines[$i]->detail_batch)) {
+						print '<!-- Detail of lot -->';
+						print '<td class="linecolbatch">';
+						if ($lines[$i]->product_tobatch) {
+							$detail = '';
+							foreach ($lines[$i]->detail_batch as $dbatch) {	// $dbatch is instance of ExpeditionLineBatch
+								$detail .= $langs->trans("Batch").': '.$dbatch->batch;
+								if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+									$detail .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day");
+								}
+								if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+									$detail .= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day");
+								}
+								$detail .= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
+								$detail .= '<br>';
+							}
+							print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"), $detail);
+						} else {
+							print $langs->trans("NA");
 						}
 						print '</td>';
-					}
-
-					// Batch number managment
-					if (isModEnabled('productbatch')) {
-						if (isset($lines[$i]->detail_batch)) {
-							print '<!-- Detail of lot -->';
-							print '<td class="linecolbatch">';
-							if ($lines[$i]->product_tobatch) {
-								$detail = '';
-								foreach ($lines[$i]->detail_batch as $dbatch) {	// $dbatch is instance of ExpeditionLineBatch
-									$detail .= $langs->trans("Batch").': '.$dbatch->batch;
-									if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
-										$detail .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day");
-									}
-									if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
-										$detail .= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day");
-									}
-									$detail .= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
-									$detail .= '<br>';
-								}
-								print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"), $detail);
-							} else {
-								print $langs->trans("NA");
-							}
-							print '</td>';
-						} else {
-							print '<td class="linecolbatch" ></td>';
-						}
-					}
-				}
-
-				// Weight
-				print '<td class="center linecolweight">';
-				if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) {
-					print $lines[$i]->weight * $lines[$i]->qty_shipped.' '.measuringUnitString(0, "weight", $lines[$i]->weight_units);
-				} else {
-					print '&nbsp;';
-				}
-				print '</td>';
-
-				// Volume
-				print '<td class="center linecolvolume">';
-				if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) {
-					print $lines[$i]->volume * $lines[$i]->qty_shipped.' '.measuringUnitString(0, "volume", $lines[$i]->volume_units);
-				} else {
-					print '&nbsp;';
-				}
-				print '</td>';
-
-				// Size
-				//print '<td class="center">'.$lines[$i]->volume*$lines[$i]->qty_shipped.' '.measuringUnitString(0, "volume", $lines[$i]->volume_units).'</td>';
-
-				if ($action == 'editline' && $lines[$i]->id == $line_id) {
-					print '<td class="center" colspan="2" valign="middle">';
-					print '<input type="submit" class="button button-save" id="savelinebutton marginbottomonly" name="save" value="'.$langs->trans("Save").'"><br>';
-					print '<input type="submit" class="button button-cancel" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'"><br>';
-					print '</td>';
-				} elseif ($object->statut == Expedition::STATUS_DRAFT) {
-					// edit-delete buttons
-					print '<td class="linecoledit center">';
-					print '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editline&token='.newToken().'&lineid='.$lines[$i]->id.'">'.img_edit().'</a>';
-					print '</td>';
-					print '<td class="linecoldelete" width="10">';
-					print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deleteline&token='.newToken().'&lineid='.$lines[$i]->id.'">'.img_delete().'</a>';
-					print '</td>';
-
-					// Display lines extrafields
-					if (!empty($rowExtrafieldsStart)) {
-						print $rowExtrafieldsStart;
-						print $rowExtrafieldsView;
-						print $rowEnd;
-					}
-				}
-				print "</tr>";
-
-				// Display lines extrafields.
-				// $line is a line of shipment
-				if (!empty($extrafields)) {
-					$colspan = 6;
-					if ($origin && $origin_id > 0) {
-						$colspan++;
-					}
-					if (isModEnabled('productbatch')) {
-						$colspan++;
-					}
-					if (isModEnabled('stock')) {
-						$colspan++;
-					}
-
-					$line = $lines[$i];
-					$line->fetch_optionals();
-
-					// TODO Show all in same line by setting $display_type = 'line'
-					if ($action == 'editline' && $line->id == $line_id) {
-						print $lines[$i]->showOptionals($extrafields, 'edit', array('colspan'=>$colspan), !empty($indiceAsked) ? $indiceAsked : '', '', 0, 'card');
 					} else {
-						print $lines[$i]->showOptionals($extrafields, 'view', array('colspan'=>$colspan), !empty($indiceAsked) ? $indiceAsked : '', '', 0, 'card');
+						print '<td class="linecolbatch" ></td>';
 					}
 				}
 			}
+
+			// Weight
+			print '<td class="center linecolweight">';
+			if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) {
+				print $lines[$i]->weight * $lines[$i]->qty_shipped.' '.measuringUnitString(0, "weight", $lines[$i]->weight_units);
+			} else {
+				print '&nbsp;';
+			}
+			print '</td>';
+
+			// Volume
+			print '<td class="center linecolvolume">';
+			if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) {
+				print $lines[$i]->volume * $lines[$i]->qty_shipped.' '.measuringUnitString(0, "volume", $lines[$i]->volume_units);
+			} else {
+				print '&nbsp;';
+			}
+			print '</td>';
+
+			// Size
+			//print '<td class="center">'.$lines[$i]->volume*$lines[$i]->qty_shipped.' '.measuringUnitString(0, "volume", $lines[$i]->volume_units).'</td>';
+
+			if ($action == 'editline' && $lines[$i]->id == $line_id) {
+				print '<td class="center" colspan="2" valign="middle">';
+				print '<input type="submit" class="button button-save" id="savelinebutton marginbottomonly" name="save" value="'.$langs->trans("Save").'"><br>';
+				print '<input type="submit" class="button button-cancel" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'"><br>';
+				print '</td>';
+			} elseif ($object->statut == Expedition::STATUS_DRAFT) {
+				// edit-delete buttons
+				print '<td class="linecoledit center">';
+				print '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editline&token='.newToken().'&lineid='.$lines[$i]->id.'">'.img_edit().'</a>';
+				print '</td>';
+				print '<td class="linecoldelete" width="10">';
+				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deleteline&token='.newToken().'&lineid='.$lines[$i]->id.'">'.img_delete().'</a>';
+				print '</td>';
+
+				// Display lines extrafields
+				if (!empty($rowExtrafieldsStart)) {
+					print $rowExtrafieldsStart;
+					print $rowExtrafieldsView;
+					print $rowEnd;
+				}
+			}
+			print "</tr>";
+
+			// Display lines extrafields.
+			// $line is a line of shipment
+			if (!empty($extrafields)) {
+				$colspan = 6;
+				if ($origin && $origin_id > 0) {
+					$colspan++;
+				}
+				if (isModEnabled('productbatch')) {
+					$colspan++;
+				}
+				if (isModEnabled('stock')) {
+					$colspan++;
+				}
+
+				$line = $lines[$i];
+				$line->fetch_optionals();
+
+				// TODO Show all in same line by setting $display_type = 'line'
+				if ($action == 'editline' && $line->id == $line_id) {
+					print $lines[$i]->showOptionals($extrafields, 'edit', array('colspan'=>$colspan), !empty($indiceAsked) ? $indiceAsked : '', '', 0, 'card');
+				} else {
+					print $lines[$i]->showOptionals($extrafields, 'view', array('colspan'=>$colspan), !empty($indiceAsked) ? $indiceAsked : '', '', 0, 'card');
+				}
+			}
 		}
-
-		// TODO Show also lines ordered but not delivered
-
-		print "</table>\n";
-		print '</tbody>';
-		print '</div>';
 	}
 
+	// TODO Show also lines ordered but not delivered
+
+	print "</table>\n";
+	print '</tbody>';
+	print '</div>';
+
 
 	print dol_get_fiche_end();
 
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 9394269a03a..2adf16e4c35 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -329,7 +329,7 @@ if ($id > 0 || !empty($ref)) {
 			$filtercreditnote = "fk_facture_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%')";
 		}
 
-		print '<tr><td class="titlefield">'.$langs->trans('Discounts').'</td><td colspan="3">';
+		print '<tr><td class="titlefield">'.$langs->trans('Discounts').'</td><td colspan="2">';
 
 		$absolute_discount = $soc->getAvailableDiscounts('', $filterabsolutediscount);
 		$absolute_creditnote = $soc->getAvailableDiscounts('', $filtercreditnote);
@@ -393,7 +393,7 @@ if ($id > 0 || !empty($ref)) {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editavailability&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetAvailability'), 1).'</a></td>';
 		}
 		print '</tr></table>';
-		print '</td><td colspan="3">';
+		print '</td><td colspan="2">';
 		if ($action == 'editavailability') {
 			$form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id, $object->availability_id, 'availability_id', 1);
 		} else {
@@ -450,7 +450,7 @@ if ($id > 0 || !empty($ref)) {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdemandreason&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetDemandReason'), 1).'</a></td>';
 		}
 		print '</tr></table>';
-		print '</td><td colspan="3">';
+		print '</td><td colspan="2">';
 		if ($action == 'editdemandreason') {
 			$form->formInputReason($_SERVER['PHP_SELF'].'?id='.$object->id, $object->demand_reason_id, 'demand_reason_id', 1);
 		} else {
@@ -500,11 +500,11 @@ if ($id > 0 || !empty($ref)) {
 		$totalVolume = $tmparray['volume'];
 		if ($totalWeight || $totalVolume) {
 			print '<tr><td>'.$langs->trans("CalculatedWeight").'</td>';
-			print '<td>';
+			print '<td colspan="2">';
 			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 '</td></tr>';
 			print '<tr><td>'.$langs->trans("CalculatedVolume").'</td>';
-			print '<td>';
+			print '<td colspan="2">';
 			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 '</td></tr>';
 		}
@@ -524,7 +524,7 @@ if ($id > 0 || !empty($ref)) {
 			}
 			print '</td></tr></table>';
 			print '</td>';
-			print '<td colspan="3">';
+			print '<td colspan="2">';
 			if ($action != 'editincoterm') {
 				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
 			} else {
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index f559c31a89f..3e61571dea5 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2415,7 +2415,7 @@ if ($action == 'create') {
 
 	// Show object lines
 	if (!empty($object->lines)) {
-		$ret = $object->printObjectLines($action, $societe, $mysoc, $lineid, 1);
+		$object->printObjectLines($action, $societe, $mysoc, $lineid, 1);
 	}
 
 	$num = count($object->lines);
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 6bc9ae679bb..50e450be105 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -3628,7 +3628,7 @@ if ($action == 'create') {
 
 		// Show object lines
 		if (!empty($object->lines)) {
-			$ret = $object->printObjectLines($action, $societe, $mysoc, $lineid, 1);
+			$object->printObjectLines($action, $societe, $mysoc, $lineid, 1);
 		}
 
 		$num = count($object->lines);
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 69e7e40c16b..1d8075c21ea 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -1058,8 +1058,8 @@ class KnowledgeRecord extends CommonObject
 	 * Adds it to non existing supplied categories.
 	 * Existing categories are left untouch.
 	 *
-	 * @param int[]|int $categories Category or categories IDs
-	 * @return void
+	 * @param 	int[]|int 	$categories 	Category or categories IDs
+	 * @return 	int							<0 if KO, >0 if OK
 	 */
 	public function setCategories($categories)
 	{
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index f17a128544a..887ef6e1a44 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -6111,8 +6111,8 @@ class Product extends CommonObject
 	 * Adds it to non existing supplied categories.
 	 * Existing categories are left untouch.
 	 *
-	 * @param  int[]|int $categories Category or categories IDs
-	 * @return void
+	 * @param  int[]|int 	$categories 	Category or categories IDs
+	 * @return int							<0 if KO, >0 if OK
 	 */
 	public function setCategories($categories)
 	{
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index b47430bffc2..e70c67412ee 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -895,8 +895,8 @@ class Entrepot extends CommonObject
 	 * Adds it to non existing supplied categories.
 	 * Existing categories are left untouch.
 	 *
-	 * @param int[]|int $categories Category or categories IDs
-	 * @return void
+	 * @param 	int[]|int 	$categories 	Category or categories IDs
+	 * @return 	int							<0 if KO, >0 if OK
 	 */
 	public function setCategories($categories)
 	{
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index ccefdb4c600..c8d3be0163d 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -2289,8 +2289,8 @@ class Project extends CommonObject
 	 * Adds it to non existing supplied categories.
 	 * Existing categories are left untouch.
 	 *
-	 * @param int[]|int $categories Category or categories IDs
-	 * @return void
+	 * @param 	int[]|int 	$categories 	Category or categories IDs
+	 * @return 	int							<0 if KO, >0 if OK
 	 */
 	public function setCategories($categories)
 	{
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 3643a404863..dd5ccd7ef0b 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -4886,7 +4886,7 @@ class Societe extends CommonObject
 	 * Existing categories are left untouch.
 	 *
 	 * @param 	int[]|int 	$categories 	Category ID or array of Categories IDs
-	 * @param 	string 		$type_categ 			Category type ('customer' or 'supplier')
+	 * @param 	string 		$type_categ 	Category type ('customer' or 'supplier')
 	 * @return	int							<0 if KO, >0 if OK
 	 */
 	public function setCategories($categories, $type_categ)
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 71d9668dc92..4b898a75645 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1322,7 +1322,8 @@ if ($action == 'create') {
 	// Shipping Method
 	if (isModEnabled("expedition")) {
 		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', '', 1);
+		print img_picto('', 'object_dollyrevert', 'class="pictofixedwidth"');
+		$form->selectShippingMethod(GETPOST('shipping_method_id') > 0 ? GETPOST('shipping_method_id', 'int') : "", 'shipping_method_id', '', 1);
 		print '</td></tr>';
 	}
 
@@ -1902,7 +1903,7 @@ if ($action == 'create') {
 	}
 
 	if (!empty($object->lines)) {
-		$ret = $object->printObjectLines($action, $soc, $mysoc, $lineid, $dateSelector);
+		$object->printObjectLines($action, $soc, $mysoc, $lineid, $dateSelector);
 	}
 
 	// Form to add new line
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index d077ed3e777..27cdf8d164b 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -2318,8 +2318,8 @@ class Ticket extends CommonObject
 	 * Adds it to non existing supplied categories.
 	 * Existing categories are left untouch.
 	 *
-	 * @param  int[]|int $categories Category or categories IDs
-	 * @return void
+	 * @param  int[]|int 	$categories 	Category or categories IDs
+	 * @return int							<0 if KO, >0 if OK
 	 */
 	public function setCategories($categories)
 	{
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 75c9f1b2bae..dddcaa0ca6a 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1390,8 +1390,8 @@ class User extends CommonObject
 	 * Adds it to non existing supplied categories.
 	 * Existing categories are left untouch.
 	 *
-	 * @param int[]|int $categories Category or categories IDs
-	 * @return void
+	 * @param 	int[]|int 	$categories 	Category or categories IDs
+	 * @return 	int							<0 if KO, >0 if OK
 	 */
 	public function setCategories($categories)
 	{

From 1934db2dd103da100c3104d9bba4722d56f11a7a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 31 Dec 2022 14:37:33 +0100
Subject: [PATCH 216/816] Debug v17

---
 htdocs/core/modules/import/import_csv.modules.php         | 2 +-
 htdocs/core/modules/import/import_xlsx.modules.php        | 2 +-
 htdocs/core/modules/movement/doc/pdf_standard.modules.php | 8 +++++++-
 htdocs/debugbar/class/TraceableDB.php                     | 2 +-
 htdocs/install/upgrade2.php                               | 4 +++-
 htdocs/projet/tasks/task.php                              | 2 +-
 6 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index e1699660acc..075de9f0d2a 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -579,7 +579,7 @@ class ImportCsv extends ModeleImports
 									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto') {
 									if (strtolower($newval) == 'auto') {
-										$newval = $this->thirdpartyobject->get_codefournisseur(0, 1);
+										$this->thirdpartyobject->get_codefournisseur(0, 1);
 										$newval = $this->thirdpartyobject->code_fournisseur;
 										//print 'code_fournisseur='.$newval;
 									}
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index 0e63ea77075..0854a0f56c5 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -624,7 +624,7 @@ class ImportXlsx extends ModeleImports
 									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto') {
 									if (strtolower($newval) == 'auto') {
-										$newval = $this->thirdpartyobject->get_codefournisseur(0, 1);
+										$this->thirdpartyobject->get_codefournisseur(0, 1);
 										$newval = $this->thirdpartyobject->code_fournisseur;
 										//print 'code_fournisseur='.$newval;
 									}
diff --git a/htdocs/core/modules/movement/doc/pdf_standard.modules.php b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
index 094e19a280a..a823eadbc05 100644
--- a/htdocs/core/modules/movement/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
@@ -941,7 +941,7 @@ class pdf_standard extends ModelePDFMovement
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @param	string		$titlekey		Translation key to show as title of document
-	 *  @return	void
+	 *  @return	int                         Return topshift value
 	 */
 	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey = "")
 	{
@@ -1108,8 +1108,13 @@ class pdf_standard extends ModelePDFMovement
 
 		$posy += 2;
 
+		$top_shift = 0;
 		// Show list of linked objects
+		$current_y = $pdf->getY();
 		//$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
+		//if ($current_y < $pdf->getY()) {
+		//	$top_shift = $pdf->getY() - $current_y;
+		//}
 
 		if ($showaddress) {
 			/*
@@ -1146,6 +1151,7 @@ class pdf_standard extends ModelePDFMovement
 		}
 
 		$pdf->SetTextColor(0, 0, 0);
+		return $top_shift;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
diff --git a/htdocs/debugbar/class/TraceableDB.php b/htdocs/debugbar/class/TraceableDB.php
index 0b862f4df70..5863f1d902e 100644
--- a/htdocs/debugbar/class/TraceableDB.php
+++ b/htdocs/debugbar/class/TraceableDB.php
@@ -661,7 +661,7 @@ class TraceableDB extends DoliDB
 	 */
 	public function free($resultset = null)
 	{
-		return $this->db->free($resultset);
+		$this->db->free($resultset);
 	}
 
 	/**
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index bbb12e8693e..51334eaae21 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -4485,7 +4485,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
  * @param	DoliDB		$db			Database handler
  * @param	Translate	$langs		Object langs
  * @param	Conf		$conf		Object conf
- * @return	void
+ * @return	int						<0 if KO, >0 if OK
  */
 function migrate_reload_menu($db, $langs, $conf)
 {
@@ -4515,6 +4515,8 @@ function migrate_reload_menu($db, $langs, $conf)
 
 		print '</td></tr>';
 	}
+
+	return 1;
 }
 
 /**
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 8b19c8c0519..fccf9d2ffe1 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -467,7 +467,7 @@ if ($id > 0 || !empty($ref)) {
 
 		// Task parent
 		print '<tr><td>'.$langs->trans("ChildOfProjectTask").'</td><td>';
-		print $formother->selectProjectTasks($object->fk_task_parent, $projectstatic->id, 'task_parent', ($user->admin ? 0 : 1), 0, 0, 0, $object->id);
+		$formother->selectProjectTasks($object->fk_task_parent, $projectstatic->id, 'task_parent', ($user->admin ? 0 : 1), 0, 0, 0, $object->id);
 		print '</td></tr>';
 
 		// Date start

From 26ef1cb27088c78402779c8fa3b195348079c447 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 31 Dec 2022 14:43:31 +0100
Subject: [PATCH 217/816] Debug v17

---
 .../modules/expedition/doc/pdf_espadon.modules.php | 11 ++++++++++-
 .../modules/expedition/doc/pdf_merou.modules.php   | 14 +++++++++++++-
 .../modules/expedition/doc/pdf_rouget.modules.php  | 13 ++++++++++++-
 .../class/conferenceorbooth.class.php              |  5 ++---
 htdocs/hrm/class/evaluation.class.php              |  4 ++--
 htdocs/hrm/class/evaluationdet.class.php           |  7 ++++---
 htdocs/hrm/class/job.class.php                     |  4 ++--
 htdocs/hrm/class/position.class.php                |  4 ++--
 htdocs/hrm/class/skill.class.php                   |  4 ++--
 htdocs/hrm/class/skillrank.class.php               |  4 ++--
 .../class/knowledgerecord.class.php                |  4 ++--
 htdocs/mrp/class/mo.class.php                      |  4 ++--
 htdocs/partnership/class/partnership.class.php     |  4 ++--
 .../stocktransfer/class/stocktransfer.class.php    |  4 ++--
 .../class/stocktransferline.class.php              |  4 ++--
 .../class/recruitmentcandidature.class.php         |  4 ++--
 htdocs/webhook/class/target.class.php              |  4 ++--
 htdocs/workstation/class/workstation.class.php     |  4 ++--
 18 files changed, 67 insertions(+), 35 deletions(-)

diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index b87298d3dd8..d486a56bb08 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -945,7 +945,7 @@ class pdf_espadon extends ModelePdfExpedition
 	 *  @param  Expedition	$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
-	 *  @return	void
+	 *  @return	int							<0 if KO, > if OK
 	 */
 	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
@@ -1078,6 +1078,14 @@ class pdf_espadon extends ModelePdfExpedition
 			}
 		}
 
+		$top_shift = 0;
+		// Show list of linked objects
+		/*$current_y = $pdf->getY();
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, $w, 3, 'R', $default_font_size);
+		if ($current_y < $pdf->getY()) {
+			$top_shift = $pdf->getY() - $current_y;
+		}*/
+
 		if ($showaddress) {
 			// Sender properties
 			$carac_emetteur = '';
@@ -1183,6 +1191,7 @@ class pdf_espadon extends ModelePdfExpedition
 		}
 
 		$pdf->SetTextColor(0, 0, 0);
+		return $top_shift;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index e847dc26fec..2bf6e583826 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -520,7 +520,7 @@ class pdf_merou extends ModelePdfExpedition
 	 *  @param  Expedition	$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
-	 *  @return	void
+	 *  @return	int							<0 if KO, > if OK
 	 */
 	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
@@ -700,6 +700,16 @@ class pdf_merou extends ModelePdfExpedition
 
 		$widthrecbox = $blW;
 
+		$top_shift = 0;
+		// Show list of linked objects
+		/*
+		$current_y = $pdf->getY();
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, $w, 3, 'R', $default_font_size);
+		if ($current_y < $pdf->getY()) {
+			$top_shift = $pdf->getY() - $current_y;
+		}
+		*/
+
 		// Show Recipient frame
 		$pdf->SetFont('', 'B', $default_font_size - 3);
 		$pdf->SetXY($blDestX, $Yoff - 4);
@@ -717,5 +727,7 @@ class pdf_merou extends ModelePdfExpedition
 		$pdf->SetFont('', '', $default_font_size - 3);
 		$pdf->SetXY($blDestX, $posy);
 		$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
+
+		return $top_shift;
 	}
 }
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index 71fb4c4c194..2c7af07b32f 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -890,7 +890,7 @@ class pdf_rouget extends ModelePdfExpedition
 	 *  @param  Expedition	$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
-	 *  @return	void
+	 *  @return	int							<0 if KO, > if OK
 	 */
 	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
@@ -1023,6 +1023,16 @@ class pdf_rouget extends ModelePdfExpedition
 			}
 		}
 
+		$top_shift = 0;
+		// Show list of linked objects
+		/*
+		$current_y = $pdf->getY();
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, $w, 3, 'R', $default_font_size);
+		if ($current_y < $pdf->getY()) {
+			$top_shift = $pdf->getY() - $current_y;
+		}
+		*/
+
 		if ($showaddress) {
 			// Sender properties
 			$carac_emetteur = '';
@@ -1128,6 +1138,7 @@ class pdf_rouget extends ModelePdfExpedition
 		}
 
 		$pdf->SetTextColor(0, 0, 0);
+		return $top_shift;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index cdb67a2c37b..556443a25e8 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -217,7 +217,6 @@ class ConferenceOrBooth extends ActionComm
 		$this->socid = $this->fk_soc;
 		$this->datef = $this->datep2;
 		$this->note_private = $this->note;
-		$this->fk_user_author = $this->fk_user_author;
 	}
 
 	/**
@@ -716,8 +715,8 @@ class ConferenceOrBooth extends ActionComm
 		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_conferenceorbooth = '.((int) $this->id)));
 
 		if (is_numeric($result)) {
-			$this->error = $this->error;
-			$this->errors = $this->errors;
+			$this->error = $objectline->error;
+			$this->errors = $objectline->errors;
 			return $result;
 		} else {
 			$this->lines = $result;
diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index 0125e7f882c..23ccc6c9fd2 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -923,8 +923,8 @@ class Evaluation extends CommonObject
 		$result = $objectline->fetchAll('ASC', '', 0, 0, array('customsql'=>'fk_evaluation = '.$this->id));
 
 		if (is_numeric($result)) {
-			$this->error = $this->error;
-			$this->errors = $this->errors;
+			$this->error = $objectline->error;
+			$this->errors = $objectline->errors;
 			return $result;
 		} else {
 			$this->lines = $result;
diff --git a/htdocs/hrm/class/evaluationdet.class.php b/htdocs/hrm/class/evaluationdet.class.php
index f9bbde51912..5489065e52d 100644
--- a/htdocs/hrm/class/evaluationdet.class.php
+++ b/htdocs/hrm/class/evaluationdet.class.php
@@ -561,7 +561,8 @@ class Evaluationline extends CommonObject
 				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'evaluationline/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -891,8 +892,8 @@ class Evaluationline extends CommonObject
 		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_evaluationdet = '.$this->id));
 
 		if (is_numeric($result)) {
-			$this->error = $this->error;
-			$this->errors = $this->errors;
+			$this->error = $objectline->error;
+			$this->errors = $objectline->errors;
 			return $result;
 		} else {
 			$this->lines = $result;
diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index 117878c10c9..a08e8c713ae 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -925,8 +925,8 @@ class Job extends CommonObject
 		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_job = '.$this->id));
 
 		if (is_numeric($result)) {
-			$this->error = $this->error;
-			$this->errors = $this->errors;
+			$this->error = $objectline->error;
+			$this->errors = $objectline->errors;
 			return $result;
 		} else {
 			$this->lines = $result;
diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index 5d0c04a4f47..b72c11b36f6 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -971,8 +971,8 @@ class Position extends CommonObject
 		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql' => 'fk_position = ' . $this->id));
 
 		if (is_numeric($result)) {
-			$this->error = $this->error;
-			$this->errors = $this->errors;
+			$this->error = $objectline->error;
+			$this->errors = $objectline->errors;
 			return $result;
 		} else {
 			$this->lines = $result;
diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index 0cdc63ec24e..3f56294a7b2 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -965,8 +965,8 @@ class Skill extends CommonObject
 		$result = $objectline->fetchAll('ASC', 'rankorder', 0, 0, array('customsql'=>'fk_skill = '.$this->id));
 
 		if (is_numeric($result)) {
-			$this->error = $this->error;
-			$this->errors = $this->errors;
+			$this->error = $objectline->error;
+			$this->errors = $objectline->errors;
 			return $result;
 		} else {
 			$this->lines = $result;
diff --git a/htdocs/hrm/class/skillrank.class.php b/htdocs/hrm/class/skillrank.class.php
index 6db80642bab..2d75425823e 100644
--- a/htdocs/hrm/class/skillrank.class.php
+++ b/htdocs/hrm/class/skillrank.class.php
@@ -919,8 +919,8 @@ class SkillRank extends CommonObject
 		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_skillrank = '.((int) $this->id)));
 
 		if (is_numeric($result)) {
-			$this->error = $this->error;
-			$this->errors = $this->errors;
+			$this->error = $objectline->error;
+			$this->errors = $objectline->errors;
 			return $result;
 		} else {
 			$this->lines = $result;
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 1d8075c21ea..bf2bf38bbef 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -918,8 +918,8 @@ class KnowledgeRecord extends CommonObject
 		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_knowledgerecord = '.((int) $this->id)));
 
 		if (is_numeric($result)) {
-			$this->error = $this->error;
-			$this->errors = $this->errors;
+			$this->error = $objectline->error;
+			$this->errors = $objectline->errors;
 			return $result;
 		} else {
 			$this->lines = $result;
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 13f7cc5ae7b..30d6a3660a3 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -1275,8 +1275,8 @@ class Mo extends CommonObject
 		$result = $objectline->fetchAll('ASC', 'position', 0, 0, $TFilters);
 
 		if (is_numeric($result)) {
-			$this->error = $this->error;
-			$this->errors = $this->errors;
+			$this->error = $objectline->error;
+			$this->errors = $objectline->errors;
 			return $result;
 		} else {
 			$this->lines = $result;
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 5908b964f2c..d7242f4e16c 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -1158,8 +1158,8 @@ class Partnership extends CommonObject
 		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_partnership = '.((int) $this->id)));
 
 		if (is_numeric($result)) {
-			$this->error = $this->error;
-			$this->errors = $this->errors;
+			$this->error = $objectline->error;
+			$this->errors = $objectline->errors;
 			return $result;
 		} else {
 			$this->lines = $result;
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
index 5ffb56ced44..60f13396b80 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
@@ -911,8 +911,8 @@ class StockTransfer extends CommonObject
 		$result = $objectline->fetchAll('ASC', 'rang', 0, 0, array('customsql'=>'fk_stocktransfer = '.$this->id));
 
 		if (is_numeric($result)) {
-			$this->error = $this->error;
-			$this->errors = $this->errors;
+			$this->error = $objectline->error;
+			$this->errors = $objectline->errors;
 			return $result;
 		} else {
 			$this->lines = $result;
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
index 14febad09d4..4ee2f1db631 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
@@ -915,8 +915,8 @@ class StockTransferLine extends CommonObjectLine
 		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_stocktransferline = '.((int) $this->id)));
 
 		if (is_numeric($result)) {
-			$this->error = $this->error;
-			$this->errors = $this->errors;
+			$this->error = $objectline->error;
+			$this->errors = $objectline->errors;
 			return $result;
 		} else {
 			$this->lines = $result;
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index 2ece5dbe217..1690f13da56 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -894,8 +894,8 @@ class RecruitmentCandidature extends CommonObject
 		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_recruitmentcandidature = '.((int) $this->id)));
 
 		if (is_numeric($result)) {
-			$this->error = $this->error;
-			$this->errors = $this->errors;
+			$this->error = $objectline->error;
+			$this->errors = $objectline->errors;
 			return $result;
 		} else {
 			$this->lines = $result;
diff --git a/htdocs/webhook/class/target.class.php b/htdocs/webhook/class/target.class.php
index ba33f2b8995..51a2a1beffa 100644
--- a/htdocs/webhook/class/target.class.php
+++ b/htdocs/webhook/class/target.class.php
@@ -911,8 +911,8 @@ class Target extends CommonObject
 		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_target = '.((int) $this->id)));
 
 		if (is_numeric($result)) {
-			$this->error = $this->error;
-			$this->errors = $this->errors;
+			$this->error = $objectline->error;
+			$this->errors = $objectline->errors;
 			return $result;
 		} else {
 			$this->lines = $result;
diff --git a/htdocs/workstation/class/workstation.class.php b/htdocs/workstation/class/workstation.class.php
index 1213929fed9..d3b098784da 100644
--- a/htdocs/workstation/class/workstation.class.php
+++ b/htdocs/workstation/class/workstation.class.php
@@ -919,8 +919,8 @@ class Workstation extends CommonObject
 		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_workstation = '.((int) $this->id)));
 
 		if (is_numeric($result)) {
-			$this->error = $this->error;
-			$this->errors = $this->errors;
+			$this->error = $objectline->error;
+			$this->errors = $objectline->errors;
 			return $result;
 		}
 

From 169dcba95904584411bc86706c4da4b5241af091 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 31 Dec 2022 14:54:06 +0100
Subject: [PATCH 218/816] Fix qodana

---
 htdocs/fourn/commande/list.php | 2 +-
 qodana.yaml                    | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 3080a184abb..f02d2df24ca 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -1203,7 +1203,7 @@ if ($resql) {
 
 	$topicmail = "SendOrderRef";
 	$modelmail = "order_supplier_send";
-	$objecttmp = new CommandeFournisseur($db);
+	$objecttmp = new CommandeFournisseur($db);	// in case $object is not the good object
 	$trackid = 'sord'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
diff --git a/qodana.yaml b/qodana.yaml
index 361afb8967f..36c35ece4c6 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -68,7 +68,10 @@ exclude:
   - name: PhpPropertyOnlyWrittenInspection
   - name: PhpCoveredCharacterInClassInspection
   - name: PhpSameParameterValueInspection  
+  - name: PhpSillyAssignmentInspection
   - name: PhpConditionCheckedByNextConditionInspection
-  - name: RegExpSingleCharAlternation  
+  - name: RegExpSingleCharAlternation
   - name: PhpSuspiciousNameCombinationInspection
+  - name: PhpWriteAccessToReferencedArrayValueWithoutUnsetInspection
+  
   
\ No newline at end of file

From cbda0e6197d1005ab02dc5506bb745507b830f0b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 31 Dec 2022 15:17:37 +0100
Subject: [PATCH 219/816] Fix warnings

---
 htdocs/comm/action/card.php                   |  2 +-
 htdocs/core/boxes/box_activity.php            | 32 ++++++++++++++-----
 htdocs/core/class/commonobject.class.php      |  4 +--
 .../modules/mrp/doc/pdf_vinci.modules.php     |  8 ++---
 htdocs/hrm/class/evaluation.class.php         |  2 +-
 5 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index d1329e40454..91eb9f49516 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1353,7 +1353,7 @@ if ($action == 'create') {
 	if (empty($donotclearsession)) {
 		$assignedtouser = GETPOST("assignedtouser") ?GETPOST("assignedtouser") : (!empty($object->userownerid) && $object->userownerid > 0 ? $object->userownerid : $user->id);
 		if ($assignedtouser) {
-			$listofuserid[$assignedtouser] = array('id'=>$assignedtouser, 'mandatory'=>0, 'transparency'=>$object->transparency); // Owner first
+			$listofuserid[$assignedtouser] = array('id'=>$assignedtouser, 'mandatory'=>0); // Owner first
 		}
 		//$listofuserid[$user->id] = array('id'=>$user->id, 'mandatory'=>0, 'transparency'=>(GETPOSTISSET('transparency') ? GETPOST('transparency', 'alpha') : 1)); // 1 by default at first init
 		$listofuserid[$assignedtouser]['transparency'] = (GETPOSTISSET('transparency') ? GETPOST('transparency', 'alpha') : 1); // 1 by default at first init
diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index 4829b32a72a..ea45580e163 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -155,7 +155,7 @@ class box_activity extends ModeleBoxes
 				while ($j < count($data)) {
 					$this->info_box_contents[$line][0] = array(
 						'td' => 'class="left" width="16"',
-						'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;search_status=".$data[$j]->fk_statut,
+						'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&leftmenu=propals&search_status=".((int) $data[$j]->fk_statut),
 						'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
 						'logo' => 'object_propal'
 					);
@@ -169,7 +169,7 @@ class box_activity extends ModeleBoxes
 						'td' => 'class="right"',
 						'text' => $data[$j]->nb,
 						'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
-						'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;search_status=".$data[$j]->fk_statut,
+						'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&leftmenu=propals&search_status=".((int) $data[$j]->fk_statut),
 					);
 					$totalnb += $data[$j]->nb;
 
@@ -185,6 +185,13 @@ class box_activity extends ModeleBoxes
 					$line++;
 					$j++;
 				}
+				if (count($data) == 0) {
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center"',
+						'text'=>$langs->trans("NoRecordedProposals"),
+					);
+					$line++;
+				}
 			}
 		}
 
@@ -273,6 +280,13 @@ class box_activity extends ModeleBoxes
 					$line++;
 					$j++;
 				}
+				if (count($data) == 0) {
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center"',
+						'text'=>$langs->trans("NoRecordedOrders"),
+					);
+					$line++;
+				}
 			}
 		}
 
@@ -329,11 +343,11 @@ class box_activity extends ModeleBoxes
 			if (!empty($data)) {
 				$j = 0;
 				while ($j < count($data)) {
-					$billurl = "search_status=2&amp;paye=1";
+					$billurl = "search_status=2&paye=1";
 					$this->info_box_contents[$line][0] = array(
 						'td' => 'class="left" width="16"',
 						'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
-						'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
+						'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&mainmenu=accountancy&leftmenu=customers_bills",
 						'logo' => 'bill',
 					);
 
@@ -346,7 +360,7 @@ class box_activity extends ModeleBoxes
 						'td' => 'class="right"',
 						'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
 						'text' => $data[$j]->nb,
-						'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
+						'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&mainmenu=accountancy&leftmenu=customers_bills",
 					);
 
 					$this->info_box_contents[$line][3] = array(
@@ -369,6 +383,7 @@ class box_activity extends ModeleBoxes
 						'td' => 'class="center"',
 						'text'=>$langs->trans("NoRecordedInvoices"),
 					);
+					$line++;
 				}
 			}
 
@@ -412,11 +427,11 @@ class box_activity extends ModeleBoxes
 
 				$j = 0;
 				while ($j < count($data)) {
-					$billurl = "search_status=".$data[$j]->fk_statut."&amp;paye=0";
+					$billurl = "search_status=".$data[$j]->fk_statut."&paye=0";
 					$this->info_box_contents[$line][0] = array(
 						'td' => 'class="left" width="16"',
 						'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
-						'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
+						'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&mainmenu=accountancy&leftmenu=customers_bills",
 						'logo' => 'bill',
 					);
 
@@ -446,8 +461,9 @@ class box_activity extends ModeleBoxes
 				if (count($data) == 0) {
 					$this->info_box_contents[$line][0] = array(
 						'td' => 'class="center"',
-						'text'=>$langs->trans("NoRecordedInvoices"),
+						'text'=>$langs->trans("NoRecordedUnpaidInvoices"),
 					);
+					$line++;
 				}
 			}
 		}
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index f8a48f49d40..aafed5900d8 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6457,9 +6457,9 @@ abstract class CommonObject
 							return -1;
 						} elseif ($value == '') {
 							$new_array_languages[$key] = null;
+						} else {
+							$new_array_languages[$key] = $value;
 						}
-						//dol_syslog("double value"." sur ".$attributeLabel."(".$value." is '".$attributeType."')", LOG_DEBUG);
-						$new_array_languages[$key] = $value;
 						break;
 						/*case 'select':	// Not required, we chosed value='0' for undefined values
 						 if ($value=='-1')
diff --git a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
index 1416992e3c5..8e3eeeafa33 100644
--- a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
+++ b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
@@ -1405,14 +1405,13 @@ class pdf_vinci extends ModelePDFMo
 		$rank = 0;
 		$this->cols['code'] = array(
 			'rank' => $rank,
-			'status' => false,
+			'status' => true,
 			'width' => 35, // in mm
 			'title' => array(
 				'textkey' => 'Ref'
 			),
 			'border-left' => true, // add left line separator
 		);
-		$this->cols['code']['status'] = true;
 
 		$rank = 1; // do not use negative rank
 		$this->cols['desc'] = array(
@@ -1455,14 +1454,13 @@ class pdf_vinci extends ModelePDFMo
 		$rank = $rank + 10;
 		$this->cols['dim'] = array(
 			'rank' => $rank,
-			'status' => false,
+			'status' => true,
 			'width' => 25, // in mm
 			'title' => array(
 				'textkey' => 'Size'
 			),
 			'border-left' => true, // add left line separator
 		);
-		$this->cols['dim']['status'] = true;
 
 		$rank = $rank + 10;
 		$this->cols['qty'] = array(
@@ -1474,7 +1472,6 @@ class pdf_vinci extends ModelePDFMo
 			),
 			'border-left' => true, // add left line separator
 		);
-		$this->cols['qty']['status'] = true;
 
 		$rank = $rank + 10;
 		$this->cols['qtytot'] = array(
@@ -1486,7 +1483,6 @@ class pdf_vinci extends ModelePDFMo
 			),
 			'border-left' => true, // add left line separator
 		);
-		$this->cols['qtytot']['status'] = true;
 
 		// Add extrafields cols
 		if (!empty($object->lines)) {
diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index 23ccc6c9fd2..4a41f1c8e0e 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -853,7 +853,7 @@ class Evaluation extends CommonObject
 			$this->labelStatus[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Closed');
 			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
 			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
-			$this->labelStatus[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Closed');
+			$this->labelStatusShort[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Closed');
 		}
 
 		$statusType = 'status'.$status;

From f8451ffc568a7b7666658eb0e06e63c2c46b3857 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 31 Dec 2022 15:52:03 +0100
Subject: [PATCH 220/816] Debug v17

---
 htdocs/admin/multicurrency.php                |  3 ++-
 htdocs/hrm/class/job.class.php                | 21 ++++++++-----------
 htdocs/hrm/class/position.class.php           |  4 +++-
 .../class/multicurrency.class.php             | 18 ++++++++--------
 htdocs/multicurrency/multicurrency_rate.php   |  2 +-
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php
index 1cf838c08cb..5945ebfb5d5 100644
--- a/htdocs/admin/multicurrency.php
+++ b/htdocs/admin/multicurrency.php
@@ -134,7 +134,8 @@ if ($action == 'add_currency') {
 		dolibarr_set_const($db, 'MULTICURRENCY_APP_SOURCE', GETPOST('MULTICURRENCY_APP_SOURCE', 'alpha'));
 		//dolibarr_set_const($db, 'MULTICURRENCY_ALTERNATE_SOURCE', GETPOST('MULTICURRENCY_ALTERNATE_SOURCE', 'alpha'));
 	} else {
-		$result = MultiCurrency::syncRates($conf->global->MULTICURRENCY_APP_ID);
+		$multiurrency = new MultiCurrency($db);
+		$result = $multiurrency->syncRates(getDolGlobalString('MULTICURRENCY_APP_ID'));
 		if ($result > 0) {
 			setEventMessages($langs->trans("CurrencyRateSyncSucceed"), null, "mesgs");
 		}
diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index a08e8c713ae..93950979a1a 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -600,30 +600,27 @@ class Job extends CommonObject
 	}
 
 	/**
-	 * 		Get last job for user
+	 * Get the last occupied position for a user
 	 *
-	 * 			@param int $fk_user id of user we need to get last job
-	 * 			@return mixed|string|null
+	 * @param 	int 				$fk_user 	Id of user we need to get last job
+	 * @return	Position|string					Last occupied position
 	 */
 	public function getLastJobForUser($fk_user)
 	{
-		global $db;
-
-		$j = new Job($db);
-		$Tab = $j->getForUser($fk_user);
+		$Tab = $this->getForUser($fk_user);
 
 		if (empty($Tab)) return '';
 
-		$job = array_shift($Tab);
+		$lastpos = array_shift($Tab);
 
-		return $job;
+		return $lastpos;
 	}
 
 	/**
-	 * 		Get jobs for user
+	 * 	Get array of occupied positions for a user
 	 *
-	 * 			@param int $userid id of user we need to get job list
-	 * 			@return array of jobs
+	 * @param 	int 		$userid 	Id of user we need to get job list
+	 * @return 	Position[] 				Array of occupied positions
 	 */
 	public function getForUser($userid)
 	{
diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index b72c11b36f6..98b5fd89be9 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -1036,6 +1036,8 @@ class Position extends CommonObject
 	}
 
 	/**
+	 * getForUser
+	 *
 	 * @param int $userid id of user we need to get position list
 	 * @return array|int of positions of user with for each of them the job fetched into that array
 	 */
@@ -1049,7 +1051,7 @@ class Position extends CommonObject
 	}
 
 	/**
-	 *  Create a document onto disk according to template module.
+	 * Create a document onto disk according to template module.
 	 *
 	 * @param string $modele Force template to use ('' to not force)
 	 * @param Translate $outputlangs objet lang a utiliser pour traduction
diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index 8b42f7cb25b..da1b9f653b3 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -428,7 +428,7 @@ class MultiCurrency extends CommonObject
 	 *
 	 * @param	string	$code	currency code
 	 * @param	double	$rate	new rate
-	 * @return int -1 if KO, 1 if OK, 2 if label found and OK
+	 * @return 	int 			-1 if KO, 1 if OK, 2 if label found and OK
 	 */
 	public function addRateFromDolibarr($code, $rate)
 	{
@@ -609,14 +609,14 @@ class MultiCurrency extends CommonObject
 	 * @param   stdClass	$TRate	Object containing all currencies rates
 	 * @return	int					-1 if KO, 0 if nothing, 1 if OK
 	 */
-	public static function recalculRates(&$TRate)
+	public function recalculRates(&$TRate)
 	{
 		global $conf;
 
-		if ($conf->currency != $conf->global->MULTICURRENCY_APP_SOURCE) {
+		if ($conf->currency != getDolGlobalString('MULTICURRENCY_APP_SOURCE')) {
 			$alternate_source = 'USD'.$conf->currency;
-			if (!empty($TRate->{$alternate_source})) {
-				$coef = $TRate->USDUSD / $TRate->{$alternate_source};
+			if (!empty($TRate->$alternate_source)) {
+				$coef = $TRate->USDUSD / $TRate->$alternate_source;
 				foreach ($TRate as $attr => &$rate) {
 					$rate *= $coef;
 				}
@@ -637,7 +637,7 @@ class MultiCurrency extends CommonObject
 	 * @param   int     $addifnotfound      Add if not found
 	 * @return  int							<0 if KO, >0 if OK
 	 */
-	public static function syncRates($key, $addifnotfound = 0)
+	public function syncRates($key, $addifnotfound = 0)
 	{
 		global $conf, $db, $langs;
 
@@ -656,16 +656,16 @@ class MultiCurrency extends CommonObject
 
 			if ($response->success) {
 				$TRate = $response->quotes;
-				$timestamp = $response->timestamp;
+				//$timestamp = $response->timestamp;
 
-				if (self::recalculRates($TRate) >= 0) {
+				if ($this->recalculRates($TRate) >= 0) {
 					foreach ($TRate as $currency_code => $rate) {
 						$code = substr($currency_code, 3, 3);
 						$obj = new MultiCurrency($db);
 						if ($obj->fetch(null, $code) > 0) {
 							$obj->updateRate($rate);
 						} elseif ($addifnotfound) {
-							self::addRateFromDolibarr($code, $rate);
+							$this->addRateFromDolibarr($code, $rate);
 						}
 					}
 				}
diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 03e5e09334a..8b9bbf4eef6 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -271,7 +271,7 @@ if (!in_array($action, array("updateRate", "deleteRate"))) {
 
 	print ' <td>'.$langs->trans('Date').'</td>';
 	print ' <td>';
-	print $form->selectDate($dateinput, 'dateinput', 0, 0, 1);
+	print $form->selectDate($dateinput, 'dateinput', 0, 0, 1, '', 1, 1);
 	print '</td>';
 
 	print '<td> '.$langs->trans('Currency').'</td>';

From 7d433e43fac407083b508e98b77ec6e7feaacb16 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 31 Dec 2022 16:24:32 +0100
Subject: [PATCH 221/816] Add hooks on payment pages

---
 htdocs/core/class/hookmanager.class.php |  1 +
 htdocs/core/lib/payments.lib.php        | 11 +++++++++--
 htdocs/public/payment/newpayment.php    |  8 +-------
 htdocs/public/payment/paymentok.php     | 23 ++++++++++++++++++++---
 4 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 191887e1725..71a92ebb6b1 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -197,6 +197,7 @@ class HookManager
 				'getFormatedSupplierRef',
 				'getIdProfUrl',
 				'getInputIdProf',
+				'isPaymentOK',
 				'menuDropdownQuickaddItems',
 				'menuLeftMenuItems',
 				'moveUploadedFile',
diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index 44691f7c2c4..d5ddb158d6d 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -146,7 +146,7 @@ function payment_supplier_prepare_head(Paiement $object)
  */
 function getValidOnlinePaymentMethods($paymentmethod = '')
 {
-	global $conf, $langs;
+	global $conf, $langs, $hookmanager, $action;
 
 	$validpaymentmethod = array();
 
@@ -162,8 +162,15 @@ function getValidOnlinePaymentMethods($paymentmethod = '')
 		$langs->load("stripe");
 		$validpaymentmethod['stripe'] = 'valid';
 	}
-	// TODO Add trigger
 
+	// This hook is used to complete the $validpaymentmethod array so an external payment modules
+	// can add its own key (ie 'payzen' for Payzen, ...)
+	$parameters = [
+		'paymentmethod' => $paymentmethod,
+		'validpaymentmethod' => &$validpaymentmethod
+	];
+	$tmpobject = new stdClass();
+	$hookmanager->executeHooks('doValidatePayment', $parameters, $tmpobject, $action);
 
 	return $validpaymentmethod;
 }
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index e9823f2d0f7..c4b2d502d3d 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -281,15 +281,9 @@ if ((empty($paymentmethod) || $paymentmethod == 'stripe') && isModEnabled('strip
 }
 
 // Initialize $validpaymentmethod
+// The list can be complete by the hook 'doValidatePayment' executed inside getValidOnlinePaymentMethods()
 $validpaymentmethod = getValidOnlinePaymentMethods($paymentmethod);
 
-// This hook is used to push to $validpaymentmethod by external payment modules (ie Payzen, ...)
-$parameters = [
-	'paymentmethod' => $paymentmethod,
-	'validpaymentmethod' => &$validpaymentmethod
-];
-$reshook = $hookmanager->executeHooks('doValidatePayment', $parameters, $object, $action);
-
 // Check security token
 $tmpsource = $source;
 if ($tmpsource == 'membersubscription') {
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 6d50d1c8c76..3bfdfc5f089 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -54,13 +54,14 @@ if (is_numeric($entity)) {
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
-require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
-
 if (isModEnabled('paypal')) {
 	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
 }
+// Hook to be used by external payment modules (ie Payzen, ...)
+include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+$hookmanager = new HookManager($db);
+$hookmanager->initHooks(array('newpayment'));
 
 $langs->loadLangs(array("main", "other", "dict", "bills", "companies", "paybox", "paypal"));
 
@@ -337,6 +338,16 @@ if (isModEnabled('stripe')) {
 	}
 }
 
+// Check status of the object to verify if it is paid by external payment modules
+$action = '';
+$parameters = [
+	'paymentmethod' => $paymentmethod,
+];
+$reshook = $hookmanager->executeHooks('isPaymentOK', $parameters, $object, $action);
+if ($reshook >= 0) {
+	$ispaymentok = $hookmanager->resArray['ispaymentok'];
+}
+
 
 // If data not provided from back url, search them into the session env
 if (empty($ipaddress)) {
@@ -1142,6 +1153,8 @@ if ($ispaymentok) {
 		//      (we need first that the donation module is able to generate a pdf document for the cerfa with pre filled content)
 	} elseif (array_key_exists('ATT', $tmptag) && $tmptag['ATT'] > 0) {
 		// Record payment for registration to an event for an attendee
+		require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 		$object = new Facture($db);
 		$result = $object->fetch($ref);
@@ -1355,6 +1368,8 @@ if ($ispaymentok) {
 		}
 	} elseif (array_key_exists('BOO', $tmptag) && $tmptag['BOO'] > 0) {
 		// Record payment for booth or conference
+		require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 		$object = new Facture($db);
 		$result = $object->fetch($ref);
@@ -1461,6 +1476,8 @@ if ($ispaymentok) {
 
 					if (!$error) {
 						// Putting the booth to "suggested" state
+						require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
+						require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
 						$booth = new ConferenceOrBooth($db);
 						$resultbooth = $booth->fetch((int) $tmptag['BOO']);
 						if ($resultbooth < 0) {

From 65a2093cd13c945efe82ecd46df178bb1e998214 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 31 Dec 2022 16:48:40 +0100
Subject: [PATCH 222/816] Fix regression

---
 htdocs/core/lib/functions.lib.php | 12 ++++++------
 test/phpunit/FunctionsLibTest.php |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 6241eaaa8b1..977342b1457 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -340,13 +340,13 @@ function getBrowserInfo($user_agent)
 	$reg = array();
 	if (preg_match('/firefox(\/|\s)([\d\.]*)/i', $user_agent, $reg)) {
 		$name = 'firefox';
-		$version = $reg[2];
+		$version = empty($reg[2]) ? '' : $reg[2];
 	} elseif (preg_match('/edge(\/|\s)([\d\.]*)/i', $user_agent, $reg)) {
 		$name = 'edge';
-		$version = $reg[2];
+		$version = empty($reg[2]) ? '' : $reg[2];
 	} elseif (preg_match('/chrome(\/|\s)([\d\.]+)/i', $user_agent, $reg)) {
 		$name = 'chrome';
-		$version = $reg[2];
+		$version = empty($reg[2]) ? '' : $reg[2];
 	} elseif (preg_match('/chrome/i', $user_agent, $reg)) {
 		// we can have 'chrome (Mozilla...) chrome x.y' in one string
 		$name = 'chrome';
@@ -356,11 +356,11 @@ function getBrowserInfo($user_agent)
 		$name = 'epiphany';
 	} elseif (preg_match('/safari(\/|\s)([\d\.]*)/i', $user_agent, $reg)) {
 		$name = 'safari';
-		$version = $reg[2];
+		$version = empty($reg[2]) ? '' : $reg[2];
 	} elseif (preg_match('/opera(\/|\s)([\d\.]*)/i', $user_agent, $reg)) {
 		// Safari is often present in string for mobile but its not.
 		$name = 'opera';
-		$version = $reg[2];
+		$version = empty($reg[2]) ? '' : $reg[2];
 	} elseif (preg_match('/(MSIE\s([0-9]+\.[0-9]))|.*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) {
 		$name = 'ie';
 		$version = end($reg);
@@ -371,7 +371,7 @@ function getBrowserInfo($user_agent)
 	} elseif (preg_match('/l[iy]n(x|ks)(\(|\/|\s)*([\d\.]+)/i', $user_agent, $reg)) {
 		// MS products at end
 		$name = 'lynxlinks';
-		$version = $reg[4];
+		$version = empty($reg[3]) ? '' : $reg[3];
 	}
 
 	if ($tablet) {
diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index ef5507d8601..370a498ad3a 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -443,10 +443,11 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
 		$this->assertEquals('tablet', $tmp['layout']);
 		$this->assertEquals('iphone', $tmp['phone']);
 
-		//iPad
+		//Lynx
 		$user_agent = 'Lynx/2.8.8dev.3 libwww‑FM/2.14 SSL‑MM/1.4.1';
 		$tmp=getBrowserInfo($user_agent);
 		$this->assertEquals('lynxlinks', $tmp['browsername']);
+		$this->assertEquals('2.8.8', $tmp['browserversion']);
 		$this->assertEquals('unknown', $tmp['browseros']);
 		$this->assertEquals('classic', $tmp['layout']);
 	}

From 2970f039dd966b2c7d5e5105fd3ec3b38a1edec8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 31 Dec 2022 16:52:23 +0100
Subject: [PATCH 223/816] Fix warning

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 5b791594fea..4724bf85d50 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -340,13 +340,13 @@ function getBrowserInfo($user_agent)
 	$reg = array();
 	if (preg_match('/firefox(\/|\s)([\d\.]*)/i', $user_agent, $reg)) {
 		$name = 'firefox';
-		$version = $reg[2];
+		$version = empty($reg[2]) ? '' : $reg[2];
 	} elseif (preg_match('/edge(\/|\s)([\d\.]*)/i', $user_agent, $reg)) {
 		$name = 'edge';
-		$version = $reg[2];
+		$version = empty($reg[2]) ? '' : $reg[2];
 	} elseif (preg_match('/chrome(\/|\s)([\d\.]+)/i', $user_agent, $reg)) {
 		$name = 'chrome';
-		$version = $reg[2];
+		$version = empty($reg[2]) ? '' : $reg[2];
 	} elseif (preg_match('/chrome/i', $user_agent, $reg)) {
 		// we can have 'chrome (Mozilla...) chrome x.y' in one string
 		$name = 'chrome';
@@ -356,11 +356,11 @@ function getBrowserInfo($user_agent)
 		$name = 'epiphany';
 	} elseif (preg_match('/safari(\/|\s)([\d\.]*)/i', $user_agent, $reg)) {
 		$name = 'safari';
-		$version = $reg[2];
+		$version = empty($reg[2]) ? '' : $reg[2];
 	} elseif (preg_match('/opera(\/|\s)([\d\.]*)/i', $user_agent, $reg)) {
 		// Safari is often present in string for mobile but its not.
 		$name = 'opera';
-		$version = $reg[2];
+		$version = empty($reg[2]) ? '' : $reg[2];
 	} elseif (preg_match('/(MSIE\s([0-9]+\.[0-9]))|.*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) {
 		$name = 'ie';
 		$version = end($reg);
@@ -368,10 +368,10 @@ function getBrowserInfo($user_agent)
 		// MS products at end
 		$name = 'ie';
 		$version = end($reg);
-	} elseif (preg_match('/l(i|y)n(x|ks)(\(|\/|\s)*([\d\.]+)/i', $user_agent, $reg)) {
+	} elseif (preg_match('/l[iy]n(x|ks)(\(|\/|\s)*([\d\.]+)/i', $user_agent, $reg)) {
 		// MS products at end
 		$name = 'lynxlinks';
-		$version = $reg[4];
+		$version = empty($reg[3]) ? '' : $reg[3];
 	}
 
 	if ($tablet) {

From 57358b618b8f46535ed7e434cfd9e105207434e8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 31 Dec 2022 17:08:10 +0100
Subject: [PATCH 224/816] Clean code

---
 htdocs/core/modules/action/modules_action.php          |  2 --
 htdocs/core/modules/asset/modules_asset.php            |  2 --
 htdocs/core/modules/bank/modules_bank.php              |  2 --
 htdocs/core/modules/bom/modules_bom.php                |  2 --
 htdocs/core/modules/cheque/modules_chequereceipts.php  |  2 --
 htdocs/core/modules/commande/modules_commande.php      |  2 --
 htdocs/core/modules/contract/modules_contract.php      |  2 --
 htdocs/core/modules/delivery/modules_delivery.php      |  2 --
 htdocs/core/modules/dons/modules_don.php               |  2 --
 htdocs/core/modules/expedition/modules_expedition.php  |  2 --
 .../modules/expensereport/modules_expensereport.php    |  2 --
 htdocs/core/modules/export/modules_export.php          |  8 +++-----
 htdocs/core/modules/facture/modules_facture.php        |  2 --
 htdocs/core/modules/fichinter/modules_fichinter.php    |  2 --
 htdocs/core/modules/holiday/modules_holiday.php        |  2 --
 htdocs/core/modules/hrm/modules_evaluation.php         |  2 --
 htdocs/core/modules/import/modules_import.php          |  8 +++-----
 htdocs/core/modules/member/modules_cards.php           |  2 --
 htdocs/core/modules/member/modules_member.class.php    |  1 -
 htdocs/core/modules/movement/modules_movement.php      |  2 --
 htdocs/core/modules/mrp/modules_mo.php                 |  2 --
 htdocs/core/modules/printsheet/modules_labels.php      |  2 --
 .../product_batch/modules_product_batch.class.php      |  2 --
 htdocs/core/modules/project/modules_project.php        |  2 --
 htdocs/core/modules/project/task/modules_task.php      |  2 --
 .../propale/doc/doc_generic_proposal_odt.modules.php   |  8 ++++----
 htdocs/core/modules/propale/modules_propale.php        |  2 --
 htdocs/core/modules/reception/modules_reception.php    |  2 --
 htdocs/core/modules/societe/modules_societe.class.php  |  1 -
 htdocs/core/modules/stock/doc/pdf_standard.modules.php |  2 +-
 htdocs/core/modules/stock/modules_stock.php            |  2 --
 .../modules/stocktransfer/modules_stocktransfer.php    |  2 --
 .../supplier_invoice/modules_facturefournisseur.php    |  2 --
 .../supplier_order/modules_commandefournisseur.php     |  2 --
 .../supplier_payment/modules_supplier_payment.php      |  2 --
 .../supplier_proposal/modules_supplier_proposal.php    |  2 --
 htdocs/core/modules/ticket/modules_ticket.php          |  2 --
 htdocs/core/modules/user/modules_user.class.php        |  2 --
 .../core/modules/usergroup/modules_usergroup.class.php |  2 --
 .../core/modules/workstation/modules_workstation.php   |  2 --
 htdocs/exports/export.php                              |  2 +-
 htdocs/exports/index.php                               |  2 +-
 htdocs/imports/import.php                              | 10 +++++-----
 htdocs/imports/index.php                               |  2 +-
 qodana.yaml                                            |  1 +
 45 files changed, 20 insertions(+), 93 deletions(-)

diff --git a/htdocs/core/modules/action/modules_action.php b/htdocs/core/modules/action/modules_action.php
index b496e32f5e1..1681d1f5100 100644
--- a/htdocs/core/modules/action/modules_action.php
+++ b/htdocs/core/modules/action/modules_action.php
@@ -44,8 +44,6 @@ abstract class ModeleAction extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'action';
 		$list = array();
 
diff --git a/htdocs/core/modules/asset/modules_asset.php b/htdocs/core/modules/asset/modules_asset.php
index 0b90eab00e3..c9b64e0180f 100644
--- a/htdocs/core/modules/asset/modules_asset.php
+++ b/htdocs/core/modules/asset/modules_asset.php
@@ -84,8 +84,6 @@ abstract class ModelePDFAsset extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'asset';
 		$list = array();
 
diff --git a/htdocs/core/modules/bank/modules_bank.php b/htdocs/core/modules/bank/modules_bank.php
index 70f6717d0c7..cfe7d406248 100644
--- a/htdocs/core/modules/bank/modules_bank.php
+++ b/htdocs/core/modules/bank/modules_bank.php
@@ -48,8 +48,6 @@ abstract class ModeleBankAccountDoc extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'bankaccount';
 		$list = array();
 
diff --git a/htdocs/core/modules/bom/modules_bom.php b/htdocs/core/modules/bom/modules_bom.php
index 4c58e57c546..64fc9502d26 100644
--- a/htdocs/core/modules/bom/modules_bom.php
+++ b/htdocs/core/modules/bom/modules_bom.php
@@ -50,8 +50,6 @@ abstract class ModelePDFBom extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'bom';
 		$list = array();
 
diff --git a/htdocs/core/modules/cheque/modules_chequereceipts.php b/htdocs/core/modules/cheque/modules_chequereceipts.php
index 519b13db443..45e18a12734 100644
--- a/htdocs/core/modules/cheque/modules_chequereceipts.php
+++ b/htdocs/core/modules/cheque/modules_chequereceipts.php
@@ -146,8 +146,6 @@ abstract class ModeleChequeReceipts extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'chequereceipt';
 		$list = array();
 
diff --git a/htdocs/core/modules/commande/modules_commande.php b/htdocs/core/modules/commande/modules_commande.php
index 055286ddf37..d6ecda2b2e7 100644
--- a/htdocs/core/modules/commande/modules_commande.php
+++ b/htdocs/core/modules/commande/modules_commande.php
@@ -51,8 +51,6 @@ abstract class ModelePDFCommandes extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'order';
 		$list = array();
 
diff --git a/htdocs/core/modules/contract/modules_contract.php b/htdocs/core/modules/contract/modules_contract.php
index 8e296f626fb..577ec4be5d9 100644
--- a/htdocs/core/modules/contract/modules_contract.php
+++ b/htdocs/core/modules/contract/modules_contract.php
@@ -54,8 +54,6 @@ abstract class ModelePDFContract extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'contract';
 		$list = array();
 
diff --git a/htdocs/core/modules/delivery/modules_delivery.php b/htdocs/core/modules/delivery/modules_delivery.php
index 66e9727bc7b..9f7b6805f73 100644
--- a/htdocs/core/modules/delivery/modules_delivery.php
+++ b/htdocs/core/modules/delivery/modules_delivery.php
@@ -52,8 +52,6 @@ abstract class ModelePDFDeliveryOrder extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'delivery';
 		$list = array();
 
diff --git a/htdocs/core/modules/dons/modules_don.php b/htdocs/core/modules/dons/modules_don.php
index 6bb78ab98ac..ca982c61a53 100644
--- a/htdocs/core/modules/dons/modules_don.php
+++ b/htdocs/core/modules/dons/modules_don.php
@@ -50,8 +50,6 @@ abstract class ModeleDon extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'donation';
 		$list = array();
 
diff --git a/htdocs/core/modules/expedition/modules_expedition.php b/htdocs/core/modules/expedition/modules_expedition.php
index ce210d6a958..2ca5613af48 100644
--- a/htdocs/core/modules/expedition/modules_expedition.php
+++ b/htdocs/core/modules/expedition/modules_expedition.php
@@ -53,8 +53,6 @@ abstract class ModelePdfExpedition extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'shipping';
 		$list = array();
 
diff --git a/htdocs/core/modules/expensereport/modules_expensereport.php b/htdocs/core/modules/expensereport/modules_expensereport.php
index eee2190033e..8e7718ee0d5 100644
--- a/htdocs/core/modules/expensereport/modules_expensereport.php
+++ b/htdocs/core/modules/expensereport/modules_expensereport.php
@@ -75,8 +75,6 @@ abstract class ModeleExpenseReport extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'expensereport';
 		$list = array();
 
diff --git a/htdocs/core/modules/export/modules_export.php b/htdocs/core/modules/export/modules_export.php
index 685a4bda430..31b137f6465 100644
--- a/htdocs/core/modules/export/modules_export.php
+++ b/htdocs/core/modules/export/modules_export.php
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
 /**
  *	Parent class for export modules
  */
-class ModeleExports extends CommonDocGenerator    // This class can't be abstract as there is instance propreties loaded by liste_modeles
+class ModeleExports extends CommonDocGenerator    // This class can't be abstract as there is instance propreties loaded by listOfAvailableExportFormat
 {
 	/**
 	 * @var string Error code (or message)
@@ -44,7 +44,6 @@ class ModeleExports extends CommonDocGenerator    // This class can't be abstrac
 	public $libversion = array();
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Load into memory list of available export format
 	 *
@@ -52,10 +51,9 @@ class ModeleExports extends CommonDocGenerator    // This class can't be abstrac
 	 *  @param  integer	$maxfilenamelength  Max length of value to show
 	 *  @return	array						List of templates (same content than array this->driverlabel)
 	 */
-	public function liste_modeles($db, $maxfilenamelength = 0)
+	public function listOfAvailableExportFormat($db, $maxfilenamelength = 0)
 	{
-		// phpcs:enable
-		dol_syslog(get_class($this)."::liste_modeles");
+		dol_syslog(get_class($this)."::listOfAvailableExportFormat");
 
 		$dir = DOL_DOCUMENT_ROOT."/core/modules/export/";
 		$handle = opendir($dir);
diff --git a/htdocs/core/modules/facture/modules_facture.php b/htdocs/core/modules/facture/modules_facture.php
index b0d3c4682ba..ff541550d4e 100644
--- a/htdocs/core/modules/facture/modules_facture.php
+++ b/htdocs/core/modules/facture/modules_facture.php
@@ -61,8 +61,6 @@ abstract class ModelePDFFactures extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'invoice';
 		$list = array();
 
diff --git a/htdocs/core/modules/fichinter/modules_fichinter.php b/htdocs/core/modules/fichinter/modules_fichinter.php
index 185ef4cf73b..28b3fd265ce 100644
--- a/htdocs/core/modules/fichinter/modules_fichinter.php
+++ b/htdocs/core/modules/fichinter/modules_fichinter.php
@@ -51,8 +51,6 @@ abstract class ModelePDFFicheinter extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'ficheinter';
 		$list = array();
 
diff --git a/htdocs/core/modules/holiday/modules_holiday.php b/htdocs/core/modules/holiday/modules_holiday.php
index 7b6e13ea992..e38801a052e 100644
--- a/htdocs/core/modules/holiday/modules_holiday.php
+++ b/htdocs/core/modules/holiday/modules_holiday.php
@@ -55,8 +55,6 @@ abstract class ModelePDFHoliday extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'holiday';
 		$list = array();
 
diff --git a/htdocs/core/modules/hrm/modules_evaluation.php b/htdocs/core/modules/hrm/modules_evaluation.php
index a28d3f2ef9d..06276ca8474 100644
--- a/htdocs/core/modules/hrm/modules_evaluation.php
+++ b/htdocs/core/modules/hrm/modules_evaluation.php
@@ -49,8 +49,6 @@ abstract class ModelePDFEvaluation extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'evaluation';
 		$list = array();
 
diff --git a/htdocs/core/modules/import/modules_import.php b/htdocs/core/modules/import/modules_import.php
index d875afc5c4f..fa4a5ad3692 100644
--- a/htdocs/core/modules/import/modules_import.php
+++ b/htdocs/core/modules/import/modules_import.php
@@ -155,18 +155,16 @@ class ModeleImports
 	}
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Charge en memoire et renvoie la liste des modeles actifs
+	 *  Load into memory list of available import format
 	 *
 	 *  @param	DoliDB	$db     			Database handler
 	 *  @param  integer	$maxfilenamelength  Max length of value to show
 	 *  @return	array						List of templates
 	 */
-	public function liste_modeles($db, $maxfilenamelength = 0)
+	public function listOfAvailableImportFormat($db, $maxfilenamelength = 0)
 	{
-		// phpcs:enable
-		dol_syslog(get_class($this)."::liste_modeles");
+		dol_syslog(get_class($this)."::listOfAvailableImportFormat");
 
 		$dir = DOL_DOCUMENT_ROOT."/core/modules/import/";
 		$handle = opendir($dir);
diff --git a/htdocs/core/modules/member/modules_cards.php b/htdocs/core/modules/member/modules_cards.php
index b37b9144d3e..0147f42f6c7 100644
--- a/htdocs/core/modules/member/modules_cards.php
+++ b/htdocs/core/modules/member/modules_cards.php
@@ -51,8 +51,6 @@ class ModelePDFCards
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'member';
 		$list = array();
 
diff --git a/htdocs/core/modules/member/modules_member.class.php b/htdocs/core/modules/member/modules_member.class.php
index a356c76ee7c..77ab5621915 100644
--- a/htdocs/core/modules/member/modules_member.class.php
+++ b/htdocs/core/modules/member/modules_member.class.php
@@ -51,7 +51,6 @@ abstract class ModelePDFMember extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-
 		$type = 'member';
 		$list = array();
 
diff --git a/htdocs/core/modules/movement/modules_movement.php b/htdocs/core/modules/movement/modules_movement.php
index 1af966faf22..a058d685114 100644
--- a/htdocs/core/modules/movement/modules_movement.php
+++ b/htdocs/core/modules/movement/modules_movement.php
@@ -85,8 +85,6 @@ abstract class ModelePDFMovement extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'movement';
 		$list = array();
 
diff --git a/htdocs/core/modules/mrp/modules_mo.php b/htdocs/core/modules/mrp/modules_mo.php
index 1b3af7f6b8c..c178a5d3eaf 100644
--- a/htdocs/core/modules/mrp/modules_mo.php
+++ b/htdocs/core/modules/mrp/modules_mo.php
@@ -50,8 +50,6 @@ abstract class ModelePDFMo extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'mrp';
 		$list = array();
 
diff --git a/htdocs/core/modules/printsheet/modules_labels.php b/htdocs/core/modules/printsheet/modules_labels.php
index ae4c6888a6c..b80710dc1f6 100644
--- a/htdocs/core/modules/printsheet/modules_labels.php
+++ b/htdocs/core/modules/printsheet/modules_labels.php
@@ -51,8 +51,6 @@ class ModelePDFLabels
 	public function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'members_labels';
 		$list = array();
 
diff --git a/htdocs/core/modules/product_batch/modules_product_batch.class.php b/htdocs/core/modules/product_batch/modules_product_batch.class.php
index 1446d20aeda..d596ffeb111 100644
--- a/htdocs/core/modules/product_batch/modules_product_batch.class.php
+++ b/htdocs/core/modules/product_batch/modules_product_batch.class.php
@@ -55,8 +55,6 @@ abstract class ModelePDFProductBatch extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'product_batch';
 		$list = array();
 
diff --git a/htdocs/core/modules/project/modules_project.php b/htdocs/core/modules/project/modules_project.php
index 6f55426e65f..9f8e0e977c7 100644
--- a/htdocs/core/modules/project/modules_project.php
+++ b/htdocs/core/modules/project/modules_project.php
@@ -103,8 +103,6 @@ abstract class ModelePDFProjects extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'project';
 		$list = array();
 
diff --git a/htdocs/core/modules/project/task/modules_task.php b/htdocs/core/modules/project/task/modules_task.php
index 6614369aa43..97e31d5d24c 100644
--- a/htdocs/core/modules/project/task/modules_task.php
+++ b/htdocs/core/modules/project/task/modules_task.php
@@ -49,8 +49,6 @@ abstract class ModelePDFTask extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'project_task';
 		$list = array();
 
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 de6554137df..ac95786cdd2 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
@@ -190,21 +190,21 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 			if (getDolGlobalInt("MAIN_PROPAL_CHOOSE_ODT_DOCUMENT") > 0) {
 				// Model for creation
 				$list = ModelePDFPropales::liste_modeles($this->db);
-				$texte .= '<table width="50%;">';
+				$texte .= '<table width="50%">';
 				$texte .= '<tr>';
-				$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalCreate").'</td>';
+				$texte .= '<td width="60%">'.$langs->trans("DefaultModelPropalCreate").'</td>';
 				$texte .= '<td colspan="">';
 				$texte .= $form->selectarray('value2', $list, $conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT);
 				$texte .= "</td></tr>";
 
 				$texte .= '<tr>';
-				$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalToBill").'</td>';
+				$texte .= '<td width="60%">'.$langs->trans("DefaultModelPropalToBill").'</td>';
 				$texte .= '<td colspan="">';
 				$texte .= $form->selectarray('value3', $list, $conf->global->PROPALE_ADDON_PDF_ODT_TOBILL);
 				$texte .= "</td></tr>";
 				$texte .= '<tr>';
 
-				$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalClosed").'</td>';
+				$texte .= '<td width="60%">'.$langs->trans("DefaultModelPropalClosed").'</td>';
 				$texte .= '<td colspan="">';
 				$texte .= $form->selectarray('value4', $list, $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED);
 				$texte .= "</td></tr>";
diff --git a/htdocs/core/modules/propale/modules_propale.php b/htdocs/core/modules/propale/modules_propale.php
index b58ae681ef2..f69fd5e763e 100644
--- a/htdocs/core/modules/propale/modules_propale.php
+++ b/htdocs/core/modules/propale/modules_propale.php
@@ -53,8 +53,6 @@ abstract class ModelePDFPropales extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'propal';
 		$list = array();
 
diff --git a/htdocs/core/modules/reception/modules_reception.php b/htdocs/core/modules/reception/modules_reception.php
index f519974382b..0dba62ee646 100644
--- a/htdocs/core/modules/reception/modules_reception.php
+++ b/htdocs/core/modules/reception/modules_reception.php
@@ -43,8 +43,6 @@ abstract class ModelePdfReception extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'reception';
 		$list = array();
 
diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php
index a1067c14d30..105333d815b 100644
--- a/htdocs/core/modules/societe/modules_societe.class.php
+++ b/htdocs/core/modules/societe/modules_societe.class.php
@@ -48,7 +48,6 @@ abstract class ModeleThirdPartyDoc extends CommonDocGenerator
 	public static function liste_modeles($dbs, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-
 		$type = 'company';
 		$list = array();
 
diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
index ed1877ec8f7..ac0bf98b0f3 100644
--- a/htdocs/core/modules/stock/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
@@ -402,7 +402,7 @@ class pdf_standard extends ModelePDFStock
 
 						// Label
 						$pdf->SetXY($this->posxlabel + 0.8, $curY);
-						$pdf->MultiCell($this->posxqty - $this->posxlabel - 0.8, 3, dol_trunc($objp->produit, 24), 0, 'L');
+						$pdf->MultiCell($this->posxqty - $this->posxlabel - 0.8, 3, dol_trunc($productstatic->label, 24), 0, 'L');
 
 						// Quantity
 						$valtoshow = price2num($objp->value, 'MS');
diff --git a/htdocs/core/modules/stock/modules_stock.php b/htdocs/core/modules/stock/modules_stock.php
index 73092bb0bf6..d1dc684d1d2 100644
--- a/htdocs/core/modules/stock/modules_stock.php
+++ b/htdocs/core/modules/stock/modules_stock.php
@@ -75,8 +75,6 @@ abstract class ModelePDFStock extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'stock';
 		$list = array();
 
diff --git a/htdocs/core/modules/stocktransfer/modules_stocktransfer.php b/htdocs/core/modules/stocktransfer/modules_stocktransfer.php
index 6c0213afb0c..2a7218543e7 100644
--- a/htdocs/core/modules/stocktransfer/modules_stocktransfer.php
+++ b/htdocs/core/modules/stocktransfer/modules_stocktransfer.php
@@ -50,8 +50,6 @@ abstract class ModelePDFStockTransfer extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'stocktransfer';
 		$list = array();
 
diff --git a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
index 546596ab640..de56773eae2 100644
--- a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
+++ b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
@@ -51,8 +51,6 @@ abstract class ModelePDFSuppliersInvoices extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'invoice_supplier';
 		$list = array();
 
diff --git a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
index 51c4e5f07d3..e8b66bb84cf 100644
--- a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
+++ b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
@@ -54,8 +54,6 @@ abstract class ModelePDFSuppliersOrders extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'order_supplier';
 		$list = array();
 
diff --git a/htdocs/core/modules/supplier_payment/modules_supplier_payment.php b/htdocs/core/modules/supplier_payment/modules_supplier_payment.php
index 9409c4c688b..881d123772c 100644
--- a/htdocs/core/modules/supplier_payment/modules_supplier_payment.php
+++ b/htdocs/core/modules/supplier_payment/modules_supplier_payment.php
@@ -74,8 +74,6 @@ abstract class ModelePDFSuppliersPayments extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'supplier_payment';
 		$list = array();
 
diff --git a/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php b/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
index 42c935ca13c..f1fbf2f9890 100644
--- a/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
+++ b/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
@@ -53,8 +53,6 @@ abstract class ModelePDFSupplierProposal extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'supplier_proposal';
 		$list = array();
 
diff --git a/htdocs/core/modules/ticket/modules_ticket.php b/htdocs/core/modules/ticket/modules_ticket.php
index 263803162fd..aaf9fb2e11b 100644
--- a/htdocs/core/modules/ticket/modules_ticket.php
+++ b/htdocs/core/modules/ticket/modules_ticket.php
@@ -44,8 +44,6 @@ abstract class ModelePDFTicket extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'ticket';
 		$list = array();
 
diff --git a/htdocs/core/modules/user/modules_user.class.php b/htdocs/core/modules/user/modules_user.class.php
index b0142687ce5..d20e5e95eb8 100644
--- a/htdocs/core/modules/user/modules_user.class.php
+++ b/htdocs/core/modules/user/modules_user.class.php
@@ -55,8 +55,6 @@ abstract class ModelePDFUser extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'user';
 		$list = array();
 
diff --git a/htdocs/core/modules/usergroup/modules_usergroup.class.php b/htdocs/core/modules/usergroup/modules_usergroup.class.php
index 99ee232fdf2..2c4aebe1e6f 100644
--- a/htdocs/core/modules/usergroup/modules_usergroup.class.php
+++ b/htdocs/core/modules/usergroup/modules_usergroup.class.php
@@ -55,8 +55,6 @@ abstract class ModelePDFUserGroup extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'group';
 		$list = array();
 
diff --git a/htdocs/core/modules/workstation/modules_workstation.php b/htdocs/core/modules/workstation/modules_workstation.php
index a99dab9b17a..b72d34f5812 100644
--- a/htdocs/core/modules/workstation/modules_workstation.php
+++ b/htdocs/core/modules/workstation/modules_workstation.php
@@ -50,8 +50,6 @@ abstract class ModelePDFWorkstation extends CommonDocGenerator
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'workstation';
 		$list = array();
 
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 4591ccd0bf3..f35ae3a3121 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -1187,7 +1187,7 @@ if ($step == 5 && $datatoexport) {
 	$htmltabloflibs .= '<td class="right">'.$langs->trans("LibraryVersion").'</td>';
 	$htmltabloflibs .= '</tr>'."\n";
 
-	$liste = $objmodelexport->liste_modeles($db);
+	$liste = $objmodelexport->listOfAvailableExportFormat($db);
 	$listeall = $liste;
 	foreach ($listeall as $key => $val) {
 		if (preg_match('/__\(Disabled\)__/', $listeall[$key])) {
diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php
index 41d6cd18ed0..6039a9c447a 100644
--- a/htdocs/exports/index.php
+++ b/htdocs/exports/index.php
@@ -72,7 +72,7 @@ print '</tr>';
 
 include_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
 $model = new ModeleExports($db);
-$liste = $model->liste_modeles($db); // This is not a static method for exports because method load non static properties
+$liste = $model->listOfAvailableExportFormat($db); // This is not a static method for exports because method load non static properties
 
 foreach ($liste as $key => $val) {
 	if (preg_match('/__\(Disabled\)__/', $liste[$key])) {
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 579fdb74c4a..d326470aa04 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -485,7 +485,7 @@ if ($step == 2 && $datatoimport) {
 	print '<tr class="liste_titre"><td colspan="5">';
 	print $langs->trans("FileMustHaveOneOfFollowingFormat");
 	print '</td></tr>';
-	$list = $objmodelimport->liste_modeles($db);
+	$list = $objmodelimport->listOfAvailableImportFormat($db);
 	foreach ($list as $key) {
 		print '<tr class="oddeven">';
 		print '<td width="16">'.img_picto_common($key, $objmodelimport->getPictoForKey($key)).'</td>';
@@ -529,7 +529,7 @@ if ($step == 3 && $datatoimport) {
 		$param .= '&enclosure='.urlencode($enclosure);
 	}
 
-	$list = $objmodelimport->liste_modeles($db);
+	$list = $objmodelimport->listOfAvailableImportFormat($db);
 
 	llxHeader('', $langs->trans("NewImport"), $help_url);
 
@@ -763,7 +763,7 @@ if ($step == 4 && $datatoimport) {
 	//var_dump($array_match_file_to_database);
 
 	$model = $format;
-	$list = $objmodelimport->liste_modeles($db);
+	$list = $objmodelimport->listOfAvailableImportFormat($db);
 
 	if (empty($separator)) {
 		$separator = (empty($conf->global->IMPORT_CSV_SEPARATOR_TO_USE) ? ',' : $conf->global->IMPORT_CSV_SEPARATOR_TO_USE);
@@ -1547,7 +1547,7 @@ if ($step == 5 && $datatoimport) {
 	}
 
 	$model = $format;
-	$list = $objmodelimport->liste_modeles($db);
+	$list = $objmodelimport->listOfAvailableImportFormat($db);
 
 	// Create classe to use for import
 	$dir = DOL_DOCUMENT_ROOT."/core/modules/import/";
@@ -2010,7 +2010,7 @@ if ($step == 6 && $datatoimport) {
 	}
 
 	$model = $format;
-	$list = $objmodelimport->liste_modeles($db);
+	$list = $objmodelimport->listOfAvailableImportFormat($db);
 	$importid = GETPOST("importid", 'alphanohtml');
 
 
diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php
index ac3d2b23f69..e90f58aa8e1 100644
--- a/htdocs/imports/index.php
+++ b/htdocs/imports/index.php
@@ -68,7 +68,7 @@ print '</tr>';
 
 include_once DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php';
 $model = new ModeleImports();
-$list = $model->liste_modeles($db);
+$list = $model->listOfAvailableImportFormat($db);
 
 foreach ($list as $key) {
 	print '<tr class="oddeven">';
diff --git a/qodana.yaml b/qodana.yaml
index 36c35ece4c6..49fd189e734 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -72,6 +72,7 @@ exclude:
   - name: PhpConditionCheckedByNextConditionInspection
   - name: RegExpSingleCharAlternation
   - name: PhpSuspiciousNameCombinationInspection
+  - name: PhpObjectFieldsAreOnlyWrittenInspection  
   - name: PhpWriteAccessToReferencedArrayValueWithoutUnsetInspection
   
   
\ No newline at end of file

From 97222603c10c97396c450a6cb933c081d5c8dc3e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 31 Dec 2022 17:14:58 +0100
Subject: [PATCH 225/816] Debug v17

---
 htdocs/modulebuilder/index.php    | 6 +++---
 htdocs/stripe/admin/stripe.php    | 4 ++--
 htdocs/takepos/admin/terminal.php | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 8b87d84c10e..a6f3431bd2e 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -1731,9 +1731,9 @@ if ($dirins && $action == 'confirm_deleteobject' && $objectname) {
 		);
 
 		$resultko = 0;
-		foreach ($filetodelete as $filetodelete) {
-			$resulttmp = dol_delete_file($dir.'/'.$filetodelete, 0, 0, 1);
-			$resulttmp = dol_delete_file($dir.'/'.$filetodelete.'.back', 0, 0, 1);
+		foreach ($filetodelete as $tmpfiletodelete) {
+			$resulttmp = dol_delete_file($dir.'/'.$tmpfiletodelete, 0, 0, 1);
+			$resulttmp = dol_delete_file($dir.'/'.$tmpfiletodelete.'.back', 0, 0, 1);
 			if (!$resulttmp) {
 				$resultko++;
 			}
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 6cbefc14185..1c5a507b619 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -420,8 +420,8 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {	// TODO Not used by current code
 
 	$location = array();
 	$location[""] = $langs->trans("NotDefined");
-	foreach ($locations as $locations) {
-		$location[$locations->id] = $locations->display_name;
+	foreach ($locations as $tmplocation) {
+		$location[$tmplocation->id] = $tmplocation->display_name;
 	}
 	print $form->selectarray("STRIPE_LOCATION", $location, getDolGlobalString('STRIPE_LOCATION'));
 	print '</td></tr>';
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index fe03139c8a3..7fc2d60544a 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -219,8 +219,8 @@ if (isModEnabled("banque")) {
 
 		$reader = array();
 		$reader[""] = $langs->trans("NoReader");
-		foreach ($readers as $readers) {
-			$reader[$reader->id] = $readers->label.' ('.$readers->status.')';
+		foreach ($readers as $tmpreader) {
+			$reader[$tmpreader->id] = $tmpreader->label.' ('.$tmpreader->status.')';
 		}
 		print $form->selectarray('CASHDESK_ID_BANKACCOUNT_STRIPETERMINAL'.$terminaltouse, $reader, $conf->global->{'CASHDESK_ID_BANKACCOUNT_STRIPETERMINAL'.$terminaltouse});
 		print '</td></tr>';

From 1b1e4e188e439ba2a6b417264182bcf379e03769 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 31 Dec 2022 17:17:21 +0100
Subject: [PATCH 226/816] Debug v17

---
 htdocs/core/class/fileupload.class.php | 2 +-
 qodana.yaml                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php
index b1e085fbff7..a3fb3505fba 100644
--- a/htdocs/core/class/fileupload.class.php
+++ b/htdocs/core/class/fileupload.class.php
@@ -259,7 +259,7 @@ class FileUpload
 	/**
 	 * getFileObjects
 	 *
-	 * @return	void
+	 * @return	array	Array of objects
 	 */
 	protected function getFileObjects()
 	{
diff --git a/qodana.yaml b/qodana.yaml
index 49fd189e734..5b835ab446d 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -72,7 +72,7 @@ exclude:
   - name: PhpConditionCheckedByNextConditionInspection
   - name: RegExpSingleCharAlternation
   - name: PhpSuspiciousNameCombinationInspection
-  - name: PhpObjectFieldsAreOnlyWrittenInspection  
+  - name: PhpObjectFieldsAreOnlyWrittenInspection
   - name: PhpWriteAccessToReferencedArrayValueWithoutUnsetInspection
   
   
\ No newline at end of file

From b70c6faef299c1418b984497ae2272d471131644 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 31 Dec 2022 17:19:05 +0100
Subject: [PATCH 227/816] Clean code

---
 .../modules/supplier_payment/modules_supplier_payment.php | 7 +++++--
 htdocs/ftp/index.php                                      | 8 ++++----
 htdocs/index.php                                          | 2 +-
 qodana.yaml                                               | 3 ++-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/modules/supplier_payment/modules_supplier_payment.php b/htdocs/core/modules/supplier_payment/modules_supplier_payment.php
index 881d123772c..93195edec24 100644
--- a/htdocs/core/modules/supplier_payment/modules_supplier_payment.php
+++ b/htdocs/core/modules/supplier_payment/modules_supplier_payment.php
@@ -17,6 +17,8 @@
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
+
+
 /**
  *	Parent class for supplier invoices models
  */
@@ -85,8 +87,9 @@ abstract class ModelePDFSuppliersPayments extends CommonDocGenerator
 }
 
 /**
- *  \class      ModeleNumRefSupplierPayments
- *  \brief      Payment numbering references mother class
+ *  ModeleNumRefSupplierPayments
+ *
+ *  Payment numbering references mother class
  */
 
 abstract class ModeleNumRefSupplierPayments
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index af48f0f8348..633cb6fa5ce 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -282,7 +282,7 @@ if ($action == 'download') {
 
 		$newsection = $section;
 
-		$result = dol_ftp_get($connect_id, $localfile, $file, $newsection);
+		$result = dol_ftp_get($conn_id, $localfile, $file, $newsection);
 
 
 		if ($result) {
@@ -306,9 +306,9 @@ if ($action == 'download') {
 				header('Content-Type: '.$type);
 			}
 			if ($attachment) {
-				header('Content-Disposition: attachment; filename="'.$filename.'"');
+				header('Content-Disposition: attachment; filename="'.$file.'"');
 			} else {
-				header('Content-Disposition: inline; filename="'.$filename.'"');
+				header('Content-Disposition: inline; filename="'.$file.'"');
 			}
 
 			// Ajout directives pour resoudre bug IE
@@ -319,7 +319,7 @@ if ($action == 'download') {
 
 			exit;
 		} else {
-			setEventMessages($langs->transnoentitiesnoconv('FailedToGetFile', $remotefile), null, 'errors');
+			setEventMessages($langs->transnoentitiesnoconv('FailedToGetFile', $file), null, 'errors');
 		}
 	} else {
 		dol_print_error('', $mesg);
diff --git a/htdocs/index.php b/htdocs/index.php
index e0001adba5e..15c41e7ff50 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -119,7 +119,7 @@ if (empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) {
 	}
 
 	// Conf files must be in read only mode
-	if (is_writable($conffile)) {
+	if (is_writable($conffile)) {	// $conffile is defined into filefunc.inc.php
 		$langs->load("errors");
 		//$langs->load("other");
 		//if (!empty($message)) $message.='<br>';
diff --git a/qodana.yaml b/qodana.yaml
index 5b835ab446d..75ab2315e9a 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -73,6 +73,7 @@ exclude:
   - name: RegExpSingleCharAlternation
   - name: PhpSuspiciousNameCombinationInspection
   - name: PhpObjectFieldsAreOnlyWrittenInspection
+  - name: PhpMissingParentConstructorInspection  
   - name: PhpWriteAccessToReferencedArrayValueWithoutUnsetInspection
-  
+
   
\ No newline at end of file

From d1934bfded6f1ef8ff7c75487746c72f19e86dc6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 31 Dec 2022 17:29:57 +0100
Subject: [PATCH 228/816] Debug v17

---
 htdocs/compta/localtax/index.php | 12 ++----------
 htdocs/compta/tva/index.php      | 10 ----------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php
index ad0b86a161d..fb96e766945 100644
--- a/htdocs/compta/localtax/index.php
+++ b/htdocs/compta/localtax/index.php
@@ -18,11 +18,13 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 /**
  *      \file       htdocs/compta/localtax/index.php
  *      \ingroup    tax
  *      \brief      Index page of IRPF reports
  */
+
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
@@ -441,16 +443,6 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000) {	// $
 	$hookmanager->initHooks(array('externalbalance'));
 	$reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-	if (!is_array($x_coll) && $coll_listbuy == -1) {
-		$langs->load("errors");
-		print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
-		break;
-	}
-	if (!is_array($x_paye) && $coll_listbuy == -2) {
-		print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
-		break;
-	}
-
 
 	print '<tr class="oddeven">';
 	print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/compta/localtax/quadri_detail.php?leftmenu=tax_vat&month='.$m.'&year='.$y.'">'.dol_print_date(dol_mktime(0, 0, 0, $m, 1, $y), "%b %Y").'</a></td>';
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index f0efe305d8c..5c0d6930475 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -389,16 +389,6 @@ if ($refresh === true) {
 		$hookmanager->initHooks(array('externalbalance'));
 		$reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-		if (!is_array($x_coll) && $coll_listbuy == -1) {
-			$langs->load("errors");
-			print '<tr><td colspan="5">' . $langs->trans("ErrorNoAccountancyModuleLoaded") . '</td></tr>';
-			break;
-		}
-		if (!is_array($x_paye) && $coll_listbuy == -2) {
-			print '<tr><td colspan="5">' . $langs->trans("FeatureNotYetAvailable") . '</td></tr>';
-			break;
-		}
-
 
 		print '<tr class="oddeven">';
 		print '<td class="nowrap"><a href="' . DOL_URL_ROOT . '/compta/tva/quadri_detail.php?leftmenu=tax_vat&month=' . $m . '&year=' . $y . '">' . dol_print_date(dol_mktime(0, 0, 0, $m, 1, $y), "%b %Y") . '</a></td>';

From da4567c87524c96337cfa89588dfe3a689ac7c2a Mon Sep 17 00:00:00 2001
From: Christian Humpel <christian.humpel@gmail.com>
Date: Sun, 1 Jan 2023 15:05:04 +0100
Subject: [PATCH 229/816] Set $remise_percent to 0, if GETPOST is empty.

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

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 77a59c159ff..996beecab61 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1106,7 +1106,7 @@ if (empty($reshook)) {
 			$special_code = 3;
 		}
 
-		$remise_percent = price2num(GETPOST('remise_percent'), '', 2);
+		$remise_percent = GETPOST('remise_percent') != '' ? price2num(GETPOST('remise_percent'), '', 2) : 0;
 
 		// Check minimum price
 		$productid = GETPOST('productid', 'int');

From 0915374fa126efda9260bf898e714eb7f65bda22 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sun, 1 Jan 2023 16:54:36 +0100
Subject: [PATCH 230/816] Fix php 8 errors

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

diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 43f940acdee..53adfdbe85b 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -378,7 +378,7 @@ class Stripe extends CommonObject
 
 		$paymentintent = null;
 
-		if (is_object($object) && !empty($conf->global->STRIPE_REUSE_EXISTING_INTENT_IF_FOUND) && empty($conf->global->STRIPE_CARD_PRESENT)) {
+		if (is_object($object) && getDolGlobalInt('STRIPE_REUSE_EXISTING_INTENT_IF_FOUND') && !getDolGlobalInt('STRIPE_CARD_PRESENT')) {
 			// Warning. If a payment was tried and failed, a payment intent was created.
 			// But if we change something on object to pay (amount or other that does not change the idempotency key), reusing same payment intent is not allowed by Stripe.
 			// Recommended solution is to recreate a new payment intent each time we need one (old one will be automatically closed by Stripe after a delay), Stripe will
@@ -435,26 +435,26 @@ 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)) {
+			if (getDolGlobalInt('STRIPE_SEPA_DIRECT_DEBIT')) {
 				$paymentmethodtypes[] = "sepa_debit"; //&& ($object->thirdparty->isInEEC())
 				//$descriptor = preg_replace('/ref=[^:=]+/', '', $descriptor);	// Clean ref
 			}
-			if (!empty($conf->global->STRIPE_KLARNA)) {
+			if (getDolGlobalInt('STRIPE_KLARNA')) {
 				$paymentmethodtypes[] = "klarna";
 			}
-			if (!empty($conf->global->STRIPE_BANCONTACT)) {
+			if (getDolGlobalInt('STRIPE_BANCONTACT')) {
 				$paymentmethodtypes[] = "bancontact";
 			}
-			if (!empty($conf->global->STRIPE_IDEAL)) {
+			if (getDolGlobalInt('STRIPE_IDEAL')) {
 				$paymentmethodtypes[] = "ideal";
 			}
-			if (!empty($conf->global->STRIPE_GIROPAY)) {
+			if (getDolGlobalInt('STRIPE_GIROPAY')) {
 				$paymentmethodtypes[] = "giropay";
 			}
-			if (!empty($conf->global->STRIPE_SOFORT)) {
+			if (getDolGlobalInt('STRIPE_SOFORT')) {
 				$paymentmethodtypes[] = "sofort";
 			}
-			if (!empty($conf->global->STRIPE_CARD_PRESENT) && $mode == 'terminal') {
+			if (getDolGlobalInt('STRIPE_CARD_PRESENT') && $mode == 'terminal') {
 				$paymentmethodtypes = array("card_present");
 			}
 
@@ -484,13 +484,13 @@ class Stripe extends CommonObject
 				//$dataforintent["setup_future_usage"] = "off_session";
 				$dataforintent["off_session"] = true;
 			}
-			if (!empty($conf->global->STRIPE_GIROPAY)) {
+			if (getDolGlobalInt('STRIPE_GIROPAY')) {
 				unset($dataforintent['setup_future_usage']);
 			}
-			if (!empty($conf->global->STRIPE_KLARNA)) {
+			if (getDolGlobalInt('STRIPE_KLARNA')) {
 				unset($dataforintent['setup_future_usage']);
 			}
-			if (!empty($conf->global->STRIPE_CARD_PRESENT) && $mode == 'terminal') {
+			if (getDolGlobalInt('STRIPE_CARD_PRESENT') && $mode == 'terminal') {
 				unset($dataforintent['setup_future_usage']);
 				$dataforintent["capture_method"] = "manual";
 				$dataforintent["confirmation_method"] = "manual";
@@ -500,7 +500,7 @@ class Stripe extends CommonObject
 				$description .= ' - '.$payment_method;
 			}
 
-			if ($conf->entity != $conf->global->STRIPECONNECT_PRINCIPAL && $stripefee > 0) {
+			if ($conf->entity != getDolGlobalInt('STRIPECONNECT_PRINCIPAL') && $stripefee > 0) {
 				$dataforintent["application_fee_amount"] = $stripefee;
 			}
 			if ($usethirdpartyemailforreceiptemail && is_object($object) && $object->thirdparty->email) {

From 5c8dc4ed58e1a3231dc1572b24e188ef234485e5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 1 Jan 2023 23:50:37 +0100
Subject: [PATCH 231/816] Fix warning

---
 .../core/boxes/box_graph_invoices_peryear.php |  4 ++--
 htdocs/core/modules/modLoan.class.php         |  2 +-
 htdocs/don/class/don.class.php                |  8 ++++----
 htdocs/expedition/class/expedition.class.php  | 19 +------------------
 htdocs/reception/class/reception.class.php    | 19 -------------------
 qodana.yaml                                   |  2 +-
 6 files changed, 9 insertions(+), 45 deletions(-)

diff --git a/htdocs/core/boxes/box_graph_invoices_peryear.php b/htdocs/core/boxes/box_graph_invoices_peryear.php
index 5a9b84829f2..9ea2fe5a130 100644
--- a/htdocs/core/boxes/box_graph_invoices_peryear.php
+++ b/htdocs/core/boxes/box_graph_invoices_peryear.php
@@ -142,7 +142,7 @@ class box_graph_invoices_peryear extends ModeleBoxes
 				$px2->SetData($data2);
 				unset($data2);
 				$i = $startyear;
-				$legend = array();
+				/*$legend = array();
 				while ($i <= $endyear) {
 					if ($startmonth != 1) {
 						$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
@@ -150,7 +150,7 @@ class box_graph_invoices_peryear extends ModeleBoxes
 						$legend[] = $i;
 					}
 					$i++;
-				}
+				}*/
 				$px2->SetLegend([$langs->trans("AmountOfBillsHT")]);
 				$px2->SetMaxValue($px2->GetCeilMaxValue());
 				$px2->SetWidth($WIDTH);
diff --git a/htdocs/core/modules/modLoan.class.php b/htdocs/core/modules/modLoan.class.php
index 7f2850b075a..36919bc38af 100644
--- a/htdocs/core/modules/modLoan.class.php
+++ b/htdocs/core/modules/modLoan.class.php
@@ -82,7 +82,7 @@ class modLoan extends DolibarrModules
 				"chaine",
 				"6611"
 		);
-		$this->const[1] = array(
+		$this->const[2] = array(
 				"LOAN_ACCOUNTING_ACCOUNT_INSURANCE",
 				"chaine",
 				"6162"
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 333f9673175..158c96cb441 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -206,7 +206,7 @@ class Don extends CommonObject
 	 */
 	public function initAsSpecimen()
 	{
-		global $conf, $user, $langs;
+		global $conf;
 
 		$now = dol_now();
 
@@ -224,10 +224,10 @@ class Don extends CommonObject
 			$num_socs = $this->db->num_rows($resql);
 			$i = 0;
 			while ($i < $num_socs) {
-				$i++;
-
 				$row = $this->db->fetch_row($resql);
 				$socids[$i] = $row[0];
+
+				$i++;
 			}
 		}
 
@@ -237,7 +237,7 @@ class Don extends CommonObject
 		$this->specimen = 1;
 		$this->lastname = 'Doe';
 		$this->firstname = 'John';
-		$this->socid = 1;
+		$this->socid = empty($socids[0]) ? 0 : $socids[0];
 		$this->date = $now;
 		$this->date_valid = $now;
 		$this->amount = 100.90;
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index bb2954daa60..dd6dfee55b1 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -1911,23 +1911,6 @@ class Expedition extends CommonObject
 
 		dol_syslog(get_class($this)."::initAsSpecimen");
 
-		// Load array of products prodids
-		$num_prods = 0;
-		$prodids = array();
-		$sql = "SELECT rowid";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product";
-		$sql .= " WHERE entity IN (".getEntity('product').")";
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num_prods = $this->db->num_rows($resql);
-			$i = 0;
-			while ($i < $num_prods) {
-				$i++;
-				$row = $this->db->fetch_row($resql);
-				$prodids[$i] = $row[0];
-			}
-		}
-
 		$order = new Commande($this->db);
 		$order->initAsSpecimen();
 
@@ -1940,7 +1923,7 @@ class Expedition extends CommonObject
 		$this->date                 = $now;
 		$this->date_creation        = $now;
 		$this->date_valid           = $now;
-		$this->date_delivery        = $now;
+		$this->date_delivery        = $now + 24 * 3600;
 		$this->date_expedition      = $now + 24 * 3600;
 
 		$this->entrepot_id          = 0;
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index 96b275bfb26..03ed28a2200 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -1348,25 +1348,6 @@ class Reception extends CommonObject
 
 		dol_syslog(get_class($this)."::initAsSpecimen");
 
-		// Load array of products prodids
-		$num_prods = 0;
-		$prodids = array();
-		$sql = "SELECT rowid";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product";
-		$sql .= " WHERE entity IN (".getEntity('product').")";
-		$sql .= $this->db->plimit(100);
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num_prods = $this->db->num_rows($resql);
-			$i = 0;
-			while ($i < $num_prods) {
-				$i++;
-				$row = $this->db->fetch_row($resql);
-				$prodids[$i] = $row[0];
-			}
-		}
-
 		$order = new CommandeFournisseur($this->db);
 		$order->initAsSpecimen();
 
diff --git a/qodana.yaml b/qodana.yaml
index 75ab2315e9a..7347f4dd50b 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -75,5 +75,5 @@ exclude:
   - name: PhpObjectFieldsAreOnlyWrittenInspection
   - name: PhpMissingParentConstructorInspection  
   - name: PhpWriteAccessToReferencedArrayValueWithoutUnsetInspection
-
+  - name: PhpArrayUsedOnlyForWriteInspection
   
\ No newline at end of file

From ac75406e357ce5b4cddf590a26dd0936898d4faa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 1 Jan 2023 23:55:59 +0100
Subject: [PATCH 232/816] Clean code

---
 htdocs/fichinter/card-rec.php                 |  2 +-
 htdocs/fichinter/class/fichinterrec.class.php | 11 ++++-------
 qodana.yaml                                   |  3 +++
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index f2bd0bac8a3..22f77546090 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -234,7 +234,7 @@ if ($action == 'add') {
 } elseif ($action == 'delete' && $user->rights->ficheinter->supprimer) {
 	// delete modele
 	$object->fetch($id);
-	$object->delete();
+	$object->delete($user);
 	$id = 0;
 	header('Location: '.$_SERVER["PHP_SELF"]);
 	exit;
diff --git a/htdocs/fichinter/class/fichinterrec.class.php b/htdocs/fichinter/class/fichinterrec.class.php
index fa3b700b1fd..2f4ca02d3c7 100644
--- a/htdocs/fichinter/class/fichinterrec.class.php
+++ b/htdocs/fichinter/class/fichinterrec.class.php
@@ -411,16 +411,13 @@ class FichinterRec extends Fichinter
 	/**
 	 * 	Delete template fichinter rec
 	 *
-	 *	@param	 	int		$rowid	  	    Id of fichinter rec to delete. If empty, we delete current instance of fichinter rec
-	 *	@param		int		$notrigger	    1=Does not execute triggers, 0= execute triggers
-	 *	@param		int		$idwarehouse    Id warehouse to use for stock change.
+	 *	@param      User	$user			Object user who delete
+	 *	@param		int		$notrigger		Disable trigger
 	 *	@return		int						<0 if KO, >0 if OK
 	 */
-	public function delete($rowid = 0, $notrigger = 0, $idwarehouse = -1)
+	public function delete(User $user, $notrigger = 0)
 	{
-		if (empty($rowid)) {
-			$rowid = $this->id;
-		}
+		$rowid = $this->id;
 
 		dol_syslog(get_class($this)."::delete rowid=".$rowid, LOG_DEBUG);
 
diff --git a/qodana.yaml b/qodana.yaml
index 7347f4dd50b..872b043013b 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -76,4 +76,7 @@ exclude:
   - name: PhpMissingParentConstructorInspection  
   - name: PhpWriteAccessToReferencedArrayValueWithoutUnsetInspection
   - name: PhpArrayUsedOnlyForWriteInspection
+  - name: PhpArrayIndexImmediatelyRewrittenInspection
+  - name: PhpParameterNameChangedDuringInheritanceInspection
+  - name: PhpDuplicateSwitchCaseBodyInspection
   
\ No newline at end of file

From 7e22e1e7b490f7c3862602b2afa2870359497206 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2023 00:02:34 +0100
Subject: [PATCH 233/816] Clean php

---
 .github/workflows/code_quality.yml             | 1 +
 htdocs/mailmanspip/class/mailmanspip.class.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml
index 2b8ea0b3551..700d9fe64bf 100644
--- a/.github/workflows/code_quality.yml
+++ b/.github/workflows/code_quality.yml
@@ -16,6 +16,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
+          php-version: '7.1'
       - name: 'Qodana Scan'
         uses: JetBrains/qodana-action@v2022.3.0
         env:
diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php
index 46701a459a6..6bc34977e4e 100644
--- a/htdocs/mailmanspip/class/mailmanspip.class.php
+++ b/htdocs/mailmanspip/class/mailmanspip.class.php
@@ -105,13 +105,13 @@ class MailmanSpip
 	 */
 	public function connectSpip()
 	{
-		$resource = getDoliDBInstance('mysql', ADHERENT_SPIP_SERVEUR, ADHERENT_SPIP_USER, ADHERENT_SPIP_PASS, ADHERENT_SPIP_DB, ADHERENT_SPIP_PORT);
+		$resource = getDoliDBInstance('mysql', getDolGlobalString('ADHERENT_SPIP_SERVEUR'), getDolGlobalString('ADHERENT_SPIP_USER'), getDolGlobalString('ADHERENT_SPIP_PASS'), getDolGlobalString('ADHERENT_SPIP_DB'), getDolGlobalString('ADHERENT_SPIP_PORT'));
 
 		if ($resource->ok) {
 			return $resource;
 		}
 
-		dol_syslog('Error when connecting to SPIP '.ADHERENT_SPIP_SERVEUR.' '.ADHERENT_SPIP_USER.' '.ADHERENT_SPIP_PASS.' '.ADHERENT_SPIP_DB, LOG_ERR);
+		dol_syslog('Error when connecting to SPIP '.getDolGlobalString('ADHERENT_SPIP_SERVEUR').' '.getDolGlobalString('ADHERENT_SPIP_USER').' '.getDolGlobalString('ADHERENT_SPIP_PASS').' '.getDolGlobalString('ADHERENT_SPIP_DB'), LOG_ERR);
 
 		return false;
 	}

From a6847e9edc81976fb98324ae04f586a21e8b3fbc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2023 00:06:15 +0100
Subject: [PATCH 234/816] doxygen

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

diff --git a/htdocs/ticket/class/actions_ticket.class.php b/htdocs/ticket/class/actions_ticket.class.php
index 6ad204965bc..29a013f1eb9 100644
--- a/htdocs/ticket/class/actions_ticket.class.php
+++ b/htdocs/ticket/class/actions_ticket.class.php
@@ -111,7 +111,7 @@ class ActionsTicket
 	 * @param	int		$id				ID of ticket
 	 * @param	string	$ref			Reference of ticket
 	 * @param	string	$track_id		Track ID of ticket (for public area)
-	 * @return 	void
+	 * @return int              		<0 if KO, >0 if OK
 	 */
 	public function fetch($id = 0, $ref = '', $track_id = '')
 	{

From cf1ff1e1f69688a7656c08051dc01fb3f6fb0ec7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2023 00:07:03 +0100
Subject: [PATCH 235/816] Fix warning

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

diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
index 5c588b59c6b..3ee118d06c7 100644
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -225,7 +225,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0) {
 		// Type
 		print '<tr><td>'.$langs->trans("ResourceType").'</td>';
 		print '<td>';
-		$ret = $formresource->select_types_resource($object->fk_code_type_resource, 'fk_code_type_resource', '', 2);
+		$formresource->select_types_resource($object->fk_code_type_resource, 'fk_code_type_resource', '', 2);
 		print '</td></tr>';
 
 		// Description

From 2aef5e94df346965073f9feddca8342037afc913 Mon Sep 17 00:00:00 2001
From: Christian Humpel <christian.humpel@gmail.com>
Date: Sun, 1 Jan 2023 15:05:04 +0100
Subject: [PATCH 236/816] Set $remise_percent to 0, if GETPOST is empty.

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

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 66e673abf2d..e467a398dc7 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1106,7 +1106,7 @@ if (empty($reshook)) {
 			$special_code = 3;
 		}
 
-		$remise_percent = price2num(GETPOST('remise_percent'), '', 2);
+		$remise_percent = GETPOST('remise_percent') != '' ? price2num(GETPOST('remise_percent'), '', 2) : 0;
 
 		// Check minimum price
 		$productid = GETPOST('productid', 'int');

From b96c58ea6796232bd35562c2f711358b8812b054 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2023 00:07:03 +0100
Subject: [PATCH 237/816] Fix warning

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

diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
index 5c588b59c6b..3ee118d06c7 100644
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -225,7 +225,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0) {
 		// Type
 		print '<tr><td>'.$langs->trans("ResourceType").'</td>';
 		print '<td>';
-		$ret = $formresource->select_types_resource($object->fk_code_type_resource, 'fk_code_type_resource', '', 2);
+		$formresource->select_types_resource($object->fk_code_type_resource, 'fk_code_type_resource', '', 2);
 		print '</td></tr>';
 
 		// Description

From edfa7dddfcc4c78faa6f6130f418be6818488205 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2023 01:50:25 +0100
Subject: [PATCH 238/816] Update html.formpropal.class.php

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

diff --git a/htdocs/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php
index fbbf2c97fb7..7cce3c839c5 100644
--- a/htdocs/core/class/html.formpropal.class.php
+++ b/htdocs/core/class/html.formpropal.class.php
@@ -139,7 +139,7 @@ class FormPropal
 		} else {
 			print '<option value="2,4">';
 		}
-		print ($langs->trans($prefix.'Signed'.($short ? 'Short' : '')).'+'.$langs->trans($prefix.'Billed'.($short ? 'Short' : '')));
+		print ($langs->trans($prefix.'Signed'.($short ? 'Short' : '')).' '.$langs->trans("or").' '.$langs->trans($prefix.'Billed'.($short ? 'Short' : '')));
 		print '</option>';
 		print '</select>';
 

From 9aecf48ce33880623e3f5f0330cbbba76710bd7d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2023 01:53:05 +0100
Subject: [PATCH 239/816] Update main.inc.php

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index e0ea7b1dbfc..dbb18aa61d3 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -3211,7 +3211,7 @@ if (!function_exists("llxFooter")) {
 		global $contextpage, $page, $limit, $mode;
 		global $dolibarr_distrib;
 
-		$ext = 'layout='.$conf->browser->layout.'&version='.urlencode(DOL_VERSION);
+		$ext = 'layout='.urlencode($conf->browser->layout).'&version='.urlencode(DOL_VERSION);
 
 		// Hook to add more things on all pages within fiche DIV
 		$llxfooter = '';
@@ -3222,7 +3222,9 @@ if (!function_exists("llxFooter")) {
 		} elseif ($reshook > 0) {
 			$llxfooter = $hookmanager->resPrint;
 		}
-		print $llxfooter;
+		if ($llxfooter) {
+			print $llxfooter;
+		}
 
 		// Global html output events ($mesgs, $errors, $warnings)
 		dol_htmloutput_events($disabledoutputofmessages);

From 73e5d6d2d2a7b86eee434a0db4fe100c195a4b31 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2023 02:08:20 +0100
Subject: [PATCH 240/816] Clean code

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

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 56e9e88b1dc..74d8b089223 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -499,9 +499,9 @@ class Conf
 			// Exception: Some dir are not the name of module. So we keep exception here for backward compatibility.
 
 			// Sous module bons d'expedition
-			$this->expedition_bon->enabled = (!empty($this->global->MAIN_SUBMODULE_EXPEDITION) ? $this->global->MAIN_SUBMODULE_EXPEDITION : 0);
+			$this->expedition_bon->enabled = (empty($this->global->MAIN_SUBMODULE_EXPEDITION) ? 0 : $this->global->MAIN_SUBMODULE_EXPEDITION);
 			// Sub module delivery note  Sous module bons de livraison
-			$this->delivery_note->enabled = (!empty($this->global->MAIN_SUBMODULE_DELIVERY) ? $this->global->MAIN_SUBMODULE_DELIVERY : 0);
+			$this->delivery_note->enabled = (empty($this->global->MAIN_SUBMODULE_DELIVERY) ? 0 : $this->global->MAIN_SUBMODULE_DELIVERY);
 
 			// Module fournisseur
 			if (!empty($this->fournisseur)) {

From f3bdecd111e8d30f92536be289f407271600bcf7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2023 02:23:28 +0100
Subject: [PATCH 241/816] Revert option ECM_AUTO_TREE_ENABLED into
 ECM_AUTO_TREE_HIDEN

---
 htdocs/admin/ecm.php                 | 24 ++++++++++++------------
 htdocs/core/lib/ecm.lib.php          |  2 +-
 htdocs/core/modules/modECM.class.php |  8 +-------
 htdocs/ecm/index_auto.php            |  2 +-
 htdocs/install/upgrade2.php          |  7 +++++++
 5 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/htdocs/admin/ecm.php b/htdocs/admin/ecm.php
index 3e0c2378742..4b5ccbb133e 100644
--- a/htdocs/admin/ecm.php
+++ b/htdocs/admin/ecm.php
@@ -31,6 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 // Load translation files required by the page
 $langs->load("admin");
 
+$action = GETPOST('action', 'aZ09');
+
 if (!$user->admin) {
 	accessforbidden();
 }
@@ -41,6 +43,7 @@ if (!$user->admin) {
  */
 
 // set
+$reg = array();
 if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg)) {
 	$code = $reg[1];
 	if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0) {
@@ -67,6 +70,8 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg)) {
  * View
  */
 
+$form = new Form($db);
+
 $help_url = '';
 llxHeader('', $langs->trans("ECMSetup"), $help_url);
 
@@ -81,26 +86,21 @@ print dol_get_fiche_head($head, 'ecm', '', -1, '');
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Description").'</td>';
-print '<td class="center" width="20">&nbsp;</td>';
-print '<td class="center" width="100">'.$langs->trans("Value").'</td>'."\n";
+print '<td class="center" width="100px">'.$langs->trans("Value").'</td>'."\n";
 print '</tr>';
 
-$form = new Form($db);
-
 // Mail required for members
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ECMAutoTree").'</td>';
-print '<td class="center" width="20">&nbsp;</td>';
-
-print '<td class="center" width="100">';
+print '<td class="center">';
 if ($conf->use_javascript_ajax) {
-	print ajax_constantonoff('ECM_AUTO_TREE_ENABLED');
+	print ajax_constantonoff('ECM_AUTO_TREE_HIDEN', null, null, 1);
 } else {
-	if (empty($conf->global->ECM_AUTO_TREE_ENABLED)) {
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_ECM_AUTO_TREE_ENABLED&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	} elseif (!empty($conf->global->USER_MAIL_REQUIRED)) {
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_ECM_AUTO_TREE_ENABLED&token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+	if (empty($conf->global->ECM_AUTO_TREE_HIDEN)) {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_ECM_AUTO_TREE_HIDEN&token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+	} else {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_ECM_AUTO_TREE_HIDEN&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	}
 }
 print '</td></tr>';
diff --git a/htdocs/core/lib/ecm.lib.php b/htdocs/core/lib/ecm.lib.php
index e7840505e8f..2a9b9a766a3 100644
--- a/htdocs/core/lib/ecm.lib.php
+++ b/htdocs/core/lib/ecm.lib.php
@@ -54,7 +54,7 @@ function ecm_prepare_dasboard_head($object)
 	$head[$h][2] = 'index';
 	$h++;
 
-	if (!empty($conf->global->ECM_AUTO_TREE_ENABLED)) {
+	if (empty($conf->global->ECM_AUTO_TREE_HIDEN)) {
 		$head[$h][0] = DOL_URL_ROOT.'/ecm/index_auto.php';
 		$head[$h][1] = $langs->trans("ECMSectionsAuto").$form->textwithpicto('', $helptext, 1, 'info', '', 0, 3);
 		$head[$h][2] = 'index_auto';
diff --git a/htdocs/core/modules/modECM.class.php b/htdocs/core/modules/modECM.class.php
index 1ea7530be53..09556b43cd8 100644
--- a/htdocs/core/modules/modECM.class.php
+++ b/htdocs/core/modules/modECM.class.php
@@ -74,12 +74,6 @@ class modECM extends DolibarrModules
 		$this->const = array(); // List of parameters
 		$r = 0;
 
-		$this->const[$r][0] = "ECM_AUTO_TREE_ENABLED";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "1";
-		$this->const[$r][3] = 'Auto tree is enabled by default';
-		$this->const[$r][4] = 0;
-
 		// Boxes
 		$this->boxes = array(); // List of boxes
 		$r = 0;
@@ -182,7 +176,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) && getDolGlobalInt("ECM_AUTO_TREE_ENABLED")',
+			'enabled'=>'($user->rights->ecm->read || $user->rights->ecm->upload) && !getDolGlobalInt("ECM_AUTO_TREE_HIDEN")',
 			'target'=>'',
 			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
 		);
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 342d7d74129..9d9d30e8188 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -309,7 +309,7 @@ llxHeader($moreheadcss.$moreheadjs, $langs->trans("ECMArea"), '', '', '', '', $m
 // Add sections to manage
 $rowspan = 0;
 $sectionauto = array();
-if (!empty($conf->global->ECM_AUTO_TREE_ENABLED)) {
+if (empty($conf->global->ECM_AUTO_TREE_HIDEN)) {
 	if (isModEnabled("product") || isModEnabled("service")) {
 		$langs->load("products");
 		$rowspan++; $sectionauto[] = array('position'=>10, 'level'=>1, 'module'=>'product', 'test'=>(isModEnabled("product") || isModEnabled("service")), 'label'=>$langs->trans("ProductsAndServices"), 'desc'=>$langs->trans("ECMDocsByProducts"));
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 51334eaae21..89e190f92c1 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -490,6 +490,13 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 			if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
 				migrate_contractdet_rank();
 			}
+
+			// Scripts for 18.0
+			$afterversionarray = explode('.', '170.9');
+			$beforeversionarray = explode('.', '18.0.9');
+			if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
+				migrate_contractdet_rank();
+			}
 		}
 
 

From 5148e6a1a2601e298188a87312ce22853fa74a9e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2023 03:08:57 +0100
Subject: [PATCH 242/816] Enhance doxygen conf

---
 .github/workflows/doxygen-action.yml.disabled | 17 +++++++
 build/doxygen/dolibarr-doxygen.doxyfile       | 50 ++++++++++++-------
 2 files changed, 50 insertions(+), 17 deletions(-)
 create mode 100644 .github/workflows/doxygen-action.yml.disabled

diff --git a/.github/workflows/doxygen-action.yml.disabled b/.github/workflows/doxygen-action.yml.disabled
new file mode 100644
index 00000000000..bd923e6394f
--- /dev/null
+++ b/.github/workflows/doxygen-action.yml.disabled
@@ -0,0 +1,17 @@
+# See syntax file on https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
+name: Doxygen
+on:
+  schedule:
+  - cron: "0 15 * * *"
+  workflow_dispatch:
+    branches:
+      - develop
+
+jobs:
+  doxygen:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Doxygen'
+        uses: mattnotmitt/doxygen-action@1.9.5
+        with:
+          doxyfile-path: build/doxygen
diff --git a/build/doxygen/dolibarr-doxygen.doxyfile b/build/doxygen/dolibarr-doxygen.doxyfile
index 31400661ecc..b7ca04898e5 100644
--- a/build/doxygen/dolibarr-doxygen.doxyfile
+++ b/build/doxygen/dolibarr-doxygen.doxyfile
@@ -1,14 +1,17 @@
-# Doxyfile 1.7.3
+# Doxyfile 1.8.16
 
 # This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
+# doxygen (www.doxygen.org) for a project.
 #
-# All text after a hash (#) is considered a comment and will be ignored
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
 # The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
 
 #---------------------------------------------------------------------------
 # Project related configuration options
@@ -448,7 +451,7 @@ GENERATE_TODOLIST = NO
 # disable (NO) the test list. This list is created by putting \test
 # commands in the documentation.
 
-GENERATE_TESTLIST = YES
+GENERATE_TESTLIST = NO
 
 # The GENERATE_BUGLIST tag can be used to enable (YES) or
 # disable (NO) the bug list. This list is created by putting \bug
@@ -625,7 +628,7 @@ EXCLUDE_SYMLINKS = YES
 # against the file with absolute path, so to exclude all test directories
 # for example use the pattern */test/*
 
-EXCLUDE_PATTERNS = */CVS/* *google* *pibarcode*
+EXCLUDE_PATTERNS = */CVS/*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
@@ -775,14 +778,16 @@ IGNORE_PREFIX =
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
 
 GENERATE_HTML = YES
 
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_OUTPUT = html
 
@@ -852,13 +857,24 @@ HTML_TIMESTAMP = YES
 
 HTML_ALIGN_MEMBERS = YES
 
+# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
+# documentation will contain a main index with vertical navigation menus that
+# are dynamically created via Javascript. If disabled, the navigation index will
+# consists of multiple levels of tabs that are statically embedded in every HTML
+# page. Disable this option to support browsers that do not have Javascript,
+# like the Qt help browser.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_MENUS     = NO
+
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 # documentation will contain sections that can be hidden and shown after the
 # page has loaded. For this to work a browser that supports
 # JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
 # Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
 
-HTML_DYNAMIC_SECTIONS = YES
+HTML_DYNAMIC_SECTIONS = NO
 
 # If the GENERATE_DOCSET tag is set to YES, additional index files
 # will be generated that can be used as input for Apple's Xcode 3
@@ -1003,7 +1019,7 @@ QHG_LOCATION =
 # the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
 # the help appears.
 
-GENERATE_ECLIPSEHELP = YES
+GENERATE_ECLIPSEHELP = NO
 
 # A unique identifier for the eclipse help plugin. When installing the plugin
 # the directory name containing the HTML and XML files should also have
@@ -1072,7 +1088,7 @@ FORMULA_TRANSPARENT = YES
 # typically be disabled. For large projects the javascript based search engine
 # can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
 
-SEARCHENGINE = NO
+SEARCHENGINE = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
 # implemented using a PHP enabled web server instead of at the web client

From f8f2e8ea9ea988c075153037feb58853506704d7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2023 03:52:29 +0100
Subject: [PATCH 243/816] Enhancement with doxygen

---
 .github/workflows/doxygen-action.yml.disabled | 17 ---------
 .github/workflows/doxygen-gh-pages.yml        | 38 +++++++++++++++++++
 build/doxygen/dolibarr-doxygen-build.pl       | 10 ++---
 build/doxygen/dolibarr-doxygen.doxyfile       | 38 +++++++++----------
 4 files changed, 62 insertions(+), 41 deletions(-)
 delete mode 100644 .github/workflows/doxygen-action.yml.disabled
 create mode 100644 .github/workflows/doxygen-gh-pages.yml

diff --git a/.github/workflows/doxygen-action.yml.disabled b/.github/workflows/doxygen-action.yml.disabled
deleted file mode 100644
index bd923e6394f..00000000000
--- a/.github/workflows/doxygen-action.yml.disabled
+++ /dev/null
@@ -1,17 +0,0 @@
-# See syntax file on https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
-name: Doxygen
-on:
-  schedule:
-  - cron: "0 15 * * *"
-  workflow_dispatch:
-    branches:
-      - develop
-
-jobs:
-  doxygen:
-    runs-on: ubuntu-latest
-    steps:
-      - name: 'Doxygen'
-        uses: mattnotmitt/doxygen-action@1.9.5
-        with:
-          doxyfile-path: build/doxygen
diff --git a/.github/workflows/doxygen-gh-pages.yml b/.github/workflows/doxygen-gh-pages.yml
new file mode 100644
index 00000000000..066ede4dea3
--- /dev/null
+++ b/.github/workflows/doxygen-gh-pages.yml
@@ -0,0 +1,38 @@
+# See syntax file on https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
+name: Doxygen
+on:
+  schedule:
+  - cron: "0 15 * * *"
+  workflow_dispatch:
+    branches:
+      - develop
+permissions:
+  contents: write
+  
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Build
+        uses: DenverCoder1/doxygen-github-pages-action@v1.2.0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          branch: gh-pages
+          folder: docs/html
+          config_file: build/doxygen/dolibarr-doxygen.doxyfile
+
+      - name: Deploy
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          branch: gh-pages
+          folder: docs/html # The folder the action should deploy.
+          target-folder: docs/html2
+          
+#jobs:
+#  doxygen:
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: 'Doxygen'
+#        uses: mattnotmitt/doxygen-action@1.9.5
+#        with:
+#          doxyfile-path: build/doxygen
diff --git a/build/doxygen/dolibarr-doxygen-build.pl b/build/doxygen/dolibarr-doxygen-build.pl
index 75a5cceddbe..5a4849a3a5b 100755
--- a/build/doxygen/dolibarr-doxygen-build.pl
+++ b/build/doxygen/dolibarr-doxygen-build.pl
@@ -17,9 +17,9 @@ use Cwd;
 my $dir = getcwd;
 
 print "Current dir is: $dir\n";
-print "Running dir for doxygen must be: $DIR\n";
+#print "Running dir for doxygen must be: $DIR\n";
 
-if (! -s $CONFFILE)
+if (! -s "build/doxygen/$CONFFILE")
 {
     print "Error: current directory for building Dolibarr doxygen documentation is not correct.\n";
     print "\n";
@@ -30,7 +30,7 @@ if (! -s $CONFFILE)
     exit 1;   
 }
 
-$SOURCE="../..";
+$SOURCE=".";
 
 # Get version $MAJOR, $MINOR and $BUILD
 $result = open( IN, "< " . $SOURCE . "/htdocs/filefunc.inc.php" );
@@ -47,8 +47,8 @@ $version=$MAJOR.".".$MINOR.".".$BUILD;
 
 
 print "Running doxygen for version ".$version.", please wait...\n";
-print "cat $CONFFILE | sed -e 's/x\.y\.z/".$version."/' | doxygen $OPTIONS - 2>&1\n";
-$result=`cat $CONFFILE | sed -e 's/x\.y\.z/$version/' | doxygen $OPTIONS - 2>&1`;
+print "cat build/doxygen/$CONFFILE | sed -e 's/x\.y\.z/".$version."/' | doxygen $OPTIONS - 2>&1\n";
+$result=`cat build/doxygen/$CONFFILE | sed -e 's/x\.y\.z/$version/' | doxygen $OPTIONS - 2>&1`;
 
 print $result;
 
diff --git a/build/doxygen/dolibarr-doxygen.doxyfile b/build/doxygen/dolibarr-doxygen.doxyfile
index b7ca04898e5..216ba517dc5 100644
--- a/build/doxygen/dolibarr-doxygen.doxyfile
+++ b/build/doxygen/dolibarr-doxygen.doxyfile
@@ -41,7 +41,7 @@ PROJECT_NUMBER = x.y.z
 # If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY = ../../build
+OUTPUT_DIRECTORY = build
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
 # 4096 sub-directories (in 2 levels) under the output directory of each output
@@ -117,7 +117,7 @@ FULL_PATH_NAMES = YES
 # If left blank the directory from which doxygen is run is used as the
 # path to strip.
 
-STRIP_FROM_PATH = "../.."
+STRIP_FROM_PATH = ""
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
 # the path mentioned in the documentation of a class, which tells
@@ -290,7 +290,7 @@ TYPEDEF_HIDES_STRUCT = NO
 # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
 # corresponding to a cache size of 2^16 = 65536 symbols
 
-SYMBOL_CACHE_SIZE = 0
+#SYMBOL_CACHE_SIZE = 0
 
 #---------------------------------------------------------------------------
 # Build related configuration options
@@ -490,7 +490,7 @@ SHOW_USED_FILES = YES
 # then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
 # in the documentation. The default is NO.
 
-SHOW_DIRECTORIES = YES
+#SHOW_DIRECTORIES = YES
 
 # Set the SHOW_FILES tag to NO to disable the generation of the Files page.
 # This will remove the Files entry from the Quick Index and from the
@@ -574,7 +574,7 @@ WARN_FORMAT = "$file:$line: $text"
 # and error messages should be written. If left blank the output is written
 # to stderr.
 
-WARN_LOGFILE = doxygen_warnings.log
+WARN_LOGFILE = build/html/doxygen_warnings.log
 
 #---------------------------------------------------------------------------
 # configuration options related to the input files
@@ -585,7 +585,7 @@ WARN_LOGFILE = doxygen_warnings.log
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT = ../../htdocs ../../scripts
+INPUT = htdocs scripts
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -614,7 +614,7 @@ RECURSIVE = YES
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE = ../../build ../../dev ../../doc ../../document ../../documents ../../htdocs/conf/conf.php ../../htdocs/custom ../../htdocs/document ../../htdocs/documents ../../htdocs/includes
+EXCLUDE = build dev doc document documents htdocs/conf/conf.php htdocs/custom htdocs/document htdocs/documents htdocs/includes
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or
 # directories that are symbolic links (a Unix filesystem feature) are excluded
@@ -642,7 +642,7 @@ EXCLUDE_SYMBOLS =
 # directories that contain example code fragments that are included (see
 # the \include command).
 
-EXAMPLE_PATH = ../../htdocs/modulebuilder/template 
+EXAMPLE_PATH = htdocs/modulebuilder/template 
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
@@ -662,7 +662,7 @@ EXAMPLE_RECURSIVE = NO
 # directories that contain image that are included in the documentation (see
 # the \image command).
 
-IMAGE_PATH = ../../doc/images
+IMAGE_PATH = doc/images
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
@@ -765,7 +765,7 @@ ALPHABETICAL_INDEX = YES
 # the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
 # in which this list will be split (can be a number in the range [1..20])
 
-COLS_IN_ALPHA_INDEX = 5
+#COLS_IN_ALPHA_INDEX = 5
 
 # In case all classes in a project start with a common prefix, all
 # classes will be put under the same header in the alphabetical index.
@@ -802,14 +802,14 @@ HTML_FILE_EXTENSION = .html
 # standard header.
 
 # Does not work with 1.7.3
-#HTML_HEADER = doxygen_header.html
+#HTML_HEADER = build/doxygen/doxygen_header.html
 
 # The HTML_FOOTER tag can be used to specify a personal HTML footer for
 # each generated HTML page. If it is left blank doxygen will generate a
 # standard footer.
 
 # Does not work with 1.7.3
-HTML_FOOTER = doxygen_footer.html
+HTML_FOOTER = build/doxygen/doxygen_footer.html
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading
 # style sheet that is used by each HTML page. It can be used to
@@ -855,7 +855,7 @@ HTML_TIMESTAMP = YES
 # files or namespaces will be aligned in HTML using tables. If set to
 # NO a bullet list will be used.
 
-HTML_ALIGN_MEMBERS = YES
+#HTML_ALIGN_MEMBERS = YES
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
@@ -1051,7 +1051,7 @@ GENERATE_TREEVIEW = NO
 # By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
 # and Class Hierarchy pages using a tree view instead of an ordered list.
 
-USE_INLINE_TREES = NO
+#USE_INLINE_TREES = NO
 
 # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
 # used to set the initial width (in pixels) of the frame in which the tree
@@ -1098,7 +1098,7 @@ SEARCHENGINE = YES
 # full text search. The disadvances is that it is more difficult to setup
 # and does not have live searching capabilities.
 
-SERVER_BASED_SEARCH = NO
+SERVER_BASED_SEARCH = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -1276,13 +1276,13 @@ XML_OUTPUT = xml
 # which can be used by a validating XML parser to check the
 # syntax of the XML files.
 
-XML_SCHEMA = 
+#XML_SCHEMA = 
 
 # The XML_DTD tag can be used to specify an XML DTD,
 # which can be used by a validating XML parser to check the
 # syntax of the XML files.
 
-XML_DTD = 
+#XML_DTD = 
 
 # If the XML_PROGRAMLISTING tag is set to YES Doxygen will
 # dump the program listings (including syntax highlighting
@@ -1447,7 +1447,7 @@ EXTERNAL_GROUPS = YES
 # The PERL_PATH should be the absolute path and name of the perl script
 # interpreter (i.e. the result of `which perl').
 
-PERL_PATH = /usr/bin/perl
+#PERL_PATH = /usr/bin/perl
 
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
@@ -1469,7 +1469,7 @@ CLASS_DIAGRAMS = NO
 # the mscgen tool resides. If left empty the tool is assumed to be found in the
 # default search path.
 
-MSCGEN_PATH = 
+#MSCGEN_PATH = 
 
 # If set to YES, the inheritance and collaboration graphs will hide
 # inheritance and usage relations if the target is undocumented

From 466239c256e1cf6371a29a4644cb600c45eb5db4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2023 04:08:09 +0100
Subject: [PATCH 244/816] Fix font

---
 build/doxygen/dolibarr-doxygen.doxyfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/doxygen/dolibarr-doxygen.doxyfile b/build/doxygen/dolibarr-doxygen.doxyfile
index 216ba517dc5..b1302c7853d 100644
--- a/build/doxygen/dolibarr-doxygen.doxyfile
+++ b/build/doxygen/dolibarr-doxygen.doxyfile
@@ -1501,7 +1501,7 @@ DOT_NUM_THREADS = 0
 # DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
 # containing the font.
 
-DOT_FONTNAME = FreeSans.ttf
+#DOT_FONTNAME = FreeSans.ttf
 
 # The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
 # The default size is 10pt.

From 7dd39092279fe9bfe35623e4414a81e8b4991331 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2023 04:16:06 +0100
Subject: [PATCH 245/816] Fix doxygen

---
 .github/workflows/doxygen-gh-pages.yml  | 4 ++--
 build/doxygen/dolibarr-doxygen.doxyfile | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/doxygen-gh-pages.yml b/.github/workflows/doxygen-gh-pages.yml
index 066ede4dea3..dbeebfeb8d9 100644
--- a/.github/workflows/doxygen-gh-pages.yml
+++ b/.github/workflows/doxygen-gh-pages.yml
@@ -18,14 +18,14 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           branch: gh-pages
-          folder: docs/html
+          folder: build/html
           config_file: build/doxygen/dolibarr-doxygen.doxyfile
 
       - name: Deploy
         uses: JamesIves/github-pages-deploy-action@v4
         with:
           branch: gh-pages
-          folder: docs/html # The folder the action should deploy.
+          folder: build/html # The folder the action should deploy.
           target-folder: docs/html2
           
 #jobs:
diff --git a/build/doxygen/dolibarr-doxygen.doxyfile b/build/doxygen/dolibarr-doxygen.doxyfile
index b1302c7853d..2ba292f21ad 100644
--- a/build/doxygen/dolibarr-doxygen.doxyfile
+++ b/build/doxygen/dolibarr-doxygen.doxyfile
@@ -614,7 +614,7 @@ RECURSIVE = YES
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE = build dev doc document documents htdocs/conf/conf.php htdocs/custom htdocs/document htdocs/documents htdocs/includes
+EXCLUDE = build dev doc document documents htdocs/conf/conf.php htdocs/custom htdocs/document htdocs/documents htdocs/includes htdocs/install/doctemplates
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or
 # directories that are symbolic links (a Unix filesystem feature) are excluded

From 47d26974e6a4d2ece4a59b0c14c106c251b6dbdd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2023 04:31:27 +0100
Subject: [PATCH 246/816] Fix doxygen

---
 build/doxygen/dolibarr-doxygen.doxyfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/doxygen/dolibarr-doxygen.doxyfile b/build/doxygen/dolibarr-doxygen.doxyfile
index 2ba292f21ad..51f697e1945 100644
--- a/build/doxygen/dolibarr-doxygen.doxyfile
+++ b/build/doxygen/dolibarr-doxygen.doxyfile
@@ -642,21 +642,21 @@ EXCLUDE_SYMBOLS =
 # directories that contain example code fragments that are included (see
 # the \include command).
 
-EXAMPLE_PATH = htdocs/modulebuilder/template 
+#EXAMPLE_PATH = htdocs/modulebuilder/template 
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
 # and *.h) to filter out the source-files in the directories. If left
 # blank all files are included.
 
-EXAMPLE_PATTERNS = *.php
+#EXAMPLE_PATTERNS = *.php
 
 # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
 # searched for input files to be used with the \include or \dontinclude
 # commands irrespective of the value of the RECURSIVE tag.
 # Possible values are YES and NO. If left blank NO is used.
 
-EXAMPLE_RECURSIVE = NO
+#EXAMPLE_RECURSIVE = NO
 
 # The IMAGE_PATH tag can be used to specify one or more files or
 # directories that contain image that are included in the documentation (see

From c973b7d59c0b20c3b4625b63eccead5bd2d743cb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2023 04:33:42 +0100
Subject: [PATCH 247/816] Try removing the copy

---
 .github/workflows/doxygen-gh-pages.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/doxygen-gh-pages.yml b/.github/workflows/doxygen-gh-pages.yml
index dbeebfeb8d9..33dd47aa6e6 100644
--- a/.github/workflows/doxygen-gh-pages.yml
+++ b/.github/workflows/doxygen-gh-pages.yml
@@ -21,12 +21,12 @@ jobs:
           folder: build/html
           config_file: build/doxygen/dolibarr-doxygen.doxyfile
 
-      - name: Deploy
-        uses: JamesIves/github-pages-deploy-action@v4
-        with:
-          branch: gh-pages
-          folder: build/html # The folder the action should deploy.
-          target-folder: docs/html2
+#      - name: Deploy
+#        uses: JamesIves/github-pages-deploy-action@v4
+#        with:
+#          branch: gh-pages
+#          folder: build/html # The folder the action should deploy.
+#          target-folder: docs/html2
           
 #jobs:
 #  doxygen:

From 6dbffb53989f8f75f7d5b1d863c7c72328f1a3b6 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Mon, 2 Jan 2023 09:48:34 +0100
Subject: [PATCH 248/816] Add price() to pricetonum() on bomline view

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

diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index 85bd4d6b02a..fc6b7709d14 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -247,13 +247,13 @@ if ($resql) {
 		// Cost
 		if (!empty($sub_bom->id)) {
 			$sub_bom->calculateCosts();
-			print '<td class="linecolcost nowrap right" id="sub_bom_cost_'.$sub_bom_line->id.'"><span class="amount">'.price2num($sub_bom->total_cost * $sub_bom_line->qty * $line->qty, 'MT').'</span></td>';
+			print '<td class="linecolcost nowrap right" id="sub_bom_cost_'.$sub_bom_line->id.'"><span class="amount">'.price(price2num($sub_bom->total_cost * $sub_bom_line->qty * $line->qty, 'MT')).'</span></td>';
 			$total_cost+= $sub_bom->total_cost * $sub_bom_line->qty * $line->qty;
 		} elseif ($sub_bom_product->cost_price > 0) {
-			print '<td class="linecolcost nowrap right" id="sub_bom_cost_'.$sub_bom_line->id.'"><span class="amount">'.price2num($sub_bom_product->cost_price * $sub_bom_line->qty * $line->qty, 'MT').'</span></td>';
+			print '<td class="linecolcost nowrap right" id="sub_bom_cost_'.$sub_bom_line->id.'"><span class="amount">'.price(price2num($sub_bom_product->cost_price * $sub_bom_line->qty * $line->qty, 'MT')).'</span></td>';
 			$total_cost+= $sub_bom_product->cost_price * $sub_bom_line->qty * $line->qty;
 		} elseif ($sub_bom_product->pmp > 0) {	// PMP if cost price isn't defined
-			print '<td class="linecolcost nowrap right" id="sub_bom_cost_'.$sub_bom_line->id.'"><span class="amount">'.price2num($sub_bom_product->pmp * $sub_bom_line->qty * $line->qty, 'MT').'</span></td>';
+			print '<td class="linecolcost nowrap right" id="sub_bom_cost_'.$sub_bom_line->id.'"><span class="amount">'.price(price2num($sub_bom_product->pmp * $sub_bom_line->qty * $line->qty, 'MT')).'</span></td>';
 			$total_cost.= $sub_bom_product->pmp * $sub_bom_line->qty * $line->qty;
 		} else {	// Minimum purchase price if cost price and PMP aren't defined
 			$sql_supplier_price = 'SELECT MIN(price) AS min_price, quantity AS qty FROM '.MAIN_DB_PREFIX.'product_fournisseur_price';

From 70e1e8cbb9d52c814c54cc3943853e89fa62c0cf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2023 12:48:17 +0100
Subject: [PATCH 249/816] Clean code for doxygen

---
 build/doxygen/dolibarr-doxygen.doxyfile       |    6 +-
 build/doxygen/doxygen-awesome.css             | 2413 +++++++++++++++++
 .../stock/class/api_stockmovements.class.php  |    4 +-
 3 files changed, 2420 insertions(+), 3 deletions(-)
 create mode 100644 build/doxygen/doxygen-awesome.css

diff --git a/build/doxygen/dolibarr-doxygen.doxyfile b/build/doxygen/dolibarr-doxygen.doxyfile
index 51f697e1945..20ff102f0a2 100644
--- a/build/doxygen/dolibarr-doxygen.doxyfile
+++ b/build/doxygen/dolibarr-doxygen.doxyfile
@@ -1098,7 +1098,7 @@ SEARCHENGINE = YES
 # full text search. The disadvances is that it is more difficult to setup
 # and does not have live searching capabilities.
 
-SERVER_BASED_SEARCH = YES
+SERVER_BASED_SEARCH = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -1650,3 +1650,7 @@ GENERATE_LEGEND = YES
 # the various graphs.
 
 DOT_CLEANUP = YES
+
+
+FULL_SIDEBAR = NO
+HTML_EXTRA_STYLESHEET = build/doxygen/doxygen-awesome.css
diff --git a/build/doxygen/doxygen-awesome.css b/build/doxygen/doxygen-awesome.css
new file mode 100644
index 00000000000..0b1c8c20892
--- /dev/null
+++ b/build/doxygen/doxygen-awesome.css
@@ -0,0 +1,2413 @@
+/**
+
+Doxygen Awesome
+https://github.com/jothepro/doxygen-awesome-css
+
+MIT License
+
+Copyright (c) 2021 - 2022 jothepro
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+*/
+
+html {
+    /* primary theme color. This will affect the entire websites color scheme: links, arrows, labels, ... */
+    --primary-color: #1779c4;
+    --primary-dark-color: #335c80;
+    --primary-light-color: #70b1e9;
+
+    /* page base colors */
+    --page-background-color: #ffffff;
+    --page-foreground-color: #2f4153;
+    --page-secondary-foreground-color: #6f7e8e;
+
+    /* color for all separators on the website: hr, borders, ... */
+    --separator-color: #dedede;
+
+    /* border radius for all rounded components. Will affect many components, like dropdowns, memitems, codeblocks, ... */
+    --border-radius-large: 8px;
+    --border-radius-small: 4px;
+    --border-radius-medium: 6px;
+
+    /* default spacings. Most components reference these values for spacing, to provide uniform spacing on the page. */
+    --spacing-small: 5px;
+    --spacing-medium: 10px;
+    --spacing-large: 16px;
+
+    /* default box shadow used for raising an element above the normal content. Used in dropdowns, search result, ... */
+    --box-shadow: 0 2px 8px 0 rgba(0,0,0,.075);
+
+    --odd-color: rgba(0,0,0,.028);
+
+    /* font-families. will affect all text on the website
+     * font-family: the normal font for text, headlines, menus
+     * font-family-monospace: used for preformatted text in memtitle, code, fragments
+     */
+    --font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif;
+    --font-family-monospace: ui-monospace,SFMono-Regular,SF Mono,Menlo,Consolas,Liberation Mono,monospace;
+
+    /* font sizes */
+    --page-font-size: 15.6px;
+    --navigation-font-size: 14.4px;
+    --toc-font-size: 13.4px;
+    --code-font-size: 14px; /* affects code, fragment */
+    --title-font-size: 22px;
+
+    /* content text properties. These only affect the page content, not the navigation or any other ui elements */
+    --content-line-height: 27px;
+    /* The content is centered and constraint in it's width. To make the content fill the whole page, set the variable to auto.*/
+    --content-maxwidth: 1050px;
+    --table-line-height: 24px;
+    --toc-sticky-top: var(--spacing-medium);
+    --toc-width: 200px;
+    --toc-max-height: calc(100vh - 2 * var(--spacing-medium) - 85px);
+
+    /* colors for various content boxes: @warning, @note, @deprecated @bug */
+    --warning-color: #f8d1cc;
+    --warning-color-dark: #b61825;
+    --warning-color-darker: #75070f;
+    --note-color: #faf3d8;
+    --note-color-dark: #f3a600;
+    --note-color-darker: #5f4204;
+    --todo-color: #e4f3ff;
+    --todo-color-dark: #1879C4;
+    --todo-color-darker: #274a5c;
+    --deprecated-color: #ecf0f3;
+    --deprecated-color-dark: #5b6269;
+    --deprecated-color-darker: #43454a;
+    --bug-color: #e4dafd;
+    --bug-color-dark: #5b2bdd;
+    --bug-color-darker: #2a0d72;
+    --invariant-color: #d8f1e3;
+    --invariant-color-dark: #44b86f;
+    --invariant-color-darker: #265532;
+
+    /* blockquote colors */
+    --blockquote-background: #f8f9fa;
+    --blockquote-foreground: #636568;
+
+    /* table colors */
+    --tablehead-background: #f1f1f1;
+    --tablehead-foreground: var(--page-foreground-color);
+
+    /* menu-display: block | none
+     * Visibility of the top navigation on screens >= 768px. On smaller screen the menu is always visible.
+     * `GENERATE_TREEVIEW` MUST be enabled!
+     */
+    --menu-display: block;
+
+    --menu-focus-foreground: var(--page-background-color);
+    --menu-focus-background: var(--primary-color);
+    --menu-selected-background: rgba(0,0,0,.05);
+
+
+    --header-background: var(--page-background-color);
+    --header-foreground: var(--page-foreground-color);
+
+    /* searchbar colors */
+    --searchbar-background: var(--side-nav-background);
+    --searchbar-foreground: var(--page-foreground-color);
+
+    /* searchbar size
+     * (`searchbar-width` is only applied on screens >= 768px.
+     * on smaller screens the searchbar will always fill the entire screen width) */
+    --searchbar-height: 33px;
+    --searchbar-width: 210px;
+    --searchbar-border-radius: var(--searchbar-height);
+
+    /* code block colors */
+    --code-background: #f5f5f5;
+    --code-foreground: var(--page-foreground-color);
+
+    /* fragment colors */
+    --fragment-background: #F8F9FA;
+    --fragment-foreground: #37474F;
+    --fragment-keyword: #bb6bb2;
+    --fragment-keywordtype: #8258b3;
+    --fragment-keywordflow: #d67c3b;
+    --fragment-token: #438a59;
+    --fragment-comment: #969696;
+    --fragment-link: #5383d6;
+    --fragment-preprocessor: #46aaa5;
+    --fragment-linenumber-color: #797979;
+    --fragment-linenumber-background: #f4f4f5;
+    --fragment-linenumber-border: #e3e5e7;
+    --fragment-lineheight: 20px;
+
+    /* sidebar navigation (treeview) colors */
+    --side-nav-background: #fbfbfb;
+    --side-nav-foreground: var(--page-foreground-color);
+    --side-nav-arrow-opacity: 0;
+    --side-nav-arrow-hover-opacity: 0.9;
+
+    --toc-background: var(--side-nav-background);
+    --toc-foreground: var(--side-nav-foreground);
+
+    /* height of an item in any tree / collapsable table */
+    --tree-item-height: 30px;
+
+    --memname-font-size: var(--code-font-size);
+    --memtitle-font-size: 18px;
+
+    --webkit-scrollbar-size: 7px;
+    --webkit-scrollbar-padding: 4px;
+    --webkit-scrollbar-color: var(--separator-color);
+}
+
+@media screen and (max-width: 767px) {
+    html {
+        --page-font-size: 16px;
+        --navigation-font-size: 16px;
+        --toc-font-size: 15px;
+        --code-font-size: 15px; /* affects code, fragment */
+        --title-font-size: 22px;
+    }
+}
+
+@media (prefers-color-scheme: dark) {
+    html:not(.light-mode) {
+        color-scheme: dark;
+
+        --primary-color: #1982d2;
+        --primary-dark-color: #86a9c4;
+        --primary-light-color: #4779ac;
+
+        --box-shadow: 0 2px 8px 0 rgba(0,0,0,.35);
+
+        --odd-color: rgba(100,100,100,.06);
+
+        --menu-selected-background: rgba(0,0,0,.4);
+
+        --page-background-color: #1C1D1F;
+        --page-foreground-color: #d2dbde;
+        --page-secondary-foreground-color: #859399;
+        --separator-color: #38393b;
+        --side-nav-background: #252628;
+
+        --code-background: #2a2c2f;
+
+        --tablehead-background: #2a2c2f;
+    
+        --blockquote-background: #222325;
+        --blockquote-foreground: #7e8c92;
+
+        --warning-color: #2e1917;
+        --warning-color-dark: #ad2617;
+        --warning-color-darker: #f5b1aa;
+        --note-color: #3b2e04;
+        --note-color-dark: #f1b602;
+        --note-color-darker: #ceb670;
+        --todo-color: #163750;
+        --todo-color-dark: #1982D2;
+        --todo-color-darker: #dcf0fa;
+        --deprecated-color: #2e323b;
+        --deprecated-color-dark: #738396;
+        --deprecated-color-darker: #abb0bd;
+        --bug-color: #2a2536;
+        --bug-color-dark: #7661b3;
+        --bug-color-darker: #ae9ed6;
+        --invariant-color: #303a35;
+        --invariant-color-dark: #76ce96;
+        --invariant-color-darker: #cceed5;
+
+        --fragment-background: #282c34;
+        --fragment-foreground: #dbe4eb;
+        --fragment-keyword: #cc99cd;
+        --fragment-keywordtype: #ab99cd;
+        --fragment-keywordflow: #e08000;
+        --fragment-token: #7ec699;
+        --fragment-comment: #999999;
+        --fragment-link: #98c0e3;
+        --fragment-preprocessor: #65cabe;
+        --fragment-linenumber-color: #cccccc;
+        --fragment-linenumber-background: #35393c;
+        --fragment-linenumber-border: #1f1f1f;
+    }
+}
+
+/* dark mode variables are defined twice, to support both the dark-mode without and with doxygen-awesome-darkmode-toggle.js */
+html.dark-mode {
+    color-scheme: dark;
+
+    --primary-color: #1982d2;
+    --primary-dark-color: #86a9c4;
+    --primary-light-color: #4779ac;
+
+    --box-shadow: 0 2px 8px 0 rgba(0,0,0,.30);
+
+    --odd-color: rgba(100,100,100,.06);
+
+    --menu-selected-background: rgba(0,0,0,.4);
+
+    --page-background-color: #1C1D1F;
+    --page-foreground-color: #d2dbde;
+    --page-secondary-foreground-color: #859399;
+    --separator-color: #38393b;
+    --side-nav-background: #252628;
+
+    --code-background: #2a2c2f;
+
+    --tablehead-background: #2a2c2f;
+
+    --blockquote-background: #222325;
+    --blockquote-foreground: #7e8c92;
+
+    --warning-color: #2e1917;
+    --warning-color-dark: #ad2617;
+    --warning-color-darker: #f5b1aa;
+    --note-color: #3b2e04;
+    --note-color-dark: #f1b602;
+    --note-color-darker: #ceb670;
+    --todo-color: #163750;
+    --todo-color-dark: #1982D2;
+    --todo-color-darker: #dcf0fa;
+    --deprecated-color: #2e323b;
+    --deprecated-color-dark: #738396;
+    --deprecated-color-darker: #abb0bd;
+    --bug-color: #2a2536;
+    --bug-color-dark: #7661b3;
+    --bug-color-darker: #ae9ed6;
+    --invariant-color: #303a35;
+    --invariant-color-dark: #76ce96;
+    --invariant-color-darker: #cceed5;
+
+    --fragment-background: #282c34;
+    --fragment-foreground: #dbe4eb;
+    --fragment-keyword: #cc99cd;
+    --fragment-keywordtype: #ab99cd;
+    --fragment-keywordflow: #e08000;
+    --fragment-token: #7ec699;
+    --fragment-comment: #999999;
+    --fragment-link: #98c0e3;
+    --fragment-preprocessor: #65cabe;
+    --fragment-linenumber-color: #cccccc;
+    --fragment-linenumber-background: #35393c;
+    --fragment-linenumber-border: #1f1f1f;
+}
+
+body {
+    color: var(--page-foreground-color);
+    background-color: var(--page-background-color);
+    font-size: var(--page-font-size);
+}
+
+body, table, div, p, dl, #nav-tree .label, .title,
+.sm-dox a, .sm-dox a:hover, .sm-dox a:focus, #projectname,
+.SelectItem, #MSearchField, .navpath li.navelem a,
+.navpath li.navelem a:hover, p.reference, p.definition {
+    font-family: var(--font-family);
+}
+
+h1, h2, h3, h4, h5 {
+    margin-top: .9em;
+    font-weight: 600;
+    line-height: initial;
+}
+
+p, div, table, dl, p.reference, p.definition {
+    font-size: var(--page-font-size);
+}
+
+p.reference, p.definition {
+    color: var(--page-secondary-foreground-color);
+}
+
+a:link, a:visited, a:hover, a:focus, a:active {
+    color: var(--primary-color) !important;
+    font-weight: 500;
+}
+
+a.anchor {
+    scroll-margin-top: var(--spacing-large);
+    display: block;
+}
+
+/*
+ Title and top navigation
+ */
+
+#top {
+    background: var(--header-background);
+    border-bottom: 1px solid var(--separator-color);
+}
+
+@media screen and (min-width: 768px) {
+    #top {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: space-between;
+        align-items: center;
+    }
+}
+
+#main-nav {
+    flex-grow: 5;
+    padding: var(--spacing-small) var(--spacing-medium);
+}
+
+#titlearea {
+    width: auto;
+    padding: var(--spacing-medium) var(--spacing-large);
+    background: none;
+    color: var(--header-foreground);
+    border-bottom: none;
+}
+
+@media screen and (max-width: 767px) {
+    #titlearea {
+        padding-bottom: var(--spacing-small);
+    }
+}
+
+#titlearea table tbody tr {
+    height: auto !important;
+}
+
+#projectname {
+    font-size: var(--title-font-size);
+    font-weight: 600;
+}
+
+#projectnumber {
+    font-family: inherit;
+    font-size: 60%;
+}
+
+#projectbrief {
+    font-family: inherit;
+    font-size: 80%;
+}
+
+#projectlogo {
+    vertical-align: middle;
+}
+
+#projectlogo img {
+    max-height: calc(var(--title-font-size) * 2);
+    margin-right: var(--spacing-small);
+}
+
+.sm-dox, .tabs, .tabs2, .tabs3 {
+    background: none;
+    padding: 0;
+}
+
+.tabs, .tabs2, .tabs3 {
+    border-bottom: 1px solid var(--separator-color);
+    margin-bottom: -1px;
+}
+
+.main-menu-btn-icon, .main-menu-btn-icon:before, .main-menu-btn-icon:after {
+    background: var(--page-secondary-foreground-color);
+}
+
+@media screen and (max-width: 767px) {
+    .sm-dox a span.sub-arrow {
+        background: var(--code-background);
+    }
+
+    #main-menu a.has-submenu span.sub-arrow {
+        color: var(--page-secondary-foreground-color);
+        border-radius: var(--border-radius-medium);
+    }
+
+    #main-menu a.has-submenu:hover span.sub-arrow {
+        color: var(--page-foreground-color);
+    }
+}
+
+@media screen and (min-width: 768px) {
+    .sm-dox li, .tablist li {
+        display: var(--menu-display);
+    }
+
+    .sm-dox a span.sub-arrow {
+        border-color: var(--header-foreground) transparent transparent transparent;
+    }
+
+    .sm-dox a:hover span.sub-arrow {
+        border-color: var(--menu-focus-foreground) transparent transparent transparent;
+    }
+
+    .sm-dox ul a span.sub-arrow {
+        border-color: transparent transparent transparent var(--page-foreground-color);
+    }
+
+    .sm-dox ul a:hover span.sub-arrow {
+        border-color: transparent transparent transparent var(--menu-focus-foreground);
+    }
+}
+
+.sm-dox ul {
+    background: var(--page-background-color);
+    box-shadow: var(--box-shadow);
+    border: 1px solid var(--separator-color);
+    border-radius: var(--border-radius-medium) !important;
+    padding: var(--spacing-small);
+    animation: ease-out 150ms slideInMenu;
+}
+
+@keyframes slideInMenu {
+    from {
+        opacity: 0;
+        transform: translate(0px, -2px);
+    }
+
+    to {
+        opacity: 1;
+        transform: translate(0px, 0px);
+    }
+}
+
+.sm-dox ul a {
+    color: var(--page-foreground-color) !important;
+    background: var(--page-background-color);
+    font-size: var(--navigation-font-size);
+}
+
+.sm-dox>li>ul:after {
+    border-bottom-color: var(--page-background-color) !important;
+}
+
+.sm-dox>li>ul:before {
+    border-bottom-color: var(--separator-color) !important;
+}
+
+.sm-dox ul a:hover, .sm-dox ul a:active, .sm-dox ul a:focus {
+    font-size: var(--navigation-font-size) !important;
+    color: var(--menu-focus-foreground) !important;
+    text-shadow: none;
+    background-color: var(--menu-focus-background);
+    border-radius: var(--border-radius-small) !important;
+}
+
+.sm-dox a, .sm-dox a:focus, .tablist li, .tablist li a, .tablist li.current a {
+    text-shadow: none;
+    background: transparent;
+    background-image: none !important;
+    color: var(--header-foreground) !important;
+    font-weight: normal;
+    font-size: var(--navigation-font-size);
+    border-radius: var(--border-radius-small) !important;
+}
+
+.sm-dox a:focus {
+    outline: auto;
+}
+
+.sm-dox a:hover, .sm-dox a:active, .tablist li a:hover {
+    text-shadow: none;
+    font-weight: normal;
+    background: var(--menu-focus-background);
+    color: var(--menu-focus-foreground) !important;
+    border-radius: var(--border-radius-small) !important;
+    font-size: var(--navigation-font-size);
+}
+
+.tablist li.current {
+    border-radius: var(--border-radius-small);
+    background: var(--menu-selected-background);
+}
+
+.tablist li {
+    margin: var(--spacing-small) 0 var(--spacing-small) var(--spacing-small);
+}
+
+.tablist a {
+    padding: 0 var(--spacing-large);
+}
+
+
+/*
+ Search box
+ */
+
+#MSearchBox {
+    height: var(--searchbar-height);
+    background: var(--searchbar-background);
+    border-radius: var(--searchbar-border-radius);
+    border: 1px solid var(--separator-color);
+    overflow: hidden;
+    width: var(--searchbar-width);
+    position: relative;
+    box-shadow: none;
+    display: block;
+    margin-top: 0;
+}
+
+/* until Doxygen 1.9.4 */
+.left img#MSearchSelect {
+    left: 0;
+    user-select: none;
+    padding-left: 8px;
+}
+
+/* Doxygen 1.9.5 */
+.left span#MSearchSelect {
+    left: 0;
+    user-select: none;
+    margin-left: 8px;
+    padding: 0;
+}
+
+.left #MSearchSelect[src$=".png"] {
+    padding-left: 0
+}
+
+.SelectionMark {
+    user-select: none;
+}
+
+.tabs .left #MSearchSelect {
+    padding-left: 0;
+}
+
+.tabs #MSearchBox {
+    position: absolute;
+    right: var(--spacing-medium);
+}
+
+@media screen and (max-width: 767px) {
+    .tabs #MSearchBox {
+        position: relative;
+        right: 0;
+        margin-left: var(--spacing-medium);
+        margin-top: 0;
+    }
+}
+
+#MSearchSelectWindow, #MSearchResultsWindow {
+    z-index: 9999;
+}
+
+#MSearchBox.MSearchBoxActive {
+    border-color: var(--primary-color);
+    box-shadow: inset 0 0 0 1px var(--primary-color);
+}
+
+#main-menu > li:last-child {
+    margin-right: 0;
+}
+
+@media screen and (max-width: 767px) {
+    #main-menu > li:last-child {
+        height: 50px;
+    }
+}
+
+#MSearchField {
+    font-size: var(--navigation-font-size);
+    height: calc(var(--searchbar-height) - 2px);
+    background: transparent;
+    width: calc(var(--searchbar-width) - 64px);
+}
+
+.MSearchBoxActive #MSearchField {
+    color: var(--searchbar-foreground);
+}
+
+#MSearchSelect {
+    top: calc(calc(var(--searchbar-height) / 2) - 11px);
+}
+
+#MSearchBox span.left, #MSearchBox span.right {
+    background: none;
+    background-image: none;
+}
+
+#MSearchBox span.right {
+    padding-top: calc(calc(var(--searchbar-height) / 2) - 12px);
+    position: absolute;
+    right: var(--spacing-small);
+}
+
+.tabs #MSearchBox span.right {
+    top: calc(calc(var(--searchbar-height) / 2) - 12px);
+}
+
+@keyframes slideInSearchResults {
+    from {
+        opacity: 0;
+        transform: translate(0, 15px);
+    }
+
+    to {
+        opacity: 1;
+        transform: translate(0, 20px);
+    }
+}
+
+#MSearchResultsWindow {
+    left: auto !important;
+    right: var(--spacing-medium);
+    border-radius: var(--border-radius-large);
+    border: 1px solid var(--separator-color);
+    transform: translate(0, 20px);
+    box-shadow: var(--box-shadow);
+    animation: ease-out 280ms slideInSearchResults;
+    background: var(--page-background-color);
+}
+
+iframe#MSearchResults {
+    margin: 4px;
+}
+
+iframe {
+    color-scheme: normal;
+}
+
+@media (prefers-color-scheme: dark) {
+    html:not(.light-mode) iframe#MSearchResults {
+        filter: invert() hue-rotate(180deg);
+    }
+}
+
+html.dark-mode iframe#MSearchResults {
+    filter: invert() hue-rotate(180deg);
+}
+
+#MSearchResults .SRPage {
+    background-color: transparent;
+}
+
+#MSearchResults .SRPage .SREntry {
+    font-size: 10pt;
+    padding: var(--spacing-small) var(--spacing-medium);
+}
+
+#MSearchSelectWindow {
+    border: 1px solid var(--separator-color);
+    border-radius: var(--border-radius-medium);
+    box-shadow: var(--box-shadow);
+    background: var(--page-background-color);
+    padding-top: var(--spacing-small);
+    padding-bottom: var(--spacing-small);
+}
+
+#MSearchSelectWindow a.SelectItem {
+    font-size: var(--navigation-font-size);
+    line-height: var(--content-line-height);
+    margin: 0 var(--spacing-small);
+    border-radius: var(--border-radius-small);
+    color: var(--page-foreground-color) !important;
+    font-weight: normal;
+}
+
+#MSearchSelectWindow a.SelectItem:hover {
+    background: var(--menu-focus-background);
+    color: var(--menu-focus-foreground) !important;
+}
+
+@media screen and (max-width: 767px) {
+    #MSearchBox {
+        margin-top: var(--spacing-medium);
+        margin-bottom: var(--spacing-medium);
+        width: calc(100vw - 30px);
+    }
+
+    #main-menu > li:last-child {
+        float: none !important;
+    }
+
+    #MSearchField {
+        width: calc(100vw - 110px);
+    }
+
+    @keyframes slideInSearchResultsMobile {
+        from {
+            opacity: 0;
+            transform: translate(0, 15px);
+        }
+
+        to {
+            opacity: 1;
+            transform: translate(0, 20px);
+        }
+    }
+
+    #MSearchResultsWindow {
+        left: var(--spacing-medium) !important;
+        right: var(--spacing-medium);
+        overflow: auto;
+        transform: translate(0, 20px);
+        animation: ease-out 280ms slideInSearchResultsMobile;
+        width: auto !important;
+    }
+
+    /*
+     * Overwrites for fixing the searchbox on mobile in doxygen 1.9.2
+     */
+    label.main-menu-btn ~ #searchBoxPos1 {
+        top: 3px !important;
+        right: 6px !important;
+        left: 45px;
+        display: flex;
+    }
+
+    label.main-menu-btn ~ #searchBoxPos1 > #MSearchBox {
+        margin-top: 0;
+        margin-bottom: 0;
+        flex-grow: 2;
+        float: left;
+    }
+}
+
+/*
+ Tree view
+ */
+
+#side-nav {
+    padding: 0 !important;
+    background: var(--side-nav-background);
+}
+
+@media screen and (max-width: 767px) {
+    #side-nav {
+        display: none;
+    }
+
+    #doc-content {
+        margin-left: 0 !important;
+    }
+}
+
+#nav-tree {
+    background: transparent;
+}
+
+#nav-tree .label {
+    font-size: var(--navigation-font-size);
+}
+
+#nav-tree .item {
+    height: var(--tree-item-height);
+    line-height: var(--tree-item-height);
+}
+
+#nav-sync {
+    bottom: 12px;
+    right: 12px;
+    top: auto !important;
+    user-select: none;
+}
+
+#nav-tree .selected {
+    text-shadow: none;
+    background-image: none;
+    background-color: transparent;
+    position: relative;
+}
+
+#nav-tree .selected::after {
+    content: "";
+    position: absolute;
+    top: 1px;
+    bottom: 1px;
+    left: 0;
+    width: 4px;
+    border-radius: 0 var(--border-radius-small) var(--border-radius-small) 0;
+    background: var(--primary-color);
+}
+
+
+#nav-tree a {
+    color: var(--side-nav-foreground) !important;
+    font-weight: normal;
+}
+
+#nav-tree a:focus {
+    outline-style: auto;
+}
+
+#nav-tree .arrow {
+    opacity: var(--side-nav-arrow-opacity);
+}
+
+.arrow {
+    color: inherit;
+    cursor: pointer;
+    font-size: 45%;
+    vertical-align: middle;
+    margin-right: 2px;
+    font-family: serif;
+    height: auto;
+    text-align: right;
+}
+
+#nav-tree div.item:hover .arrow, #nav-tree a:focus .arrow {
+    opacity: var(--side-nav-arrow-hover-opacity);
+}
+
+#nav-tree .selected a {
+    color: var(--primary-color) !important;
+    font-weight: bolder;
+    font-weight: 600;
+}
+
+.ui-resizable-e {
+    background: var(--separator-color);
+    width: 1px;
+}
+
+/*
+ Contents
+ */
+
+div.header {
+    border-bottom: 1px solid var(--separator-color);
+    background-color: var(--page-background-color);
+    background-image: none;
+}
+
+@media screen and (min-width: 1000px) {
+    #doc-content > div > div.contents,
+    .PageDoc > div.contents {
+        display: flex;
+        flex-direction: row-reverse;
+        flex-wrap: nowrap;
+        align-items: flex-start;
+    }
+    
+    div.contents .textblock {
+        min-width: 200px;
+        flex-grow: 1;
+    }
+}
+
+div.contents, div.header .title, div.header .summary {
+    max-width: var(--content-maxwidth);
+}
+
+div.contents, div.header .title  {
+    line-height: initial;
+    margin: calc(var(--spacing-medium) + .2em) auto var(--spacing-medium) auto;
+}
+
+div.header .summary {
+    margin: var(--spacing-medium) auto 0 auto;
+}
+
+div.headertitle {
+    padding: 0;
+}
+
+div.header .title {
+    font-weight: 600;
+    font-size: 225%;
+    padding: var(--spacing-medium) var(--spacing-large);
+    word-break: break-word;
+}
+
+div.header .summary {
+    width: auto;
+    display: block;
+    float: none;
+    padding: 0 var(--spacing-large);
+}
+
+td.memSeparator {
+    border-color: var(--separator-color);
+}
+
+span.mlabel {
+    background: var(--primary-color);
+    border: none;
+    padding: 4px 9px;
+    border-radius: 12px;
+    margin-right: var(--spacing-medium);
+}
+
+span.mlabel:last-of-type {
+    margin-right: 2px;
+}
+
+div.contents {
+    padding: 0 var(--spacing-large);
+}
+
+div.contents p, div.contents li {
+    line-height: var(--content-line-height);
+}
+
+div.contents div.dyncontent {
+    margin: var(--spacing-medium) 0;
+}
+
+@media (prefers-color-scheme: dark) {
+    html:not(.light-mode) div.contents div.dyncontent img,
+    html:not(.light-mode) div.contents center img,
+    html:not(.light-mode) div.contents > table img,
+    html:not(.light-mode) div.contents div.dyncontent iframe,
+    html:not(.light-mode) div.contents center iframe,
+    html:not(.light-mode) div.contents table iframe {
+        filter: hue-rotate(180deg) invert();
+    }
+}
+
+html.dark-mode div.contents div.dyncontent img,
+html.dark-mode div.contents center img,
+html.dark-mode div.contents > table img,
+html.dark-mode div.contents div.dyncontent iframe,
+html.dark-mode div.contents center iframe,
+html.dark-mode div.contents table iframe {
+    filter: hue-rotate(180deg) invert();
+}
+
+h2.groupheader {
+    border-bottom: 0px;
+    color: var(--page-foreground-color);
+    box-shadow: 
+        100px 0 var(--page-background-color), 
+        -100px 0 var(--page-background-color),
+        100px 0.75px var(--separator-color),
+        -100px 0.75px var(--separator-color),
+        500px 0 var(--page-background-color), 
+        -500px 0 var(--page-background-color),
+        500px 0.75px var(--separator-color),
+        -500px 0.75px var(--separator-color),
+        900px 0 var(--page-background-color), 
+        -900px 0 var(--page-background-color),
+        900px 0.75px var(--separator-color),
+        -900px 0.75px var(--separator-color),
+        1400px 0 var(--page-background-color),
+        -1400px 0 var(--page-background-color), 
+        1400px 0.75px var(--separator-color),
+        -1400px 0.75px var(--separator-color),
+        1900px 0 var(--page-background-color),
+        -1900px 0 var(--page-background-color),
+        1900px 0.75px var(--separator-color),
+        -1900px 0.75px var(--separator-color);
+}
+
+blockquote {
+    margin: 0 var(--spacing-medium) 0 var(--spacing-medium);
+    padding: var(--spacing-small) var(--spacing-large);
+    background: var(--blockquote-background);
+    color: var(--blockquote-foreground);
+    border-left: 0;
+    overflow: visible;
+    border-radius: var(--border-radius-medium);
+    overflow: visible;
+    position: relative;
+}
+
+blockquote::before, blockquote::after {
+    font-weight: bold;
+    font-family: serif;
+    font-size: 360%;
+    opacity: .15;
+    position: absolute;
+}
+
+blockquote::before {
+    content: "“";
+    left: -10px;
+    top: 4px;
+}
+
+blockquote::after {
+    content: "”";
+    right: -8px;
+    bottom: -25px;
+}
+
+blockquote p {
+    margin: var(--spacing-small) 0 var(--spacing-medium) 0;
+}
+.paramname {
+    font-weight: 600;
+    color: var(--primary-dark-color);
+}
+
+.paramname > code {
+    border: 0;
+}
+
+table.params .paramname {
+    font-weight: 600;
+    font-family: var(--font-family-monospace);
+    font-size: var(--code-font-size);
+    padding-right: var(--spacing-small);
+    line-height: var(--table-line-height);
+}
+
+h1.glow, h2.glow, h3.glow, h4.glow, h5.glow, h6.glow {
+    text-shadow: 0 0 15px var(--primary-light-color);
+}
+
+.alphachar a {
+    color: var(--page-foreground-color);
+}
+
+/*
+ Table of Contents
+ */
+
+div.contents .toc {
+    max-height: var(--toc-max-height);
+    min-width: var(--toc-width);
+    border: 0;
+    border-left: 1px solid var(--separator-color);
+    border-radius: 0;
+    background-color: transparent;
+    box-shadow: none;
+    position: sticky;
+    top: var(--toc-sticky-top);
+    padding: 0 var(--spacing-large);
+    margin: var(--spacing-small) 0 var(--spacing-large) var(--spacing-large);
+}
+
+div.toc h3 {
+    color: var(--toc-foreground);
+    font-size: var(--navigation-font-size);
+    margin: var(--spacing-large) 0 var(--spacing-medium) 0;
+}
+
+div.toc li {
+    padding: 0;
+    background: none;
+    line-height: var(--toc-font-size);
+    margin: var(--toc-font-size) 0 0 0;
+}
+
+div.toc li::before {
+    display: none;
+}
+
+div.toc ul {
+    margin-top: 0
+}
+
+div.toc li a {
+    font-size: var(--toc-font-size);
+    color: var(--page-foreground-color) !important;
+    text-decoration: none;
+}
+
+div.toc li a:hover, div.toc li a.active {
+    color: var(--primary-color) !important;
+}
+
+div.toc li a.aboveActive {
+    color: var(--page-secondary-foreground-color) !important;
+}
+
+
+@media screen and (max-width: 999px) {
+    div.contents .toc {
+        max-height: 45vh;
+        float: none;
+        width: auto;
+        margin: 0 0 var(--spacing-medium) 0;
+        position: relative;
+        top: 0;
+        position: relative;
+        border: 1px solid var(--separator-color);
+        border-radius: var(--border-radius-medium);
+        background-color: var(--toc-background);
+        box-shadow: var(--box-shadow);
+    }
+
+    div.contents .toc.interactive {
+        max-height: calc(var(--navigation-font-size) + 2 * var(--spacing-large));
+        overflow: hidden;
+    }
+
+    div.contents .toc > h3 {
+        -webkit-tap-highlight-color: transparent;
+        cursor: pointer;
+        position: sticky;
+        top: 0;
+        background-color: var(--toc-background);
+        margin: 0;
+        padding: var(--spacing-large) 0;
+        display: block;
+    }
+
+    div.contents .toc.interactive > h3::before {
+        content: "";
+        width: 0; 
+        height: 0; 
+        border-left: 4px solid transparent;
+        border-right: 4px solid transparent;
+        border-top: 5px solid var(--primary-color);
+        display: inline-block;
+        margin-right: var(--spacing-small);
+        margin-bottom: calc(var(--navigation-font-size) / 4);
+        transform: rotate(-90deg);
+        transition: transform 0.25s ease-out;
+    }
+
+    div.contents .toc.interactive.open > h3::before {
+        transform: rotate(0deg);
+    }
+
+    div.contents .toc.interactive.open {
+        max-height: 45vh;
+        overflow: auto;
+        transition: max-height 0.2s ease-in-out;
+    }
+
+    div.contents .toc a, div.contents .toc a.active {
+        color: var(--primary-color) !important;
+    }
+
+    div.contents .toc a:hover {
+        text-decoration: underline;
+    }
+}
+
+/*
+ Code & Fragments
+ */
+
+code, div.fragment, pre.fragment {
+    border-radius: var(--border-radius-small);
+    border: 1px solid var(--separator-color);
+    overflow: hidden;
+}
+
+code {
+    display: inline;
+    background: var(--code-background);
+    color: var(--code-foreground);
+    padding: 2px 6px;
+}
+
+div.fragment, pre.fragment {
+    margin: var(--spacing-medium) 0;
+    padding: calc(var(--spacing-large) - (var(--spacing-large) / 6)) var(--spacing-large);
+    background: var(--fragment-background);
+    color: var(--fragment-foreground);
+    overflow-x: auto;
+}
+
+@media screen and (max-width: 767px) {
+    div.fragment, pre.fragment {
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
+        border-right: 0;
+    }
+
+    .contents > div.fragment,
+    .textblock > div.fragment,
+    .textblock > pre.fragment,
+    .contents > .doxygen-awesome-fragment-wrapper > div.fragment,
+    .textblock > .doxygen-awesome-fragment-wrapper > div.fragment,
+    .textblock > .doxygen-awesome-fragment-wrapper > pre.fragment {
+        margin: var(--spacing-medium) calc(0px - var(--spacing-large));
+        border-radius: 0;
+        border-left: 0;
+    }
+
+    .textblock li > .fragment,
+    .textblock li > .doxygen-awesome-fragment-wrapper > .fragment {
+        margin: var(--spacing-medium) calc(0px - var(--spacing-large));
+    }
+
+    .memdoc li > .fragment,
+    .memdoc li > .doxygen-awesome-fragment-wrapper > .fragment {
+        margin: var(--spacing-medium) calc(0px - var(--spacing-medium));
+    }
+
+    .textblock ul, .memdoc ul {
+        overflow: initial;
+    }
+
+    .memdoc > div.fragment,
+    .memdoc > pre.fragment,
+    dl dd > div.fragment,
+    dl dd pre.fragment,
+    .memdoc > .doxygen-awesome-fragment-wrapper > div.fragment,
+    .memdoc > .doxygen-awesome-fragment-wrapper > pre.fragment,
+    dl dd > .doxygen-awesome-fragment-wrapper > div.fragment,
+    dl dd .doxygen-awesome-fragment-wrapper > pre.fragment {
+        margin: var(--spacing-medium) calc(0px - var(--spacing-medium));
+        border-radius: 0;
+        border-left: 0;
+    }
+}
+
+code, code a, pre.fragment, div.fragment, div.fragment .line, div.fragment span, div.fragment .line a, div.fragment .line span {
+    font-family: var(--font-family-monospace);
+    font-size: var(--code-font-size) !important;
+}
+
+div.line:after {
+    margin-right: var(--spacing-medium);
+}
+
+div.fragment .line, pre.fragment {
+    white-space: pre;
+    word-wrap: initial;
+    line-height: var(--fragment-lineheight);
+}
+
+div.fragment span.keyword {
+    color: var(--fragment-keyword);
+}
+
+div.fragment span.keywordtype {
+    color: var(--fragment-keywordtype);
+}
+
+div.fragment span.keywordflow {
+    color: var(--fragment-keywordflow);
+}
+
+div.fragment span.stringliteral {
+    color: var(--fragment-token)
+}
+
+div.fragment span.comment {
+    color: var(--fragment-comment);
+}
+
+div.fragment a.code {
+    color: var(--fragment-link) !important;
+}
+
+div.fragment span.preprocessor {
+    color: var(--fragment-preprocessor);
+}
+
+div.fragment span.lineno {
+    display: inline-block;
+    width: 27px;
+    border-right: none;
+    background: var(--fragment-linenumber-background);
+    color: var(--fragment-linenumber-color);
+}
+
+div.fragment span.lineno a {
+    background: none;
+    color: var(--fragment-link) !important;
+}
+
+div.fragment .line:first-child .lineno {
+    box-shadow: -999999px 0px 0 999999px var(--fragment-linenumber-background), -999998px 0px 0 999999px var(--fragment-linenumber-border);
+}
+
+div.line {
+    border-radius: var(--border-radius-small);
+}
+
+div.line.glow {
+    background-color: var(--primary-light-color);
+    box-shadow: none;
+}
+
+/*
+ dl warning, attention, note, deprecated, bug, ...
+ */
+
+dl.bug dt a, dl.deprecated dt a, dl.todo dt a {
+    font-weight: bold !important;
+}
+
+dl.warning, dl.attention, dl.note, dl.deprecated, dl.bug, dl.invariant, dl.pre, dl.todo, dl.remark {
+    padding: var(--spacing-medium);
+    margin: var(--spacing-medium) 0;
+    color: var(--page-background-color);
+    overflow: hidden;
+    margin-left: 0;
+    border-radius: var(--border-radius-small);
+}
+
+dl.section dd {
+    margin-bottom: 2px;
+}
+
+dl.warning, dl.attention {
+    background: var(--warning-color);
+    border-left: 8px solid var(--warning-color-dark);
+    color: var(--warning-color-darker);
+}
+
+dl.warning dt, dl.attention dt {
+    color: var(--warning-color-dark);
+}
+
+dl.note, dl.remark {
+    background: var(--note-color);
+    border-left: 8px solid var(--note-color-dark);
+    color: var(--note-color-darker);
+}
+
+dl.note dt, dl.remark dt {
+    color: var(--note-color-dark);
+}
+
+dl.todo {
+    background: var(--todo-color);
+    border-left: 8px solid var(--todo-color-dark);
+    color: var(--todo-color-darker);
+}
+
+dl.todo dt {
+    color: var(--todo-color-dark);
+}
+
+dl.bug dt a {
+    color: var(--todo-color-dark) !important;
+}
+
+dl.bug {
+    background: var(--bug-color);
+    border-left: 8px solid var(--bug-color-dark);
+    color: var(--bug-color-darker);
+}
+
+dl.bug dt a {
+    color: var(--bug-color-dark) !important;
+}
+
+dl.deprecated {
+    background: var(--deprecated-color);
+    border-left: 8px solid var(--deprecated-color-dark);
+    color: var(--deprecated-color-darker);
+}
+
+dl.deprecated dt a {
+    color: var(--deprecated-color-dark) !important;
+}
+
+dl.section dd, dl.bug dd, dl.deprecated dd, dl.todo dd {
+    margin-inline-start: 0px;
+}
+
+dl.invariant, dl.pre {
+    background: var(--invariant-color);
+    border-left: 8px solid var(--invariant-color-dark);
+    color: var(--invariant-color-darker);
+}
+
+dl.invariant dt, dl.pre dt {
+    color: var(--invariant-color-dark);
+}
+
+/*
+ memitem
+ */
+
+div.memdoc, div.memproto, h2.memtitle {
+    box-shadow: none;
+    background-image: none;
+    border: none;
+}
+
+div.memdoc {
+    padding: 0 var(--spacing-medium);
+    background: var(--page-background-color);
+}
+
+h2.memtitle, div.memitem {
+    border: 1px solid var(--separator-color);
+    box-shadow: var(--box-shadow);
+}
+
+h2.memtitle {
+    box-shadow: 0px var(--spacing-medium) 0 -1px var(--fragment-background), var(--box-shadow);
+}
+
+div.memitem {
+    transition: none;
+}
+
+div.memproto, h2.memtitle {
+    background: var(--fragment-background);
+}
+
+h2.memtitle {
+    font-weight: 500;
+    font-size: var(--memtitle-font-size);
+    font-family: var(--font-family-monospace);
+    border-bottom: none;
+    border-top-left-radius: var(--border-radius-medium);
+    border-top-right-radius: var(--border-radius-medium);
+    word-break: break-all;
+    position: relative;
+}
+
+h2.memtitle:after {
+    content: "";
+    display: block;
+    background: var(--fragment-background);
+    height: var(--spacing-medium);
+    bottom: calc(0px - var(--spacing-medium));
+    left: 0;
+    right: -14px;
+    position: absolute;
+    border-top-right-radius: var(--border-radius-medium);
+}
+
+h2.memtitle > span.permalink {
+    font-size: inherit;
+}
+
+h2.memtitle > span.permalink > a {
+    text-decoration: none;
+    padding-left: 3px;
+    margin-right: -4px;
+    user-select: none;
+    display: inline-block;
+    margin-top: -6px;
+}
+
+h2.memtitle > span.permalink > a:hover {
+    color: var(--primary-dark-color) !important;
+}
+
+a:target + h2.memtitle, a:target + h2.memtitle + div.memitem {
+    border-color: var(--primary-light-color);
+}
+
+div.memitem {
+    border-top-right-radius: var(--border-radius-medium);
+    border-bottom-right-radius: var(--border-radius-medium);
+    border-bottom-left-radius: var(--border-radius-medium);
+    overflow: hidden;
+    display: block !important;
+}
+
+div.memdoc {
+    border-radius: 0;
+}
+
+div.memproto {
+    border-radius: 0 var(--border-radius-small) 0 0;
+    overflow: auto;
+    border-bottom: 1px solid var(--separator-color);
+    padding: var(--spacing-medium);
+    margin-bottom: -1px;
+}
+
+div.memtitle {
+    border-top-right-radius: var(--border-radius-medium);
+    border-top-left-radius: var(--border-radius-medium);
+}
+
+div.memproto table.memname {
+    font-family: var(--font-family-monospace);
+    color: var(--page-foreground-color);
+    font-size: var(--memname-font-size);
+    text-shadow: none;
+}
+
+div.memproto div.memtemplate {
+    font-family: var(--font-family-monospace);
+    color: var(--primary-dark-color);
+    font-size: var(--memname-font-size);
+    margin-left: 2px;
+    text-shadow: none;
+}
+
+table.mlabels, table.mlabels > tbody {
+    display: block;
+}
+
+td.mlabels-left {
+    width: auto;
+}
+
+td.mlabels-right {
+    margin-top: 3px;
+    position: sticky;
+    left: 0;
+}
+
+table.mlabels > tbody > tr:first-child {
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+}
+
+.memname, .memitem span.mlabels {
+    margin: 0
+}
+
+/*
+ reflist
+ */
+
+dl.reflist {
+    box-shadow: var(--box-shadow);
+    border-radius: var(--border-radius-medium);
+    border: 1px solid var(--separator-color);
+    overflow: hidden;
+    padding: 0;
+}
+
+
+dl.reflist dt, dl.reflist dd {
+    box-shadow: none;
+    text-shadow: none;
+    background-image: none;
+    border: none;
+    padding: 12px;
+}
+
+
+dl.reflist dt {
+    font-weight: 500;
+    border-radius: 0;
+    background: var(--code-background);
+    border-bottom: 1px solid var(--separator-color);
+    color: var(--page-foreground-color)
+}
+
+
+dl.reflist dd {
+    background: none;
+}
+
+/*
+ Table
+ */
+
+.contents table:not(.memberdecls):not(.mlabels):not(.fieldtable):not(.memname),
+.contents table:not(.memberdecls):not(.mlabels):not(.fieldtable):not(.memname) tbody {
+    display: inline-block;
+    max-width: 100%;
+}
+
+.contents > table:not(.memberdecls):not(.mlabels):not(.fieldtable):not(.memname):not(.classindex) {
+    margin-left: calc(0px - var(--spacing-large));
+    margin-right: calc(0px - var(--spacing-large));
+    max-width: calc(100% + 2 * var(--spacing-large));
+}
+
+table.fieldtable,
+table.markdownTable tbody,
+table.doxtable tbody {
+    border: none;
+    margin: var(--spacing-medium) 0;
+    box-shadow: 0 0 0 1px var(--separator-color);
+    border-radius: var(--border-radius-small);
+}
+
+table.doxtable caption {
+    display: block;
+}
+
+table.fieldtable {
+    border-collapse: collapse;
+    width: 100%;
+}
+
+th.markdownTableHeadLeft,
+th.markdownTableHeadRight,
+th.markdownTableHeadCenter,
+th.markdownTableHeadNone,
+table.doxtable th {
+    background: var(--tablehead-background);
+    color: var(--tablehead-foreground);
+    font-weight: 600;
+    font-size: var(--page-font-size);
+}
+
+th.markdownTableHeadLeft:first-child,
+th.markdownTableHeadRight:first-child,
+th.markdownTableHeadCenter:first-child,
+th.markdownTableHeadNone:first-child,
+table.doxtable tr th:first-child {
+    border-top-left-radius: var(--border-radius-small);
+}
+
+th.markdownTableHeadLeft:last-child,
+th.markdownTableHeadRight:last-child,
+th.markdownTableHeadCenter:last-child,
+th.markdownTableHeadNone:last-child,
+table.doxtable tr th:last-child {
+    border-top-right-radius: var(--border-radius-small);
+}
+
+table.markdownTable td,
+table.markdownTable th,
+table.fieldtable td,
+table.fieldtable th,
+table.doxtable td,
+table.doxtable th {
+    border: 1px solid var(--separator-color);
+    padding: var(--spacing-small) var(--spacing-medium);
+}
+
+table.markdownTable td:last-child,
+table.markdownTable th:last-child,
+table.fieldtable td:last-child,
+table.fieldtable th:last-child,
+table.doxtable td:last-child,
+table.doxtable th:last-child {
+    border-right: none;
+}
+
+table.markdownTable td:first-child,
+table.markdownTable th:first-child,
+table.fieldtable td:first-child,
+table.fieldtable th:first-child,
+table.doxtable td:first-child,
+table.doxtable th:first-child {
+    border-left: none;
+}
+
+table.markdownTable tr:first-child td,
+table.markdownTable tr:first-child th,
+table.fieldtable tr:first-child td,
+table.fieldtable tr:first-child th,
+table.doxtable tr:first-child td,
+table.doxtable tr:first-child th {
+    border-top: none;
+}
+
+table.markdownTable tr:last-child td,
+table.markdownTable tr:last-child th,
+table.fieldtable tr:last-child td,
+table.fieldtable tr:last-child th,
+table.doxtable tr:last-child td,
+table.doxtable tr:last-child th {
+    border-bottom: none;
+}
+
+table.markdownTable tr, table.doxtable tr {
+    border-bottom: 1px solid var(--separator-color);
+}
+
+table.markdownTable tr:last-child, table.doxtable tr:last-child {
+    border-bottom: none;
+}
+
+table.fieldtable th {
+    font-size: var(--page-font-size);
+    font-weight: 600;
+    background-image: none;
+    background-color: var(--tablehead-background);
+    color: var(--tablehead-foreground);
+}
+
+table.fieldtable td.fieldtype, .fieldtable td.fieldname, .fieldtable td.fielddoc, .fieldtable th {
+    border-bottom: 1px solid var(--separator-color);
+    border-right: 1px solid var(--separator-color);
+}
+
+table.fieldtable tr:last-child td:first-child {
+    border-bottom-left-radius: var(--border-radius-small);
+}
+
+table.fieldtable tr:last-child td:last-child {
+    border-bottom-right-radius: var(--border-radius-small);
+}
+
+.memberdecls td.glow, .fieldtable tr.glow {
+    background-color: var(--primary-light-color);
+    box-shadow: none;
+}
+
+table.memberdecls {
+    display: block;
+    -webkit-tap-highlight-color: transparent;
+}
+
+table.memberdecls tr[class^='memitem'] {
+    font-family: var(--font-family-monospace);
+    font-size: var(--code-font-size);
+}
+
+table.memberdecls tr[class^='memitem'] .memTemplParams {
+    font-family: var(--font-family-monospace);
+    font-size: var(--code-font-size);
+    color: var(--primary-dark-color);
+    white-space: normal;
+}
+
+table.memberdecls .memItemLeft,
+table.memberdecls .memItemRight,
+table.memberdecls .memTemplItemLeft,
+table.memberdecls .memTemplItemRight,
+table.memberdecls .memTemplParams {
+    transition: none;
+    padding-top: var(--spacing-small);
+    padding-bottom: var(--spacing-small);
+    border-top: 1px solid var(--separator-color);
+    border-bottom: 1px solid var(--separator-color);
+    background-color: var(--fragment-background);
+}
+
+table.memberdecls .memTemplItemLeft,
+table.memberdecls .memTemplItemRight {
+    padding-top: 2px;
+}
+
+table.memberdecls .memTemplParams {
+    border-bottom: 0;
+    border-left: 1px solid var(--separator-color);
+    border-right: 1px solid var(--separator-color);
+    border-radius: var(--border-radius-small) var(--border-radius-small) 0 0;
+    padding-bottom: var(--spacing-small);
+}
+
+table.memberdecls .memTemplItemLeft {
+    border-radius: 0 0 0 var(--border-radius-small);
+    border-left: 1px solid var(--separator-color);
+    border-top: 0;
+}
+
+table.memberdecls .memTemplItemRight {
+    border-radius: 0 0 var(--border-radius-small) 0;
+    border-right: 1px solid var(--separator-color);
+    padding-left: 0;
+    border-top: 0;
+}
+
+table.memberdecls .memItemLeft {
+    border-radius: var(--border-radius-small) 0 0 var(--border-radius-small);
+    border-left: 1px solid var(--separator-color);
+    padding-left: var(--spacing-medium);
+    padding-right: 0;
+}
+
+table.memberdecls .memItemRight  {
+    border-radius: 0 var(--border-radius-small) var(--border-radius-small) 0;
+    border-right: 1px solid var(--separator-color);
+    padding-right: var(--spacing-medium);
+    padding-left: 0;
+
+}
+
+table.memberdecls .mdescLeft, table.memberdecls .mdescRight {
+    background: none;
+    color: var(--page-foreground-color);
+    padding: var(--spacing-small) 0;
+}
+
+table.memberdecls .memItemLeft,
+table.memberdecls .memTemplItemLeft {
+    padding-right: var(--spacing-medium);
+}
+
+table.memberdecls .memSeparator {
+    background: var(--page-background-color);
+    height: var(--spacing-large);
+    border: 0;
+    transition: none;
+}
+
+table.memberdecls .groupheader {
+    margin-bottom: var(--spacing-large);
+}
+
+table.memberdecls .inherit_header td {
+    padding: 0 0 var(--spacing-medium) 0;
+    text-indent: -12px;
+    color: var(--page-secondary-foreground-color);
+}
+
+table.memberdecls img[src="closed.png"],
+table.memberdecls img[src="open.png"],
+div.dynheader img[src="open.png"],
+div.dynheader img[src="closed.png"] {
+    width: 0; 
+    height: 0; 
+    border-left: 4px solid transparent;
+    border-right: 4px solid transparent;
+    border-top: 5px solid var(--primary-color);
+    margin-top: 8px;
+    display: block;
+    float: left;
+    margin-left: -10px;
+    transition: transform 0.25s ease-out;
+}
+
+table.memberdecls img {
+    margin-right: 10px;
+}
+
+table.memberdecls img[src="closed.png"],
+div.dynheader img[src="closed.png"] {
+    transform: rotate(-90deg);
+    
+}
+
+.compoundTemplParams {
+    font-family: var(--font-family-monospace);
+    color: var(--primary-dark-color);
+    font-size: var(--code-font-size);
+}
+
+@media screen and (max-width: 767px) {
+
+    table.memberdecls .memItemLeft,
+    table.memberdecls .memItemRight,
+    table.memberdecls .mdescLeft,
+    table.memberdecls .mdescRight,
+    table.memberdecls .memTemplItemLeft,
+    table.memberdecls .memTemplItemRight,
+    table.memberdecls .memTemplParams {
+        display: block;
+        text-align: left;
+        padding-left: var(--spacing-large);
+        margin: 0 calc(0px - var(--spacing-large)) 0 calc(0px - var(--spacing-large));
+        border-right: none;
+        border-left: none;
+        border-radius: 0;
+        white-space: normal;
+    }
+
+    table.memberdecls .memItemLeft,
+    table.memberdecls .mdescLeft,
+    table.memberdecls .memTemplItemLeft {
+        border-bottom: 0;
+        padding-bottom: 0;
+    }
+
+    table.memberdecls .memTemplItemLeft {
+        padding-top: 0;
+    }
+
+    table.memberdecls .mdescLeft {
+        margin-bottom: calc(0px - var(--page-font-size));
+    }
+
+    table.memberdecls .memItemRight, 
+    table.memberdecls .mdescRight,
+    table.memberdecls .memTemplItemRight {
+        border-top: 0;
+        padding-top: 0;
+        padding-right: var(--spacing-large);
+        overflow-x: auto;
+    }
+
+    table.memberdecls tr[class^='memitem']:not(.inherit) {
+        display: block;
+        width: calc(100vw - 2 * var(--spacing-large));
+    }
+
+    table.memberdecls .mdescRight {
+        color: var(--page-foreground-color);
+    }
+
+    table.memberdecls tr.inherit {
+        visibility: hidden;
+    }
+
+    table.memberdecls tr[style="display: table-row;"] {
+        display: block !important;
+        visibility: visible;
+        width: calc(100vw - 2 * var(--spacing-large));
+        animation: fade .5s;
+    }
+
+    @keyframes fade {
+        0% {
+            opacity: 0;
+            max-height: 0;
+        }
+
+        100% {
+            opacity: 1;
+            max-height: 200px;
+        }
+    }
+}
+
+
+/*
+ Horizontal Rule
+ */
+
+hr {
+    margin-top: var(--spacing-large);
+    margin-bottom: var(--spacing-large);
+    height: 1px;
+    background-color: var(--separator-color);
+    border: 0;
+}
+
+.contents hr {
+    box-shadow: 100px 0 0 var(--separator-color),
+                -100px 0 0 var(--separator-color),
+                500px 0 0 var(--separator-color),
+                -500px 0 0 var(--separator-color),
+                1500px 0 0 var(--separator-color),
+                -1500px 0 0 var(--separator-color),
+                2000px 0 0 var(--separator-color),
+                -2000px 0 0 var(--separator-color);
+}
+
+.contents img, .contents .center, .contents center, .contents div.image object {
+    max-width: 100%;
+    overflow: auto;
+}
+
+@media screen and (max-width: 767px) {
+    .contents .dyncontent > .center, .contents > center {
+        margin-left: calc(0px - var(--spacing-large));
+        margin-right: calc(0px - var(--spacing-large));
+        max-width: calc(100% + 2 * var(--spacing-large));
+    }
+}
+
+/*
+ Directories
+ */
+div.directory {
+    border-top: 1px solid var(--separator-color);
+    border-bottom: 1px solid var(--separator-color);
+    width: auto;
+}
+
+table.directory {
+    font-family: var(--font-family);
+    font-size: var(--page-font-size);
+    font-weight: normal;
+    width: 100%;
+}
+
+table.directory td.entry, table.directory td.desc {
+    padding: calc(var(--spacing-small) / 2) var(--spacing-small);
+    line-height: var(--table-line-height);
+}
+
+table.directory tr.even td:last-child {
+    border-radius: 0 var(--border-radius-small) var(--border-radius-small) 0;
+}
+
+table.directory tr.even td:first-child {
+    border-radius: var(--border-radius-small) 0 0 var(--border-radius-small);
+}
+
+table.directory tr.even:last-child td:last-child {
+    border-radius: 0 var(--border-radius-small) 0 0;
+}
+
+table.directory tr.even:last-child td:first-child {
+    border-radius: var(--border-radius-small) 0 0 0;
+}
+
+table.directory td.desc {
+    min-width: 250px;
+}
+
+table.directory tr.even {
+    background-color: var(--odd-color);
+}
+
+table.directory tr.odd {
+    background-color: transparent;
+}
+
+.icona {
+    width: auto;
+    height: auto;
+    margin: 0 var(--spacing-small);
+}
+
+.icon {
+    background: var(--primary-color);
+    border-radius: var(--border-radius-small);
+    font-size: var(--page-font-size);
+    padding: calc(var(--page-font-size) / 5);
+    line-height: var(--page-font-size);
+    transform: scale(0.8);
+    height: auto;
+    width: var(--page-font-size);
+    user-select: none;
+}
+
+.iconfopen, .icondoc, .iconfclosed {
+    background-position: center;
+    margin-bottom: 0;
+    height: var(--table-line-height);
+}
+
+.icondoc {
+    filter: saturate(0.2);
+}
+
+@media screen and (max-width: 767px) {
+    div.directory {
+        margin-left: calc(0px - var(--spacing-large));
+        margin-right: calc(0px - var(--spacing-large));
+    }
+}
+
+@media (prefers-color-scheme: dark) {
+    html:not(.light-mode) .iconfopen, html:not(.light-mode) .iconfclosed {
+        filter: hue-rotate(180deg) invert();
+    }
+}
+
+html.dark-mode .iconfopen, html.dark-mode .iconfclosed {
+    filter: hue-rotate(180deg) invert();
+}
+
+/*
+ Class list
+ */
+
+.classindex dl.odd {
+    background: var(--odd-color);
+    border-radius: var(--border-radius-small);
+}
+
+.classindex dl.even {
+    background-color: transparent;
+}
+
+/* 
+ Class Index Doxygen 1.8 
+*/
+
+table.classindex {
+    margin-left: 0;
+    margin-right: 0;
+    width: 100%;
+}
+
+table.classindex table div.ah {
+    background-image: none;
+    background-color: initial;
+    border-color: var(--separator-color);
+    color: var(--page-foreground-color);
+    box-shadow: var(--box-shadow);
+    border-radius: var(--border-radius-large);
+    padding: var(--spacing-small);
+}
+
+div.qindex {
+    background-color: var(--odd-color);
+    border-radius: var(--border-radius-small);
+    border: 1px solid var(--separator-color);
+    padding: var(--spacing-small) 0;
+}
+
+/*
+  Footer and nav-path
+ */
+
+#nav-path {
+    width: 100%;
+}
+
+#nav-path ul {
+    background-image: none;
+    background: var(--page-background-color);
+    border: none;
+    border-top: 1px solid var(--separator-color);
+    border-bottom: 1px solid var(--separator-color);
+    border-bottom: 0;
+    box-shadow: 0 0.75px 0 var(--separator-color);
+    font-size: var(--navigation-font-size);
+}
+
+img.footer {
+    width: 60px;
+}
+
+.navpath li.footer {
+    color: var(--page-secondary-foreground-color);
+}
+
+address.footer {
+    color: var(--page-secondary-foreground-color);
+    margin-bottom: var(--spacing-large);
+}
+
+#nav-path li.navelem {
+    background-image: none;
+    display: flex;
+    align-items: center;
+}
+
+.navpath li.navelem a {
+    text-shadow: none;
+    display: inline-block;
+    color: var(--primary-color) !important;
+}
+
+.navpath li.navelem b {
+    color: var(--primary-dark-color);
+    font-weight: 500;
+}
+
+li.navelem {
+    padding: 0;
+    margin-left: -8px;
+}
+
+li.navelem:first-child {
+    margin-left: var(--spacing-large);
+}
+
+li.navelem:first-child:before {
+    display: none;
+}
+
+#nav-path li.navelem:after {
+    content: '';
+    border: 5px solid var(--page-background-color);
+    border-bottom-color: transparent;
+    border-right-color: transparent;
+    border-top-color: transparent;
+    transform: translateY(-1px) scaleY(4.2);
+    z-index: 10;
+    margin-left: 6px;
+}
+
+#nav-path li.navelem:before {
+    content: '';
+    border: 5px solid var(--separator-color);
+    border-bottom-color: transparent;
+    border-right-color: transparent;
+    border-top-color: transparent;
+    transform: translateY(-1px) scaleY(3.2);
+    margin-right: var(--spacing-small);
+}
+
+.navpath li.navelem a:hover {
+    color: var(--primary-color);
+}
+
+/*
+ Scrollbars for Webkit
+*/
+
+#nav-tree::-webkit-scrollbar,
+div.fragment::-webkit-scrollbar,
+pre.fragment::-webkit-scrollbar,
+div.memproto::-webkit-scrollbar,
+.contents center::-webkit-scrollbar,
+.contents .center::-webkit-scrollbar,
+.contents table:not(.memberdecls):not(.mlabels):not(.fieldtable):not(.memname) tbody::-webkit-scrollbar,
+div.contents .toc::-webkit-scrollbar {
+    background: transparent;
+    width: calc(var(--webkit-scrollbar-size) + var(--webkit-scrollbar-padding) + var(--webkit-scrollbar-padding));
+    height: calc(var(--webkit-scrollbar-size) + var(--webkit-scrollbar-padding) + var(--webkit-scrollbar-padding));
+}
+
+#nav-tree::-webkit-scrollbar-thumb,
+div.fragment::-webkit-scrollbar-thumb,
+pre.fragment::-webkit-scrollbar-thumb,
+div.memproto::-webkit-scrollbar-thumb,
+.contents center::-webkit-scrollbar-thumb,
+.contents .center::-webkit-scrollbar-thumb,
+.contents table:not(.memberdecls):not(.mlabels):not(.fieldtable):not(.memname) tbody::-webkit-scrollbar-thumb,
+div.contents .toc::-webkit-scrollbar-thumb {
+    background-color: transparent;
+    border: var(--webkit-scrollbar-padding) solid transparent;
+    border-radius: calc(var(--webkit-scrollbar-padding) + var(--webkit-scrollbar-padding));
+    background-clip: padding-box;  
+}
+
+#nav-tree:hover::-webkit-scrollbar-thumb,
+div.fragment:hover::-webkit-scrollbar-thumb,
+pre.fragment:hover::-webkit-scrollbar-thumb,
+div.memproto:hover::-webkit-scrollbar-thumb,
+.contents center:hover::-webkit-scrollbar-thumb,
+.contents .center:hover::-webkit-scrollbar-thumb,
+.contents table:not(.memberdecls):not(.mlabels):not(.fieldtable):not(.memname) tbody:hover::-webkit-scrollbar-thumb,
+div.contents .toc:hover::-webkit-scrollbar-thumb {
+    background-color: var(--webkit-scrollbar-color);
+}
+
+#nav-tree::-webkit-scrollbar-track,
+div.fragment::-webkit-scrollbar-track,
+pre.fragment::-webkit-scrollbar-track,
+div.memproto::-webkit-scrollbar-track,
+.contents center::-webkit-scrollbar-track,
+.contents .center::-webkit-scrollbar-track,
+.contents table:not(.memberdecls):not(.mlabels):not(.fieldtable):not(.memname) tbody::-webkit-scrollbar-track,
+div.contents .toc::-webkit-scrollbar-track {
+    background: transparent;
+}
+
+#nav-tree::-webkit-scrollbar-corner {
+    background-color: var(--side-nav-background);
+}
+
+#nav-tree,
+div.fragment,
+pre.fragment,
+div.memproto,
+.contents center,
+.contents .center,
+.contents table:not(.memberdecls):not(.mlabels):not(.fieldtable):not(.memname) tbody,
+div.contents .toc {
+    overflow-x: auto;
+    overflow-x: overlay;
+}
+
+#nav-tree {
+    overflow-x: auto;
+    overflow-y: auto;
+    overflow-y: overlay;
+}
+
+/*
+ Scrollbars for Firefox
+*/
+
+#nav-tree,
+div.fragment,
+pre.fragment,
+div.memproto,
+.contents center,
+.contents .center,
+.contents table:not(.memberdecls):not(.mlabels):not(.fieldtable):not(.memname) tbody,
+div.contents .toc {
+    scrollbar-width: thin;
+}
+
+/*
+  Optional Dark mode toggle button
+*/
+
+doxygen-awesome-dark-mode-toggle {
+    display: inline-block;
+    margin: 0 0 0 var(--spacing-small);
+    padding: 0;
+    width: var(--searchbar-height);
+    height: var(--searchbar-height);
+    background: none;
+    border: none;
+    border-radius: var(--searchbar-height);
+    vertical-align: middle;
+    text-align: center;
+    line-height: var(--searchbar-height);
+    font-size: 22px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    user-select: none;
+    cursor: pointer;
+}
+
+doxygen-awesome-dark-mode-toggle > svg {
+    transition: transform .1s ease-in-out;
+}
+
+doxygen-awesome-dark-mode-toggle:active > svg {
+    transform: scale(.5);
+}
+
+doxygen-awesome-dark-mode-toggle:hover {
+    background-color: rgba(0,0,0,.03);
+}
+
+html.dark-mode doxygen-awesome-dark-mode-toggle:hover {
+    background-color: rgba(0,0,0,.18);
+}
+
+/*
+ Optional fragment copy button
+*/
+.doxygen-awesome-fragment-wrapper {
+    position: relative;
+}
+
+doxygen-awesome-fragment-copy-button {
+    opacity: 0;
+    background: var(--fragment-background);
+    width: 28px;
+    height: 28px;
+    position: absolute;
+    right: calc(var(--spacing-large) - (var(--spacing-large) / 2.5));
+    top: calc(var(--spacing-large) - (var(--spacing-large) / 2.5));
+    border: 1px solid var(--fragment-foreground);
+    cursor: pointer;
+    border-radius: var(--border-radius-small);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.doxygen-awesome-fragment-wrapper:hover doxygen-awesome-fragment-copy-button, doxygen-awesome-fragment-copy-button.success {
+    opacity: .28;
+}
+
+doxygen-awesome-fragment-copy-button:hover, doxygen-awesome-fragment-copy-button.success {
+    opacity: 1 !important;
+}
+
+doxygen-awesome-fragment-copy-button:active:not([class~=success]) svg {
+    transform: scale(.91);
+}
+
+doxygen-awesome-fragment-copy-button svg {
+    fill: var(--fragment-foreground);
+    width: 18px;
+    height: 18px;
+}
+
+doxygen-awesome-fragment-copy-button.success svg {
+    fill: rgb(14, 168, 14);
+}
+
+doxygen-awesome-fragment-copy-button.success {
+    border-color: rgb(14, 168, 14);
+}
+
+@media screen and (max-width: 767px) {
+    .textblock > .doxygen-awesome-fragment-wrapper > doxygen-awesome-fragment-copy-button,
+    .textblock li > .doxygen-awesome-fragment-wrapper > doxygen-awesome-fragment-copy-button,
+    .memdoc li > .doxygen-awesome-fragment-wrapper > doxygen-awesome-fragment-copy-button,
+    .memdoc > .doxygen-awesome-fragment-wrapper > doxygen-awesome-fragment-copy-button,
+    dl dd > .doxygen-awesome-fragment-wrapper > doxygen-awesome-fragment-copy-button {
+        right: 0;
+    }
+}
+
+/*
+ Optional paragraph link button
+*/
+
+a.anchorlink {
+    font-size: 90%;
+    margin-left: var(--spacing-small);
+    color: var(--page-foreground-color) !important;
+    text-decoration: none;
+    opacity: .15;
+    display: none;
+    transition: opacity .1s ease-in-out, color .1s ease-in-out;
+}
+
+a.anchorlink svg {
+    fill: var(--page-foreground-color);
+}
+
+h3 a.anchorlink svg, h4 a.anchorlink svg {
+    margin-bottom: -3px;
+    margin-top: -4px;
+}
+
+a.anchorlink:hover {
+    opacity: .45;
+}
+
+h2:hover a.anchorlink, h1:hover a.anchorlink, h3:hover a.anchorlink, h4:hover a.anchorlink  {
+    display: inline-block;
+}
+
+
+#MSearchBox .left {
+	background: none !important;	
+}
+#MSearchBox .right {
+	background: none !important;	
+}
diff --git a/htdocs/product/stock/class/api_stockmovements.class.php b/htdocs/product/stock/class/api_stockmovements.class.php
index 544485060af..472d38ea245 100644
--- a/htdocs/product/stock/class/api_stockmovements.class.php
+++ b/htdocs/product/stock/class/api_stockmovements.class.php
@@ -162,8 +162,8 @@ class StockMovements extends DolibarrApi
 	 * @param float $qty Qty to add (Use negative value for a stock decrease) {@from body} {@required true}
 	 * @param int $type Optionally specify the type of movement. 0=input (stock increase by a stock transfer), 1=output (stock decrease by a stock transfer), 2=output (stock decrease), 3=input (stock increase). {@from body} {@type int}
 	 * @param string $lot Lot {@from body}
-	 * @param string $movementcode Movement code {@example INV123} {@from body}
-	 * @param string $movementlabel Movement label {@example Inventory number 123} {@from body}
+	 * @param string $movementcode Movement code {@from body}
+	 * @param string $movementlabel Movement label {@from body}
 	 * @param string $price To update AWP (Average Weighted Price) when you make a stock increase (qty must be higher then 0). {@from body}
 	 * @param string $datem Date of movement {@from body} {@type date}
 	 * @param string $dlc Eat-by date. {@from body} {@type date}

From 59ed7b9f96f8b6ad5bf42ac4fc04e56f587ec9c1 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 2 Jan 2023 11:52:34 +0000
Subject: [PATCH 250/816] Fixing style errors.

---
 htdocs/comm/propal/card.php | 26 ++++++++++-----------
 htdocs/commande/card.php    | 45 ++++++++++++++++++-------------------
 2 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 73a94a2a503..7953691f11b 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1235,7 +1235,7 @@ if (empty($reshook)) {
 
 			// Prepare a price equivalent for minimum price check
 			$pu_equivalent = $pu_ht;
-      $pu_equivalent_ttc = $pu_ttc;
+			$pu_equivalent_ttc = $pu_ttc;
 			$currency_tx = $object->multicurrency_tx;
 
 			// Check if we have a foreing currency
@@ -1243,7 +1243,7 @@ if (empty($reshook)) {
 			if ($pu_ht == '' && $pu_ht_devise != '' && $currency_tx != '') {
 				$pu_equivalent = $pu_ht_devise * $currency_tx;
 			}
-      if ($pu_ttc == '' && $pu_ttc_devise != '' && $currency_tx != '') {
+			if ($pu_ttc == '' && $pu_ttc_devise != '' && $currency_tx != '') {
 				$pu_equivalent_ttc = $pu_ttc_devise * $currency_tx;
 			}
 
@@ -1364,18 +1364,18 @@ if (empty($reshook)) {
 		$remise_percent = price2num(GETPOST('remise_percent'), '', 2);
 
 		// Prepare a price equivalent for minimum price check
-    $pu_equivalent = $pu_ht;
-    $pu_equivalent_ttc = $pu_ttc;
-    $currency_tx = $object->multicurrency_tx;
+		$pu_equivalent = $pu_ht;
+		$pu_equivalent_ttc = $pu_ttc;
+		$currency_tx = $object->multicurrency_tx;
 
-    // Check if we have a foreing currency
-    // If so, we update the pu_equiv as the equivalent price in base currency
-    if ($pu_ht == '' && $pu_ht_devise != '' && $currency_tx != '') {
-      $pu_equivalent = $pu_ht_devise * $currency_tx;
-    }
-    if ($pu_ttc == '' && $pu_ttc_devise != '' && $currency_tx != '') {
-      $pu_equivalent_ttc = $pu_ttc_devise * $currency_tx;
-    }
+		// Check if we have a foreing currency
+		// If so, we update the pu_equiv as the equivalent price in base currency
+		if ($pu_ht == '' && $pu_ht_devise != '' && $currency_tx != '') {
+			$pu_equivalent = $pu_ht_devise * $currency_tx;
+		}
+		if ($pu_ttc == '' && $pu_ttc_devise != '' && $currency_tx != '') {
+			$pu_equivalent_ttc = $pu_ttc_devise * $currency_tx;
+		}
 
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index f5b204c6889..135c6fc9ab9 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -684,18 +684,18 @@ if (empty($reshook)) {
 
 
 		// Prepare a price equivalent for minimum price check
-    $pu_equivalent = $pu_ht;
-    $pu_equivalent_ttc = $pu_ttc;
-    $currency_tx = $object->multicurrency_tx;
+		$pu_equivalent = $pu_ht;
+		$pu_equivalent_ttc = $pu_ttc;
+		$currency_tx = $object->multicurrency_tx;
 
-    // Check if we have a foreing currency
-    // If so, we update the pu_equiv as the equivalent price in base currency
-    if ($pu_ht == '' && $pu_ht_devise != '' && $currency_tx != '') {
-      $pu_equivalent = $pu_ht_devise * $currency_tx;
-    }
-    if ($pu_ttc == '' && $pu_ttc_devise != '' && $currency_tx != '') {
-      $pu_equivalent_ttc = $pu_ttc_devise * $currency_tx;
-    }
+		// Check if we have a foreing currency
+		// If so, we update the pu_equiv as the equivalent price in base currency
+		if ($pu_ht == '' && $pu_ht_devise != '' && $currency_tx != '') {
+			$pu_equivalent = $pu_ht_devise * $currency_tx;
+		}
+		if ($pu_ttc == '' && $pu_ttc_devise != '' && $currency_tx != '') {
+			$pu_equivalent_ttc = $pu_ttc_devise * $currency_tx;
+		}
 
 		$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS', 2);
 
@@ -1013,7 +1013,6 @@ if (empty($reshook)) {
 			}
 
 			if (!$error) {
-
 				// Insert line
 				$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $info_bits, 0, $price_base_type, $pu_ttc, $date_start, $date_end, $type, min($rank, count($object->lines) + 1), 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_options, $fk_unit, '', 0, $pu_ht_devise);
 
@@ -1093,18 +1092,18 @@ if (empty($reshook)) {
 		$qty = price2num(GETPOST('qty', 'alpha'), 'MS');
 
 		// Prepare a price equivalent for minimum price check
-    $pu_equivalent = $pu_ht;
-    $pu_equivalent_ttc = $pu_ttc;
-    $currency_tx = $object->multicurrency_tx;
+		$pu_equivalent = $pu_ht;
+		$pu_equivalent_ttc = $pu_ttc;
+		$currency_tx = $object->multicurrency_tx;
 
-    // Check if we have a foreing currency
-    // If so, we update the pu_equiv as the equivalent price in base currency
-    if ($pu_ht == '' && $pu_ht_devise != '' && $currency_tx != '') {
-      $pu_equivalent = $pu_ht_devise * $currency_tx;
-    }
-    if ($pu_ttc == '' && $pu_ttc_devise != '' && $currency_tx != '') {
-      $pu_equivalent_ttc = $pu_ttc_devise * $currency_tx;
-    }
+		// Check if we have a foreing currency
+		// If so, we update the pu_equiv as the equivalent price in base currency
+		if ($pu_ht == '' && $pu_ht_devise != '' && $currency_tx != '') {
+			$pu_equivalent = $pu_ht_devise * $currency_tx;
+		}
+		if ($pu_ttc == '' && $pu_ttc_devise != '' && $currency_tx != '') {
+			$pu_equivalent_ttc = $pu_ttc_devise * $currency_tx;
+		}
 
 		// Define info_bits
 		$info_bits = 0;

From 66ee541f771664fa3437d96748528ae914452809 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2023 15:18:25 +0100
Subject: [PATCH 251/816] Fix class name collision

---
 htdocs/includes/OAuth/Common/Storage/DoliStorage.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/includes/OAuth/Common/Storage/DoliStorage.php b/htdocs/includes/OAuth/Common/Storage/DoliStorage.php
index a769efdf8b9..0ca8dee700b 100644
--- a/htdocs/includes/OAuth/Common/Storage/DoliStorage.php
+++ b/htdocs/includes/OAuth/Common/Storage/DoliStorage.php
@@ -67,10 +67,10 @@ class DoliStorage implements TokenStorageInterface
 
 	/**
 	 * @param 	DoliDB 	$db					Database handler
-	 * @param 	Conf 	$conf				Conf object
+	 * @param 	\Conf 	$conf				Conf object
 	 * @param	string	$keyforprovider		Key to manage several providers of the same type. For example 'abc' will be added to 'Google' to defined storage key.
 	 */
-	public function __construct(DoliDB $db, Conf $conf, $keyforprovider = '')
+	public function __construct(DoliDB $db, \Conf $conf, $keyforprovider = '')
 	{
 		$this->db = $db;
 		$this->conf = $conf;

From 5dcee6b7d76548ae404be0861746e3226c0c460b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2023 15:24:20 +0100
Subject: [PATCH 252/816] Fix doxygen

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

diff --git a/htdocs/core/boxes/box_dolibarr_state_board.php b/htdocs/core/boxes/box_dolibarr_state_board.php
index 9a2e94b8a1d..6152b167863 100644
--- a/htdocs/core/boxes/box_dolibarr_state_board.php
+++ b/htdocs/core/boxes/box_dolibarr_state_board.php
@@ -20,7 +20,7 @@
 
 /**
  *	\file       htdocs/core/boxes/box_dolibarr_state_board.php
- *	\ingroup
+ *	\ingroup	core
  *	\brief      Module Dolibarr state base
  */
 

From 1484237c1e7588ebe5ac9f0d5654c95b634a198c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2023 16:13:35 +0100
Subject: [PATCH 253/816] Doc

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

diff --git a/ChangeLog b/ChangeLog
index 3d9b0b04e5a..bbb01cfd3cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,7 +21,7 @@ For users:
 NEW: Minimal PHP version is now PHP 7.0 instead of PHP 5.6
 NEW: #21780 Add pid field to Cronjob class and store PID on job execution
 NEW: #19680 Add option PRODUCT_ALLOW_EXTERNAL_DOWNLOAD to automatically have uploaded files shared publicly by a link
-NEW: #20650 can move the checkbox column on left (experimental option)
+NEW: #20650 can move the checkbox column on left (experimental option MAIN_CHECKBOX_LEFT_COLUMN)
 NEW: #21000 Added columns 'alias_name' on project, supplier invoice, supplier order, supplier proposals and task list
 NEW: #21395 Added option for dark theme mode in display - color and theme
 NEW: #21397 added option to auto define barcode numbers for third-parties in barcode module setup

From 3ed5edc0032ff0f1ace6958e11e628cf52eeecb0 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Mon, 2 Jan 2023 16:21:14 +0100
Subject: [PATCH 254/816] NEW : search on time spent duration range

---
 htdocs/projet/tasks/time.php | 53 +++++++++++++++++++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 94ed0edaffd..8c98e6387b1 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -88,6 +88,10 @@ $search_company = GETPOST('$search_company', 'alpha');
 $search_company_alias = GETPOST('$search_company_alias', 'alpha');
 $search_project_ref = GETPOST('$search_project_ref', 'alpha');
 $search_project_label = GETPOST('$search_project_label', 'alpha');
+$search_timespent_starthour = GETPOSTINT("search_timespent_duration_starthour");
+$search_timespent_startmin = GETPOSTINT("search_timespent_duration_startmin");
+$search_timespent_endhour = GETPOSTINT("search_timespent_duration_endhour");
+$search_timespent_endmin = GETPOSTINT("search_timespent_duration_endmin");
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
@@ -196,6 +200,10 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_product_ref = '';
 	$toselect = array();
 	$search_array_options = array();
+	$search_timespent_starthour = '';
+	$search_timespent_startmin = '';
+	$search_timespent_endhour = '';
+	$search_timespent_endmin = '';
 	$action = '';
 }
 
@@ -1337,6 +1345,18 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 		if ($search_date_endyear) {
 			$param .= '&search_date_endyear='.urlencode($search_date_endyear);
 		}
+		if ($search_timespent_starthour) {
+			$param .= '&search_timespent_duration_starthour='.urlencode($search_timespent_starthour);
+		}
+		if ($search_timespent_startmin) {
+			$param .= '&search_timespent_duration_startmin='.urlencode($search_timespent_startmin);
+		}
+		if ($search_timespent_endhour) {
+			$param .= '&search_timespent_duration_endhour='.urlencode($search_timespent_endhour);
+		}
+		if ($search_timespent_endmin) {
+			$param .= '&search_timespent_duration_endmin='.urlencode($search_timespent_endmin);
+		}
 
 		/*
 		 // Add $param from extra fields
@@ -1609,6 +1629,18 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			$sql .= " AND t.task_date <= '".$db->idate($search_date_end)."'";
 		}
 
+		if($search_timespent_starthour || $search_timespent_startmin) {
+			$timespent_duration_start = $search_timespent_starthour * 60 * 60; // We store duration in seconds
+			$timespent_duration_start += ($search_timespent_startmin ? $search_timespent_startmin : 0) * 60; // We store duration in seconds
+			$sql .= " AND t.task_duration >= ".$timespent_duration_start;
+		}
+
+		if($search_timespent_endhour || $search_timespent_endmin) {
+			$timespent_duration_end = $search_timespent_endhour * 60 * 60; // We store duration in seconds
+			$timespent_duration_end += ($search_timespent_endmin ? $search_timespent_endmin : 0) * 60; // We store duration in seconds
+			$sql .= " AND t.task_duration <= ".$timespent_duration_end;
+		}
+
 		$sql .= dolSqlDateFilter('t.task_datehour', $search_day, $search_month, $search_year);
 
 		// Add where from hooks
@@ -1877,7 +1909,26 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 		}
 		// Duration
 		if (!empty($arrayfields['t.task_duration']['checked'])) {
-			print '<td class="liste_titre right"></td>';
+			// Duration - Time spent
+			print '<td class="liste_titre right">';
+
+			$durationtouse_start = 0;
+			if ($search_timespent_starthour || $search_timespent_startmin) {
+				$durationtouse_start = ($search_timespent_starthour * 3600 + $search_timespent_startmin * 60);
+			}
+			print '<div class="nowraponall">'.$langs->trans('from').'&nbsp;';
+			$form->select_duration('search_timespent_duration_start', $durationtouse_start, 0, 'text');
+			print '</div>';
+
+			$durationtouse_end = 0;
+			if ($search_timespent_endhour || $search_timespent_endmin) {
+				$durationtouse_end = ($search_timespent_endhour * 3600 + $search_timespent_endmin * 60);
+			}
+			print '<div class="nowraponall">'.$langs->trans('at').'&nbsp;';
+			$form->select_duration('search_timespent_duration_end', $durationtouse_end, 0, 'text');
+			print '</div>';
+
+			print '</td>';
 		}
 		// Product
 		if (!empty($arrayfields['t.fk_product']['checked'])) {

From 1bd0099d9f1e3c85ecdf3aefefe4830212a3bbcd Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Mon, 2 Jan 2023 16:29:16 +0100
Subject: [PATCH 255/816] Add column "Alias Name" in contact list

---
 htdocs/contact/list.php | 44 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 40 insertions(+), 4 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index e8c4174af71..3e5103d319a 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -72,6 +72,7 @@ $search_firstlast_only = GETPOST("search_firstlast_only", 'alpha');
 $search_lastname = GETPOST("search_lastname", 'alpha');
 $search_firstname = GETPOST("search_firstname", 'alpha');
 $search_societe = GETPOST("search_societe", 'alpha');
+$search_societe_alias = GETPOST("search_societe_alias", 'alpha');
 $search_poste = GETPOST("search_poste", 'alpha');
 $search_phone_perso = GETPOST("search_phone_perso", 'alpha');
 $search_phone_pro = GETPOST("search_phone_pro", 'alpha');
@@ -192,6 +193,7 @@ foreach ($object->fields as $key => $val) {
 // Add none object fields for "search in all"
 if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
 	$fieldstosearchall['s.nom'] = "ThirdParty";
+	$fieldstosearchall['s.name_alias'] = "AliasNames";
 }
 
 // Definition of fields for list
@@ -213,6 +215,7 @@ foreach ($object->fields as $key => $val) {
 $arrayfields['country.code_iso'] = array('label'=>"Country", 'position'=>66, 'checked'=>0);
 if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
 	$arrayfields['s.nom'] = array('label'=>"ThirdParty", 'position'=>113, 'checked'=> 1);
+	$arrayfields['s.name_alias'] = array('label'=>"AliasNameShort", 'position'=>114, 'checked'=> 1);
 }
 
 $arrayfields['unsubscribed'] = array(
@@ -277,6 +280,7 @@ if (empty($reshook)) {
 		$search_lastname = "";
 		$search_firstname = "";
 		$search_societe = "";
+		$search_societe_alias = "";
 		$search_town = "";
 		$search_address = "";
 		$search_zip = "";
@@ -372,7 +376,7 @@ if ($resql) {
 	dol_print_error($db);
 }
 
-$sql = "SELECT s.rowid as socid, s.nom as name,";
+$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias as alias,";
 $sql .= " p.rowid, p.lastname as lastname, p.statut, p.firstname, p.address, p.zip, p.town, p.poste, p.email,";
 $sql .= " p.socialnetworks, p.photo,";
 $sql .= " p.phone as phone_pro, p.phone_mobile, p.phone_perso, p.fax, p.fk_pays, p.priv, p.datec as date_creation, p.tms as date_update,";
@@ -544,8 +548,15 @@ if ($search_lastname) {
 if ($search_firstname) {
 	$sql .= natural_search('p.firstname', $search_firstname);
 }
-if ($search_societe) {
-	$sql .= natural_search(empty($conf->global->SOCIETE_DISABLE_CONTACTS) ? 's.nom' : 'p.fk_soc', $search_societe);
+if (empty($arrayfields['s.name_alias']['checked']) && $search_societe) {
+	$sql .= natural_search(array("s.nom", "s.name_alias"), $search_societe);
+} else {
+	if ($search_societe) {
+		$sql .= natural_search('s.nom', $search_societe);
+	}
+	if ($search_societe_alias) {
+		$sql .= natural_search('s.name_alias', $search_societe_alias);
+	}
 }
 if ($search_country) {
 	$sql .= " AND p.fk_pays IN (".$db->sanitize($search_country).')';
@@ -676,6 +687,9 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && (
 	exit;
 }
 
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:M&oacute;dulo_Empresas';
 llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');
 
@@ -712,6 +726,9 @@ if ($search_firstname != '') {
 if ($search_societe != '') {
 	$param .= '&search_societe='.urlencode($search_societe);
 }
+if ($search_societe_alias != '') {
+	$param .= '&search_societe_alias='.urlencode($search_societe_alias);
+}
 if ($search_address != '') {
 	$param .= '&search_address='.urlencode($search_address);
 }
@@ -984,6 +1001,12 @@ if (!empty($arrayfields['p.fk_soc']['checked']) || !empty($arrayfields['s.nom'][
 	print '<input class="flat" type="text" name="search_societe" size="8" value="'.dol_escape_htmltag($search_societe).'">';
 	print '</td>';
 }
+// Alias
+if (!empty($arrayfields['s.name_alias']['checked'])) {
+	print '<td class="liste_titre" align="left">';
+	print '<input class="flat maxwidth100" type="text" name="search_societe_alias" value="'.dol_escape_htmltag($search_societe_alias).'">';
+	print '</td>';
+}
 if (!empty($arrayfields['p.priv']['checked'])) {
 	print '<td class="liste_titre center">';
 	$selectarray = array('0'=>$langs->trans("ContactPublic"), '1'=>$langs->trans("ContactPrivate"));
@@ -1105,6 +1128,9 @@ if (!empty($arrayfields['p.fk_soc']['checked'])) {
 if (!empty($arrayfields['s.nom']['checked'])) {
 	print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", $begin, $param, '', $sortfield, $sortorder);
 }
+if (!empty($arrayfields['s.name_alias']['checked'])) {
+	print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER["PHP_SELF"], "s.name_alias", $begin, $param, '', $sortfield, $sortorder);
+}
 if (!empty($arrayfields['p.priv']['checked'])) {
 	print_liste_field_titre($arrayfields['p.priv']['label'], $_SERVER["PHP_SELF"], "p.priv", $begin, $param, '', $sortfield, $sortorder, 'center ');
 }
@@ -1323,7 +1349,7 @@ while ($i < min($num, $limit)) {
 		if ($obj->socid) {
 			$objsoc = new Societe($db);
 			$objsoc->fetch($obj->socid);
-			print $objsoc->getNomUrl(1);
+			print $objsoc->getNomUrl(1, 'customer', 100, 0, 1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);
 		} else {
 			print '&nbsp;';
 		}
@@ -1333,6 +1359,16 @@ while ($i < min($num, $limit)) {
 		}
 	}
 
+	// Alias name
+	if (!empty($arrayfields['s.name_alias']['checked'])) {
+		print '<td class="nocellnopadd">';
+		print $obj->alias;
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
 	// Private/Public
 	if (!empty($arrayfields['p.priv']['checked'])) {
 		print '<td class="center">'.$contactstatic->LibPubPriv($obj->priv).'</td>';

From 07ba47dff8a89f9e37d2cbdda66ce67838f8ed82 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2023 16:31:38 +0100
Subject: [PATCH 256/816] css

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

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index daeb574a9dd..fe18193910d 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -171,6 +171,11 @@ table.liste th.wrapcolumntitle.liste_titre_sel:not(.maxwidthsearch), table.liste
 	max-width: 100px;
 	text-overflow: ellipsis;
 }
+th.wrapcolumntitle dl dt a span.fas.fa-list {
+	padding-bottom: 0;
+	vertical-align: bottom;
+}
+
 /*.liste_titre input[name=month_date_when], .liste_titre input[name=monthvalid], .liste_titre input[name=search_ordermonth], .liste_titre input[name=search_deliverymonth],
 .liste_titre input[name=search_smonth], .liste_titre input[name=search_month], .liste_titre input[name=search_emonth], .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre select[name=month],
 .liste_titre select[name=year],
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index b4ff8bb18b6..b59eb7ebd10 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -485,6 +485,11 @@ th.wrapcolumntitle.liste_titre_sel:not(.maxwidthsearch), td.wrapcolumntitle.list
 	max-width: 120px;
 	text-overflow: ellipsis;
 }
+th.wrapcolumntitle dl dt a span.fas.fa-list {
+	padding-bottom: 0;
+	vertical-align: bottom;
+}
+
 .liste_titre input[name=month_date_when], .liste_titre input[name=monthvalid], .liste_titre input[name=search_ordermonth], .liste_titre input[name=search_deliverymonth],
 .liste_titre input[name=search_smonth], .liste_titre input[name=search_month], .liste_titre input[name=search_emonth], .liste_titre input[name=smonth], .liste_titre input[name=month],
 .liste_titre input[name=month_lim], .liste_titre input[name=month_start], .liste_titre input[name=month_end], .liste_titre input[name=month_create],

From c84d17eced5d2a922b89b85a30ba61f6b680dbcf Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Mon, 2 Jan 2023 16:58:33 +0100
Subject: [PATCH 257/816] FIX : filter only if t.task_duration checked

---
 htdocs/projet/tasks/time.php | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 8c98e6387b1..6652b57304a 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -1629,16 +1629,20 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			$sql .= " AND t.task_date <= '".$db->idate($search_date_end)."'";
 		}
 
-		if($search_timespent_starthour || $search_timespent_startmin) {
-			$timespent_duration_start = $search_timespent_starthour * 60 * 60; // We store duration in seconds
-			$timespent_duration_start += ($search_timespent_startmin ? $search_timespent_startmin : 0) * 60; // We store duration in seconds
-			$sql .= " AND t.task_duration >= ".$timespent_duration_start;
-		}
+		if (!empty($arrayfields['t.task_duration']['checked'])) {
 
-		if($search_timespent_endhour || $search_timespent_endmin) {
-			$timespent_duration_end = $search_timespent_endhour * 60 * 60; // We store duration in seconds
-			$timespent_duration_end += ($search_timespent_endmin ? $search_timespent_endmin : 0) * 60; // We store duration in seconds
-			$sql .= " AND t.task_duration <= ".$timespent_duration_end;
+			if ($search_timespent_starthour || $search_timespent_startmin) {
+				$timespent_duration_start = $search_timespent_starthour * 60 * 60; // We store duration in seconds
+				$timespent_duration_start += ($search_timespent_startmin ? $search_timespent_startmin : 0) * 60; // We store duration in seconds
+				$sql .= " AND t.task_duration >= " . $timespent_duration_start;
+			}
+
+			if ($search_timespent_endhour || $search_timespent_endmin) {
+				$timespent_duration_end = $search_timespent_endhour * 60 * 60; // We store duration in seconds
+				$timespent_duration_end += ($search_timespent_endmin ? $search_timespent_endmin : 0) * 60; // We store duration in seconds
+				$sql .= " AND t.task_duration <= " . $timespent_duration_end;
+			}
+			
 		}
 
 		$sql .= dolSqlDateFilter('t.task_datehour', $search_day, $search_month, $search_year);

From c3f44859ae61968e1db1d6846f53777201eed225 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2023 17:33:11 +0100
Subject: [PATCH 258/816] Debug v17

---
 htdocs/admin/oauth.php                             | 7 ++++---
 htdocs/admin/oauthlogintokens.php                  | 8 +++++++-
 htdocs/core/modules/oauth/google_oauthcallback.php | 2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
index 64968b1a516..217dfd63cc9 100644
--- a/htdocs/admin/oauth.php
+++ b/htdocs/admin/oauth.php
@@ -285,7 +285,7 @@ if (count($listinsetup) > 0) {
 		// Delete
 		print '<td>';
 		$label = preg_replace('/_NAME$/', '', $keyforsupportedoauth2array);
-		print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&provider='.$keyforprovider.'&label='.$label.'">';
+		print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&provider='.urlencode($keyforprovider).'&label='.urlencode($label).'">';
 		print img_picto('', 'delete');
 		print '</a>';
 
@@ -298,7 +298,8 @@ if (count($listinsetup) > 0) {
 			$redirect_uri = $urlwithroot.'/core/modules/oauth/'.$supportedoauth2array[$keyforsupportedoauth2array]['callbackfile'].'_oauthcallback.php';
 			print '<tr class="oddeven value">';
 			print '<td>'.$langs->trans("UseTheFollowingUrlAsRedirectURI").'</td>';
-			print '<td><input style="width: 80%" type"text" name="uri'.$keyforsupportedoauth2array.'" value="'.$redirect_uri.'" disabled>';
+			print '<td><input style="width: 80%" type="text" name="uri'.$keyforsupportedoauth2array.'" id="uri'.$keyforsupportedoauth2array.$keyforprovider.'" value="'.$redirect_uri.'" disabled>';
+			print ajax_autoselect('uri'.$keyforsupportedoauth2array.$keyforprovider);
 			print '</td>';
 			print '<td></td>';
 			print '</tr>';
@@ -306,7 +307,7 @@ if (count($listinsetup) > 0) {
 			if ($keyforsupportedoauth2array == 'OAUTH_OTHER_NAME') {
 				print '<tr class="oddeven value">';
 				print '<td>'.$langs->trans("URLOfServiceForAuthorization").'</td>';
-				print '<td><input style="width: 80%" type"text" name="'.$key[3].'" value="'.getDolGlobalString($key[3]).'" >';
+				print '<td><input style="width: 80%" type="text" name="'.$key[3].'" value="'.getDolGlobalString($key[3]).'" >';
 				print '</td>';
 				print '<td></td>';
 				print '</tr>';
diff --git a/htdocs/admin/oauthlogintokens.php b/htdocs/admin/oauthlogintokens.php
index f798995d525..9a0532880cd 100644
--- a/htdocs/admin/oauthlogintokens.php
+++ b/htdocs/admin/oauthlogintokens.php
@@ -213,7 +213,13 @@ if ($mode == 'setup' && $user->admin) {
 			$urltocheckperms = '';
 		}
 
-		$urltorenew .= '&keyforprovider='.urlencode($keyforprovider);
+		if ($urltorenew) {
+			$urltorenew .= '&keyforprovider='.urlencode($keyforprovider);
+		}
+		if ($urltodelete) {
+			$urltodelete .= '&keyforprovider='.urlencode($keyforprovider);
+		}
+
 
 		// Show value of token
 		$tokenobj = null;
diff --git a/htdocs/core/modules/oauth/google_oauthcallback.php b/htdocs/core/modules/oauth/google_oauthcallback.php
index b993cbdd81e..80c39d85158 100644
--- a/htdocs/core/modules/oauth/google_oauthcallback.php
+++ b/htdocs/core/modules/oauth/google_oauthcallback.php
@@ -42,7 +42,7 @@ $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domai
 $action = GETPOST('action', 'aZ09');
 $backtourl = GETPOST('backtourl', 'alpha');
 $keyforprovider = GETPOST('keyforprovider', 'aZ09');
-if (empty($keyforprovider) && !empty($_SESSION["oauthkeyforproviderbeforeoauthjump"]) && (GETPOST('code') || $action == 'delete')) {
+if (!GETPOSTISSET('keyforprovider', 'aZ09') && !empty($_SESSION["oauthkeyforproviderbeforeoauthjump"]) && (GETPOST('code') || $action == 'delete')) {
 	// If we are coming from the Oauth page
 	$keyforprovider = $_SESSION["oauthkeyforproviderbeforeoauthjump"];
 }

From 4ddf0b27dc10268344c35e5db9c998af794270d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20N=C3=BA=C3=B1ez?= <javi.nr@dualmatic.com>
Date: Mon, 2 Jan 2023 18:15:33 +0100
Subject: [PATCH 259/816] NEW create email substitution variable for
 intervention signature URL

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 977342b1457..d5c3652ebdb 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7659,6 +7659,9 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			if (isModEnabled("propal") && (!is_object($object) || $object->element == 'propal')) {
 				$substitutionarray['__ONLINE_SIGN_URL__'] = 'ToOfferALinkForOnlineSignature';
 			}
+			if (isModEnabled("ficheinter") && (!is_object($object) || $object->element == 'fichinter')) {
+				$substitutionarray['__ONLINE_SIGN_FICHINTER_URL__'] = 'ToOfferALinkForOnlineSignature';
+			}
 			$substitutionarray['__ONLINE_PAYMENT_URL__'] = 'UrlToPayOnlineIfApplicable';
 			$substitutionarray['__ONLINE_PAYMENT_TEXT_AND_URL__'] = 'TextAndUrlToPayOnlineIfApplicable';
 			$substitutionarray['__SECUREKEYPAYMENT__'] = 'Security key (if key is not unique per record)';
@@ -7929,6 +7932,10 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/signature.lib.php';
 					$substitutionarray['__ONLINE_SIGN_URL__'] = getOnlineSignatureUrl(0, 'proposal', $object->ref);
 				}
+				if (is_object($object) && $object->element == 'fichinter') {
+					require_once DOL_DOCUMENT_ROOT.'/core/lib/signature.lib.php';
+					$substitutionarray['__ONLINE_SIGN_FICHINTER_URL__'] = getOnlineSignatureUrl(0, 'fichinter', $object->ref);
+				}
 				if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'propal') {
 					$substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = $object->getLastMainDocLink($object->element);
 				} else {

From 6a085ad60246dd4d73b8943959ef61d2bd2d3127 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2023 19:01:15 +0100
Subject: [PATCH 260/816] css

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

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index b4ff1774054..46e34549731 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -172,7 +172,7 @@ table.liste th.wrapcolumntitle.liste_titre_sel:not(.maxwidthsearch), table.liste
 	text-overflow: ellipsis;
 }
 th.wrapcolumntitle dl dt a span.fas.fa-list {
-	padding-bottom: 0;
+	padding-bottom: 1px;
 	vertical-align: bottom;
 }
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 59cadcb3763..9a341e56b3b 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -486,7 +486,7 @@ th.wrapcolumntitle.liste_titre_sel:not(.maxwidthsearch), td.wrapcolumntitle.list
 	text-overflow: ellipsis;
 }
 th.wrapcolumntitle dl dt a span.fas.fa-list {
-	padding-bottom: 0;
+	padding-bottom: 1px;
 	vertical-align: bottom;
 }
 

From 9478cd6ad320a43c67006c9d354f84c2fbae1359 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2023 19:09:27 +0100
Subject: [PATCH 261/816] Doc

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

diff --git a/ChangeLog b/ChangeLog
index bbb01cfd3cf..68b22cc4f8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -166,7 +166,7 @@ NEW: show product label on inventory
 NEW: show sell-by and eat-by dates only if not empty
 NEW: show SellBy/EatBy dates for each batch product in shipment card
 NEW: skip accept/refuse process for proposals (option PROPAL_SKIP_ACCEPT_REFUSE)
-NEW: SMTP using oauth2 authentication
+NEW: experimental SMTP using PhpImap allowing OAuth2 authentication (need to add option MAIN_IMAP_USE_PHPIMAP)
 NEW: can substitue project title in mail template
 NEW: Supplier order list - Add column private and public note
 NEW: Support IP type in extrafields

From 3147c3a8d2548060db1fed4d4700b11ac0ecf845 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2023 19:01:15 +0100
Subject: [PATCH 262/816] css

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

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index fe18193910d..de4b84b5975 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -172,7 +172,7 @@ table.liste th.wrapcolumntitle.liste_titre_sel:not(.maxwidthsearch), table.liste
 	text-overflow: ellipsis;
 }
 th.wrapcolumntitle dl dt a span.fas.fa-list {
-	padding-bottom: 0;
+	padding-bottom: 1px;
 	vertical-align: bottom;
 }
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index b59eb7ebd10..78b962aa87d 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -486,7 +486,7 @@ th.wrapcolumntitle.liste_titre_sel:not(.maxwidthsearch), td.wrapcolumntitle.list
 	text-overflow: ellipsis;
 }
 th.wrapcolumntitle dl dt a span.fas.fa-list {
-	padding-bottom: 0;
+	padding-bottom: 1px;
 	vertical-align: bottom;
 }
 

From d62fb2af64eea3dab5bd1c20826f43f4f4f9edfe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2023 20:15:34 +0100
Subject: [PATCH 263/816] css

---
 htdocs/core/lib/functions.lib.php | 2 +-
 htdocs/societe/list.php           | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4724bf85d50..a600761d9b9 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2198,7 +2198,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 						// If the preview file is found
 						if (file_exists($fileimage)) {
 							$phototoshow = '<div class="photoref">';
-							$phototoshow .= '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
+							$phototoshow .= '<img height="'.$heightforphotref.'" class="photo photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
 							$phototoshow .= '</div>';
 						}
 					}
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 84a8d355c1a..f0ef18e4dfd 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -113,6 +113,7 @@ $place = GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : '0'; // $place is
 
 $diroutputmassaction = $conf->societe->dir_output.'/temp/massgeneration/'.$user->id;
 
+// Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
@@ -770,6 +771,7 @@ $num = $db->num_rows($resql);
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
+// Direct jump if only one record found
 if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && ($search_all != '' || $search_cti != '') && $action != 'list') {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
@@ -1011,6 +1013,7 @@ foreach (array(1, 2, 3, 4, 5, 6) as $key) {
 	}
 }
 
+// Add code for pre mass action (confirmation or email presend form)
 $topicmail = "Information";
 $modelmail = "thirdparty";
 $objecttmp = new Societe($db);

From 2dfb8c049683153e257610600d730801e053ef59 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2023 20:26:46 +0100
Subject: [PATCH 264/816] Clean code

---
 htdocs/core/lib/files.lib.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 82831424ccd..47b3955e617 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1991,7 +1991,6 @@ function deleteFilesIntoDatabaseIndex($dir, $file, $mode = 'uploaded')
  */
 function dol_convert_file($fileinput, $ext = 'png', $fileoutput = '', $page = '')
 {
-	global $langs;
 	if (class_exists('Imagick')) {
 		$image = new Imagick();
 		try {

From 94fb344bd67c5910b8e681d74e7677e864270ea7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2023 02:02:34 +0100
Subject: [PATCH 265/816] FIX #22271

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

diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index dfe2d0b9d49..a6982bd0a4e 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -815,18 +815,22 @@ if ($step == 4 && $datatoimport) {
 		$array_match_file_to_database = array();
 	}
 
-	// Load source fields in input file
+	// Load the source fields from input file into variable $arrayrecord
 	$fieldssource = array();
 	$result = $obj->import_open_file($conf->import->dir_temp.'/'.$filetoimport, $langs);
 	if ($result >= 0) {
 		// Read first line
 		$arrayrecord = $obj->import_read_record();
-		// Put into array fieldssource starting with 1.
+
+		// Create array $fieldssource starting with 1 with values found of first line.
 		$i = 1;
 		foreach ($arrayrecord as $key => $val) {
 			if ($val["type"] != -1) {
 				$fieldssource[$i]['example1'] = dol_trunc($val['val'], 128);
 				$i++;
+			} else {
+				$fieldssource[$i]['example1'] = $langs->trans('Empty');
+				$i++;
 			}
 		}
 		$obj->import_close_file();

From 496cff016713848127b458ef027d9dc64ea05eb0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2023 02:29:49 +0100
Subject: [PATCH 266/816] Debug v17

---
 htdocs/accountancy/admin/account.php          | 77 ++++++++++++++-----
 htdocs/accountancy/bookkeeping/list.php       | 10 +++
 .../accountancy/bookkeeping/listbyaccount.php | 10 +++
 htdocs/langs/en_US/accountancy.lang           |  2 +
 4 files changed, 80 insertions(+), 19 deletions(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 21d60103135..91b7673ab81 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -47,6 +47,7 @@ $search_label = GETPOST('search_label', 'alpha');
 $search_labelshort = GETPOST('search_labelshort', 'alpha');
 $search_accountparent = GETPOST('search_accountparent', 'alpha');
 $search_pcgtype = GETPOST('search_pcgtype', 'alpha');
+$search_import_key = GETPOST('search_import_key', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $confirm = GETPOST('confirm', 'alpha');
@@ -83,16 +84,19 @@ if (!$sortorder) {
 }
 
 $arrayfields = array(
-	'aa.account_number'=>array('label'=>$langs->trans("AccountNumber"), 'checked'=>1),
-	'aa.label'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
-	'aa.labelshort'=>array('label'=>$langs->trans("LabelToShow"), 'checked'=>1),
-	'aa.account_parent'=>array('label'=>$langs->trans("Accountparent"), 'checked'=>1),
-	'aa.pcg_type'=>array('label'=>$langs->trans("Pcgtype"), 'checked'=>1, 'help'=>'PcgtypeDesc'),
-	'aa.reconcilable'=>array('label'=>$langs->trans("Reconcilable"), 'checked'=>1),
-	'aa.active'=>array('label'=>$langs->trans("Activated"), 'checked'=>1)
+	'aa.account_number'=>array('label'=>"AccountNumber", 'checked'=>1),
+	'aa.label'=>array('label'=>"Label", 'checked'=>1),
+	'aa.labelshort'=>array('label'=>"LabelToShow", 'checked'=>1),
+	'aa.account_parent'=>array('label'=>"Accountparent", 'checked'=>1),
+	'aa.pcg_type'=>array('label'=>"Pcgtype", 'checked'=>1, 'help'=>'PcgtypeDesc'),
+	'categories'=>array('label'=>"AccountingCategories", 'checked'=>-1, 'help'=>'AccountingCategoriesDesc'),
+	'aa.reconcilable'=>array('label'=>"Reconcilable", 'checked'=>1),
+	'aa.active'=>array('label'=>"Activated", 'checked'=>1),
+	'aa.import_key'=>array('label'=>"ImportId", 'checked'=>-1)
 );
 
 if ($conf->global->MAIN_FEATURES_LEVEL < 2) {
+	unset($arrayfields['categories']);
 	unset($arrayfields['aa.reconcilable']);
 }
 
@@ -226,15 +230,12 @@ if ($action == 'delete') {
 
 $pcgver = $conf->global->CHARTOFACCOUNTS;
 
-$sql = "SELECT aa.rowid, aa.fk_pcg_version, aa.pcg_type, aa.account_number, aa.account_parent , aa.label, aa.labelshort, aa.reconcilable, aa.active, ";
+$sql = "SELECT aa.rowid, aa.fk_pcg_version, aa.pcg_type, aa.account_number, aa.account_parent, aa.label, aa.labelshort, aa.fk_accounting_category,";
+$sql .= " aa.reconcilable, aa.active, aa.import_key,";
 $sql .= " a2.rowid as rowid2, a2.label as label2, a2.account_number as account_number2";
 $sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as aa";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version AND aa.entity = ".$conf->entity;
-if ($db->type == 'pgsql') {
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as a2 ON a2.rowid = aa.account_parent AND a2.entity = ".$conf->entity;
-} else {
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as a2 ON a2.rowid = aa.account_parent AND a2.entity = ".$conf->entity;
-}
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version AND aa.entity = ".((int) $conf->entity);
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as a2 ON a2.rowid = aa.account_parent AND a2.entity = ".((int) $conf->entity);
 $sql .= " WHERE asy.rowid = ".((int) $pcgver);
 //print $sql;
 if (strlen(trim($search_account))) {
@@ -337,6 +338,9 @@ if ($resql) {
 	if ($search_pcgtype) {
 		$param .= '&search_pcgtype='.urlencode($search_pcgtype);
 	}
+	if ($optioncss != '') {
+		$param .= '&search_import_key='.urlencode($search_import_key);
+	}
 	if ($optioncss != '') {
 		$param .= '&optioncss='.urlencode($optioncss);
 	}
@@ -439,8 +443,17 @@ if ($resql) {
 		print $formaccounting->select_account($search_accountparent, 'search_accountparent', 2, array(), 0, 0, 'maxwidth150');
 		print '</td>';
 	}
+	// Predefined group
 	if (!empty($arrayfields['aa.pcg_type']['checked'])) {
-		print '<td class="liste_titre"><input type="text" class="flat width100" name="search_pcgtype" value="'.$search_pcgtype.'"></td>';
+		print '<td class="liste_titre"><input type="text" class="flat width75" name="search_pcgtype" value="'.$search_pcgtype.'"></td>';
+	}
+	// Custom groups
+	if (!empty($arrayfields['categories']['checked'])) {
+		print '<td class="liste_titre"></td>';
+	}
+	// Import key
+	if (!empty($arrayfields['aa.import_key']['checked'])) {
+		print '<td class="liste_titre"><input type="text" class="flat width75" name="search_import_key" value="'.$search_import_key.'"></td>';
 	}
 	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
 		if (!empty($arrayfields['aa.reconcilable']['checked'])) {
@@ -471,6 +484,12 @@ if ($resql) {
 	if (!empty($arrayfields['aa.pcg_type']['checked'])) {
 		print_liste_field_titre($arrayfields['aa.pcg_type']['label'], $_SERVER["PHP_SELF"], 'aa.pcg_type,aa.account_number', '', $param, '', $sortfield, $sortorder, '', $arrayfields['aa.pcg_type']['help'], 1);
 	}
+	if (!empty($arrayfields['categories']['checked'])) {
+		print_liste_field_titre($arrayfields['categories']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, '', $arrayfields['categories']['help'], 1);
+	}
+	if (!empty($arrayfields['aa.import_key']['checked'])) {
+		print_liste_field_titre($arrayfields['aa.import_key']['label'], $_SERVER["PHP_SELF"], 'aa.import_key', '', $param, '', $sortfield, $sortorder, '', $arrayfields['aa.import_key']['help'], 1);
+	}
 	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
 		if (!empty($arrayfields['aa.reconcilable']['checked'])) {
 			print_liste_field_titre($arrayfields['aa.reconcilable']['label'], $_SERVER["PHP_SELF"], 'aa.reconcilable', '', $param, '', $sortfield, $sortorder);
@@ -505,7 +524,7 @@ if ($resql) {
 		// Account label
 		if (!empty($arrayfields['aa.label']['checked'])) {
 			print "<td>";
-			print $obj->label;
+			print dol_escape_htmltag($obj->label);
 			print "</td>\n";
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -515,7 +534,7 @@ if ($resql) {
 		// Account label to show (label short)
 		if (!empty($arrayfields['aa.labelshort']['checked'])) {
 			print "<td>";
-			print $obj->labelshort;
+			print dol_escape_htmltag($obj->labelshort);
 			print "</td>\n";
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -549,10 +568,30 @@ if ($resql) {
 			}
 		}
 
-		// Chart of accounts type
+		// Predefined group (deprecated)
 		if (!empty($arrayfields['aa.pcg_type']['checked'])) {
 			print "<td>";
-			print $obj->pcg_type;
+			print dol_escape_htmltag($obj->pcg_type);
+			print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Custom accounts
+		if (!empty($arrayfields['categories']['checked'])) {
+			print "<td>";
+			// TODO Get all custom groups labels the account is in
+			print dol_escape_htmltag($obj->fk_accounting_category);
+			print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Import id
+		if (!empty($arrayfields['aa.import_key']['checked'])) {
+			print "<td>";
+			print dol_escape_htmltag($obj->import_key);
 			print "</td>\n";
 			if (!$i) {
 				$totalarray['nbfield']++;
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 2b2df70d647..fa42b5bd6fd 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -1511,6 +1511,16 @@ while ($i < min($num, $limit)) {
 // Show total line
 include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
+// If no record found
+if ($num == 0) {
+	$colspan = 1;
+	foreach ($arrayfields as $key => $val) {
+		if (!empty($val['checked'])) {
+			$colspan++;
+		}
+	}
+	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
+}
 
 $parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 4a6e37ceb29..29596f0a124 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -1232,6 +1232,16 @@ if ($num > 0 && $colspan > 0) {
 // Show total line
 include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
+// If no record found
+if ($num == 0) {
+	$colspan = 1;
+	foreach ($arrayfields as $key => $val) {
+		if (!empty($val['checked'])) {
+			$colspan++;
+		}
+	}
+	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
+}
 
 $parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index b6bf1b90aef..9822a52e8f0 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -218,6 +218,7 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Custom group
+AccountingCategories=Custom groups
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -265,6 +266,7 @@ ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=Reconcilable
 

From 61ec6f5226f0d7d1d0c92e8e0cceb4452cd3a004 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2023 02:44:38 +0100
Subject: [PATCH 267/816] Doc

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

diff --git a/htdocs/core/doxygen.php b/htdocs/core/doxygen.php
index ac66362a89f..06a2510dfef 100644
--- a/htdocs/core/doxygen.php
+++ b/htdocs/core/doxygen.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2008-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2008-2022 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2009      Regis Houssin        <regis.houssin@inodbox.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,7 +23,7 @@
  *		\mainpage	Dolibarr project
  *
  *	    This is source documentation for Dolibarr ERP/CRM.<br>
- *      This documentation can be built or updated running the script <b>dolibarr-doxygen-build.pl</b> or from Eclipse with Doxygen plugin.<br>
+ *      This documentation can be built or updated running the script <b>build/doxygen/dolibarr-doxygen-build.pl</b> or from Eclipse with Doxygen plugin.<br>
  *      <br>
  *      Dolibarr official web site: <a href="https://www.dolibarr.org">www.dolibarr.org</a><br>
  *      <br>

From a0a6ab72415e85431b51d982e6f16b2afad84d2d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2023 02:46:05 +0100
Subject: [PATCH 268/816] Doc

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

diff --git a/htdocs/core/doxygen.php b/htdocs/core/doxygen.php
index 06a2510dfef..1e66b348ef8 100644
--- a/htdocs/core/doxygen.php
+++ b/htdocs/core/doxygen.php
@@ -20,7 +20,7 @@
 /**
  *	    \file       htdocs/core/doxygen.php
  *      \ingroup    core
- *		\mainpage	Dolibarr project
+ *		\mainpage	Dolibarr documentation of source code
  *
  *	    This is source documentation for Dolibarr ERP/CRM.<br>
  *      This documentation can be built or updated running the script <b>build/doxygen/dolibarr-doxygen-build.pl</b> or from Eclipse with Doxygen plugin.<br>

From 5978f404614fc31fe35f9d904152636fcd2d1fde Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2023 10:27:54 +0100
Subject: [PATCH 269/816] Fix user status

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

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 129e6ed63d4..3e69b1ff76e 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -1314,7 +1314,7 @@ if (!empty($arrayfields['s.tms']['checked'])) {
 // Status
 if (!empty($arrayfields['s.status']['checked'])) {
 	print '<td class="liste_titre center minwidth75imp">';
-	print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status minwidth75 maxwidth125 onrightofpage', 1);
+	print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status minwidth75imp maxwidth125 onrightofpage', 1);
 	print '</td>';
 }
 if (!empty($arrayfields['s.import_key']['checked'])) {
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index ebc49db57d3..a3445e3939f 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -436,7 +436,7 @@ class User extends CommonObject
 		$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,";
+		$sql .= " u.statut as status, u.lang, u.entity,";
 		$sql .= " u.datec as datec,";
 		$sql .= " u.tms as datem,";
 		$sql .= " u.datelastlogin as datel,";
@@ -553,7 +553,10 @@ class User extends CommonObject
 				$this->note_public = $obj->note_public;
 				$this->note_private = $obj->note_private;
 				$this->note			= $obj->note_private;	// deprecated
-				$this->statut		= $obj->statut;
+
+				$this->statut		= $obj->status;			// deprecated
+				$this->status		= $obj->status;
+
 				$this->photo		= $obj->photo;
 				$this->openid		= $obj->openid;
 				$this->lang			= $obj->lang;
@@ -1349,7 +1352,10 @@ class User extends CommonObject
 		$error = 0;
 
 		// Check parameters
-		if ($this->statut == $status) {
+		if (isset($this->statut) && $this->statut == $status) {
+			return 0;
+		}
+		if (isset($this->status) && $this->status == $status) {
 			return 0;
 		}
 
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 8610113f0da..d3139b438e2 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -800,7 +800,7 @@ if (!empty($arrayfields['u.tms']['checked'])) {
 if (!empty($arrayfields['u.statut']['checked'])) {
 	// Status
 	print '<td class="liste_titre center">';
-	print $form->selectarray('search_statut', array('-1'=>'', '0'=>$langs->trans('Disabled'), '1'=>$langs->trans('Enabled')), $search_statut, 0, 0, 0, '', 0, 0, 0, '', 'minwidth75imp');
+	print $form->selectarray('search_statut', array('-1'=>'', '0'=>$langs->trans('Disabled'), '1'=>$langs->trans('Enabled')), $search_statut, 0, 0, 0, '', 0, 0, 0, '', 'search_status minwidth75imp maxwidth125 onrightofpage');
 	print '</td>';
 }
 // Action column

From 37ce175d538a2382334b914dbf071976a41a7896 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2023 10:27:54 +0100
Subject: [PATCH 270/816] Fix user status

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

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index f0ef18e4dfd..96666b28d8c 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -1311,7 +1311,7 @@ if (!empty($arrayfields['s.tms']['checked'])) {
 // Status
 if (!empty($arrayfields['s.status']['checked'])) {
 	print '<td class="liste_titre center minwidth75imp">';
-	print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status minwidth75 maxwidth125 onrightofpage', 1);
+	print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status minwidth75imp maxwidth125 onrightofpage', 1);
 	print '</td>';
 }
 if (!empty($arrayfields['s.import_key']['checked'])) {
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index dddcaa0ca6a..744e24fe15a 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -436,7 +436,7 @@ class User extends CommonObject
 		$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,";
+		$sql .= " u.statut as status, u.lang, u.entity,";
 		$sql .= " u.datec as datec,";
 		$sql .= " u.tms as datem,";
 		$sql .= " u.datelastlogin as datel,";
@@ -553,7 +553,10 @@ class User extends CommonObject
 				$this->note_public = $obj->note_public;
 				$this->note_private = $obj->note_private;
 				$this->note			= $obj->note_private;	// deprecated
-				$this->statut		= $obj->statut;
+
+				$this->statut		= $obj->status;			// deprecated
+				$this->status		= $obj->status;
+
 				$this->photo		= $obj->photo;
 				$this->openid		= $obj->openid;
 				$this->lang			= $obj->lang;
@@ -1350,7 +1353,10 @@ class User extends CommonObject
 		$error = 0;
 
 		// Check parameters
-		if ($this->statut == $status) {
+		if (isset($this->statut) && $this->statut == $status) {
+			return 0;
+		}
+		if (isset($this->status) && $this->status == $status) {
 			return 0;
 		}
 
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 8610113f0da..d3139b438e2 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -800,7 +800,7 @@ if (!empty($arrayfields['u.tms']['checked'])) {
 if (!empty($arrayfields['u.statut']['checked'])) {
 	// Status
 	print '<td class="liste_titre center">';
-	print $form->selectarray('search_statut', array('-1'=>'', '0'=>$langs->trans('Disabled'), '1'=>$langs->trans('Enabled')), $search_statut, 0, 0, 0, '', 0, 0, 0, '', 'minwidth75imp');
+	print $form->selectarray('search_statut', array('-1'=>'', '0'=>$langs->trans('Disabled'), '1'=>$langs->trans('Enabled')), $search_statut, 0, 0, 0, '', 0, 0, 0, '', 'search_status minwidth75imp maxwidth125 onrightofpage');
 	print '</td>';
 }
 // Action column

From 9f02bd2350ed9b256c7f2d978cb9514e521df3e7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2023 11:32:33 +0100
Subject: [PATCH 271/816] Debug v17

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

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 744e24fe15a..e90252877d1 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1353,10 +1353,11 @@ class User extends CommonObject
 		$error = 0;
 
 		// Check parameters
-		if (isset($this->statut) && $this->statut == $status) {
-			return 0;
-		}
-		if (isset($this->status) && $this->status == $status) {
+		if (isset($this->statut)) {
+			if ($this->statut == $status) {
+				return 0;
+			}
+		} elseif (isset($this->status) && $this->status == $status) {
 			return 0;
 		}
 
@@ -3259,7 +3260,8 @@ class User extends CommonObject
 		$this->iplastlogin = '127.0.0.1';
 		$this->datepreviouslogin = $now;
 		$this->ippreviouslogin = '127.0.0.1';
-		$this->statut = 1;
+		$this->statut = 1;		// deprecated
+		$this->status = 1;
 
 		$this->entity = 1;
 		return 1;

From 797b9c90548f27755cb5c68c9acb7cd9f780eeb8 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 3 Jan 2023 11:42:39 +0100
Subject: [PATCH 272/816] dfelete cem data on product deletion

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 0900f11ed29..e133e1a42f4 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1408,6 +1408,14 @@ class Product extends CommonObject
 				}
 			}
 
+			// Delete record into ECM index and physically
+			if (!$error) {
+				$res = $this->deleteEcmFiles(0); // Deleting files physically is done later with the dol_delete_dir_recursive
+				if (!$res) {
+					$error++;
+				}
+			}
+
 			if (!$error) {
 				// We remove directory
 				$ref = dol_sanitizeFileName($this->ref);

From ea1ad5243f7b3e4f96b99c6a6edcc1c3072a04f7 Mon Sep 17 00:00:00 2001
From: Florent Poinsaut <florent@solution-libre.fr>
Date: Thu, 22 Dec 2022 16:31:55 +0000
Subject: [PATCH 273/816] fix supplier invoice import

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

diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index 7bd10fcaf9b..b6286c35162 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -587,6 +587,9 @@ class modFournisseur extends DolibarrModules
 		}
 		// End add extra fields
 		$this->import_fieldshidden_array[$r] = array('extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'facture_fourn');
+		if (empty($conf->multicurrency->enabled)) {
+			$this->import_fieldshidden_array[$r]['f.multicurrency_code'] = 'const-'.$conf->currency;
+		}
 		$this->import_regex_array[$r] = array('f.ref' => '(SI\d{4}-\d{4}|PROV.{1,32}$)', 'f.multicurrency_code' => 'code@'.MAIN_DB_PREFIX.'multicurrency');
 		$import_sample = array(
 			'f.ref' => '(PROV001)',

From 7fd82ccc45d59409c40bc3c29feb4b13b4553fd1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2023 12:08:04 +0100
Subject: [PATCH 274/816] NEW formconfirm can support field with format
 datetime

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 6655215a4f7..71df1296fc7 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5010,7 +5010,7 @@ class Form
 	 *     @param	string			$question    	   	Question
 	 *     @param 	string			$action      	   	Action
 	 *	   @param  	array|string	$formquestion	   	An array with complementary inputs to add into forms: array(array('label'=> ,'type'=> , 'size'=>, 'morecss'=>, 'moreattr'=>'autofocus' or 'style=...'))
-	 *													'type' can be 'text', 'password', 'checkbox', 'radio', 'date', 'select', 'multiselect', 'morecss',
+	 *													'type' can be 'text', 'password', 'checkbox', 'radio', 'date', 'datetime', 'select', 'multiselect', 'morecss',
 	 *                                                  'other', 'onecolumn' or 'hidden'...
 	 * 	   @param  	int|string		$selectedchoice  	'' or 'no', or 'yes' or '1', 1, '0' or 0
 	 * 	   @param  	int|string		$useajax		   	0=No, 1=Yes use Ajax to show the popup, 2=Yes and also submit page with &confirm=no if choice is No, 'xxx'=Yes and preoutput confirm box with div id=dialog-confirm-xxx
@@ -5141,11 +5141,11 @@ class Form
 							$more .= '</div></div>'."\n";
 							$i++;
 						}
-					} elseif ($input['type'] == 'date') {
+					} elseif ($input['type'] == 'date' || $input['type'] == 'datetime') {
 						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].'</div>';
 						$more .= '<div class="tagtd">';
 						$addnowlink = (empty($input['datenow']) ? 0 : 1);
-						$more .= $this->selectDate($input['value'], $input['name'], 0, 0, 0, '', 1, $addnowlink);
+						$more .= $this->selectDate($input['value'], $input['name'], ($input['type'] == 'datetime' ? 1 : 0), ($input['type'] == 'datetime' ? 1 : 0), 0, '', 1, $addnowlink);
 						$more .= '</div></div>'."\n";
 						$formquestion[] = array('name'=>$input['name'].'day');
 						$formquestion[] = array('name'=>$input['name'].'month');

From b8b1eb603559cb33e8df617e2b0dae9204c36a73 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2023 12:08:04 +0100
Subject: [PATCH 275/816] NEW formconfirm can support field with format
 datetime

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index c33ffe28551..5a2efa07f40 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5001,7 +5001,7 @@ class Form
 	 *     @param	string			$question    	   	Question
 	 *     @param 	string			$action      	   	Action
 	 *	   @param  	array|string	$formquestion	   	An array with complementary inputs to add into forms: array(array('label'=> ,'type'=> , 'size'=>, 'morecss'=>, 'moreattr'=>'autofocus' or 'style=...'))
-	 *													'type' can be 'text', 'password', 'checkbox', 'radio', 'date', 'select', 'multiselect', 'morecss',
+	 *													'type' can be 'text', 'password', 'checkbox', 'radio', 'date', 'datetime', 'select', 'multiselect', 'morecss',
 	 *                                                  'other', 'onecolumn' or 'hidden'...
 	 * 	   @param  	int|string		$selectedchoice  	'' or 'no', or 'yes' or '1', 1, '0' or 0
 	 * 	   @param  	int|string		$useajax		   	0=No, 1=Yes use Ajax to show the popup, 2=Yes and also submit page with &confirm=no if choice is No, 'xxx'=Yes and preoutput confirm box with div id=dialog-confirm-xxx
@@ -5132,11 +5132,11 @@ class Form
 							$more .= '</div></div>'."\n";
 							$i++;
 						}
-					} elseif ($input['type'] == 'date') {
+					} elseif ($input['type'] == 'date' || $input['type'] == 'datetime') {
 						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].'</div>';
 						$more .= '<div class="tagtd">';
 						$addnowlink = (empty($input['datenow']) ? 0 : 1);
-						$more .= $this->selectDate($input['value'], $input['name'], 0, 0, 0, '', 1, $addnowlink);
+						$more .= $this->selectDate($input['value'], $input['name'], ($input['type'] == 'datetime' ? 1 : 0), ($input['type'] == 'datetime' ? 1 : 0), 0, '', 1, $addnowlink);
 						$more .= '</div></div>'."\n";
 						$formquestion[] = array('name'=>$input['name'].'day');
 						$formquestion[] = array('name'=>$input['name'].'month');

From 3e36e9831e137d427777055829f18e4ed1032ea9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2023 13:03:27 +0100
Subject: [PATCH 276/816] Fix warnings

---
 htdocs/admin/syslog.php                       |  3 --
 htdocs/core/class/ctyperesource.class.php     |  4 --
 .../class/stocktransfer.class.php             | 52 +++++--------------
 .../class/stocktransferline.class.php         | 36 -------------
 .../class/companypaymentmode.class.php        | 26 ----------
 htdocs/website/class/websitepage.class.php    | 39 ++++----------
 .../workstation/class/workstation.class.php   | 36 -------------
 7 files changed, 22 insertions(+), 174 deletions(-)

diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 71f7fd7f875..cf07dd49539 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -115,9 +115,6 @@ if ($action == 'set') {
 
 	// Check configuration
 	foreach ($activeModules as $modulename) {
-		/**
-		 * @var LogHandler
-		 */
 		$module = new $modulename;
 		$error = $module->checkConfiguration();
 	}
diff --git a/htdocs/core/class/ctyperesource.class.php b/htdocs/core/class/ctyperesource.class.php
index be83877098c..88f6960a9f9 100644
--- a/htdocs/core/class/ctyperesource.class.php
+++ b/htdocs/core/class/ctyperesource.class.php
@@ -468,8 +468,4 @@ class CtyperesourceLine
 	public $label;
 
 	public $active;
-
-	/**
-	 * @var mixed Sample line property 2
-	 */
 }
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
index 60f13396b80..84182736a0a 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
@@ -57,11 +57,19 @@ class StockTransfer extends CommonObject
 	 */
 	public $isextrafieldmanaged = 1;
 
+
 	/**
-	* @var string Customer ref
-	* @deprecated
-	* @see $ref_customer
-	*/
+	 * @var array    List of child tables. To know object to delete on cascade.
+	 *               If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
+	 *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
+	 */
+	protected $childtablesoncascade = array('stocktransfer_stocktransferline');
+
+	/**
+	 * @var string Customer ref
+	 * @deprecated
+	 * @see $ref_customer
+	 */
 	public $ref_client;
 
 	/**
@@ -162,42 +170,6 @@ class StockTransfer extends CommonObject
 	// END MODULEBUILDER PROPERTIES
 
 
-	// If this object has a subtable with lines
-
-	/**
-	 * @var int    Name of subtable line
-	 */
-	public $table_element_line = 'stocktransfer_stocktransferline';
-
-	/**
-	 * @var int    Field with ID of parent key if this object has a parent
-	 */
-	public $fk_element = 'fk_stocktransfer';
-
-	/**
-	 * @var int    Name of subtable class that manage subtable lines
-	 */
-	//public $class_element_line = 'StockTransferline';
-
-	/**
-	 * @var array	List of child tables. To test if we can delete object.
-	 */
-	//protected $childtables = array();
-
-	/**
-	 * @var array    List of child tables. To know object to delete on cascade.
-	 *               If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
-	 *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
-	 */
-	protected $childtablesoncascade = array('stocktransfer_stocktransferline');
-
-	/**
-	 * @var StockTransferLine[]     Array of subtable lines
-	 */
-	//public $lines = array();
-
-
-
 	/**
 	 * Constructor
 	 *
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
index 4ee2f1db631..65252efa106 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
@@ -117,42 +117,6 @@ class StockTransferLine extends CommonObjectLine
 	// END MODULEBUILDER PROPERTIES
 
 
-	// If this object has a subtable with lines
-
-	/**
-	 * @var int    Name of subtable line
-	 */
-	//public $table_element_line = 'stocktransfer_stocktransferlineline';
-
-	/**
-	 * @var int    Field with ID of parent key if this object has a parent
-	 */
-	//public $fk_element = 'fk_stocktransferline';
-
-	/**
-	 * @var int    Name of subtable class that manage subtable lines
-	 */
-	//public $class_element_line = 'StockTransferLineline';
-
-	/**
-	 * @var array	List of child tables. To test if we can delete object.
-	 */
-	//protected $childtables = array();
-
-	/**
-	 * @var array    List of child tables. To know object to delete on cascade.
-	 *               If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
-	 *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
-	 */
-	//protected $childtablesoncascade = array('stocktransfer_stocktransferlinedet');
-
-	/**
-	 * @var StockTransferLineLine[]     Array of subtable lines
-	 */
-	//public $lines = array();
-
-
-
 	/**
 	 * Constructor
 	 *
diff --git a/htdocs/societe/class/companypaymentmode.class.php b/htdocs/societe/class/companypaymentmode.class.php
index 17889026e89..eb77a928f14 100644
--- a/htdocs/societe/class/companypaymentmode.class.php
+++ b/htdocs/societe/class/companypaymentmode.class.php
@@ -195,32 +195,6 @@ class CompanyPaymentMode extends CommonObject
 	// END MODULEBUILDER PROPERTIES
 
 
-
-	// If this object has a subtable with lines
-
-	/**
-	 * @var string    Name of subtable line
-	 */
-	//public $table_element_line = 'companypaymentmodedet';
-	/**
-	 * @var string    Field with ID of parent key if this field has a parent
-	 */
-	//public $fk_element = 'fk_companypaymentmode';
-	/**
-	 * @var string    Name of subtable class that manage subtable lines
-	 */
-	//public $class_element_line = 'CompanyPaymentModeline';
-	/**
-	 * @var array	List of child tables. To test if we can delete object.
-	 */
-	//protected $childtables=array();
-	/**
-	 * @var CompanyPaymentModeLine[]     Array of subtable lines
-	 */
-	//public $lines = array();
-
-
-
 	/**
 	 * Constructor
 	 *
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 55916fc4fe2..c4efd987d0b 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -50,6 +50,16 @@ class WebsitePage extends CommonObject
 	 */
 	public $picto = 'file-code';
 
+	/**
+	 * @var string 	Field with ID of parent key if this field has a parent or for child tables
+	 */
+	public $fk_element = 'fk_website_page';
+
+	/**
+	 * @var array	List of child tables. To know object to delete on cascade.
+	 */
+	protected $childtablesoncascade = array('categorie_website_page');
+
 
 	/**
 	 * @var int ID
@@ -181,35 +191,6 @@ class WebsitePage extends CommonObject
 	// END MODULEBUILDER PROPERTIES
 
 
-	// If this object has a subtable with lines
-
-	// /**
-	//  * @var string    Name of subtable line
-	//  */
-	//public $table_element_line = 'mymodule_myobjectline';
-
-	/**
-	 * @var string 	Field with ID of parent key if this field has a parent or for child tables
-	 */
-	public $fk_element = 'fk_website_page';
-
-	// /**
-	//  * @var string    Name of subtable class that manage subtable lines
-	//  */
-	//public $class_element_line = 'MyObjectline';
-
-	/**
-	 * @var array	List of child tables. To test if we can delete object.
-	 */
-	//protected $childtables=array();
-
-	/**
-	 * @var array	List of child tables. To know object to delete on cascade.
-	 */
-	protected $childtablesoncascade = array('categorie_website_page');
-
-
-
 	/**
 	 * Constructor
 	 *
diff --git a/htdocs/workstation/class/workstation.class.php b/htdocs/workstation/class/workstation.class.php
index d3b098784da..6f81c4a28eb 100644
--- a/htdocs/workstation/class/workstation.class.php
+++ b/htdocs/workstation/class/workstation.class.php
@@ -132,42 +132,6 @@ class Workstation extends CommonObject
 	// END MODULEBUILDER PROPERTIES
 
 
-	// If this object has a subtable with lines
-
-	/**
-	 * @var int    Name of subtable line
-	 */
-	//public $table_element_line = 'workstation_workstationline';
-
-	/**
-	 * @var int    Field with ID of parent key if this object has a parent
-	 */
-	//public $fk_element = 'fk_workstation';
-
-	/**
-	 * @var int    Name of subtable class that manage subtable lines
-	 */
-	//public $class_element_line = 'Workstationline';
-
-	/**
-	 * @var array	List of child tables. To test if we can delete object.
-	 */
-	//protected $childtables = array();
-
-	/**
-	 * @var array    List of child tables. To know object to delete on cascade.
-	 *               If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
-	 *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
-	 */
-	//protected $childtablesoncascade = array('workstation_workstationdet');
-
-	/**
-	 * @var WorkstationLine[]     Array of subtable lines
-	 */
-	//public $lines = array();
-
-
-
 	/**
 	 * Constructor
 	 *

From f5792d692af4199d4d28fe637ad3d1a4013518dc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2023 13:32:43 +0100
Subject: [PATCH 277/816] Fix migration

---
 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 228fde598bb..31cbebab726 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
@@ -207,6 +207,8 @@ ALTER TABLE llx_societe_remise_except ADD COLUMN multicurrency_tx double(24,8) N
 
 -- VMYSQL4.3 ALTER TABLE llx_hrm_evaluationdet CHANGE COLUMN `rank` rankorder integer;
 -- VPGSQL8.2 ALTER TABLE llx_hrm_evaluationdet CHANGE COLUMN rank rankorder integer;
+-- VMYSQL4.3 ALTER TABLE llx_hrm_skillrank CHANGE COLUMN `rank` rankorder integer;
+-- VPGSQL8.2 ALTER TABLE llx_hrm_skillrank CHANGE COLUMN rank rankorder integer;
 
 
 -- Rename const to hide public and private notes (fix allow notes const was used to hide)
@@ -388,4 +390,3 @@ ALTER TABLE llx_opensurvey_user_studs ADD COLUMN date_creation datetime NULL;
 ALTER TABLE llx_opensurvey_comments ADD COLUMN date_creation datetime NULL;
 
 ALTER TABLE llx_c_tva ADD COLUMN use_default tinyint DEFAULT 0;
-

From ed11164b74e92fbd7214cbbbfbee3b71635902ad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2023 13:33:04 +0100
Subject: [PATCH 278/816] Debug

---
 htdocs/hrm/compare.php | 66 +++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/htdocs/hrm/compare.php b/htdocs/hrm/compare.php
index d1dde23a63c..6365dd51d25 100644
--- a/htdocs/hrm/compare.php
+++ b/htdocs/hrm/compare.php
@@ -28,9 +28,6 @@
  * 2- the central part displays the skills. display of the maximum score for this group and the number of occurrences.
  *
  * 3-  the right part displays the members of group 2 or the job to be compared
- *
- *
- *
  */
 
 
@@ -48,6 +45,7 @@ require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm.lib.php';
 // Load translation files required by the page
 $langs->load('hrm');
 
+$job = new Job($db);
 
 // Permissions
 $permissiontoread = $user->rights->hrm->evaluation->read || $user->rights->hrm->compare_advance->read;
@@ -61,8 +59,8 @@ if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) accessfor
  * View
  */
 
-$css = array();
-$css[] = '/hrm/css/style.css';
+$css = array('/hrm/css/style.css');
+
 llxHeader('', $langs->trans('SkillComparison'), '', '', 0, 0, '', $css);
 
 $head = array();
@@ -74,8 +72,6 @@ $head[$h][2] = 'compare';
 
 print dol_get_fiche_head($head, 'compare', '', 1);
 
-//$PDOdb = new TPDOdb;
-$form = new Form($db);
 ?>
 	<script type="text/javascript">
 
@@ -114,8 +110,6 @@ $form = new Form($db);
 
 
 <?php
-$job = new Job($db);
-$form = new Form($db);
 
 $fk_usergroup2 = 0;
 $fk_job = (int) GETPOST('fk_job');
@@ -133,11 +127,19 @@ $fk_usergroup1 = GETPOST('fk_usergroup1');
 				<div class="fichehalfleft">
 					<table class="border tableforfield" width="100%">
 						<tr>
-							<td><?php echo $langs->trans('group1ToCompare').'</td><td>'.$form->select_dolgroups($fk_usergroup1, 'fk_usergroup1', 1); ?></td>
+							<td><?php
+							print $langs->trans('group1ToCompare').'</td><td>';
+							print img_picto('', 'group', 'class="pictofixedwidth"');
+							print $form->select_dolgroups($fk_usergroup1, 'fk_usergroup1', 1);
+							?></td>
 						</tr>
 						<tr><td>&nbsp;</td></tr>
 						<tr>
-							<td><?php echo $langs->trans('group2ToCompare').'</td><td>'.$form->select_dolgroups($fk_usergroup2, 'fk_usergroup2', 1); ?></td>
+							<td><?php
+							print $langs->trans('group2ToCompare').'</td><td>';
+							print img_picto('', 'group', 'class="pictofixedwidth"');
+							print $form->select_dolgroups($fk_usergroup2, 'fk_usergroup2', 1);
+							?></td>
 						</tr>
 						<tr>
 							<td><STRONG><?php print $langs->trans('or'); ?></STRONG></td>
@@ -397,10 +399,11 @@ function mergeSkills($TSkill1, $TSkill2)
 
 /**
  * 	Display a list of User with picto
- * 		@param array $TUser list of users (employees) in selected usergroup of a column
- * 		@param int $fk_usergroup selected usergroup id
- * 		@param string $namelist html name
- * 		@return string
+ *
+ * 	@param 	array 	$TUser 			list of users (employees) in selected usergroup of a column
+ * 	@param 	int 	$fk_usergroup 	selected usergroup id
+ * 	@param 	string 	$namelist 		html name
+ * 	@return string
  */
 function displayUsersListWithPicto(&$TUser, $fk_usergroup = 0, $namelist = 'list-user')
 {
@@ -412,19 +415,19 @@ function displayUsersListWithPicto(&$TUser, $fk_usergroup = 0, $namelist = 'list
 
 		$excludedIdsList = GETPOST($list);
 
-
-		$sql = "SELECT DISTINCT u.rowid FROM " . MAIN_DB_PREFIX . "user u
+		$sql = "SELECT u.rowid FROM " . MAIN_DB_PREFIX . "user u
 		LEFT JOIN " . MAIN_DB_PREFIX . "usergroup_user as ugu ON (u.rowid = ugu.fk_user)
-		WHERE u.statut > 0
-		AND ugu.fk_usergroup=" . ((int) $fk_usergroup);
+		WHERE u.statut > 0 AND ugu.entity = ".((int) $conf->entity);
+		$sql .= " AND ugu.fk_usergroup=" . ((int) $fk_usergroup);
 
 		$res = $db->query($sql);
 		$out .= '<ul name="' . $namelist . '">';
 
 		$TExcludedId = explode(',', $excludedIdsList);
 
-		$form = new Form($db);
-		$out .= '<input id="'.$list.'" type="HIDDEN" name="'.$list.'" value="'.$excludedIdsList.'"> ';
+		$out .= '<input id="'.$list.'" type="hidden" name="'.$list.'" value="'.$excludedIdsList.'"> ';
+
+		$job = new Job($db);
 
 		while ($obj = $db->fetch_object($res)) {
 			$class = '';
@@ -441,11 +444,10 @@ function displayUsersListWithPicto(&$TUser, $fk_usergroup = 0, $namelist = 'list
 				if (!in_array($user->id, $TUser)) $TUser[] = $user->id;
 			}
 
-
 			$desc = '';
 
-			$job = Job::getLastJobForUser($user->id);
-			$desc .= $job;
+			$jobstring = $job->getLastJobForUser($user->id);
+			$desc .= $jobstring;
 
 			$static_eval = new Evaluation($db);
 			$evaluation = $static_eval->getLastEvaluationForUser($user->id);
@@ -487,7 +489,7 @@ function getSkillForUsers($TUser)
 	if (empty($TUser)) return array();
 
 	$sql = 'SELECT sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill, ';
-	$sql.= ' MAX(sr.rankorder) as "rankorder"';
+	$sql.= ' MAX(sr.rankorder) as rankorder';
 	$sql.= ' FROM '.MAIN_DB_PREFIX.'hrm_skill sk';
 	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'hrm_skillrank sr ON (sk.rowid = sr.fk_skill)';
 	$sql.= " WHERE sr.objecttype = '".SkillRank::SKILLRANK_TYPE_USER."'";
@@ -501,7 +503,7 @@ function getSkillForUsers($TUser)
 		//For each skill, we count the number of times that the max score has been reached within a given group
 		$num = 0;
 		while ($obj = $db->fetch_object($resql) ) {
-			$sql1 = "SELECT count(*) as how_many_max FROM ".MAIN_DB_PREFIX."hrm_skillrank sr";
+			$sql1 = "SELECT COUNT(rowid) as how_many_max FROM ".MAIN_DB_PREFIX."hrm_skillrank as sr";
 			$sql1.=" WHERE sr.rankorder = ".((int) $obj->rankorder);
 			$sql1.=" AND sr.objecttype = '".Skillrank::SKILLRANK_TYPE_USER."'";
 			$sql1.=" AND sr.fk_skill = ".((int) $obj->fk_skill);
@@ -541,18 +543,17 @@ function getSkillForJob($fk_job)
 
 	if (empty($fk_job)) return array();
 
-	$sql = 'SELECT sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill, ';
-	$sql.= ' MAX(sr.rankorder) as "rankorder"';
-	$sql.=' FROM '.MAIN_DB_PREFIX.'hrm_skill sk';
-	$sql.='	LEFT JOIN '.MAIN_DB_PREFIX.'hrm_skillrank sr ON (sk.rowid = sr.fk_skill)';
+	$sql = 'SELECT sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill,';
+	$sql.= " MAX(sr.rankorder) as rankorder";
+	$sql.=' FROM '.MAIN_DB_PREFIX.'hrm_skill as sk';
+	$sql.='	LEFT JOIN '.MAIN_DB_PREFIX.'hrm_skillrank as sr ON (sk.rowid = sr.fk_skill)';
 	$sql.="	WHERE sr.objecttype = '".SkillRank::SKILLRANK_TYPE_JOB."'";
 	$sql.=' AND sr.fk_object = '.((int) $fk_job);
-	$sql.=' GROUP BY sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill '; // group par competence*/
+	$sql.=' GROUP BY sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill'; // group par competence*/
 
 	$resql = $db->query($sql);
 	$Tab = array();
 
-
 	if ($resql) {
 		$num = 0;
 		while ($obj = $db->fetch_object($resql) ) {
@@ -574,6 +575,5 @@ function getSkillForJob($fk_job)
 		dol_print_error($db);
 	}
 
-
 	return $Tab;
 }

From f5c59c39f9a17d7c76bac674a18ab5bb4a6ba21d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2023 13:33:10 +0100
Subject: [PATCH 279/816] Fix migration

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

diff --git a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
index ae7d51a20dd..1adc89643d8 100644
--- a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
+++ b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
@@ -31,6 +31,14 @@
 -- To rebuild sequence for postgresql after insert by forcing id autoincrement fields:
 -- -- VPGSQL8.2 SELECT dol_util_rebuild_sequences();
 
+
+-- v17
+
+-- VMYSQL4.3 ALTER TABLE llx_hrm_skillrank CHANGE COLUMN `rank` rankorder integer;
+-- VPGSQL8.2 ALTER TABLE llx_hrm_skillrank CHANGE COLUMN rank rankorder integer;
+
+
+
 -- v18
 
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_CLOSE','Project closed','Executed when a project is closed','project',145);
@@ -45,3 +53,4 @@ ALTER TABLE llx_facture ADD COLUMN prorata_discount	real DEFAULT NULL;
 
 ALTER TABLE llx_payment_salary MODIFY COLUMN datep datetime;
 
+

From 79b9fd7bc95e80f65bfc3cf2ec1ac201d89eae83 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2023 13:33:04 +0100
Subject: [PATCH 280/816] Debug

---
 htdocs/hrm/compare.php | 66 +++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/htdocs/hrm/compare.php b/htdocs/hrm/compare.php
index 686d5820695..beee61ca6fa 100644
--- a/htdocs/hrm/compare.php
+++ b/htdocs/hrm/compare.php
@@ -28,9 +28,6 @@
  * 2- the central part displays the skills. display of the maximum score for this group and the number of occurrences.
  *
  * 3-  the right part displays the members of group 2 or the job to be compared
- *
- *
- *
  */
 
 
@@ -48,6 +45,7 @@ require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm.lib.php';
 // Load translation files required by the page
 $langs->load('hrm');
 
+$job = new Job($db);
 
 // Permissions
 $permissiontoread = $user->rights->hrm->evaluation->read || $user->rights->hrm->compare_advance->read;
@@ -61,8 +59,8 @@ if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) accessfor
  * View
  */
 
-$css = array();
-$css[] = '/hrm/css/style.css';
+$css = array('/hrm/css/style.css');
+
 llxHeader('', $langs->trans('SkillComparison'), '', '', 0, 0, '', $css);
 
 $head = array();
@@ -74,8 +72,6 @@ $head[$h][2] = 'compare';
 
 print dol_get_fiche_head($head, 'compare', '', 1);
 
-//$PDOdb = new TPDOdb;
-$form = new Form($db);
 ?>
 	<script type="text/javascript">
 
@@ -114,8 +110,6 @@ $form = new Form($db);
 
 
 <?php
-$job = new Job($db);
-$form = new Form($db);
 
 $fk_usergroup2 = 0;
 $fk_job = (int) GETPOST('fk_job');
@@ -133,11 +127,19 @@ $fk_usergroup1 = GETPOST('fk_usergroup1');
 				<div class="fichehalfleft">
 					<table class="border tableforfield" width="100%">
 						<tr>
-							<td><?php echo $langs->trans('group1ToCompare').'</td><td>'.$form->select_dolgroups($fk_usergroup1, 'fk_usergroup1', 1); ?></td>
+							<td><?php
+							print $langs->trans('group1ToCompare').'</td><td>';
+							print img_picto('', 'group', 'class="pictofixedwidth"');
+							print $form->select_dolgroups($fk_usergroup1, 'fk_usergroup1', 1);
+							?></td>
 						</tr>
 						<tr><td>&nbsp;</td></tr>
 						<tr>
-							<td><?php echo $langs->trans('group2ToCompare').'</td><td>'.$form->select_dolgroups($fk_usergroup2, 'fk_usergroup2', 1); ?></td>
+							<td><?php
+							print $langs->trans('group2ToCompare').'</td><td>';
+							print img_picto('', 'group', 'class="pictofixedwidth"');
+							print $form->select_dolgroups($fk_usergroup2, 'fk_usergroup2', 1);
+							?></td>
 						</tr>
 						<tr>
 							<td><STRONG><?php print $langs->trans('or'); ?></STRONG></td>
@@ -397,10 +399,11 @@ function mergeSkills($TSkill1, $TSkill2)
 
 /**
  * 	Display a list of User with picto
- * 		@param array $TUser list of users (employees) in selected usergroup of a column
- * 		@param int $fk_usergroup selected usergroup id
- * 		@param string $namelist html name
- * 		@return string
+ *
+ * 	@param 	array 	$TUser 			list of users (employees) in selected usergroup of a column
+ * 	@param 	int 	$fk_usergroup 	selected usergroup id
+ * 	@param 	string 	$namelist 		html name
+ * 	@return string
  */
 function displayUsersListWithPicto(&$TUser, $fk_usergroup = 0, $namelist = 'list-user')
 {
@@ -412,19 +415,19 @@ function displayUsersListWithPicto(&$TUser, $fk_usergroup = 0, $namelist = 'list
 
 		$excludedIdsList = GETPOST($list);
 
-
-		$sql = "SELECT DISTINCT u.rowid FROM " . MAIN_DB_PREFIX . "user u
+		$sql = "SELECT u.rowid FROM " . MAIN_DB_PREFIX . "user u
 		LEFT JOIN " . MAIN_DB_PREFIX . "usergroup_user as ugu ON (u.rowid = ugu.fk_user)
-		WHERE u.statut > 0
-		AND ugu.fk_usergroup=" . ((int) $fk_usergroup);
+		WHERE u.statut > 0 AND ugu.entity = ".((int) $conf->entity);
+		$sql .= " AND ugu.fk_usergroup=" . ((int) $fk_usergroup);
 
 		$res = $db->query($sql);
 		$out .= '<ul name="' . $namelist . '">';
 
 		$TExcludedId = explode(',', $excludedIdsList);
 
-		$form = new Form($db);
-		$out .= '<input id="'.$list.'" type="HIDDEN" name="'.$list.'" value="'.$excludedIdsList.'"> ';
+		$out .= '<input id="'.$list.'" type="hidden" name="'.$list.'" value="'.$excludedIdsList.'"> ';
+
+		$job = new Job($db);
 
 		while ($obj = $db->fetch_object($res)) {
 			$class = '';
@@ -441,11 +444,10 @@ function displayUsersListWithPicto(&$TUser, $fk_usergroup = 0, $namelist = 'list
 				if (!in_array($user->id, $TUser)) $TUser[] = $user->id;
 			}
 
-
 			$desc = '';
 
-			$job = Job::getLastJobForUser($user->id);
-			$desc .= $job;
+			$jobstring = $job->getLastJobForUser($user->id);
+			$desc .= $jobstring;
 
 			$static_eval = new Evaluation($db);
 			$evaluation = $static_eval->getLastEvaluationForUser($user->id);
@@ -487,7 +489,7 @@ function getSkillForUsers($TUser)
 	if (empty($TUser)) return array();
 
 	$sql = 'SELECT sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill, ';
-	$sql.= ' MAX(sr.rankorder) as "rankorder"';
+	$sql.= ' MAX(sr.rankorder) as rankorder';
 	$sql.= ' FROM '.MAIN_DB_PREFIX.'hrm_skill sk';
 	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'hrm_skillrank sr ON (sk.rowid = sr.fk_skill)';
 	$sql.= " WHERE sr.objecttype = '".SkillRank::SKILLRANK_TYPE_USER."'";
@@ -501,7 +503,7 @@ function getSkillForUsers($TUser)
 		//For each skill, we count the number of times that the max score has been reached within a given group
 		$num = 0;
 		while ($obj = $db->fetch_object($resql) ) {
-			$sql1 = "SELECT count(*) as how_many_max FROM ".MAIN_DB_PREFIX."hrm_skillrank sr";
+			$sql1 = "SELECT COUNT(rowid) as how_many_max FROM ".MAIN_DB_PREFIX."hrm_skillrank as sr";
 			$sql1.=" WHERE sr.rankorder = ".((int) $obj->rankorder);
 			$sql1.=" AND sr.objecttype = '".Skillrank::SKILLRANK_TYPE_USER."'";
 			$sql1.=" AND sr.fk_skill = ".((int) $obj->fk_skill);
@@ -541,18 +543,17 @@ function getSkillForJob($fk_job)
 
 	if (empty($fk_job)) return array();
 
-	$sql = 'SELECT sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill, ';
-	$sql.= ' MAX(sr.rankorder) as "rankorder"';
-	$sql.=' FROM '.MAIN_DB_PREFIX.'hrm_skill sk';
-	$sql.='	LEFT JOIN '.MAIN_DB_PREFIX.'hrm_skillrank sr ON (sk.rowid = sr.fk_skill)';
+	$sql = 'SELECT sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill,';
+	$sql.= " MAX(sr.rankorder) as rankorder";
+	$sql.=' FROM '.MAIN_DB_PREFIX.'hrm_skill as sk';
+	$sql.='	LEFT JOIN '.MAIN_DB_PREFIX.'hrm_skillrank as sr ON (sk.rowid = sr.fk_skill)';
 	$sql.="	WHERE sr.objecttype = '".SkillRank::SKILLRANK_TYPE_JOB."'";
 	$sql.=' AND sr.fk_object = '.((int) $fk_job);
-	$sql.=' GROUP BY sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill '; // group par competence*/
+	$sql.=' GROUP BY sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill'; // group par competence*/
 
 	$resql = $db->query($sql);
 	$Tab = array();
 
-
 	if ($resql) {
 		$num = 0;
 		while ($obj = $db->fetch_object($resql) ) {
@@ -574,6 +575,5 @@ function getSkillForJob($fk_job)
 		dol_print_error($db);
 	}
 
-
 	return $Tab;
 }

From 564c6f2cfd75743bb1b026e681b561df6ddf5463 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2023 13:37:11 +0100
Subject: [PATCH 281/816] Fix warnings

---
 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 25fc0996ca0..9f39c259ef8 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -955,7 +955,7 @@ class Fichinter extends CommonObject
 	 *	@param		int		$notrigger		Disable trigger
 	 *	@return		int						<0 if KO, >0 if OK
 	 */
-	public function delete($user, $notrigger = 0)
+	public function delete(User $user, $notrigger = 0)
 	{
 		global $conf, $langs;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

From cb13069fa1c5b0421529b8209352642a25178150 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2023 13:47:34 +0100
Subject: [PATCH 282/816] Fix warnings

---
 htdocs/core/boxes/box_project.php                    |  1 -
 htdocs/core/class/translate.class.php                |  1 -
 htdocs/core/lib/company.lib.php                      |  2 +-
 htdocs/core/modules/modUser.class.php                |  2 +-
 htdocs/emailcollector/class/emailcollector.class.php |  2 +-
 htdocs/product/stock/class/entrepot.class.php        |  1 -
 htdocs/takepos/admin/orderprinters.php               | 10 ++++++----
 7 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
index 80d465f0f87..6c3db843523 100644
--- a/htdocs/core/boxes/box_project.php
+++ b/htdocs/core/boxes/box_project.php
@@ -175,7 +175,6 @@ class box_project extends ModeleBoxes
 		$this->info_box_contents[$i][] = array(
 			'td' => 'class="liste_total"',
 			'text' => $langs->trans("Total")."&nbsp;".$textHead,
-			 'text' => "&nbsp;",
 		);
 		$this->info_box_contents[$i][] = array(
 			'td' => 'class="right liste_total" ',
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 568ef7b4ace..3f2f756977d 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -834,7 +834,6 @@ class Translate
 						'ja'=>'ja_JP',
 						'lo'=>'lo_LA',
 						'nb'=>'nb_NO',
-						'fa'=>'fa_IR',
 						'sq'=>'sq_AL',
 						'sr'=>'sr_RS',
 						'sv'=>'sv_SE',
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 47525ab5328..c863c802d4f 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -999,7 +999,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 	$extrafields->fetch_name_optionals_label($contactstatic->table_element);
 
 	$contactstatic->fields = array(
-		'rowid'     =>array('type'=>'integer', 'label'=>"TechnicalID", 'enabled'=>1, 'visible'=>(!empty($conf->global->MAIN_SHOW_TECHNICAL_ID) ? 1 : 0), 'enabled'=>(!empty($conf->global->MAIN_SHOW_TECHNICAL_ID) ? 1 : 0), 'position'=>1),
+		'rowid'     =>array('type'=>'integer', 'label'=>"TechnicalID", 'enabled'=>(!empty($conf->global->MAIN_SHOW_TECHNICAL_ID) ? 1 : 0), 'visible'=>(!empty($conf->global->MAIN_SHOW_TECHNICAL_ID) ? 1 : 0), 'position'=>1),
 		'name'      =>array('type'=>'varchar(128)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1),
 		'poste'     =>array('type'=>'varchar(128)', 'label'=>'PostOrFunction', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>2, 'index'=>1, 'position'=>20),
 		'address'   =>array('type'=>'varchar(128)', 'label'=>'Address', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>3, 'index'=>1, 'position'=>30),
diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index 6b14d797f15..de7bb6feecf 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -337,7 +337,7 @@ class modUser extends DolibarrModules
 		$this->import_examplevalues_array[$r] = array(
 			'u.lastname'=>"Doe", 'u.firstname'=>'John', 'u.login'=>'jdoe', 'u.employee'=>'0 or 1', 'u.job'=>'CTO', 'u.gender'=>'man or woman',
 			'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.fk_soc'=>'0 (internal user) or company name (external user)', '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_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)",
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 505bcf4f619..7dae5bbb6e5 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -2277,7 +2277,7 @@ class EmailCollector extends CommonObject
 									'fields' => array('ref'),
 									'class' => 'recruitment/class/recruitmentjobposition.class.php',
 									'object' => 'RecruitmentJobPosition'),
-								'recruitment/recruitmentjobposition' => array('table' => 'recruitment_recruitmentcandidature',
+								'recruitment/recruitmentcandidature' => array('table' => 'recruitment_recruitmentcandidature',
 									'fields' => array('ref'),
 									'class' => 'recruitment/class/recruitmentcandidature.class.php',
 									'object' => ' RecruitmentCandidature'),
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 9bfdf672fb0..065883e7a2c 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -125,7 +125,6 @@ class Entrepot extends CommonObject
 		'rowid' =>array('type'=>'integer', 'label'=>'ID', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>10),
 		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>15),
 		'ref' =>array('type'=>'varchar(255)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'showoncombobox'=>1, 'position'=>25, 'searchall'=>1),
-		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>30),
 		'description' =>array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-2, 'position'=>35, 'searchall'=>1),
 		'lieu' =>array('type'=>'varchar(64)', 'label'=>'LocationSummary', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'showoncombobox'=>2, 'searchall'=>1),
 		'fk_parent' =>array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:1:statut=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ParentWarehouse', 'enabled'=>1, 'visible'=>-2, 'position'=>41),
diff --git a/htdocs/takepos/admin/orderprinters.php b/htdocs/takepos/admin/orderprinters.php
index d2fadf94c81..981f6813acc 100644
--- a/htdocs/takepos/admin/orderprinters.php
+++ b/htdocs/takepos/admin/orderprinters.php
@@ -158,14 +158,16 @@ foreach ($fulltree as $key => $val) {
 	$categstatic->ref = $val['label'];
 	$categstatic->color = $val['color'];
 	$categstatic->type = $type;
+
 	$li = $categstatic->getNomUrl(1, '', 60);
+
 	$desc = dol_htmlcleanlastbr($val['description']);
 
 	$data[] = array(
-	'rowid'=>$val['rowid'],
-	'fk_menu'=>$val['fk_menu'],
-	'fk_menu'=>$val['fk_parent'],
-	'label'=>$val['label']
+		'rowid'=>$val['rowid'],
+		'fk_menu'=>$val['fk_menu'],
+		'fk_parent'=>$val['fk_parent'],
+		'label'=>$val['label']
 	);
 }
 

From e58d88c62ab3fac31fff05966e189b972ab4b35e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2023 13:47:34 +0100
Subject: [PATCH 283/816] Fix warnings

---
 htdocs/core/boxes/box_project.php                    |  1 -
 htdocs/core/class/translate.class.php                |  1 -
 htdocs/core/lib/company.lib.php                      |  2 +-
 htdocs/core/modules/modUser.class.php                |  2 +-
 htdocs/emailcollector/class/emailcollector.class.php |  2 +-
 htdocs/product/stock/class/entrepot.class.php        |  1 -
 htdocs/takepos/admin/orderprinters.php               | 10 ++++++----
 7 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
index 80d465f0f87..6c3db843523 100644
--- a/htdocs/core/boxes/box_project.php
+++ b/htdocs/core/boxes/box_project.php
@@ -175,7 +175,6 @@ class box_project extends ModeleBoxes
 		$this->info_box_contents[$i][] = array(
 			'td' => 'class="liste_total"',
 			'text' => $langs->trans("Total")."&nbsp;".$textHead,
-			 'text' => "&nbsp;",
 		);
 		$this->info_box_contents[$i][] = array(
 			'td' => 'class="right liste_total" ',
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 568ef7b4ace..3f2f756977d 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -834,7 +834,6 @@ class Translate
 						'ja'=>'ja_JP',
 						'lo'=>'lo_LA',
 						'nb'=>'nb_NO',
-						'fa'=>'fa_IR',
 						'sq'=>'sq_AL',
 						'sr'=>'sr_RS',
 						'sv'=>'sv_SE',
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 25393c6ee56..b1d53e452bb 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -999,7 +999,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 	$extrafields->fetch_name_optionals_label($contactstatic->table_element);
 
 	$contactstatic->fields = array(
-		'rowid'     =>array('type'=>'integer', 'label'=>"TechnicalID", 'enabled'=>1, 'visible'=>(!empty($conf->global->MAIN_SHOW_TECHNICAL_ID) ? 1 : 0), 'enabled'=>(!empty($conf->global->MAIN_SHOW_TECHNICAL_ID) ? 1 : 0), 'position'=>1),
+		'rowid'     =>array('type'=>'integer', 'label'=>"TechnicalID", 'enabled'=>(!empty($conf->global->MAIN_SHOW_TECHNICAL_ID) ? 1 : 0), 'visible'=>(!empty($conf->global->MAIN_SHOW_TECHNICAL_ID) ? 1 : 0), 'position'=>1),
 		'name'      =>array('type'=>'varchar(128)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1),
 		'poste'     =>array('type'=>'varchar(128)', 'label'=>'PostOrFunction', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>2, 'index'=>1, 'position'=>20),
 		'address'   =>array('type'=>'varchar(128)', 'label'=>'Address', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>3, 'index'=>1, 'position'=>30),
diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index 6b14d797f15..de7bb6feecf 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -337,7 +337,7 @@ class modUser extends DolibarrModules
 		$this->import_examplevalues_array[$r] = array(
 			'u.lastname'=>"Doe", 'u.firstname'=>'John', 'u.login'=>'jdoe', 'u.employee'=>'0 or 1', 'u.job'=>'CTO', 'u.gender'=>'man or woman',
 			'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.fk_soc'=>'0 (internal user) or company name (external user)', '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_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)",
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 4d7ef042e69..7bf8306f4fd 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -2260,7 +2260,7 @@ class EmailCollector extends CommonObject
 									'fields' => array('ref'),
 									'class' => 'recruitment/class/recruitmentjobposition.class.php',
 									'object' => 'RecruitmentJobPosition'),
-								'recruitment/recruitmentjobposition' => array('table' => 'recruitment_recruitmentcandidature',
+								'recruitment/recruitmentcandidature' => array('table' => 'recruitment_recruitmentcandidature',
 									'fields' => array('ref'),
 									'class' => 'recruitment/class/recruitmentcandidature.class.php',
 									'object' => ' RecruitmentCandidature'),
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index e70c67412ee..23e9334f91b 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -125,7 +125,6 @@ class Entrepot extends CommonObject
 		'rowid' =>array('type'=>'integer', 'label'=>'ID', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>10),
 		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>15),
 		'ref' =>array('type'=>'varchar(255)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'showoncombobox'=>1, 'position'=>25, 'searchall'=>1),
-		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>30),
 		'description' =>array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-2, 'position'=>35, 'searchall'=>1),
 		'lieu' =>array('type'=>'varchar(64)', 'label'=>'LocationSummary', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'showoncombobox'=>2, 'searchall'=>1),
 		'fk_parent' =>array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:1:statut=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ParentWarehouse', 'enabled'=>1, 'visible'=>-2, 'position'=>41),
diff --git a/htdocs/takepos/admin/orderprinters.php b/htdocs/takepos/admin/orderprinters.php
index d2fadf94c81..981f6813acc 100644
--- a/htdocs/takepos/admin/orderprinters.php
+++ b/htdocs/takepos/admin/orderprinters.php
@@ -158,14 +158,16 @@ foreach ($fulltree as $key => $val) {
 	$categstatic->ref = $val['label'];
 	$categstatic->color = $val['color'];
 	$categstatic->type = $type;
+
 	$li = $categstatic->getNomUrl(1, '', 60);
+
 	$desc = dol_htmlcleanlastbr($val['description']);
 
 	$data[] = array(
-	'rowid'=>$val['rowid'],
-	'fk_menu'=>$val['fk_menu'],
-	'fk_menu'=>$val['fk_parent'],
-	'label'=>$val['label']
+		'rowid'=>$val['rowid'],
+		'fk_menu'=>$val['fk_menu'],
+		'fk_parent'=>$val['fk_parent'],
+		'label'=>$val['label']
 	);
 }
 

From 6df4795dedd2abe07b6f0a846ab74ed99ec5af5a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2023 14:06:25 +0100
Subject: [PATCH 284/816] Debug bad params

---
 htdocs/adherents/card.php                     |  2 +-
 htdocs/admin/modules.php                      |  2 +-
 htdocs/contact/card.php                       |  2 +-
 htdocs/core/class/discount.class.php          |  2 +-
 htdocs/core/class/dolgeoip.class.php          |  4 ++--
 htdocs/core/class/fileupload.class.php        |  5 ++--
 htdocs/core/menus/standard/eldy.lib.php       |  2 +-
 .../modules/oauth/google_oauthcallback.php    |  2 +-
 htdocs/core/tpl/advtarget.tpl.php             |  2 +-
 htdocs/don/payment/card.php                   |  2 +-
 htdocs/ecm/search.php                         |  2 +-
 htdocs/expensereport/card.php                 |  2 +-
 htdocs/expensereport/payment/card.php         |  2 +-
 htdocs/fichinter/class/fichinterrec.class.php |  2 +-
 htdocs/fourn/ajax/getSupplierPrices.php       |  2 +-
 .../fourn/class/fournisseur.facture.class.php |  2 +-
 htdocs/fourn/facture/card.php                 | 23 ++++++++++++++++++-
 htdocs/margin/agentMargins.php                |  3 ++-
 htdocs/margin/checkMargins.php                |  3 ++-
 htdocs/margin/customerMargins.php             |  3 ++-
 htdocs/margin/productMargins.php              |  3 ++-
 htdocs/theme/eldy/style.css.php               |  2 +-
 qodana.yaml                                   |  3 ++-
 23 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index d0a3c6ba271..f72682ce22a 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1046,7 +1046,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		// Website
 		print '<tr><td>'.$form->editfieldkey('Web', 'member_url', GETPOST('member_url', 'alpha'), $object, 0).'</td>';
-		print '<td>'.img_picto('', 'globe').' <input type="text" class="maxwidth500 widthcentpercentminusx" name="member_url" id="member_url" value="'.(GETPOSTISSET('member_url', 'alpha') ? GETPOST('member_url', 'alpha') : $object->url).'"></td></tr>';
+		print '<td>'.img_picto('', 'globe').' <input type="text" class="maxwidth500 widthcentpercentminusx" name="member_url" id="member_url" value="'.(GETPOSTISSET('member_url') ? GETPOST('member_url', 'alpha') : $object->url).'"></td></tr>';
 
 		// Address
 		print '<tr><td class="tdtop">'.$langs->trans("Address").'</td><td>';
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index b39576a8d44..e93b5a58e96 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -1075,7 +1075,7 @@ if ($mode == 'marketplace') {
 			<div id="listing-content">
 				<table summary="list_of_modules" id="list_of_modules" class="productlist centpercent">
 					<tbody id="listOfModules">
-						<?php echo $dolistore->get_products(!empty($categorie) ? $categorie: ''); ?>
+						<?php echo $dolistore->get_products(); ?>
 					</tbody>
 				</table>
 			</div>
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index c5184a18454..6cf7d3051f3 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -362,7 +362,7 @@ if (empty($reshook)) {
 		if (!$error) {
 			$contactid = GETPOST("contactid", 'int');
 			$object->fetch($contactid);
-			$object->fetchRoles($contactid);
+			$object->fetchRoles();
 
 			// Photo save
 			$dir = $conf->societe->multidir_output[$object->entity]."/contact/".$object->id."/photos";
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index 052d5ae7e1c..9f5ea960c9a 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -419,7 +419,7 @@ class DiscountAbsolute
 	 *	When discount is from a credit note used to reduce payment of an invoice, we link using rowidinvoice
 	 *
 	 *	@param		int		$rowidline		Invoice line id (To use discount into invoice lines)
-	 *	@param		int		$rowidinvoice	Invoice id (To use discount as a credit note to reduc payment of invoice)
+	 *	@param		int		$rowidinvoice	Invoice id (To use discount as a credit note to reduce payment of invoice)
 	 *	@return		int						<0 if KO, >0 if OK
 	 */
 	public function link_to_invoice($rowidline, $rowidinvoice)
diff --git a/htdocs/core/class/dolgeoip.class.php b/htdocs/core/class/dolgeoip.class.php
index 24726fec7c3..a2eea7023d9 100644
--- a/htdocs/core/class/dolgeoip.class.php
+++ b/htdocs/core/class/dolgeoip.class.php
@@ -45,7 +45,7 @@ class DolGeoIP
 	{
 		global $conf;
 
-		$geoipversion = '2'; // 'php', or '2'
+		$geoipversion = '2'; // 'php', or geoip version '2'
 		if (!empty($conf->global->GEOIP_VERSION)) {
 			$geoipversion = $conf->global->GEOIP_VERSION;
 		}
@@ -181,7 +181,7 @@ class DolGeoIP
 				return '';
 			}
 		} else {
-			return geoip_country_code_by_name($this->gi, $name);
+			return strtolower(geoip_country_code_by_name($name));
 		}
 	}
 
diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php
index a3fb3505fba..906933c9701 100644
--- a/htdocs/core/class/fileupload.class.php
+++ b/htdocs/core/class/fileupload.class.php
@@ -180,6 +180,8 @@ class FileUpload
 				)
 		);
 
+		global $action;
+
 		$hookmanager->executeHooks(
 			'overrideUploadOptions',
 			array(
@@ -187,8 +189,7 @@ class FileUpload
 				'element' => $element
 			),
 			$object,
-			$action,
-			$hookmanager
+			$action
 		);
 
 		if ($options) {
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index fece6df98ec..bf75035f333 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -2061,7 +2061,7 @@ function get_left_menu_products($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 			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/stockatdate.php", $langs->trans("StockAtDate"), 1, $user->hasRight('product', 'read', '', 1) && $user->hasRight('stock', 'lire'));
+			$newmenu->add("/product/stock/stockatdate.php", $langs->trans("StockAtDate"), 1, $user->hasRight('product', 'read') && $user->hasRight('stock', 'lire'));
 
 			// Categories for warehouses
 			if (isModEnabled('categorie')) {
diff --git a/htdocs/core/modules/oauth/google_oauthcallback.php b/htdocs/core/modules/oauth/google_oauthcallback.php
index 80c39d85158..ed0caa1a4ff 100644
--- a/htdocs/core/modules/oauth/google_oauthcallback.php
+++ b/htdocs/core/modules/oauth/google_oauthcallback.php
@@ -42,7 +42,7 @@ $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domai
 $action = GETPOST('action', 'aZ09');
 $backtourl = GETPOST('backtourl', 'alpha');
 $keyforprovider = GETPOST('keyforprovider', 'aZ09');
-if (!GETPOSTISSET('keyforprovider', 'aZ09') && !empty($_SESSION["oauthkeyforproviderbeforeoauthjump"]) && (GETPOST('code') || $action == 'delete')) {
+if (!GETPOSTISSET('keyforprovider') && !empty($_SESSION["oauthkeyforproviderbeforeoauthjump"]) && (GETPOST('code') || $action == 'delete')) {
 	// If we are coming from the Oauth page
 	$keyforprovider = $_SESSION["oauthkeyforproviderbeforeoauthjump"];
 }
diff --git a/htdocs/core/tpl/advtarget.tpl.php b/htdocs/core/tpl/advtarget.tpl.php
index 8f27d747fab..55d5c5ed24a 100644
--- a/htdocs/core/tpl/advtarget.tpl.php
+++ b/htdocs/core/tpl/advtarget.tpl.php
@@ -198,7 +198,7 @@ if (!empty($array_query['cust_prospect_status'])) {
 	print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 }
 print '</td><td>';
-print $formadvtargetemaling->multiselectProspectionStatus($array_query['cust_prospect_status'], 'cust_prospect_status', 1);
+print $formadvtargetemaling->multiselectProspectionStatus($array_query['cust_prospect_status'], 'cust_prospect_status');
 print '</td><td>'."\n";
 print '</td></tr>'."\n";
 
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index 19f40bc984e..416e848d271 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -181,7 +181,7 @@ if ($resql) {
 			// Expected to pay
 			print '<td class="right">'.price($objp->d_amount).'</td>';
 			// Status
-			print '<td class="center">'.$don->getLibStatut(4, $objp->amount).'</td>';
+			print '<td class="center">'.$don->getLibStatut(4).'</td>';
 			// Amount paid
 			print '<td class="right">'.price($objp->amount).'</td>';
 			print "</tr>\n";
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index e37a1ce88f3..c43428fae8e 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -175,7 +175,7 @@ print load_fiche_titre($langs->trans("ECMArea").' - '.$langs->trans("Search"));
 print $langs->trans("FeatureNotYetAvailable").'.<br><br>';
 
 // Tool bar
-$head = ecm_prepare_head_fm($ecmdir, $module, $section);
+$head = ecm_prepare_head_fm($ecmdir);
 //print dol_get_fiche_head($head, 'search_form', '', 1);
 
 
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index a14f5b75be9..75c5b02de10 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -295,7 +295,7 @@ if (empty($reshook)) {
 		}
 
 		if (!$error && empty($conf->global->EXPENSEREPORT_ALLOW_OVERLAPPING_PERIODS)) {
-			$overlappingExpenseReportID = $object->periode_existe($fuser, $object->date_debut, $object->date_fin, true);
+			$overlappingExpenseReportID = $object->periode_existe($fuser, $object->date_debut, $object->date_fin);
 
 			if ($overlappingExpenseReportID > 0) {
 				$error++;
diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index db6c21e202f..bdc7b51312a 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -209,7 +209,7 @@ if ($resql) {
 			print '<td class="right">'.price($objp->total_ttc - $objp->amount).'</td>';
 
 			// Status
-			print '<td class="center">'.$expensereport->getLibStatut(4, $objp->amount).'</td>';
+			print '<td class="center">'.$expensereport->getLibStatut(4).'</td>';
 
 			print "</tr>\n";
 
diff --git a/htdocs/fichinter/class/fichinterrec.class.php b/htdocs/fichinter/class/fichinterrec.class.php
index 2f4ca02d3c7..d1ab5fbee54 100644
--- a/htdocs/fichinter/class/fichinterrec.class.php
+++ b/htdocs/fichinter/class/fichinterrec.class.php
@@ -150,7 +150,7 @@ class FichinterRec extends Fichinter
 		$fichintsrc = new Fichinter($this->db);
 
 		$result = $fichintsrc->fetch($this->id_origin);
-		$result = $fichintsrc->fetch_lines(1); // to get all lines
+		$result = $fichintsrc->fetch_lines(); // to get all lines
 
 
 		if ($result > 0) {
diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php
index 29cf421059e..66001ccc5a6 100644
--- a/htdocs/fourn/ajax/getSupplierPrices.php
+++ b/htdocs/fourn/ajax/getSupplierPrices.php
@@ -88,7 +88,7 @@ if ($idprod > 0) {
 				$label .= ' ('.$productSupplier->fourn_ref.')';
 			}
 
-			$prices[] = array("id" => $productSupplier->product_fourn_price_id, "price" => price2num($price, 0, '', 0), "label" => $label, "title" => $title); // For price field, we must use price2num(), for label or title, price()
+			$prices[] = array("id" => $productSupplier->product_fourn_price_id, "price" => price2num($price, '', 0), "label" => $label, "title" => $title); // For price field, we must use price2num(), for label or title, price()
 		}
 	}
 
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index de012c86a58..ad5e9505cfd 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1383,7 +1383,7 @@ class FactureFournisseur extends CommonInvoice
 				$result = $this->update_price(1);
 				if ($result > 0) {
 					// Create link between discount and invoice line
-					$result = $remise->link_to_invoice($lineid, 0, 'supplier');
+					$result = $remise->link_to_invoice($lineid, 0);
 					if ($result < 0) {
 						$this->error = $remise->error;
 						$this->db->rollback();
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index ff9ada0a5c4..0720727f69c 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1172,7 +1172,28 @@ if (empty($reshook)) {
 							if (!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA) && $diff != 0) {
 								$object->fetch_lines();
 								$subprice_diff = $object->lines[0]->subprice - $diff / (1 + $object->lines[0]->tva_tx / 100);
-								$object->updateline($object->lines[0]->id, $object->lines[0]->desc, $subprice_diff, $object->lines[0]->qty, $object->lines[0]->remise_percent, $object->lines[0]->date_start, $object->lines[0]->date_end, $object->lines[0]->tva_tx, 0, 0, 'HT', $object->lines[0]->info_bits, $object->lines[0]->product_type, 0, 0, 0, $object->lines[0]->pa_ht, $object->lines[0]->label, 0, array(), 100);
+								$object->updateline(
+									$object->lines[0]->id,
+									$object->lines[0]->desc,
+									$subprice_diff,
+									$object->lines[0]->tva_tx,
+									$object->lines[0]->localtax1_tx,
+									$object->lines[0]->localtax2_tx,
+									$object->lines[0]->qty,
+									$object->lines[0]->fk_product,
+									'HT',
+									$object->lines[0]->info_bits,
+									$object->lines[0]->product_type,
+									$object->lines[0]->remise_percent,
+									0,
+									$object->lines[0]->date_start,
+									$object->lines[0]->date_end,
+									0,
+									0,
+									0,
+									'',
+									100
+								);
 							}
 						} elseif ($result > 0) {
 							$lines = $srcobject->lines;
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index 3bb84086b1e..f89cc60736d 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -109,7 +109,8 @@ $text = $langs->trans("Margins");
 //print load_fiche_titre($text);
 
 // Show tabs
-$head = marges_prepare_head($user);
+$head = marges_prepare_head();
+
 $titre = $langs->trans("Margins");
 $picto = 'margin';
 
diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php
index 1349e02d2d8..0ef626c507f 100644
--- a/htdocs/margin/checkMargins.php
+++ b/htdocs/margin/checkMargins.php
@@ -176,7 +176,8 @@ if ($optioncss != '') {
 }
 
 // Show tabs
-$head = marges_prepare_head($user);
+$head = marges_prepare_head();
+
 $picto = 'margin';
 
 print '<form method="post" name="sel" action="'.$_SERVER['PHP_SELF'].'">';
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 0a07fc9542f..df040e68bdb 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -89,7 +89,8 @@ $text = $langs->trans("Margins");
 //print load_fiche_titre($text);
 
 // Show tabs
-$head = marges_prepare_head($user);
+$head = marges_prepare_head();
+
 $titre = $langs->trans("Margins");
 $picto = 'margin';
 
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index 903613b8379..634d0ca50ca 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -102,7 +102,8 @@ $text = $langs->trans("Margins");
 //print load_fiche_titre($text);
 
 // Show tabs
-$head = marges_prepare_head($user);
+$head = marges_prepare_head();
+
 $titre = $langs->trans("Margins");
 $picto = 'margin';
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index fcf9f7ffd1f..2b74cf538b4 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -91,7 +91,7 @@ if (GETPOST('theme', 'aZ09')) {
 if (GETPOST('lang', 'aZ09')) {
 	$langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL
 }
-if (GETPOSTISSET('THEME_DARKMODEENABLED', 'int')) {
+if (GETPOSTISSET('THEME_DARKMODEENABLED')) {
 	$conf->global->THEME_DARKMODEENABLED = GETPOST('THEME_DARKMODEENABLED', 'int'); // If darkmode was forced on URL
 }
 
diff --git a/qodana.yaml b/qodana.yaml
index 872b043013b..672be8ea928 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -79,4 +79,5 @@ exclude:
   - name: PhpArrayIndexImmediatelyRewrittenInspection
   - name: PhpParameterNameChangedDuringInheritanceInspection
   - name: PhpDuplicateSwitchCaseBodyInspection
-  
\ No newline at end of file
+  - name: PhpNestedDirNameCallsCanBeReplacedWithLevelParameterInspection
+  

From f8abd0b7f6816c7384fce0b82305bf78af55f987 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2023 14:06:25 +0100
Subject: [PATCH 285/816] Debug bad params

---
 htdocs/adherents/card.php                     |  2 +-
 htdocs/admin/modules.php                      |  2 +-
 htdocs/contact/card.php                       |  2 +-
 htdocs/core/class/discount.class.php          |  2 +-
 htdocs/core/class/dolgeoip.class.php          |  4 ++--
 htdocs/core/class/fileupload.class.php        |  5 ++--
 htdocs/core/menus/standard/eldy.lib.php       |  2 +-
 .../modules/oauth/google_oauthcallback.php    |  2 +-
 htdocs/core/tpl/advtarget.tpl.php             |  2 +-
 htdocs/don/payment/card.php                   |  2 +-
 htdocs/ecm/search.php                         |  2 +-
 htdocs/expensereport/card.php                 |  2 +-
 htdocs/expensereport/payment/card.php         |  2 +-
 htdocs/fichinter/class/fichinterrec.class.php |  2 +-
 htdocs/fourn/ajax/getSupplierPrices.php       |  2 +-
 .../fourn/class/fournisseur.facture.class.php |  2 +-
 htdocs/fourn/facture/card.php                 | 23 ++++++++++++++++++-
 htdocs/margin/agentMargins.php                |  3 ++-
 htdocs/margin/checkMargins.php                |  3 ++-
 htdocs/margin/customerMargins.php             |  3 ++-
 htdocs/margin/productMargins.php              |  3 ++-
 htdocs/theme/eldy/style.css.php               |  2 +-
 22 files changed, 50 insertions(+), 24 deletions(-)

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 9d0677a2fc9..9e9cf47eff4 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1046,7 +1046,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		// Website
 		print '<tr><td>'.$form->editfieldkey('Web', 'member_url', GETPOST('member_url', 'alpha'), $object, 0).'</td>';
-		print '<td>'.img_picto('', 'globe').' <input type="text" class="maxwidth500 widthcentpercentminusx" name="member_url" id="member_url" value="'.(GETPOSTISSET('member_url', 'alpha') ? GETPOST('member_url', 'alpha') : $object->url).'"></td></tr>';
+		print '<td>'.img_picto('', 'globe').' <input type="text" class="maxwidth500 widthcentpercentminusx" name="member_url" id="member_url" value="'.(GETPOSTISSET('member_url') ? GETPOST('member_url', 'alpha') : $object->url).'"></td></tr>';
 
 		// Address
 		print '<tr><td class="tdtop">'.$langs->trans("Address").'</td><td>';
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 46b711875b8..dc639a4ecf0 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -1075,7 +1075,7 @@ if ($mode == 'marketplace') {
 			<div id="listing-content">
 				<table summary="list_of_modules" id="list_of_modules" class="productlist centpercent">
 					<tbody id="listOfModules">
-						<?php echo $dolistore->get_products(!empty($categorie) ? $categorie: ''); ?>
+						<?php echo $dolistore->get_products(); ?>
 					</tbody>
 				</table>
 			</div>
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index c5184a18454..6cf7d3051f3 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -362,7 +362,7 @@ if (empty($reshook)) {
 		if (!$error) {
 			$contactid = GETPOST("contactid", 'int');
 			$object->fetch($contactid);
-			$object->fetchRoles($contactid);
+			$object->fetchRoles();
 
 			// Photo save
 			$dir = $conf->societe->multidir_output[$object->entity]."/contact/".$object->id."/photos";
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index 052d5ae7e1c..9f5ea960c9a 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -419,7 +419,7 @@ class DiscountAbsolute
 	 *	When discount is from a credit note used to reduce payment of an invoice, we link using rowidinvoice
 	 *
 	 *	@param		int		$rowidline		Invoice line id (To use discount into invoice lines)
-	 *	@param		int		$rowidinvoice	Invoice id (To use discount as a credit note to reduc payment of invoice)
+	 *	@param		int		$rowidinvoice	Invoice id (To use discount as a credit note to reduce payment of invoice)
 	 *	@return		int						<0 if KO, >0 if OK
 	 */
 	public function link_to_invoice($rowidline, $rowidinvoice)
diff --git a/htdocs/core/class/dolgeoip.class.php b/htdocs/core/class/dolgeoip.class.php
index 24726fec7c3..a2eea7023d9 100644
--- a/htdocs/core/class/dolgeoip.class.php
+++ b/htdocs/core/class/dolgeoip.class.php
@@ -45,7 +45,7 @@ class DolGeoIP
 	{
 		global $conf;
 
-		$geoipversion = '2'; // 'php', or '2'
+		$geoipversion = '2'; // 'php', or geoip version '2'
 		if (!empty($conf->global->GEOIP_VERSION)) {
 			$geoipversion = $conf->global->GEOIP_VERSION;
 		}
@@ -181,7 +181,7 @@ class DolGeoIP
 				return '';
 			}
 		} else {
-			return geoip_country_code_by_name($this->gi, $name);
+			return strtolower(geoip_country_code_by_name($name));
 		}
 	}
 
diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php
index b1e085fbff7..ccea7de2d84 100644
--- a/htdocs/core/class/fileupload.class.php
+++ b/htdocs/core/class/fileupload.class.php
@@ -180,6 +180,8 @@ class FileUpload
 				)
 		);
 
+		global $action;
+
 		$hookmanager->executeHooks(
 			'overrideUploadOptions',
 			array(
@@ -187,8 +189,7 @@ class FileUpload
 				'element' => $element
 			),
 			$object,
-			$action,
-			$hookmanager
+			$action
 		);
 
 		if ($options) {
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index fece6df98ec..bf75035f333 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -2061,7 +2061,7 @@ function get_left_menu_products($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 			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/stockatdate.php", $langs->trans("StockAtDate"), 1, $user->hasRight('product', 'read', '', 1) && $user->hasRight('stock', 'lire'));
+			$newmenu->add("/product/stock/stockatdate.php", $langs->trans("StockAtDate"), 1, $user->hasRight('product', 'read') && $user->hasRight('stock', 'lire'));
 
 			// Categories for warehouses
 			if (isModEnabled('categorie')) {
diff --git a/htdocs/core/modules/oauth/google_oauthcallback.php b/htdocs/core/modules/oauth/google_oauthcallback.php
index 80c39d85158..ed0caa1a4ff 100644
--- a/htdocs/core/modules/oauth/google_oauthcallback.php
+++ b/htdocs/core/modules/oauth/google_oauthcallback.php
@@ -42,7 +42,7 @@ $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domai
 $action = GETPOST('action', 'aZ09');
 $backtourl = GETPOST('backtourl', 'alpha');
 $keyforprovider = GETPOST('keyforprovider', 'aZ09');
-if (!GETPOSTISSET('keyforprovider', 'aZ09') && !empty($_SESSION["oauthkeyforproviderbeforeoauthjump"]) && (GETPOST('code') || $action == 'delete')) {
+if (!GETPOSTISSET('keyforprovider') && !empty($_SESSION["oauthkeyforproviderbeforeoauthjump"]) && (GETPOST('code') || $action == 'delete')) {
 	// If we are coming from the Oauth page
 	$keyforprovider = $_SESSION["oauthkeyforproviderbeforeoauthjump"];
 }
diff --git a/htdocs/core/tpl/advtarget.tpl.php b/htdocs/core/tpl/advtarget.tpl.php
index 8f27d747fab..55d5c5ed24a 100644
--- a/htdocs/core/tpl/advtarget.tpl.php
+++ b/htdocs/core/tpl/advtarget.tpl.php
@@ -198,7 +198,7 @@ if (!empty($array_query['cust_prospect_status'])) {
 	print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 }
 print '</td><td>';
-print $formadvtargetemaling->multiselectProspectionStatus($array_query['cust_prospect_status'], 'cust_prospect_status', 1);
+print $formadvtargetemaling->multiselectProspectionStatus($array_query['cust_prospect_status'], 'cust_prospect_status');
 print '</td><td>'."\n";
 print '</td></tr>'."\n";
 
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index 19f40bc984e..416e848d271 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -181,7 +181,7 @@ if ($resql) {
 			// Expected to pay
 			print '<td class="right">'.price($objp->d_amount).'</td>';
 			// Status
-			print '<td class="center">'.$don->getLibStatut(4, $objp->amount).'</td>';
+			print '<td class="center">'.$don->getLibStatut(4).'</td>';
 			// Amount paid
 			print '<td class="right">'.price($objp->amount).'</td>';
 			print "</tr>\n";
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index e37a1ce88f3..c43428fae8e 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -175,7 +175,7 @@ print load_fiche_titre($langs->trans("ECMArea").' - '.$langs->trans("Search"));
 print $langs->trans("FeatureNotYetAvailable").'.<br><br>';
 
 // Tool bar
-$head = ecm_prepare_head_fm($ecmdir, $module, $section);
+$head = ecm_prepare_head_fm($ecmdir);
 //print dol_get_fiche_head($head, 'search_form', '', 1);
 
 
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index f6aa14865ec..f7101b2f85a 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -295,7 +295,7 @@ if (empty($reshook)) {
 		}
 
 		if (!$error && empty($conf->global->EXPENSEREPORT_ALLOW_OVERLAPPING_PERIODS)) {
-			$overlappingExpenseReportID = $object->periode_existe($fuser, $object->date_debut, $object->date_fin, true);
+			$overlappingExpenseReportID = $object->periode_existe($fuser, $object->date_debut, $object->date_fin);
 
 			if ($overlappingExpenseReportID > 0) {
 				$error++;
diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index db6c21e202f..bdc7b51312a 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -209,7 +209,7 @@ if ($resql) {
 			print '<td class="right">'.price($objp->total_ttc - $objp->amount).'</td>';
 
 			// Status
-			print '<td class="center">'.$expensereport->getLibStatut(4, $objp->amount).'</td>';
+			print '<td class="center">'.$expensereport->getLibStatut(4).'</td>';
 
 			print "</tr>\n";
 
diff --git a/htdocs/fichinter/class/fichinterrec.class.php b/htdocs/fichinter/class/fichinterrec.class.php
index 6f9beb5d051..848dbc15974 100644
--- a/htdocs/fichinter/class/fichinterrec.class.php
+++ b/htdocs/fichinter/class/fichinterrec.class.php
@@ -150,7 +150,7 @@ class FichinterRec extends Fichinter
 		$fichintsrc = new Fichinter($this->db);
 
 		$result = $fichintsrc->fetch($this->id_origin);
-		$result = $fichintsrc->fetch_lines(1); // to get all lines
+		$result = $fichintsrc->fetch_lines(); // to get all lines
 
 
 		if ($result > 0) {
diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php
index 29cf421059e..66001ccc5a6 100644
--- a/htdocs/fourn/ajax/getSupplierPrices.php
+++ b/htdocs/fourn/ajax/getSupplierPrices.php
@@ -88,7 +88,7 @@ if ($idprod > 0) {
 				$label .= ' ('.$productSupplier->fourn_ref.')';
 			}
 
-			$prices[] = array("id" => $productSupplier->product_fourn_price_id, "price" => price2num($price, 0, '', 0), "label" => $label, "title" => $title); // For price field, we must use price2num(), for label or title, price()
+			$prices[] = array("id" => $productSupplier->product_fourn_price_id, "price" => price2num($price, '', 0), "label" => $label, "title" => $title); // For price field, we must use price2num(), for label or title, price()
 		}
 	}
 
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index adf9fac3bde..4b099265f41 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1383,7 +1383,7 @@ class FactureFournisseur extends CommonInvoice
 				$result = $this->update_price(1);
 				if ($result > 0) {
 					// Create link between discount and invoice line
-					$result = $remise->link_to_invoice($lineid, 0, 'supplier');
+					$result = $remise->link_to_invoice($lineid, 0);
 					if ($result < 0) {
 						$this->error = $remise->error;
 						$this->db->rollback();
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 50e450be105..81f24f07588 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1172,7 +1172,28 @@ if (empty($reshook)) {
 							if (!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA) && $diff != 0) {
 								$object->fetch_lines();
 								$subprice_diff = $object->lines[0]->subprice - $diff / (1 + $object->lines[0]->tva_tx / 100);
-								$object->updateline($object->lines[0]->id, $object->lines[0]->desc, $subprice_diff, $object->lines[0]->qty, $object->lines[0]->remise_percent, $object->lines[0]->date_start, $object->lines[0]->date_end, $object->lines[0]->tva_tx, 0, 0, 'HT', $object->lines[0]->info_bits, $object->lines[0]->product_type, 0, 0, 0, $object->lines[0]->pa_ht, $object->lines[0]->label, 0, array(), 100);
+								$object->updateline(
+									$object->lines[0]->id,
+									$object->lines[0]->desc,
+									$subprice_diff,
+									$object->lines[0]->tva_tx,
+									$object->lines[0]->localtax1_tx,
+									$object->lines[0]->localtax2_tx,
+									$object->lines[0]->qty,
+									$object->lines[0]->fk_product,
+									'HT',
+									$object->lines[0]->info_bits,
+									$object->lines[0]->product_type,
+									$object->lines[0]->remise_percent,
+									0,
+									$object->lines[0]->date_start,
+									$object->lines[0]->date_end,
+									0,
+									0,
+									0,
+									'',
+									100
+								);
 							}
 						} elseif ($result > 0) {
 							$lines = $srcobject->lines;
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index 3bb84086b1e..f89cc60736d 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -109,7 +109,8 @@ $text = $langs->trans("Margins");
 //print load_fiche_titre($text);
 
 // Show tabs
-$head = marges_prepare_head($user);
+$head = marges_prepare_head();
+
 $titre = $langs->trans("Margins");
 $picto = 'margin';
 
diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php
index 1349e02d2d8..0ef626c507f 100644
--- a/htdocs/margin/checkMargins.php
+++ b/htdocs/margin/checkMargins.php
@@ -176,7 +176,8 @@ if ($optioncss != '') {
 }
 
 // Show tabs
-$head = marges_prepare_head($user);
+$head = marges_prepare_head();
+
 $picto = 'margin';
 
 print '<form method="post" name="sel" action="'.$_SERVER['PHP_SELF'].'">';
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 0a07fc9542f..df040e68bdb 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -89,7 +89,8 @@ $text = $langs->trans("Margins");
 //print load_fiche_titre($text);
 
 // Show tabs
-$head = marges_prepare_head($user);
+$head = marges_prepare_head();
+
 $titre = $langs->trans("Margins");
 $picto = 'margin';
 
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index 903613b8379..634d0ca50ca 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -102,7 +102,8 @@ $text = $langs->trans("Margins");
 //print load_fiche_titre($text);
 
 // Show tabs
-$head = marges_prepare_head($user);
+$head = marges_prepare_head();
+
 $titre = $langs->trans("Margins");
 $picto = 'margin';
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index fcf9f7ffd1f..2b74cf538b4 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -91,7 +91,7 @@ if (GETPOST('theme', 'aZ09')) {
 if (GETPOST('lang', 'aZ09')) {
 	$langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL
 }
-if (GETPOSTISSET('THEME_DARKMODEENABLED', 'int')) {
+if (GETPOSTISSET('THEME_DARKMODEENABLED')) {
 	$conf->global->THEME_DARKMODEENABLED = GETPOST('THEME_DARKMODEENABLED', 'int'); // If darkmode was forced on URL
 }
 

From 8d4e973e007e528a05a1261538cb7c82b0a18ede Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2023 15:29:49 +0100
Subject: [PATCH 286/816] Fix warnings

---
 .../adherents/class/adherent_type.class.php   |  2 +-
 htdocs/commande/list.php                      | 12 ++++----
 htdocs/compta/facture/class/facture.class.php |  6 ++--
 htdocs/expensereport/payment/info.php         |  2 +-
 .../fourn/class/fournisseur.facture.class.php | 28 ++++++++++++-------
 htdocs/holiday/class/holiday.class.php        |  2 +-
 htdocs/societe/class/api_contacts.class.php   |  2 +-
 htdocs/takepos/admin/orderprinters.php        | 12 ++++----
 htdocs/takepos/receipt.php                    |  2 +-
 htdocs/variants/card.php                      |  2 +-
 .../ProductCombination2ValuePair.class.php    |  6 ++--
 htdocs/variants/combinations.php              | 14 +++++-----
 .../sync_members_types_ldap2dolibarr.php      |  6 ++--
 13 files changed, 54 insertions(+), 42 deletions(-)

diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 6ab65697745..765e536fec9 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -472,7 +472,7 @@ class AdherentType extends CommonObject
 	}
 
 	/**
-	 *  Function that retrieves the status of the member
+	 *  Function that retrieves the properties of a membership type
 	 *
 	 *  @param 		int		$rowid			Id of member type to load
 	 *  @return		int						<0 if KO, >0 if OK
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index e6338903f43..8c5134bb89a 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -679,14 +679,14 @@ if ($action == 'validate' && $permissiontoadd) {
 						$idwarehouse = 0;
 					}
 					if ($objecttmp->valid($user, $idwarehouse)) {
-						setEventMessage($langs->trans('hasBeenValidated', $objecttmp->ref), 'mesgs');
+						setEventMessages($langs->trans('hasBeenValidated', $objecttmp->ref), null, 'mesgs');
 					} else {
-						setEventMessage($objecttmp->error, $objecttmp->errors, 'errors');
+						setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 						$error++;
 					}
 				} else {
 					$langs->load("errors");
-					setEventMessage($langs->trans('ErrorIsNotADraft', $objecttmp->ref), 'errors');
+					setEventMessages($langs->trans('ErrorIsNotADraft', $objecttmp->ref), null, 'errors');
 					$error++;
 				}
 			} else {
@@ -710,14 +710,14 @@ if ($action == 'shipped' && $permissiontoadd) {
 			if ($objecttmp->fetch($checked)) {
 				if ($objecttmp->statut == 1 || $objecttmp->statut == 2) {
 					if ($objecttmp->cloture($user)) {
-						setEventMessage($langs->trans('PassedInClosedStatus', $objecttmp->ref), 'mesgs');
+						setEventMessages($langs->trans('PassedInClosedStatus', $objecttmp->ref), null, 'mesgs');
 					} else {
-						setEventMessage($langs->trans('CantBeClosed'), 'errors');
+						setEventMessages($langs->trans('CantBeClosed'), null, 'errors');
 						$error++;
 					}
 				} else {
 					$langs->load("errors");
-					setEventMessage($langs->trans('ErrorIsNotADraft', $objecttmp->ref), 'errors');
+					setEventMessages($langs->trans('ErrorIsNotADraft', $objecttmp->ref), null, 'errors');
 					$error++;
 				}
 			} else {
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 0a3c1445745..833f8fb6b76 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1956,14 +1956,14 @@ class Facture extends CommonInvoice
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON f.fk_incoterms = i.rowid';
 
 		if ($rowid) {
-			$sql .= " WHERE f.rowid=".((int) $rowid);
+			$sql .= " WHERE f.rowid = ".((int) $rowid);
 		} else {
 			$sql .= ' WHERE f.entity IN ('.getEntity('invoice').')'; // Don't use entity if you use rowid
 			if ($ref) {
-				$sql .= " AND f.ref='".$this->db->escape($ref)."'";
+				$sql .= " AND f.ref = '".$this->db->escape($ref)."'";
 			}
 			if ($ref_ext) {
-				$sql .= " AND f.ref_ext='".$this->db->escape($ref_ext)."'";
+				$sql .= " AND f.ref_ext = '".$this->db->escape($ref_ext)."'";
 			}
 		}
 
diff --git a/htdocs/expensereport/payment/info.php b/htdocs/expensereport/payment/info.php
index b5d87b81a51..c1e00ffa0fb 100644
--- a/htdocs/expensereport/payment/info.php
+++ b/htdocs/expensereport/payment/info.php
@@ -52,7 +52,7 @@ $confirm = GETPOST('confirm', 'alpha');
 llxHeader('', $langs->trans("Payment"));
 
 $object = new PaymentExpenseReport($db);
-$object->fetch($id, $ref);
+$object->fetch($id);
 $object->info($object->id);
 
 $head = payment_expensereport_prepare_head($object);
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 4b099265f41..2e766fb5cdc 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -852,15 +852,18 @@ class FactureFournisseur extends CommonInvoice
 	}
 
 	/**
-	 *    Load object in memory from database
+	 *  Load object in memory from database
 	 *
-	 *    @param	int		$id         Id supplier invoice
-	 *    @param	string	$ref		Ref supplier invoice
-	 *    @return   int        			<0 if KO, >0 if OK, 0 if not found
+	 *  @param	int		$id         Id supplier invoice
+	 *  @param	string	$ref		Ref supplier invoice
+	 * 	@param	string	$ref_ext	External reference of invoice
+	 *  @return int  	   			<0 if KO, >0 if OK, 0 if not found
 	 */
-	public function fetch($id = '', $ref = '')
+	public function fetch($id = '', $ref = '', $ref_ext = '')
 	{
-		global $langs;
+		if (empty($id) && empty($ref) && empty($ref_ext)) {
+			return -1;
+		}
 
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
@@ -911,10 +914,15 @@ class FactureFournisseur extends CommonInvoice
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as p ON t.fk_mode_reglement = p.id";
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON t.fk_incoterms = i.rowid';
 		if ($id) {
-			$sql .= " WHERE t.rowid=".((int) $id);
-		}
-		if ($ref) {
-			$sql .= " WHERE t.ref='".$this->db->escape($ref)."' AND t.entity IN (".getEntity('supplier_invoice').")";
+			$sql .= " WHERE t.rowid = ".((int) $id);
+		} else {
+			$sql .= ' WHERE t.entity IN ('.getEntity('supplier_invoice').')'; // Don't use entity if you use rowid
+			if ($ref) {
+				$sql .= " AND t.ref = '".$this->db->escape($ref)."'";
+			}
+			if ($ref_ext) {
+				$sql .= " AND t.ref_ext = '".$this->db->escape($ref_ext)."'";
+			}
 		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 0125becd21c..28dc2e2253d 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -1580,7 +1580,7 @@ class Holiday extends CommonObject
 					// We add a log for each user
 					$this->addLogCP($user->id, $userCounter['rowid'], $langs->trans('HolidaysMonthlyUpdate'), $newSolde, $userCounter['type']);
 
-					$result = $this->updateSoldeCP($userCounter['rowid'], $newSolde, $userCounter['type'], $langs->trans('HolidaysMonthlyUpdate'));
+					$result = $this->updateSoldeCP($userCounter['rowid'], $newSolde, $userCounter['type']);
 
 					if ($result < 0) {
 						$error++;
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index e79c39a1955..68bba46a3cb 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -335,7 +335,7 @@ class Contacts extends DolibarrApi
 			$this->contact->setNoEmail($this->contact->no_email);
 		}
 
-		if ($this->contact->update($id, DolibarrApiAccess::$user, 1, '', '', 'update')) {
+		if ($this->contact->update($id, DolibarrApiAccess::$user, 1, 'update')) {
 			return $this->get($id);
 		}
 
diff --git a/htdocs/takepos/admin/orderprinters.php b/htdocs/takepos/admin/orderprinters.php
index 981f6813acc..9597c7262e2 100644
--- a/htdocs/takepos/admin/orderprinters.php
+++ b/htdocs/takepos/admin/orderprinters.php
@@ -33,11 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
-$langs->loadLangs(array("main"), "categories", "takepos", "printing");
-
-if (!$user->rights->categorie->lire) {
-	accessforbidden();
-}
+$langs->loadLangs(array("main", "categories", "takepos", "printing"));
 
 $id = GETPOST('id', 'int');
 $type = (GETPOST('type', 'aZ09') ? GETPOST('type', 'aZ09') : Categorie::TYPE_PRODUCT);
@@ -51,9 +47,15 @@ if (is_numeric($type)) {
 	$type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
 }
 
+if (!$user->rights->categorie->lire) {
+	accessforbidden();
+}
+
+
 /*
  * Actions
  */
+
 if ($action == "SavePrinter1") {
 	$printedcategories = ";";
 	if (is_array($printer1)) {
diff --git a/htdocs/takepos/receipt.php b/htdocs/takepos/receipt.php
index 39fe2113071..3041c6f680e 100644
--- a/htdocs/takepos/receipt.php
+++ b/htdocs/takepos/receipt.php
@@ -81,7 +81,7 @@ $object->fetch($facid);
 
 // Call to external receipt modules if exist
 $parameters = array();
-$hookmanager->initHooks(array('takeposfrontend'), $facid);
+$hookmanager->initHooks(array('takeposfrontend'));
 $reshook = $hookmanager->executeHooks('TakeposReceipt', $parameters, $object);
 if (!empty($hookmanager->resPrint)) {
 	print $hookmanager->resPrint;
diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php
index 634290ca187..5f1065f5171 100644
--- a/htdocs/variants/card.php
+++ b/htdocs/variants/card.php
@@ -305,7 +305,7 @@ if ($action == 'create') {
 		// Show object lines
 		$result = $object->getLinesArray();
 
-		print load_fiche_titre($langs->trans("PossibleValues") . (!empty($object->lines) ? ' (' . count($object->lines) . ')' : ''));
+		print load_fiche_titre($langs->trans("PossibleValues") . (!empty($object->lines) ? '<span class="opacitymedium colorblack paddingleft">(' . count($object->lines) . ')</span>' : ''));
 
 		print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '#line_' . GETPOST('lineid', 'int')) . '" method="POST">
 		<input type="hidden" name="token" value="' . newToken() . '">
diff --git a/htdocs/variants/class/ProductCombination2ValuePair.class.php b/htdocs/variants/class/ProductCombination2ValuePair.class.php
index dee18dc99e1..5f4ab8480a5 100644
--- a/htdocs/variants/class/ProductCombination2ValuePair.class.php
+++ b/htdocs/variants/class/ProductCombination2ValuePair.class.php
@@ -83,9 +83,11 @@ class ProductCombination2ValuePair
 
 	/**
 	 * Creates a product combination 2 value pair
-	 * @return int <0 KO, >0 OK
+	 *
+	 * @param	User	$user		User that create
+	 * @return 	int 				<0 KO, >0 OK
 	 */
-	public function create()
+	public function create($user)
 	{
 		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "product_attribute_combination2val
 		(fk_prod_combination, fk_prod_attr, fk_prod_attr_val)
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index 6949ccb183f..5128f31d0c5 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -851,15 +851,15 @@ if (!empty($id) || !empty($ref)) {
 
 		$aaa = '';
 		if (count($productCombinations)) {
-			$aaa = '<label for="massaction">'.$langs->trans('BulkActions').'</label>';
-			$aaa .= '<select id="bulk_action" name="massaction" class="flat">';
+			$aaa = '<select id="bulk_action" name="massaction" class="flat">';
 			$aaa .= '	<option value="nothing">&nbsp;</option>';
-			$aaa .= '	<option value="not_buy">'.$langs->trans('ProductStatusNotOnBuy').'</option>';
-			$aaa .= '	<option value="not_sell">'.$langs->trans('ProductStatusNotOnSell').'</option>';
-			$aaa .= '	<option value="on_buy">'.$langs->trans('ProductStatusOnBuy').'</option>';
-			$aaa .= '	<option value="on_sell">'.$langs->trans('ProductStatusOnSell').'</option>';
-			$aaa .= '	<option value="delete">'.$langs->trans('Delete').'</option>';
+			$aaa .= '	<option value="not_buy" data-html="'.dol_escape_htmltag(img_picto($langs->trans("SetToStatus"), 'stop-circle', 'class="pictofixedwidth"').$langs->trans('SetToStatus', $langs->transnoentitiesnoconv('ProductStatusNotOnBuy'))).'">'.$langs->trans('ProductStatusNotOnBuy').'</option>';
+			$aaa .= '	<option value="not_sell" data-html="'.dol_escape_htmltag(img_picto($langs->trans("SetToStatus"), 'stop-circle', 'class="pictofixedwidth"').$langs->trans('SetToStatus', $langs->transnoentitiesnoconv('ProductStatusNotOnSell'))).'">'.$langs->trans('ProductStatusNotOnSell').'</option>';
+			$aaa .= '	<option value="on_buy" data-html="'.dol_escape_htmltag(img_picto($langs->trans("SetToStatus"), 'stop-circle', 'class="pictofixedwidth"').$langs->trans('SetToStatus', $langs->transnoentitiesnoconv('ProductStatusOnBuy'))).'">'.$langs->trans('ProductStatusOnBuy').'</option>';
+			$aaa .= '	<option value="on_sell" data-html="'.dol_escape_htmltag(img_picto($langs->trans("SetToStatus"), 'stop-circle', 'class="pictofixedwidth"').$langs->trans('SetToStatus', $langs->transnoentitiesnoconv('ProductStatusOnSell'))).'">'.$langs->trans('ProductStatusOnSell').'</option>';
+			$aaa .= '	<option value="delete" data-html="'.dol_escape_htmltag(img_picto($langs->trans("Delete"), 'delete', 'class="pictofixedwidth"').$langs->trans('Delete')).'">'.$langs->trans('Delete').'</option>';
 			$aaa .= '</select>';
+			$aaa .= ajax_combobox("bulk_action");
 			$aaa .= '<input type="submit" value="'.dol_escape_htmltag($langs->trans("Apply")).'" class="button small">';
 		}
 		$massactionbutton = $aaa;
diff --git a/scripts/members/sync_members_types_ldap2dolibarr.php b/scripts/members/sync_members_types_ldap2dolibarr.php
index 12a83633725..58eefbad69a 100755
--- a/scripts/members/sync_members_types_ldap2dolibarr.php
+++ b/scripts/members/sync_members_types_ldap2dolibarr.php
@@ -21,9 +21,9 @@
  */
 
 /**
- * \file scripts/members/sync_members_types_ldap2dolibarr.php
+ * \file 	scripts/members/sync_members_types_ldap2dolibarr.php
  * \ingroup ldap member
- * \brief Script to update members types into Dolibarr from LDAP
+ * \brief 	Script to update members types into Dolibarr from LDAP
  */
 
 if (!defined('NOSESSION')) {
@@ -139,7 +139,7 @@ if ($result >= 0) {
 		// Warning $ldapuser has a key in lowercase
 		foreach ($ldaprecords as $key => $ldapgroup) {
 			$membertype = new AdherentType($db);
-			$membertype->fetch('', $ldapgroup[$conf->global->LDAP_KEY_MEMBERS_TYPES]);
+			$membertype->fetch($ldapgroup[$conf->global->LDAP_KEY_MEMBERS_TYPES]);
 			$membertype->label = $ldapgroup[$conf->global->LDAP_MEMBER_TYPE_FIELD_FULLNAME];
 			$membertype->description = $ldapgroup[$conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION];
 			$membertype->entity = $conf->entity;

From fce59685100e6967369b07f74c7491c4e6cd4e32 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2023 17:09:08 +0100
Subject: [PATCH 287/816] Fix warning

---
 .../class/accountancyexport.class.php         |  6 ++---
 htdocs/admin/delais.php                       |  2 +-
 htdocs/compta/bank/graph.php                  |  2 +-
 .../class/bonprelevement.class.php            |  4 ++--
 htdocs/core/class/commonobject.class.php      |  2 +-
 htdocs/core/class/doleditor.class.php         | 22 +++++++++----------
 htdocs/core/class/dolgraph.class.php          |  4 ++--
 htdocs/core/class/lessc.class.php             | 12 +++++-----
 htdocs/core/lib/bank.lib.php                  |  2 +-
 htdocs/dav/dav.class.php                      |  2 +-
 htdocs/imports/import.php                     |  4 ++--
 htdocs/index.php                              |  2 +-
 htdocs/opensurvey/exportcsv.php               |  6 ++---
 htdocs/societe/class/societe.class.php        |  2 +-
 14 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 3c45315ffa9..9e90db931d0 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -444,14 +444,14 @@ class AccountancyExport
 			print $date.$separator;
 			print $line->piece_num.$separator;
 			print length_accountg($line->numero_compte).$separator;
-			print ''.$separator;
+			print $separator;
 			print $line->label_operation.$separator;
 			print $date.$separator;
 			if ($line->sens == 'D') {
 				print price($line->debit).$separator;
-				print ''.$separator;
+				print $separator;
 			} elseif ($line->sens == 'C') {
-				print ''.$separator;
+				print $separator;
 				print price($line->credit).$separator;
 			}
 			print $line->doc_ref.$separator;
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index a3b790525ef..55259ecfff3 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -325,7 +325,7 @@ if (empty($conf->global->MAIN_DISABLE_METEO) || $conf->global->MAIN_DISABLE_METE
 	if (!empty($conf->global->MAIN_METEO_LEVEL0)) {
 		$level0 = $conf->global->MAIN_METEO_LEVEL0;
 	}
-	$level1 = $offset + 1 * $cursor;
+	$level1 = $offset + $cursor;
 	if (!empty($conf->global->MAIN_METEO_LEVEL1)) {
 		$level1 = $conf->global->MAIN_METEO_LEVEL1;
 	}
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index c11e13f1e71..490107e4893 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -458,7 +458,7 @@ if ($result < 0) {
 			if ($day > ($max + 86400)) {
 				$datas[$i] = ''; // Valeur speciale permettant de ne pas tracer le graph
 			} else {
-				$datas[$i] = 0 + $solde + $subtotal;
+				$datas[$i] = $solde + $subtotal;
 			}
 			$datamin[$i] = $object->min_desired;
 			$dataall[$i] = $object->min_allowed;
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 373615ecdfb..554933a2137 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1866,7 +1866,7 @@ class BonPrelevement extends CommonObject
 			$XML_DEBITOR .= '					<PstlAdr>'.$CrLf;
 			$XML_DEBITOR .= '						<Ctry>'.$row_country_code.'</Ctry>'.$CrLf;
 			$addressline1 = strtr($row_address, array(CHR(13) => ", ", CHR(10) => ""));
-			$addressline2 = strtr($row_zip.(($row_zip && $row_town) ? ' ' : ''.$row_town), array(CHR(13) => ", ", CHR(10) => ""));
+			$addressline2 = strtr($row_zip.(($row_zip && $row_town) ? ' ' : (string) $row_town), array(CHR(13) => ", ", CHR(10) => ""));
 			if (trim($addressline1)) {
 				$XML_DEBITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline1), ' '), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 			}
@@ -1935,7 +1935,7 @@ class BonPrelevement extends CommonObject
 			$XML_CREDITOR .= '					<PstlAdr>'.$CrLf;
 			$XML_CREDITOR .= '						<Ctry>'.$row_country_code.'</Ctry>'.$CrLf;
 			$addressline1 = strtr($row_address, array(CHR(13) => ", ", CHR(10) => ""));
-			$addressline2 = strtr($row_zip.(($row_zip && $row_town) ? ' ' : ''.$row_town), array(CHR(13) => ", ", CHR(10) => ""));
+			$addressline2 = strtr($row_zip.(($row_zip && $row_town) ? ' ' : (string) $row_town), array(CHR(13) => ", ", CHR(10) => ""));
 			if (trim($addressline1)) {
 				$XML_CREDITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline1), ' '), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 			}
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index aafed5900d8..2a59fa4a9f5 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2072,7 +2072,7 @@ abstract class CommonObject
 
 		$sql .= " WHERE ".$id_field." = ".((int) $id);
 
-		dol_syslog(__METHOD__."", LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			if ($trigkey) {
diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index 67f9cbcbf89..fc86d661296 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -183,31 +183,31 @@ class DolEditor
 
 				$htmlencode_force = preg_match('/_encoded$/', $this->toolbarname) ? 'true' : 'false';
 
-				$out .= '<!-- Output ckeditor $disallowAnyContent='.$disallowAnyContent.' toolbarname='.$this->toolbarname.' -->'."\n";
+				$out .= '<!-- Output ckeditor $disallowAnyContent='.dol_escape_htmltag($disallowAnyContent).' toolbarname='.dol_escape_htmltag($this->toolbarname).' -->'."\n";
 				$out .= '<script type="text/javascript">
             			$(document).ready(function () {
 							/* console.log("Run ckeditor"); */
                             /* if (CKEDITOR.loadFullCore) CKEDITOR.loadFullCore(); */
                             /* should be editor=CKEDITOR.replace but what if there is several editors ? */
-                            tmpeditor = CKEDITOR.replace(\''.$this->htmlname.'\',
+                            tmpeditor = CKEDITOR.replace(\''.dol_escape_js($this->htmlname).'\',
             					{
             						/* property:xxx is same than CKEDITOR.config.property = xxx */
             						customConfig: ckeditorConfig,
-									removePlugins: \''.$pluginstodisable.'\',
+									removePlugins: \''.dol_escape_js($pluginstodisable).'\',
             						readOnly: '.($this->readonly ? 'true' : 'false').',
-                            		htmlEncodeOutput:'.$htmlencode_force.',
-            						allowedContent:'.($disallowAnyContent ? 'false' : 'true').',		/* Advanced Content Filter (ACF) is own when allowedContent is false */
+                            		htmlEncodeOutput: '.dol_escape_js($htmlencode_force).',
+            						allowedContent: '.($disallowAnyContent ? 'false' : 'true').',		/* Advanced Content Filter (ACF) is own when allowedContent is false */
             						extraAllowedContent: \'a[target];div{float,display}\',				/* Add the style float and display into div to default other allowed tags */
 									disallowedContent: '.($disallowAnyContent ? '\'\'' : '\'\'').',		/* Tags that are not allowed */
             						fullPage: '.($fullpage ? 'true' : 'false').',						/* if true, the html, header and body tags are kept */
-                            		toolbar: \''.$this->toolbarname.'\',
+                            		toolbar: \''.dol_escape_js($this->toolbarname).'\',
             						toolbarStartupExpanded: '.($this->toolbarstartexpanded ? 'true' : 'false').',
-            						width: '.($this->width ? '\''.$this->width.'\'' : '\'\'').',
-            						height: '.$this->height.',
-                                    skin: \''.$skin.'\',
+            						width: '.($this->width ? '\''.dol_escape_js($this->width).'\'' : '\'\'').',
+            						height: '.dol_escape_js($this->height).',
+                                    skin: \''.dol_escape_js($skin).'\',
                                     '.$scaytautostartup.'
-                                    language: \''.$langs->defaultlang.'\',
-                                    textDirection: \''.$langs->trans("DIRECTION").'\',
+                                    language: \''.dol_escape_js($langs->defaultlang).'\',
+                                    textDirection: \''.dol_escape_js($langs->trans("DIRECTION")).'\',
                                     on : {
                                                 instanceReady : function( ev )
                                                 {
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index d6e9d901ed8..196364a84f8 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -1173,7 +1173,7 @@ class DolGraph
 			} else {
 				$this->stringtoshow .= 'legend: { labels: { boxWidth: 15 }, position: \'' . ($showlegend == 2 ? 'right' : 'top') . '\'';
 				if (!empty($legendMaxLines)) {
-					$this->stringtoshow .= ', maxLines: ' . $legendMaxLines . '';
+					$this->stringtoshow .= ', maxLines: ' . $legendMaxLines;
 				}
 				$this->stringtoshow .= ' }, ' . "\n";
 			}
@@ -1185,7 +1185,7 @@ class DolGraph
 			} else {
 				$this->stringtoshow .= 'legend: { labels: { boxWidth: 15 }, position: \'' . ($showlegend == 2 ? 'right' : 'top') . '\'';
 				if (!empty($legendMaxLines)) {
-					$this->stringtoshow .= ', maxLines: ' . $legendMaxLines . '';
+					$this->stringtoshow .= ', maxLines: ' . $legendMaxLines;
 				}
 				$this->stringtoshow .= ' }, ' . "\n";
 			}
diff --git a/htdocs/core/class/lessc.class.php b/htdocs/core/class/lessc.class.php
index 40c4d21abaa..d697a0eab91 100644
--- a/htdocs/core/class/lessc.class.php
+++ b/htdocs/core/class/lessc.class.php
@@ -2755,7 +2755,7 @@ class lessc_parser
 
 			// media
 			if ($this->literal('@media')) {
-				if (($this->mediaQueryList($mediaQueries) || true)
+				if ($this->mediaQueryList($mediaQueries)
 					&& $this->literal('{')
 					) {
 						$media = $this->pushSpecialBlock("media");
@@ -2769,7 +2769,7 @@ class lessc_parser
 
 			if ($this->literal("@", false) && $this->keyword($dirName)) {
 				if ($this->isDirective($dirName, $this->blockDirectives)) {
-					if (($this->openString("{", $dirValue, null, array(";")) || true) &&
+					if ($this->openString("{", $dirValue, null, array(";")) &&
 						$this->literal("{")
 						) {
 							$dir = $this->pushSpecialBlock("directive");
@@ -2807,7 +2807,7 @@ class lessc_parser
 
 				// opening parametric mixin
 		if ($this->tag($tag, true) && $this->argumentDef($args, $isVararg) &&
-					($this->guards($guards) || true) &&
+					$this->guards($guards) &&
 					$this->literal('{')
 					) {
 				$block = $this->pushBlock($this->fixTags(array($tag)));
@@ -2870,8 +2870,8 @@ class lessc_parser
 
 					// mixin
 		if ($this->mixinTags($tags) &&
-						($this->argumentDef($argv, $isVararg) || true) &&
-						($this->keyword($suffix) || true) && $this->end()
+						$this->argumentDef($argv, $isVararg) &&
+						$this->keyword($suffix) && $this->end()
 						) {
 				$tags = $this->fixTags($tags);
 				$this->append(array('mixin', $tags, $argv, $suffix), $s);
@@ -3165,7 +3165,7 @@ class lessc_parser
 		$expressions = null;
 		$parts = array();
 
-		if (($this->literal("only") && ($only = true) || $this->literal("not") && ($not = true) || true) && $this->keyword($mediaType)) {
+		if ((($this->literal("only") && ($only = true)) || ($this->literal("not") && ($not = true))) && $this->keyword($mediaType)) {
 			$prop = array("mediaType");
 			if (isset($only)) {
 				$prop[] = "only";
diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
index 736b200bea3..98da571c138 100644
--- a/htdocs/core/lib/bank.lib.php
+++ b/htdocs/core/lib/bank.lib.php
@@ -360,7 +360,7 @@ function checkBanForAccount($account)
 
 		for ($i = 0, $s = 0; $i < 3; $i++) {
 			$code = substr($rib, 7 * $i, 7);
-			$s += (0 + (int) $code) * $coef[$i];
+			$s += ((int) $code) * $coef[$i];
 		}
 		// Soustraction du modulo 97 de $s a 97 pour obtenir la cle
 		$cle_rib = 97 - ($s % 97);
diff --git a/htdocs/dav/dav.class.php b/htdocs/dav/dav.class.php
index 012708c8960..a0375210271 100644
--- a/htdocs/dav/dav.class.php
+++ b/htdocs/dav/dav.class.php
@@ -251,7 +251,7 @@ class CdavLib
 	 */
 	public function getFullCalendarObjects($calendarId, $bCalendarData)
 	{
-		$calid = ($calendarId * 1);
+		$calid = (int) $calendarId;
 		$calevents = array();
 
 		if (!$this->user->rights->agenda->myactions->read) {
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 9646f0f4900..4ba13d01cf0 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -639,7 +639,7 @@ if ($step == 3 && $datatoimport) {
 		$max = $conf->global->MAIN_UPLOAD_DOC; // In Kb
 		$maxphp = @ini_get('upload_max_filesize'); // In unknown
 		if (preg_match('/k$/i', $maxphp)) {
-			$maxphp = (int) substr($maxphp, 0, -1) * 1;
+			$maxphp = (int) substr($maxphp, 0, -1);
 		}
 		if (preg_match('/m$/i', $maxphp)) {
 			$maxphp = (int) substr($maxphp, 0, -1) * 1024;
@@ -652,7 +652,7 @@ if ($step == 3 && $datatoimport) {
 		}
 		$maxphp2 = @ini_get('post_max_size'); // In unknown
 		if (preg_match('/k$/i', $maxphp2)) {
-			$maxphp2 = (int) substr($maxphp2, 0, -1) * 1;
+			$maxphp2 = (int) substr($maxphp2, 0, -1);
 		}
 		if (preg_match('/m$/i', $maxphp2)) {
 			$maxphp2 = (int) substr($maxphp2, 0, -1) * 1024;
diff --git a/htdocs/index.php b/htdocs/index.php
index 15c41e7ff50..7cfd12d4bac 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -809,7 +809,7 @@ function getWeatherStatus($totallate)
 	$weather->level = 0;
 	$level0 = $offset;
 	$level0 = getDolGlobalString($used_conf.'0', $level0);
-	$level1 = $offset + 1 * $factor;
+	$level1 = $offset + $factor;
 	$level1 = getDolGlobalString($used_conf.'1', $level1);
 	$level2 = $offset + 2 * $factor;
 	$level2 = getDolGlobalString($used_conf.'2', $level2);
diff --git a/htdocs/opensurvey/exportcsv.php b/htdocs/opensurvey/exportcsv.php
index a8a231787c3..151d748a2fd 100644
--- a/htdocs/opensurvey/exportcsv.php
+++ b/htdocs/opensurvey/exportcsv.php
@@ -68,9 +68,9 @@ $somme = array();
 $input = $langs->trans("Name").";";
 for ($i = 0; $toutsujet[$i]; $i++) {
 	if ($object->format == "D") {
-		$input .= ''.dol_print_date($toutsujet[$i], 'dayhour').';';
+		$input .= dol_print_date($toutsujet[$i], 'dayhour').';';
 	} else {
-		$input .= ''.$toutsujet[$i].';';
+		$input .= $toutsujet[$i].';';
 	}
 }
 
@@ -80,7 +80,7 @@ if (strpos($object->sujet, '@') !== false) {
 	$input .= ";";
 	for ($i = 0; $toutsujet[$i]; $i++) {
 		$heures = explode("@", $toutsujet[$i]);
-		$input .= ''.$heures[1].';';
+		$input .= $heures[1].';';
 	}
 
 	$input .= "\r\n";
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index dd5ccd7ef0b..3bf780ba106 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -5049,7 +5049,7 @@ class Societe extends CommonObject
 		$sql .= $field." = '".$this->db->escape($value)."'";
 		$sql .= " WHERE rowid = ".((int) $this->id);
 
-		dol_syslog(get_class($this)."::".__FUNCTION__."", LOG_DEBUG);
+		dol_syslog(get_class($this)."::".__FUNCTION__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 
 		if ($resql) {

From 85d91c82e8c75a12d75955246aef75888363bd17 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2023 17:34:51 +0100
Subject: [PATCH 288/816] Fix warning

---
 htdocs/comm/propal/class/propal.class.php     | 16 ++++++++++++++--
 htdocs/core/class/commonobject.class.php      |  6 ++++++
 htdocs/core/class/lessc.class.php             | 10 +++++++++-
 htdocs/core/lib/company.lib.php               |  2 ++
 htdocs/fichinter/class/fichinter.class.php    |  2 +-
 htdocs/fichinter/class/fichinterrec.class.php | 13 +++++--------
 htdocs/theme/md/style.css.php                 |  2 +-
 qodana.yaml                                   |  2 +-
 8 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index a5fd221de87..57c066886ba 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -454,6 +454,8 @@ class Propal extends CommonObject
 
 			$this->lines[] = $line;
 		}
+
+		return 1;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -2108,6 +2110,8 @@ class Propal extends CommonObject
 				return -1 * $error;
 			}
 		}
+
+		return -1;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -2164,6 +2168,8 @@ class Propal extends CommonObject
 				return -1 * $error;
 			}
 		}
+
+		return -1;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -2235,6 +2241,8 @@ class Propal extends CommonObject
 				return -1 * $error;
 			}
 		}
+
+		return -1;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -2417,9 +2425,9 @@ class Propal extends CommonObject
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		} else {
-			return -1;
 		}
+
+		return -1;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -2480,6 +2488,8 @@ class Propal extends CommonObject
 				return -1 * $error;
 			}
 		}
+
+		return -1;
 	}
 
 
@@ -2542,6 +2552,8 @@ class Propal extends CommonObject
 				return -1 * $error;
 			}
 		}
+
+		return -1;
 	}
 
 
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 2a59fa4a9f5..cdf24741025 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3338,6 +3338,8 @@ abstract class CommonObject
 			$row = $this->db->fetch_row($resql);
 			return $row[0];
 		}
+
+		return 0;
 	}
 
 	/**
@@ -3361,6 +3363,8 @@ abstract class CommonObject
 			$row = $this->db->fetch_row($resql);
 			return $row[0];
 		}
+
+		return 0;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -3406,6 +3410,8 @@ abstract class CommonObject
 				return $row[0];
 			}
 		}
+
+		return 0;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/core/class/lessc.class.php b/htdocs/core/class/lessc.class.php
index d697a0eab91..1d581a07e7f 100644
--- a/htdocs/core/class/lessc.class.php
+++ b/htdocs/core/class/lessc.class.php
@@ -1011,6 +1011,7 @@ class Lessc
 		if ($list[0] == "list" && isset($list[2][$idx - 1])) {
 			return $list[2][$idx - 1];
 		}
+		return;
 	}
 
 	protected function lib_isnumber($value)
@@ -1305,6 +1306,7 @@ class Lessc
 		if (!is_null($color = $this->coerceColor($value))) {
 			return isset($color[4]) ? $color[4] : 1;
 		}
+		return;
 	}
 
 	// set the alpha of the color
@@ -1835,6 +1837,7 @@ class Lessc
 				}
 				return null;
 		}
+		return null;
 	}
 
 	// make something string like into a string
@@ -1930,6 +1933,8 @@ class Lessc
 			array_unshift($strRight[2], $left);
 			return $strRight;
 		}
+
+		return '';
 	}
 
 
@@ -1953,6 +1958,7 @@ class Lessc
 		if ($op == '+' || $op == '*') {
 			return $this->op_color_number($op, $rgt, $lft);
 		}
+		return;
 	}
 
 	protected function op_color_number($op, $lft, $rgt)
@@ -3133,7 +3139,7 @@ class lessc_parser
 	}
 
 		// an import statement
-	protected function import(&$out)
+	protected function import(&$out, $value = '')
 	{
 		if (!$this->literal('@import')) {
 			return false;
@@ -3147,6 +3153,8 @@ class lessc_parser
 			$out = array("import", $value);
 			return true;
 		}
+
+		return false;
 	}
 
 	protected function mediaQueryList(&$out)
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index c863c802d4f..d49538f41dc 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -652,6 +652,8 @@ function getState($id, $withcode = '', $dbtouse = 0, $withregion = 0, $outputlan
 	} else {
 		dol_print_error($dbtouse, '');
 	}
+
+	return '';
 }
 
 /**
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 9f39c259ef8..1f191684d11 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -1300,7 +1300,7 @@ class Fichinter extends CommonObject
 	 */
 	public function initAsSpecimen()
 	{
-		global $user, $langs, $conf;
+		global $langs;
 
 		$now = dol_now();
 
diff --git a/htdocs/fichinter/class/fichinterrec.class.php b/htdocs/fichinter/class/fichinterrec.class.php
index d1ab5fbee54..44dd63abcd2 100644
--- a/htdocs/fichinter/class/fichinterrec.class.php
+++ b/htdocs/fichinter/class/fichinterrec.class.php
@@ -661,18 +661,15 @@ class FichinterRec extends Fichinter
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *	@param	string		$option		''=Create a specimen fichinter with lines, 'nolines'=No lines
 	 *  @return	void
 	 */
-	public function initAsSpecimen($option = '')
+	public function initAsSpecimen()
 	{
-		global $user, $langs, $conf;
+		//$now = dol_now();
+		//$arraynow = dol_getdate($now);
+		//$nownotime = dol_mktime(0, 0, 0, $arraynow['mon'], $arraynow['mday'], $arraynow['year']);
 
-		$now = dol_now();
-		$arraynow = dol_getdate($now);
-		$nownotime = dol_mktime(0, 0, 0, $arraynow['mon'], $arraynow['mday'], $arraynow['year']);
-
-		parent::initAsSpecimen($option);
+		parent::initAsSpecimen();
 
 		$this->usenewprice = 1;
 	}
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 9a341e56b3b..a90e5e351a2 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -93,7 +93,7 @@ if (GETPOST('lang', 'aZ09')) {
 	$langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL
 }
 
-if (GETPOSTISSET('THEME_DARKMODEENABLED', 'int')) {
+if (GETPOSTISSET('THEME_DARKMODEENABLED')) {
 	$conf->global->THEME_DARKMODEENABLED = GETPOST('THEME_DARKMODEENABLED', 'int'); // If darkmode was forced on URL
 }
 
diff --git a/qodana.yaml b/qodana.yaml
index 672be8ea928..adcc874ab0e 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -80,4 +80,4 @@ exclude:
   - name: PhpParameterNameChangedDuringInheritanceInspection
   - name: PhpDuplicateSwitchCaseBodyInspection
   - name: PhpNestedDirNameCallsCanBeReplacedWithLevelParameterInspection
-  
+  - name: PhpPointlessBooleanExpressionInConditionInspection  

From b005c9389b7cdf0607e90f8588423c46606e1116 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2023 18:54:11 +0100
Subject: [PATCH 289/816] Doxygen

---
 htdocs/core/class/lessc.class.php | 2 +-
 htdocs/core/db/DoliDB.class.php   | 7 +++++--
 htdocs/core/db/mysqli.class.php   | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/lessc.class.php b/htdocs/core/class/lessc.class.php
index 1d581a07e7f..cb6caf838e2 100644
--- a/htdocs/core/class/lessc.class.php
+++ b/htdocs/core/class/lessc.class.php
@@ -3212,7 +3212,7 @@ class lessc_parser
 		$value = null;
 		if ($this->literal("(") &&
 			$this->keyword($feature) &&
-			($this->literal(":") && $this->expression($value) || true) &&
+			($this->literal(":") && $this->expression($value)) &&
 			$this->literal(")")
 			) {
 				$out = array("mediaExp", $feature);
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index e2659e224a4..0c62be0a85a 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/db/Database.interface.php';
  */
 abstract class DoliDB implements Database
 {
-	/** @var bool|resource|SQLite3|PgSql\connection Database handler */
+	/** @var bool|resource|mysqli|SQLite3|PgSql\connection Database handler */
 	public $db;
 	/** @var string Database type */
 	public $type;
@@ -37,8 +37,10 @@ abstract class DoliDB implements Database
 	public $forcecharset = 'utf8';
 	/** @var string Collate used to force collate when creating database */
 	public $forcecollate = 'utf8_unicode_ci';
+
 	/** @var resource Resultset of last query */
 	private $_results;
+
 	/** @var bool true if connected, else false */
 	public $connected;
 	/** @var bool true if database selected, else false */
@@ -73,7 +75,8 @@ abstract class DoliDB implements Database
 
 
 	/**
-	 *	Return the DB prefix
+	 *	Return the DB prefix found into prefix_db (if it was set manually by doing $db->prefix_db=...).
+	 *  Otherwise return MAIN_DB_PREFIX (common use).
 	 *
 	 *	@return string		The DB prefix
 	 */
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 7d184dc06cf..d34aca48ed9 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -36,10 +36,12 @@ class DoliDBMysqli extends DoliDB
 	public $db;
 	//! Database type
 	public $type = 'mysqli';
+
 	//! Database label
 	const LABEL = 'MySQL or MariaDB';
 	//! Version min database
 	const VERSIONMIN = '5.0.3';
+
 	/** @var bool|mysqli_result Resultset of last query */
 	private $_results;
 

From 6580aa056a3cd03b3c1a1c11f95491d6fbb916a5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2023 19:04:15 +0100
Subject: [PATCH 290/816] Clean code

---
 .../test/phpunit/{ => functionnal}/MyModuleFunctionalTest.php    | 0
 qodana.yaml                                                      | 1 +
 2 files changed, 1 insertion(+)
 rename htdocs/modulebuilder/template/test/phpunit/{ => functionnal}/MyModuleFunctionalTest.php (100%)

diff --git a/htdocs/modulebuilder/template/test/phpunit/MyModuleFunctionalTest.php b/htdocs/modulebuilder/template/test/phpunit/functionnal/MyModuleFunctionalTest.php
similarity index 100%
rename from htdocs/modulebuilder/template/test/phpunit/MyModuleFunctionalTest.php
rename to htdocs/modulebuilder/template/test/phpunit/functionnal/MyModuleFunctionalTest.php
diff --git a/qodana.yaml b/qodana.yaml
index adcc874ab0e..2e29b84f55e 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -15,6 +15,7 @@ exclude:
       - htdocs/custom
       - htdocs/includes
       - htdocs/install/doctemplates
+      - htdocs/modulebuilder/template/test/functionnal
   - name: PhpIssetCanBeReplacedWithCoalesceInspection
   - name: PhpRedundantOptionalArgumentInspection
   - name: PhpLanguageLevelInspection

From e67c37f3ba897dd5e44c58bf8c9cfb2cad91d603 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2023 19:16:38 +0100
Subject: [PATCH 291/816] Fix missing security check on payment

---
 htdocs/compta/payment_sc/card.php | 8 ++++----
 htdocs/core/lib/security.lib.php  | 9 +++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
index 7d7742c3f01..11f7f1e454f 100644
--- a/htdocs/compta/payment_sc/card.php
+++ b/htdocs/compta/payment_sc/card.php
@@ -46,8 +46,6 @@ $confirm = GETPOST('confirm', 'aZ09');
 if ($user->socid) {
 	$socid = $user->socid;
 }
-// TODO ajouter regle pour restreindre acces paiement
-//$result = restrictedArea($user, 'facture', $id,'');
 
 $object = new PaymentSocialContribution($db);
 if ($id > 0) {
@@ -57,6 +55,8 @@ if ($id > 0) {
 	}
 }
 
+$result = restrictedArea($user, 'payment_sc', $id, '');
+
 
 /*
  * Actions
@@ -77,7 +77,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight('tax', '
 	}
 }
 
-if ($action == 'setdatep' && GETPOST('datepday') && $user->hasRight('tax', 'charges', 'creer')) {
+/*if ($action == 'setdatep' && GETPOST('datepday') && $user->hasRight('tax', 'charges', 'creer')) {
 	$datepaye = dol_mktime(GETPOST('datephour', 'int'), GETPOST('datepmin', 'int'), GETPOST('datepsec', 'int'), GETPOST('datepmonth', 'int'), GETPOST('datepday', 'int'), GETPOST('datepyear', 'int'));
 	$res = $object->update_date($datepaye);
 	if ($res === 0) {
@@ -85,7 +85,7 @@ if ($action == 'setdatep' && GETPOST('datepday') && $user->hasRight('tax', 'char
 	} else {
 		setEventMessages($langs->trans('PaymentDateUpdateFailed'), null, 'errors');
 	}
-}
+}*/
 
 
 /*
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 97281981754..7d88253cef2 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -466,6 +466,11 @@ function restrictedArea(User $user, $features, $object = 0, $tableandshare = '',
 				$readok = 0;
 				$nbko++;
 			}
+		} elseif ($feature == 'payment_sc') {
+			if (empty($user->rights->tax->charges->lire)) {
+				$readok = 0;
+				$nbko++;
+			}
 		} elseif (!empty($feature2)) { 													// This is for permissions on 2 levels
 			$tmpreadok = 1;
 			foreach ($feature2 as $subfeature) {
@@ -648,6 +653,10 @@ function restrictedArea(User $user, $features, $object = 0, $tableandshare = '',
 				if (!$user->rights->facture->paiement) {
 						$deleteok = 0;
 				}
+			} elseif ($feature == 'payment_sc') {
+				if (!$user->rights->tax->charges->creer) {
+					$deleteok = 0;
+				}
 			} elseif ($feature == 'banque') {
 				if (empty($user->rights->banque->modifier)) {
 					$deleteok = 0;

From e2bb024c642aac32dc9ba82d7edc394bd6351767 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2023 19:24:12 +0100
Subject: [PATCH 292/816] Enhance qodana

---
 qodana.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qodana.yaml b/qodana.yaml
index 2e29b84f55e..89cc459fdfa 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -82,3 +82,4 @@ exclude:
   - name: PhpDuplicateSwitchCaseBodyInspection
   - name: PhpNestedDirNameCallsCanBeReplacedWithLevelParameterInspection
   - name: PhpPointlessBooleanExpressionInConditionInspection  
+  - name: PhpUndefinedMethodInspection
\ No newline at end of file

From 1e65d24293c9092c973d1c27fab7aed953084a79 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2023 19:16:38 +0100
Subject: [PATCH 293/816] Fix missing security check on payment

---
 htdocs/compta/payment_sc/card.php | 14 ++++++++++++--
 htdocs/core/lib/security.lib.php  |  9 +++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
index 39bac75ba0c..238a2f9072d 100644
--- a/htdocs/compta/payment_sc/card.php
+++ b/htdocs/compta/payment_sc/card.php
@@ -46,8 +46,6 @@ $confirm = GETPOST('confirm', 'aZ09');
 if ($user->socid) {
 	$socid = $user->socid;
 }
-// TODO ajouter regle pour restreindre acces paiement
-//$result = restrictedArea($user, 'facture', $id,'');
 
 $object = new PaymentSocialContribution($db);
 if ($id > 0) {
@@ -57,6 +55,8 @@ if ($id > 0) {
 	}
 }
 
+$result = restrictedArea($user, 'payment_sc', $id, '');
+
 
 /*
  * Actions
@@ -77,6 +77,16 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->tax->char
 	}
 }
 
+/*if ($action == 'setdatep' && GETPOST('datepday') && $user->hasRight('tax', 'charges', 'creer')) {
+	$datepaye = dol_mktime(GETPOST('datephour', 'int'), GETPOST('datepmin', 'int'), GETPOST('datepsec', 'int'), GETPOST('datepmonth', 'int'), GETPOST('datepday', 'int'), GETPOST('datepyear', 'int'));
+	$res = $object->update_date($datepaye);
+	if ($res === 0) {
+		setEventMessages($langs->trans('PaymentDateUpdateSucceeded'), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans('PaymentDateUpdateFailed'), null, 'errors');
+	}
+}*/
+
 
 /*
  * View
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 0a7e9615a70..5f521fd63de 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -466,6 +466,11 @@ function restrictedArea(User $user, $features, $object = 0, $tableandshare = '',
 				$readok = 0;
 				$nbko++;
 			}
+		} elseif ($feature == 'payment_sc') {
+			if (empty($user->rights->tax->charges->lire)) {
+				$readok = 0;
+				$nbko++;
+			}
 		} elseif (!empty($feature2)) { 													// This is for permissions on 2 levels
 			$tmpreadok = 1;
 			foreach ($feature2 as $subfeature) {
@@ -648,6 +653,10 @@ function restrictedArea(User $user, $features, $object = 0, $tableandshare = '',
 				if (!$user->rights->facture->paiement) {
 						$deleteok = 0;
 				}
+			} elseif ($feature == 'payment_sc') {
+				if (!$user->rights->tax->charges->creer) {
+					$deleteok = 0;
+				}
 			} elseif ($feature == 'banque') {
 				if (empty($user->rights->banque->modifier)) {
 					$deleteok = 0;

From 70f9e7881bb4b26e09c84edc0ce359ba6551e6c9 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Tue, 3 Jan 2023 19:46:05 +0100
Subject: [PATCH 294/816] Fix error when no category selected

empty pages when searching with no category of producted selected
---
 htdocs/compta/stats/cabyprodserv.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index b8f6327ccd5..ca8b35e739d 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -323,7 +323,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	}
 	if ($selected_cat === -2) {	// Without any category
 		$sql .= " AND cp.fk_product is null";
-	} elseif ($selected_cat) {	// Into a specific category
+	} elseif ($selected_cat > 0) {	// Into a specific category
 		if ($subcat) {
 			$TListOfCats = $categorie->get_full_arbo('product', $selected_cat, 1);
 

From 23d535197d4cffcec44d763bc5ad21c39bf2c02a Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Wed, 4 Jan 2023 09:13:40 +0100
Subject: [PATCH 295/816] Fix v14 fatal error undefined fct lenght_accounta

Following #23403
See https://www.dolibarr.fr/forum/t/erreur-fatal-paiements-divers-v15-0-3/41914
---
 htdocs/compta/bank/various_payment/list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index dda68a096a1..3863cde1ab9 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -650,6 +650,7 @@ if ($result) {
 
 		// Accounting account
 		if ($arrayfields['account']['checked']) {
+			require_once(DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php');
 			$accountingaccount->fetch('', $obj->accountancy_code, 1);
 
 			print '<td>'.$accountingaccount->getNomUrl(0, 1, 1, '', 1).'</td>';

From 1d29400cdfa9b8883af73734de97d0d35c7248c1 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 4 Jan 2023 08:15:39 +0000
Subject: [PATCH 296/816] Fixing style errors.

---
 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 3863cde1ab9..cf19962489d 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -650,7 +650,7 @@ if ($result) {
 
 		// Accounting account
 		if ($arrayfields['account']['checked']) {
-			require_once(DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php');
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 			$accountingaccount->fetch('', $obj->accountancy_code, 1);
 
 			print '<td>'.$accountingaccount->getNomUrl(0, 1, 1, '', 1).'</td>';

From 4ea81b4a96cdf72050f7da93f9188315c51ded0e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Jan 2023 09:42:39 +0100
Subject: [PATCH 297/816] Fix syntax error

---
 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 f24d971acc2..7ac6150c5ac 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5745,7 +5745,7 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $
 			$currency_code = $conf->currency;
 		}
 
-		$listofcurrenciesbefore = array('AUD', 'CAD', 'CNY', 'COP', 'CLP', 'GBP', 'HKD', 'MXN', 'PEN', 'USD', 'CRC);
+		$listofcurrenciesbefore = array('AUD', 'CAD', 'CNY', 'COP', 'CLP', 'GBP', 'HKD', 'MXN', 'PEN', 'USD', 'CRC');
 		$listoflanguagesbefore = array('nl_NL');
 		if (in_array($currency_code, $listofcurrenciesbefore) || in_array($outlangs->defaultlang, $listoflanguagesbefore)) {
 			$cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);

From 37528e65448be154826440bf8d6c0e6b192aa2b0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Jan 2023 09:43:26 +0100
Subject: [PATCH 298/816] Add CRC to currency with symbol before amount

---
 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 a600761d9b9..f19220e10d6 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5765,7 +5765,7 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $
 			$currency_code = $conf->currency;
 		}
 
-		$listofcurrenciesbefore = array('AUD', 'CAD', 'CNY', 'COP', 'CLP', 'GBP', 'HKD', 'MXN', 'PEN', 'USD');
+		$listofcurrenciesbefore = array('AUD', 'CAD', 'CNY', 'COP', 'CLP', 'GBP', 'HKD', 'MXN', 'PEN', 'USD', 'CRC');
 		$listoflanguagesbefore = array('nl_NL');
 		if (in_array($currency_code, $listofcurrenciesbefore) || in_array($outlangs->defaultlang, $listoflanguagesbefore)) {
 			$cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);

From 43a0ccce2b202d91614251a26e07a24af499b0e9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Jan 2023 11:36:46 +0100
Subject: [PATCH 299/816] Clean code

---
 htdocs/api/class/api_setup.class.php          |  72 ++++-----
 htdocs/bom/class/bom.class.php                |   4 +-
 htdocs/comm/action/class/ical.class.php       |   4 +-
 .../comm/propal/class/api_proposals.class.php |  92 +++++------
 htdocs/comm/propal/class/propal.class.php     |  16 +-
 htdocs/commande/class/api_orders.class.php    |  60 +++----
 htdocs/commande/class/commande.class.php      |  57 +++----
 .../facture/class/api_invoices.class.php      | 151 ++++++++----------
 htdocs/compta/facture/class/facture.class.php |  31 ++--
 htdocs/core/class/html.form.class.php         |  14 +-
 htdocs/core/class/ldap.class.php              |  10 +-
 htdocs/core/class/rssparser.class.php         |   6 +-
 htdocs/core/lib/ftp.lib.php                   |  18 +--
 .../class/expensereport.class.php             |   6 +-
 htdocs/install/upgrade2.php                   |  15 +-
 htdocs/mrp/class/mo.class.php                 |   5 +-
 htdocs/product/class/api_products.class.php   |  29 ++--
 htdocs/projet/class/task.class.php            |  16 +-
 htdocs/ticket/class/ticket.class.php          |  26 +--
 .../variants/class/ProductAttribute.class.php |   5 +
 20 files changed, 302 insertions(+), 335 deletions(-)

diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 9dcd168f344..e06cdeb0312 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -319,8 +319,8 @@ class Setup extends DolibarrApi
 	/**
 	 * Get state by ID.
 	 *
-	 * @param int       $id        ID of state
-	 * @return array    		   Array of cleaned object properties
+	 * @param 	int       $id        	ID of state
+	 * @return 	Object 					Object with cleaned properties
 	 *
 	 * @url     GET dictionary/states/{id}
 	 *
@@ -334,8 +334,8 @@ class Setup extends DolibarrApi
 	/**
 	 * Get state by Code.
 	 *
-	 * @param string    $code      Code of state
-	 * @return array 			   Array of cleaned object properties
+	 * @param 	string    $code      	Code of state
+	 * @return 	Object 					Object with cleaned properties
 	 *
 	 * @url     GET dictionary/states/byCode/{code}
 	 *
@@ -424,10 +424,9 @@ class Setup extends DolibarrApi
 	/**
 	 * Get country by ID.
 	 *
-	 * @param int       $id        ID of country
-	 * @param string    $lang      Code of the language the name of the
-	 *                             country must be translated to
-	 * @return array 			   Array of cleaned object properties
+	 * @param 	int       $id        	ID of country
+	 * @param 	string    $lang      	Code of the language the name of the country must be translated to
+	 * @return 	Object 					Object with cleaned properties
 	 *
 	 * @url     GET dictionary/countries/{id}
 	 *
@@ -441,10 +440,9 @@ class Setup extends DolibarrApi
 	/**
 	 * Get country by Code.
 	 *
-	 * @param string    $code      Code of country (2 characters)
-	 * @param string    $lang      Code of the language the name of the
-	 *                             country must be translated to
-	 * @return array 			   Array of cleaned object properties
+	 * @param 	string    $code      	Code of country (2 characters)
+	 * @param 	string    $lang      	Code of the language the name of the country must be translated to
+	 * @return 	Object 					Object with cleaned properties
 	 *
 	 * @url     GET dictionary/countries/byCode/{code}
 	 *
@@ -458,10 +456,9 @@ class Setup extends DolibarrApi
 	/**
 	 * Get country by Iso.
 	 *
-	 * @param string    $iso       ISO of country (3 characters)
-	 * @param string    $lang      Code of the language the name of the
-	 *                             country must be translated to
-	 * @return array 			   Array of cleaned object properties
+	 * @param 	string    $iso       	ISO of country (3 characters)
+	 * @param 	string    $lang     	Code of the language the name of the country must be translated to
+	 * @return 	Object 					Object with cleaned properties
 	 *
 	 * @url     GET dictionary/countries/byISO/{iso}
 	 *
@@ -475,9 +472,9 @@ class Setup extends DolibarrApi
 	/**
 	 * Get state.
 	 *
-	 * @param int       $id        ID of state
-	 * @param string    $code      Code of state
-	 * @return array 			   Array of cleaned object properties
+	 * @param 	int       $id        	ID of state
+	 * @param 	string    $code      	Code of state
+	 * @return 	Object 					Object with cleaned properties
 	 *
 	 * @throws RestException
 	 */
@@ -498,12 +495,11 @@ class Setup extends DolibarrApi
 	/**
 	 * Get country.
 	 *
-	 * @param int       $id        ID of country
-	 * @param string    $code      Code of country (2 characters)
-	 * @param string    $iso       ISO of country (3 characters)
-	 * @param string    $lang      Code of the language the name of the
-	 *                             country must be translated to
-	 * @return array 			   Array of cleaned object properties
+	 * @param 	int       $id        	ID of country
+	 * @param 	string    $code      	Code of country (2 characters)
+	 * @param 	string    $iso       	ISO of country (3 characters)
+	 * @param 	string    $lang      	Code of the language the name of the country must be translated to
+	 * @return 	Object 					Object with cleaned properties
 	 *
 	 * @throws RestException
 	 */
@@ -527,12 +523,12 @@ class Setup extends DolibarrApi
 	/**
 	 * Get the list of delivery times.
 	 *
-	 * @param string    $sortfield  Sort field
-	 * @param string    $sortorder  Sort order
-	 * @param int       $limit      Number of items per page
-	 * @param int       $page       Page number {@min 0}
-	 * @param int       $active     Delivery times is active or not {@min 0} {@max 1}
-	 * @param string    $sqlfilters SQL criteria to filter with.
+	 * @param string    $sortfield  	Sort field
+	 * @param string    $sortorder  	Sort order
+	 * @param int       $limit      	Number of items per page
+	 * @param int       $page       	Page number {@min 0}
+	 * @param int       $active     	Delivery times is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters 	SQL criteria to filter with.
 	 *
 	 * @url     GET dictionary/availability
 	 *
@@ -592,8 +588,8 @@ class Setup extends DolibarrApi
 	/**
 	 * Clean sensible object datas
 	 *
-	 * @param Object    $object    Object to clean
-	 * @return Object 				Object with cleaned properties
+	 * @param 	Object    $object    	Object to clean
+	 * @return 	Object 					Object with cleaned properties
 	 */
 	protected function _cleanObjectDatas($object)
 	{
@@ -1786,8 +1782,8 @@ class Setup extends DolibarrApi
 	/**
 	 * Get establishment by ID.
 	 *
-	 * @param int       $id        ID of establishment
-	 * @return array    		   Array of cleaned object properties
+	 * @param 	int       $id       	ID of establishment
+	 * @return  Object    				Object with cleaned properties
 	 *
 	 * @url     GET establishments/{id}
 	 *
@@ -1813,7 +1809,7 @@ class Setup extends DolibarrApi
 	 * Note that conf variables that stores security key or password hashes can't be loaded with API.
 	 *
 	 * @param	string			$constantname	Name of conf variable to get
-	 * @return  array|mixed 				Data without useless information
+	 * @return  string							Data without useless information
 	 *
 	 * @url     GET conf/{constantname}
 	 *
@@ -1825,7 +1821,7 @@ class Setup extends DolibarrApi
 		global $conf;
 
 		if (!DolibarrApiAccess::$user->admin
-			&& (empty($conf->global->API_LOGINS_ALLOWED_FOR_CONST_READ) || DolibarrApiAccess::$user->login != $conf->global->API_LOGINS_ALLOWED_FOR_CONST_READ)) {
+			&& (!getDolGlobalString('API_LOGINS_ALLOWED_FOR_CONST_READ') || DolibarrApiAccess::$user->login != getDolGlobalString('API_LOGINS_ALLOWED_FOR_CONST_READ'))) {
 			throw new RestException(403, 'Error API open to admin users only or to the users with logins defined into constant API_LOGINS_ALLOWED_FOR_CONST_READ');
 		}
 
@@ -1836,7 +1832,7 @@ class Setup extends DolibarrApi
 			throw new RestException(403, 'Forbidden. This parameter cant be read with APIs');
 		}
 
-		return $conf->global->$constantname;
+		return getDolGlobalString($constantname);
 	}
 
 	/**
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index e5d9cc82617..79d2b57ebc8 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -1329,7 +1329,7 @@ class BOM extends CommonObject
 	 * BOM costs calculation based on cost_price or pmp of each BOM line.
 	 * Set the property ->total_cost and ->unit_cost of BOM.
 	 *
-	 * @return void
+	 * @return int			<0 if KO, >0 if OK
 	 */
 	public function calculateCosts()
 	{
@@ -1414,6 +1414,8 @@ class BOM extends CommonObject
 				$this->unit_cost = price2num($this->total_cost * $this->qty, 'MU');
 			}
 		}
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php
index 7ab09e8d891..badd5db5c98 100644
--- a/htdocs/comm/action/class/ical.class.php
+++ b/htdocs/comm/action/class/ical.class.php
@@ -402,7 +402,7 @@ class ICal
 	public function get_event_list()
 	{
 		// phpcs:enable
-		return (empty($this->cal['VEVENT']) ? '' : $this->cal['VEVENT']);
+		return (empty($this->cal['VEVENT']) ? array() : $this->cal['VEVENT']);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -414,7 +414,7 @@ class ICal
 	public function get_freebusy_list()
 	{
 		// phpcs:enable
-		return (empty($this->cal['VFREEBUSY']) ? '' : $this->cal['VFREEBUSY']);
+		return (empty($this->cal['VFREEBUSY']) ? array() : $this->cal['VFREEBUSY']);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index cf675e01b62..5e0e2c31e19 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -49,7 +49,7 @@ class Proposals extends DolibarrApi
 	 */
 	public function __construct()
 	{
-		global $db, $conf;
+		global $db;
 		$this->db = $db;
 		$this->propal = new Propal($this->db);
 	}
@@ -59,9 +59,9 @@ class Proposals extends DolibarrApi
 	 *
 	 * Return an array with commercial proposal informations
 	 *
-	 * @param       int         $id           ID of commercial proposal
-	 * @param       int         $contact_list 0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
-	 * @return 	array|mixed data without useless information
+	 * @param   int         $id           	ID of commercial proposal
+	 * @param   int         $contact_list 	0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
+	 * @return  Object              		Object with cleaned properties
 	 *
 	 * @throws 	RestException
 	 */
@@ -76,8 +76,8 @@ class Proposals extends DolibarrApi
 	 * Return an array with proposal informations
 	 *
 	 * @param       string		$ref			Ref of object
-	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
-	 * @return 	array|mixed data without useless information
+	 * @param       int         $contact_list  	0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
+	 * @return  	Object              		Object with cleaned properties
 	 *
 	 * @url GET    ref/{ref}
 	 *
@@ -93,9 +93,9 @@ class Proposals extends DolibarrApi
 	 *
 	 * Return an array with proposal informations
 	 *
-	 * @param       string		$ref_ext			External reference of object
-	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
-	 * @return 	array|mixed data without useless information
+	 * @param       string		$ref_ext		External reference of object
+	 * @param       int         $contact_list  	0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
+	 * @return  	Object              		Object with cleaned properties
 	 *
 	 * @url GET    ref_ext/{ref_ext}
 	 *
@@ -111,11 +111,11 @@ class Proposals extends DolibarrApi
 	 *
 	 * Return an array with proposal informations
 	 *
-	 * @param       int         $id             ID of order
-	 * @param		string		$ref			Ref of object
-	 * @param		string		$ref_ext		External reference of object
-	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
-	 * @return 	array|mixed data without useless information
+	 * @param   int         $id             ID of order
+	 * @param	string		$ref			Ref of object
+	 * @param	string		$ref_ext		External reference of object
+	 * @param   int         $contact_list  	0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
+	 * @return  Object              		Object with cleaned properties
 	 *
 	 * @throws 	RestException
 	 */
@@ -289,7 +289,7 @@ class Proposals extends DolibarrApi
 	 *
 	 * @url	GET {id}/lines
 	 *
-	 * @return int
+	 * @return array
 	 */
 	public function getLines($id, $sqlfilters = '')
 	{
@@ -461,7 +461,7 @@ class Proposals extends DolibarrApi
 		}
 		if (empty($errors)) {
 			$this->db->commit();
-			return count($request_data);
+			return $updateRes;
 		} else {
 			$this->db->rollback();
 			throw new RestException(400, implode(", ", $errors));
@@ -471,13 +471,12 @@ class Proposals extends DolibarrApi
 	/**
 	 * Update a line of given commercial proposal
 	 *
-	 * @param int   $id             Id of commercial proposal to update
-	 * @param int   $lineid         Id of line to update
-	 * @param array $request_data   Commercial proposal line data
+	 * @param 	int   			$id             Id of commercial proposal to update
+	 * @param 	int   			$lineid         Id of line to update
+	 * @param 	array 			$request_data   Commercial proposal line data
+	 * @return  Object|false    				Object with cleaned properties
 	 *
 	 * @url	PUT {id}/lines/{lineid}
-	 *
-	 * @return object
 	 */
 	public function putLine($id, $lineid, $request_data = null)
 	{
@@ -548,13 +547,12 @@ class Proposals extends DolibarrApi
 	 * Delete a line of given commercial proposal
 	 *
 	 *
-	 * @param int   $id             Id of commercial proposal to update
-	 * @param int   $lineid         Id of line to delete
+	 * @param 	int   			$id             Id of commercial proposal to update
+	 * @param 	int   			$lineid         Id of line to delete
+	 * @return  Object|false    				Object with cleaned properties
 	 *
 	 * @url	DELETE {id}/lines/{lineid}
 	 *
-	 * @return int
-	 *
 	 * @throws RestException 401
 	 * @throws RestException 404
 	 */
@@ -573,9 +571,7 @@ class Proposals extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		// TODO Check the lineid $lineid is a line of ojbect
-
-		$updateRes = $this->propal->deleteline($lineid);
+		$updateRes = $this->propal->deleteline($lineid, $id);
 		if ($updateRes > 0) {
 			return $this->get($id);
 		} else {
@@ -589,11 +585,10 @@ class Proposals extends DolibarrApi
 	 * @param int    $id             Id of commercial proposal to update
 	 * @param int    $contactid      Id of contact to add
 	 * @param string $type           Type of the contact (BILLING, SHIPPING, CUSTOMER)
+	 * @return array
 	 *
 	 * @url	POST {id}/contact/{contactid}/{type}
 	 *
-	 * @return int
-	 *
 	 * @throws RestException 401
 	 * @throws RestException 404
 	 */
@@ -623,20 +618,24 @@ class Proposals extends DolibarrApi
 			throw new RestException(500, 'Error when added the contact');
 		}
 
-		return $this->propal;
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Contact linked to the proposal'
+			)
+		);
 	}
 
 	 /**
 	  * Delete a contact type of given commercial proposal
 	  *
-	  * @param int    $id             Id of commercial proposal to update
-	  * @param int    $contactid      Row key of the contact in the array contact_ids.
-	  * @param string $type           Type of the contact (BILLING, SHIPPING, CUSTOMER).
+	  * @param 	int    $id             	Id of commercial proposal to update
+	  * @param 	int    $contactid      	Row key of the contact in the array contact_ids.
+	  * @param 	string $type           	Type of the contact (BILLING, SHIPPING, CUSTOMER).
+	  * @return Object    				Object with cleaned properties
 	  *
 	  * @url	DELETE {id}/contact/{contactid}/{type}
 	  *
-	  * @return int
-	  *
 	  * @throws RestException 401
 	  * @throws RestException 404
 	  * @throws RestException 500 System error
@@ -675,10 +674,9 @@ class Proposals extends DolibarrApi
 	/**
 	 * Update commercial proposal general fields (won't touch lines of commercial proposal)
 	 *
-	 * @param int   $id             Id of commercial proposal to update
-	 * @param array $request_data   Datas
-	 *
-	 * @return int
+	 * @param 	int   	$id             Id of commercial proposal to update
+	 * @param 	array 	$request_data   Datas
+	 * @return 	Object    				Object with cleaned properties
 	 */
 	public function put($id, $request_data = null)
 	{
@@ -722,7 +720,6 @@ class Proposals extends DolibarrApi
 	 * Delete commercial proposal
 	 *
 	 * @param   int     $id         Commercial proposal ID
-	 *
 	 * @return  array
 	 */
 	public function delete($id)
@@ -755,10 +752,9 @@ class Proposals extends DolibarrApi
 	 * Set a proposal to draft
 	 *
 	 * @param   int     $id             Order ID
+	 * @return 	Object    				Object with cleaned properties
 	 *
 	 * @url POST    {id}/settodraft
-	 *
-	 * @return  array
 	 */
 	public function settodraft($id)
 	{
@@ -807,6 +803,7 @@ class Proposals extends DolibarrApi
 	 *
 	 * @param   int     $id             Commercial proposal ID
 	 * @param   int     $notrigger      1=Does not execute triggers, 0= execute triggers
+	 * @return 	Object    				Object with cleaned properties
 	 *
 	 * @url POST    {id}/validate
 	 *
@@ -814,8 +811,6 @@ class Proposals extends DolibarrApi
 	 * @throws RestException 401
 	 * @throws RestException 404
 	 * @throws RestException 500 System error
-	 *
-	 * @return array
 	 */
 	public function validate($id, $notrigger = 0)
 	{
@@ -860,10 +855,9 @@ class Proposals extends DolibarrApi
 	 * @param   int	    $status			Must be 2 (accepted) or 3 (refused)				{@min 2}{@max 3}
 	 * @param   string  $note_private   Add this mention at end of private note
 	 * @param   int     $notrigger      Disabled triggers
+	 * @return 	Object    				Object with cleaned properties
 	 *
 	 * @url POST    {id}/close
-	 *
-	 * @return  array
 	 */
 	public function close($id, $status, $note_private = '', $notrigger = 0)
 	{
@@ -905,10 +899,9 @@ class Proposals extends DolibarrApi
 	 * Set a commercial proposal billed. Could be also called setbilled
 	 *
 	 * @param   int     $id             Commercial proposal ID
+	 * @return 	Object    				Object with cleaned properties
 	 *
 	 * @url POST    {id}/setinvoiced
-	 *
-	 * @return  array
 	 */
 	public function setinvoiced($id)
 	{
@@ -949,6 +942,7 @@ class Proposals extends DolibarrApi
 	 *
 	 * @param   array           $data   Array with data to verify
 	 * @return  array
+	 *
 	 * @throws  RestException
 	 */
 	private function _validate($data)
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 57c066886ba..2b429d0e8d1 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -983,9 +983,10 @@ class Propal extends CommonObject
 	 *  Delete detail line
 	 *
 	 *  @param		int		$lineid			Id of line to delete
+	 *  @param		int		$id				Id of object (for a check)
 	 *  @return     int         			>0 if OK, <0 if KO
 	 */
-	public function deleteline($lineid)
+	public function deleteline($lineid, $id = 0)
 	{
 		global $user;
 
@@ -994,9 +995,20 @@ class Propal extends CommonObject
 
 			$line = new PropaleLigne($this->db);
 
-			// For triggers
+			$line->context = $this->context;
+
+			// Load data
 			$line->fetch($lineid);
 
+			if ($id > 0 && $line->fk_propal != $id) {
+				$this->error = 'ErrorLineIDDoesNotMatchWithObjectID';
+				return -1;
+			}
+
+			// Memorize previous line for triggers
+			$staticline = clone $line;
+			$line->oldline = $staticline;
+
 			if ($line->delete($user) > 0) {
 				$this->update_price(1);
 
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index 2c916abda9a..8e389d862d3 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -28,7 +28,6 @@ require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
  */
 class Orders extends DolibarrApi
 {
-
 	/**
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
@@ -299,7 +298,7 @@ class Orders extends DolibarrApi
 	 *
 	 * @url	GET {id}/lines
 	 *
-	 * @return int
+	 * @return array
 	 */
 	public function getLines($id)
 	{
@@ -393,13 +392,12 @@ class Orders extends DolibarrApi
 	/**
 	 * Update a line to given order
 	 *
-	 * @param int   $id             Id of order to update
-	 * @param int   $lineid         Id of line to update
-	 * @param array $request_data   OrderLine data
+	 * @param 	int   $id             Id of order to update
+	 * @param 	int   $lineid         Id of line to update
+	 * @param 	array $request_data   OrderLine data
+	 * @return	Object|false		  Object with cleaned properties
 	 *
 	 * @url	PUT {id}/lines/{lineid}
-	 *
-	 * @return array|bool
 	 */
 	public function putLine($id, $lineid, $request_data = null)
 	{
@@ -458,16 +456,14 @@ class Orders extends DolibarrApi
 	}
 
 	/**
-	 * Delete a line to given order
+	 * Delete a line of a given order
 	 *
-	 *
-	 * @param int   $id             Id of order to update
-	 * @param int   $lineid         Id of line to delete
+	 * @param 	int   	$id             Id of order to update
+	 * @param 	int   	$lineid         Id of line to delete
+	 * @return	Object					Object with cleaned properties
 	 *
 	 * @url	DELETE {id}/lines/{lineid}
 	 *
-	 * @return int
-	 *
 	 * @throws RestException 401
 	 * @throws RestException 404
 	 */
@@ -486,9 +482,7 @@ class Orders extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		// TODO Check the lineid $lineid is a line of ojbect
-
-		$updateRes = $this->commande->deleteline(DolibarrApiAccess::$user, $lineid);
+		$updateRes = $this->commande->deleteline(DolibarrApiAccess::$user, $lineid, $id);
 		if ($updateRes > 0) {
 			return $this->get($id);
 		} else {
@@ -501,13 +495,12 @@ class Orders extends DolibarrApi
 	 *
 	 * Return an array with contact informations
 	 *
-	 * @param int    $id   ID of order
-	 * @param string $type Type of the contact (BILLING, SHIPPING, CUSTOMER)
+	 * @param 	int    	$id   		ID of order
+	 * @param 	string 	$type 		Type of the contact (BILLING, SHIPPING, CUSTOMER)
+	 * @return	Object				Object with cleaned properties
 	 *
 	 * @url	GET {id}/contacts
 	 *
-	 * @return 	array data without useless information
-	 *
 	 * @throws 	RestException
 	 */
 	public function getContacts($id, $type = '')
@@ -536,11 +529,10 @@ class Orders extends DolibarrApi
 	 * @param int    $id             Id of order to update
 	 * @param int    $contactid      Id of contact to add
 	 * @param string $type           Type of the contact (BILLING, SHIPPING, CUSTOMER)
+	 * @return array
 	 *
 	 * @url	POST {id}/contact/{contactid}/{type}
 	 *
-	 * @return int
-	 *
 	 * @throws RestException 401
 	 * @throws RestException 404
 	 */
@@ -586,7 +578,7 @@ class Orders extends DolibarrApi
 	 *
 	 * @url	DELETE {id}/contact/{contactid}/{type}
 	 *
-	 * @return int
+	 * @return array
 	 *
 	 * @throws RestException 401
 	 * @throws RestException 404
@@ -630,10 +622,9 @@ class Orders extends DolibarrApi
 	/**
 	 * Update order general fields (won't touch lines of order)
 	 *
-	 * @param int   $id             Id of order to update
-	 * @param array $request_data   Datas
-	 *
-	 * @return int
+	 * @param 	int   	$id             Id of order to update
+	 * @param 	array 	$request_data   Datas
+	 * @return	Object					Object with cleaned properties
 	 */
 	public function put($id, $request_data = null)
 	{
@@ -777,7 +768,6 @@ class Orders extends DolibarrApi
 	 */
 	public function reopen($id)
 	{
-
 		if (!DolibarrApiAccess::$user->rights->commande->creer) {
 			throw new RestException(401);
 		}
@@ -802,12 +792,11 @@ class Orders extends DolibarrApi
 	/**
 	 * Classify the order as invoiced. Could be also called setbilled
 	 *
-	 * @param int   $id           Id of the order
+	 * @param 	int   $id           Id of the order
+	 * @return	Object					Object with cleaned properties
 	 *
 	 * @url     POST {id}/setinvoiced
 	 *
-	 * @return int
-	 *
 	 * @throws RestException 400
 	 * @throws RestException 401
 	 * @throws RestException 404
@@ -851,10 +840,9 @@ class Orders extends DolibarrApi
 	 *
 	 * @param   int     $id             Order ID
 	 * @param   int     $notrigger      Disabled triggers
+	 * @return	Object					Object with cleaned properties
 	 *
 	 * @url POST    {id}/close
-	 *
-	 * @return  int
 	 */
 	public function close($id, $notrigger = 0)
 	{
@@ -897,10 +885,9 @@ class Orders extends DolibarrApi
 	 *
 	 * @param   int     $id             Order ID
 	 * @param   int 	$idwarehouse    Warehouse ID to use for stock change (Used only if option STOCK_CALCULATE_ON_VALIDATE_ORDER is on)
+	 * @return	Object					Object with cleaned properties
 	 *
 	 * @url POST    {id}/settodraft
-	 *
-	 * @return  array
 	 */
 	public function settodraft($id, $idwarehouse = -1)
 	{
@@ -942,12 +929,11 @@ class Orders extends DolibarrApi
 	/**
 	 * Create an order using an existing proposal.
 	 *
-	 *
 	 * @param int   $proposalid       Id of the proposal
+	 * @return	Object					Object with cleaned properties
 	 *
 	 * @url     POST /createfromproposal/{proposalid}
 	 *
-	 * @return int
 	 * @throws RestException 400
 	 * @throws RestException 401
 	 * @throws RestException 404
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 2ba281b9cb5..25c234cc66d 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -2379,58 +2379,45 @@ class Commande extends CommonOrder
 	 *
 	 *	@param      User	$user		User object
 	 *  @param      int		$lineid		Id of line to delete
+	 *  @param		int		$id			Id of object (for a check)
 	 *  @return     int        		 	>0 if OK, 0 if nothing to do, <0 if KO
 	 */
-	public function deleteline($user = null, $lineid = 0)
+	public function deleteline($user = null, $lineid = 0, $id = 0)
 	{
 		if ($this->statut == self::STATUS_DRAFT) {
 			$this->db->begin();
 
-			$sql = "SELECT fk_product, qty";
-			$sql .= " FROM ".MAIN_DB_PREFIX."commandedet";
-			$sql .= " WHERE rowid = ".((int) $lineid);
+			// Delete line
+			$line = new OrderLine($this->db);
 
-			$result = $this->db->query($sql);
-			if ($result) {
-				$obj = $this->db->fetch_object($result);
+			$line->context = $this->context;
 
-				if ($obj) {
-					$product = new Product($this->db);
-					$product->id = $obj->fk_product;
+			// Load data
+			$line->fetch($lineid);
 
-					// Delete line
-					$line = new OrderLine($this->db);
+			if ($id > 0 && $line->fk_commande != $id) {
+				$this->error = 'ErrorLineIDDoesNotMatchWithObjectID';
+				return -1;
+			}
 
-					// For triggers
-					$line->fetch($lineid);
+			// Memorize previous line for triggers
+			$staticline = clone $line;
+			$line->oldline = $staticline;
 
-					// Memorize previous line for triggers
-					$staticline = clone $line;
-					$line->oldline = $staticline;
+			if ($line->delete($user) > 0) {
+				$result = $this->update_price(1);
 
-					if ($line->delete($user) > 0) {
-						$result = $this->update_price(1);
-
-						if ($result > 0) {
-							$this->db->commit();
-							return 1;
-						} else {
-							$this->db->rollback();
-							$this->error = $this->db->lasterror();
-							return -1;
-						}
-					} else {
-						$this->db->rollback();
-						$this->error = $line->error;
-						return -1;
-					}
+				if ($result > 0) {
+					$this->db->commit();
+					return 1;
 				} else {
 					$this->db->rollback();
-					return 0;
+					$this->error = $this->db->lasterror();
+					return -1;
 				}
 			} else {
 				$this->db->rollback();
-				$this->error = $this->db->lasterror();
+				$this->error = $line->error;
 				return -1;
 			}
 		} else {
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 4c1392e28eb..bae53bce6a8 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -65,9 +65,9 @@ class Invoices extends DolibarrApi
 	 *
 	 * Return an array with invoice informations
 	 *
-	 * @param 	int 	$id           ID of invoice
-	 * @param   int     $contact_list 0:Return array contains all properties, 1:Return array contains just id, -1: Do not return contacts/adddesses
-	 * @return 	array|mixed data without useless information
+	 * @param 	int 	$id           	ID of invoice
+	 * @param   int     $contact_list 	0:Return array contains all properties, 1:Return array contains just id, -1: Do not return contacts/adddesses
+	 * @return	Object				  	Object with cleaned properties
 	 *
 	 * @throws 	RestException
 	 */
@@ -81,9 +81,9 @@ class Invoices extends DolibarrApi
 	 *
 	 * Return an array with invoice informations
 	 *
-	 * @param       string		$ref			Ref of object
-	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id, -1: Do not return contacts/adddesses
-	 * @return 	array|mixed data without useless information
+	 * @param   string		$ref			Ref of object
+	 * @param   int         $contact_list  	0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id, -1: Do not return contacts/adddesses
+	 * @return	Object				  		Object with cleaned properties
 	 *
 	 * @url GET    ref/{ref}
 	 *
@@ -99,9 +99,9 @@ class Invoices extends DolibarrApi
 	 *
 	 * Return an array with invoice informations
 	 *
-	 * @param       string		$ref_ext			External reference of object
-	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id, -1: Do not return contacts/adddesses
-	 * @return 	array|mixed data without useless information
+	 * @param   string		$ref_ext		External reference of object
+	 * @param   int         $contact_list  	0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id, -1: Do not return contacts/adddesses
+	 * @return	Object				  		Object with cleaned properties
 	 *
 	 * @url GET    ref_ext/{ref_ext}
 	 *
@@ -117,11 +117,11 @@ class Invoices extends DolibarrApi
 	 *
 	 * Return an array with invoice informations
 	 *
-	 * @param       int         $id            	ID of order
-	 * @param		string		$ref			Ref of object
-	 * @param		string		$ref_ext		External reference of object
-	 * @param       int         $contact_list  	0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id, -1: Do not return contacts/adddesses
-	 * @return 	array|mixed data without useless information
+	 * @param   int         $id            	ID of order
+	 * @param	string		$ref			Ref of object
+	 * @param	string		$ref_ext		External reference of object
+	 * @param   int         $contact_list  	0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id, -1: Do not return contacts/adddesses
+	 * @return	Object				  		Object with cleaned properties
 	 *
 	 * @throws 	RestException
 	 */
@@ -325,12 +325,11 @@ class Invoices extends DolibarrApi
 	 /**
 	  * Create an invoice using an existing order.
 	  *
-	  *
 	  * @param int   $orderid       Id of the order
+	  * @return	Object				Object with cleaned properties
 	  *
 	  * @url     POST /createfromorder/{orderid}
 	  *
-	  * @return int
 	  * @throws RestException 400
 	  * @throws RestException 401
 	  * @throws RestException 404
@@ -338,7 +337,6 @@ class Invoices extends DolibarrApi
 	  */
 	public function createInvoiceFromOrder($orderid)
 	{
-
 		require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 
 		if (!DolibarrApiAccess::$user->rights->commande->lire) {
@@ -368,11 +366,10 @@ class Invoices extends DolibarrApi
 	/**
 	 * Get lines of an invoice
 	 *
-	 * @param int   $id             Id of invoice
+	 * @param 	int   $id             	Id of invoice
+	 * @return 	array					Array of lines
 	 *
 	 * @url	GET {id}/lines
-	 *
-	 * @return int
 	 */
 	public function getLines($id)
 	{
@@ -399,14 +396,13 @@ class Invoices extends DolibarrApi
 	/**
 	 * Update a line to a given invoice
 	 *
-	 * @param int   $id             Id of invoice to update
-	 * @param int   $lineid         Id of line to update
-	 * @param array $request_data   InvoiceLine data
+	 * @param 	int   $id             Id of invoice to update
+	 * @param 	int   $lineid         Id of line to update
+	 * @param 	array $request_data   InvoiceLine data
+	 * @return	Object				  Object with cleaned properties
 	 *
 	 * @url	PUT {id}/lines/{lineid}
 	 *
-	 * @return array
-	 *
 	 * @throws RestException 304
 	 * @throws RestException 401
 	 * @throws RestException 404 Invoice not found
@@ -472,14 +468,13 @@ class Invoices extends DolibarrApi
 	/**
 	 * Add a contact type of given invoice
 	 *
-	 * @param int    $id             Id of invoice to update
-	 * @param int    $contactid      Id of contact to add
-	 * @param string $type           Type of the contact (BILLING, SHIPPING, CUSTOMER)
+	 * @param 	int    $id             Id of invoice to update
+	 * @param 	int    $contactid      Id of contact to add
+	 * @param 	string $type           Type of the contact (BILLING, SHIPPING, CUSTOMER)
+	 * @return	array
 	 *
 	 * @url	POST {id}/contact/{contactid}/{type}
 	 *
-	 * @return int
-	 *
 	 * @throws RestException 401
 	 * @throws RestException 404
 	 */
@@ -509,20 +504,24 @@ class Invoices extends DolibarrApi
 			throw new RestException(500, 'Error when added the contact');
 		}
 
-		return $this->_cleanObjectDatas($this->invoice);
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Contact linked to the invoice'
+			)
+		);
 	}
 
 	/**
 	 * Delete a contact type of given invoice
 	 *
-	 * @param int    $id             Id of invoice to update
-	 * @param int    $contactid      Row key of the contact in the array contact_ids.
-	 * @param string $type           Type of the contact (BILLING, SHIPPING, CUSTOMER).
+	 * @param 	int    $id             Id of invoice to update
+	 * @param 	int    $contactid      Row key of the contact in the array contact_ids.
+	 * @param 	string $type           Type of the contact (BILLING, SHIPPING, CUSTOMER).
+	 * @return	Object				   Object with cleaned properties
 	 *
 	 * @url	DELETE {id}/contact/{contactid}/{type}
 	 *
-	 * @return array
-	 *
 	 * @throws RestException 401
 	 * @throws RestException 404
 	 * @throws RestException 500 System error
@@ -561,13 +560,12 @@ class Invoices extends DolibarrApi
 	/**
 	 * Deletes a line of a given invoice
 	 *
-	 * @param int   $id             Id of invoice
-	 * @param int   $lineid 		Id of the line to delete
+	 * @param 	int   $id             	Id of invoice
+	 * @param 	int   $lineid 			Id of the line to delete
+	 * @return	Object				  	Object with cleaned properties
 	 *
 	 * @url     DELETE {id}/lines/{lineid}
 	 *
-	 * @return array
-	 *
 	 * @throws RestException 400
 	 * @throws RestException 401
 	 * @throws RestException 404
@@ -575,7 +573,6 @@ class Invoices extends DolibarrApi
 	 */
 	public function deleteLine($id, $lineid)
 	{
-
 		if (!DolibarrApiAccess::$user->rights->facture->creer) {
 			throw new RestException(401);
 		}
@@ -592,9 +589,7 @@ class Invoices extends DolibarrApi
 			throw new RestException(404, 'Invoice not found');
 		}
 
-		// TODO Check the lineid $lineid is a line of ojbect
-
-		$updateRes = $this->invoice->deleteline($lineid);
+		$updateRes = $this->invoice->deleteline($lineid, $id);
 		if ($updateRes > 0) {
 			return $this->get($id);
 		} else {
@@ -605,9 +600,9 @@ class Invoices extends DolibarrApi
 	/**
 	 * Update invoice
 	 *
-	 * @param int   $id             Id of invoice to update
-	 * @param array $request_data   Datas
-	 * @return int
+	 * @param 	int   			$id             Id of invoice to update
+	 * @param 	array 			$request_data   Datas
+	 * @return	Object|false				  	Object with cleaned properties
 	 */
 	public function put($id, $request_data = null)
 	{
@@ -648,8 +643,8 @@ class Invoices extends DolibarrApi
 	/**
 	 * Delete invoice
 	 *
-	 * @param int   $id 	Invoice ID
-	 * @return array
+	 * @param 	int   	$id 	Invoice ID
+	 * @return 	array
 	 */
 	public function delete($id)
 	{
@@ -829,11 +824,10 @@ class Invoices extends DolibarrApi
 	 *
 	 * @param   int $id             Order ID
 	 * @param   int $idwarehouse    Warehouse ID
+	 * @return	Object			  	Object with cleaned properties
 	 *
 	 * @url POST    {id}/settodraft
 	 *
-	 * @return  array
-	 *
 	 * @throws RestException 304
 	 * @throws RestException 401
 	 * @throws RestException 404
@@ -887,10 +881,9 @@ class Invoices extends DolibarrApi
 	 * @param   int $id             Invoice ID
 	 * @param   int $idwarehouse    Warehouse ID
 	 * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
+	 * @return	Object|false		Object with cleaned properties
 	 *
 	 * @url POST    {id}/validate
-	 *
-	 * @return  array
 	 */
 	public function validate($id, $idwarehouse = 0, $notrigger = 0)
 	{
@@ -932,11 +925,10 @@ class Invoices extends DolibarrApi
 	 * @param   int 	$id            Order ID
 	 * @param   string 	$close_code    Code filled if we classify to 'Paid completely' when payment is not complete (for escompte for example)
 	 * @param   string 	$close_note    Comment defined if we classify to 'Paid' when payment is not complete (for escompte for example)
+	 * @return	Object			  	   Object with cleaned properties
 	 *
 	 * @url POST    {id}/settopaid
 	 *
-	 * @return  array 	An invoice object
-	 *
 	 * @throws RestException 304
 	 * @throws RestException 401
 	 * @throws RestException 404
@@ -981,12 +973,11 @@ class Invoices extends DolibarrApi
 	/**
 	 * Sets an invoice as unpaid
 	 *
-	 * @param   int     $id            Order ID
+	 * @param   int     $id            	Order ID
+	 * @return	Object					Object with cleaned properties
 	 *
 	 * @url POST    {id}/settounpaid
 	 *
-	 * @return  array   An invoice object
-	 *
 	 * @throws RestException 304
 	 * @throws RestException 401
 	 * @throws RestException 404
@@ -1031,10 +1022,9 @@ class Invoices extends DolibarrApi
 	 * Get discount from invoice
 	 *
 	 * @param int   $id             Id of invoice
+	 * @return	Object				Object with cleaned properties
 	 *
 	 * @url	GET {id}/discount
-	 *
-	 * @return mixed
 	 */
 	public function getDiscount($id)
 	{
@@ -1069,10 +1059,10 @@ class Invoices extends DolibarrApi
 	/**
 	 * Create a discount (credit available) for a credit note or a deposit.
 	 *
-	 * @param   int 	$id            Invoice ID
-	 * @url POST    {id}/markAsCreditAvailable
+	 * @param   int 	$id            	Invoice ID
+	 * @return	Object					Object with cleaned properties
 	 *
-	 * @return  array 	An invoice object
+	 * @url POST    {id}/markAsCreditAvailable
 	 *
 	 * @throws RestException 304
 	 * @throws RestException 401
@@ -1241,11 +1231,10 @@ class Invoices extends DolibarrApi
 	  *
 	  * @param int   $id             Id of invoice
 	  * @param int   $discountid     Id of discount
+	  * @return int
 	  *
 	  * @url     POST {id}/usediscount/{discountid}
 	  *
-	  * @return int
-	  *
 	  * @throws RestException 400
 	  * @throws RestException 401
 	  * @throws RestException 404
@@ -1253,7 +1242,6 @@ class Invoices extends DolibarrApi
 	  */
 	public function useDiscount($id, $discountid)
 	{
-
 		if (!DolibarrApiAccess::$user->rights->facture->creer) {
 			throw new RestException(401);
 		}
@@ -1288,11 +1276,10 @@ class Invoices extends DolibarrApi
 	  *
 	  * @param int   $id            Id of invoice
 	  * @param int   $discountid    Id of a discount coming from a credit note
+	  * @return	int
 	  *
 	  * @url     POST {id}/usecreditnote/{discountid}
 	  *
-	  * @return int
-	  *
 	  * @throws RestException 400
 	  * @throws RestException 401
 	  * @throws RestException 404
@@ -1300,7 +1287,6 @@ class Invoices extends DolibarrApi
 	  */
 	public function useCreditNote($id, $discountid)
 	{
-
 		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
 		if (!DolibarrApiAccess::$user->rights->facture->creer) {
@@ -1333,12 +1319,11 @@ class Invoices extends DolibarrApi
 	/**
 	 * Get list of payments of a given invoice
 	 *
-	 * @param int   $id             Id of invoice
+	 * @param 	int   $id             Id of invoice
+	 * @return	array
 	 *
 	 * @url     GET {id}/payments
 	 *
-	 * @return array
-	 *
 	 * @throws RestException 400
 	 * @throws RestException 401
 	 * @throws RestException 404
@@ -1395,8 +1380,6 @@ class Invoices extends DolibarrApi
 	 */
 	public function addPayment($id, $datepaye, $paymentid, $closepaidinvoices, $accountid, $num_payment = '', $comment = '', $chqemetteur = '', $chqbank = '')
 	{
-		global $conf;
-
 		require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 
 		if (!DolibarrApiAccess::$user->rights->facture->creer) {
@@ -1509,6 +1492,7 @@ class Invoices extends DolibarrApi
 	 * @url     POST /paymentsdistributed
 	 *
 	 * @return int  Payment ID
+	 *
 	 * @throws RestException 400
 	 * @throws RestException 401
 	 * @throws RestException 403
@@ -1516,8 +1500,6 @@ class Invoices extends DolibarrApi
 	 */
 	public function addPaymentDistributed($arrayofamounts, $datepaye, $paymentid, $closepaidinvoices, $accountid, $num_payment = '', $comment = '', $chqemetteur = '', $chqbank = '', $ref_ext = '', $accepthigherpayment = false)
 	{
-		global $conf;
-
 		require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 
 		if (!DolibarrApiAccess::$user->rights->facture->creer) {
@@ -1645,6 +1627,7 @@ class Invoices extends DolibarrApi
 	 * @url     PUT payments/{id}
 	 *
 	 * @return array
+	 *
 	 * @throws RestException 400 Bad parameters
 	 * @throws RestException 401 Not allowed
 	 * @throws RestException 404 Not found
@@ -1708,8 +1691,8 @@ class Invoices extends DolibarrApi
 	/**
 	 * Validate fields before create or update object
 	 *
-	 * @param array|null    $data       Datas to validate
-	 * @return array
+	 * @param 	array|null    $data       Datas to validate
+	 * @return 	array
 	 *
 	 * @throws RestException
 	 */
@@ -1733,7 +1716,7 @@ class Invoices extends DolibarrApi
 	 *
 	 * @param 	int 	$id           	ID of template invoice
 	 * @param   int     $contact_list 	0:Return array contains all properties, 1:Return array contains just id, -1: Do not return contacts/adddesses
-	 * @return 	array|mixed data without useless information
+	 * @return	Object					Object with cleaned properties
 	 *
 	 * @url GET    templates/{id}
 	 *
@@ -1749,11 +1732,11 @@ class Invoices extends DolibarrApi
 	 *
 	 * Return an array with invoice informations
 	 *
-	 * @param       int         $id            	ID of order
-	 * @param		string		$ref			Ref of object
-	 * @param		string		$ref_ext		External reference of object
-	 * @param       int         $contact_list  	0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id, -1: Do not return contacts/adddesses
-	 * @return 	array|mixed data without useless information
+	 * @param   int         $id            	ID of order
+	 * @param	string		$ref			Ref of object
+	 * @param	string		$ref_ext		External reference of object
+	 * @param   int         $contact_list  	0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id, -1: Do not return contacts/adddesses
+	 * @return	Object						Object with cleaned properties
 	 *
 	 * @throws 	RestException
 	 */
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index c8612eafd9c..9af2a06f7d4 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4148,9 +4148,10 @@ class Facture extends CommonInvoice
 	 *	Delete line in database
 	 *
 	 *	@param		int		$rowid		Id of line to delete
+	 *  @param		int		$id			Id of object (for a check)
 	 *	@return		int					<0 if KO, >0 if OK
 	 */
-	public function deleteline($rowid)
+	public function deleteline($rowid, $id = 0)
 	{
 		global $user;
 
@@ -4161,6 +4162,22 @@ class Facture extends CommonInvoice
 			return -1;
 		}
 
+		$line = new FactureLigne($this->db);
+
+		$line->context = $this->context;
+
+		// Load line
+		$result = $line->fetch($rowid);
+		if (!($result > 0)) {
+			dol_print_error($this->db, $line->error, $line->errors);
+			return -1;
+		}
+
+		if ($id > 0 && $line->fk_facture != $id) {
+			$this->error = 'ErrorLineIDDoesNotMatchWithObjectID';
+			return -1;
+		}
+
 		$this->db->begin();
 
 		// Free discount linked to invoice line
@@ -4176,15 +4193,9 @@ class Facture extends CommonInvoice
 			return -1;
 		}
 
-		$line = new FactureLigne($this->db);
-
-		$line->context = $this->context;
-
-		// For triggers
-		$result = $line->fetch($rowid);
-		if (!($result > 0)) {
-			dol_print_error($this->db, $line->error, $line->errors);
-		}
+		// Memorize previous line for triggers
+		$staticline = clone $line;
+		$line->oldline = $staticline;
 
 		if ($line->delete($user) > 0) {
 			$result = $this->update_price(1);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 08a4a636785..c9332a839e7 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1347,7 +1347,7 @@ class Form
 	 *	@param  bool	$multiple       add [] in the name of element and add 'multiple' attribut
 	 *  @param	array	$excludeids		Exclude IDs from the select combo
 	 * 	@param	int		$showcode		Show code in list
-	 * 	@return	string					HTML string with
+	 * 	@return	array|string			HTML string with
 	 */
 	public function select_thirdparty_list($selected = '', $htmlname = 'socid', $filter = '', $showempty = '', $showtype = 0, $forcecombo = 0, $events = array(), $filterkey = '', $outputmode = 0, $limit = 0, $morecss = 'minwidth100', $moreparam = '', $multiple = false, $excludeids = array(), $showcode = 0)
 	{
@@ -1936,7 +1936,7 @@ class Form
 	 *  @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
+	 * 	@return	array|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 = '', $notdisabled = 0, $outputmode = 0, $multiple = false, $forcecombo = 0)
@@ -3791,7 +3791,7 @@ class Form
 	 *    @param    int		$socid				Id of company
 	 *    @param    string	$htmlname          	Name of HTML field
 	 *    @param    int		$showempty         	Add an empty field
-	 *    @return	integer|null
+	 *    @return	integer
 	 */
 	public function select_address($selected, $socid, $htmlname = 'address_id', $showempty = 0)
 	{
@@ -3827,7 +3827,7 @@ class Form
 			return $num;
 		} else {
 			dol_print_error($this->db);
-			return;
+			return -1;
 		}
 	}
 
@@ -7139,7 +7139,7 @@ class Form
 	 *  @param		string	$showempty		    '' to not show empty line. Translation key to show an empty line. '1' show empty line with no text.
 	 * 	@param		int		$forcecombo		    Force to use combo box
 	 *  @param      string  $morecss            Add more css on select
-	 *  @return     array    				    Array of keys for json
+	 *  @return     array|string			    Array of keys for json or HTML component
 	 */
 	public function selectTicketsList($selected = '', $htmlname = 'ticketid', $filtertype = '', $limit = 20, $filterkey = '', $status = 1, $outputmode = 0, $showempty = '1', $forcecombo = 0, $morecss = '')
 	{
@@ -7345,7 +7345,7 @@ class Form
 	 *  @param		string	$showempty		    '' to not show empty line. Translation key to show an empty line. '1' show empty line with no text.
 	 * 	@param		int		$forcecombo		    Force to use combo box
 	 *  @param      string  $morecss            Add more css on select
-	 *  @return     array    				    Array of keys for json
+	 *  @return     array|string			    Array of keys for json or HTML component
 	 */
 	public function selectProjectsList($selected = '', $htmlname = 'projectid', $filtertype = '', $limit = 20, $filterkey = '', $status = 1, $outputmode = 0, $showempty = '1', $forcecombo = 0, $morecss = '')
 	{
@@ -7560,7 +7560,7 @@ class Form
 	 *  @param		string	$showempty		    '' to not show empty line. Translation key to show an empty line. '1' show empty line with no text.
 	 * 	@param		int		$forcecombo		    Force to use combo box
 	 *  @param      string  $morecss            Add more css on select
-	 *  @return     array    				    Array of keys for json
+	 *  @return     array|string			    Array of keys for json or HTML string component
 	 */
 	public function selectMembersList($selected = '', $htmlname = 'adherentid', $filtertype = '', $limit = 20, $filterkey = '', $status = 1, $outputmode = 0, $showempty = '1', $forcecombo = 0, $morecss = '')
 	{
diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index 3dc45c753bc..9ad06ba137c 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -982,7 +982,7 @@ class Ldap
 	 *
 	 * 	@param	string	$filterrecord		Record
 	 * 	@param	string	$attribute			Attributes
-	 * 	@return void
+	 * 	@return array|boolean
 	 */
 	public function getAttributeValues($filterrecord, $attribute)
 	{
@@ -1025,7 +1025,7 @@ class Ldap
 	 *	@param	array	$attributeArray 	Array of fields required. Note this array must also contains field $useridentifier (Ex: sn,userPassword)
 	 *	@param	int		$activefilter		'1' or 'user'=use field this->filter as filter instead of parameter $search, 'group'=use field this->filtergroup as filter, 'member'=use field this->filtermember as filter
 	 *	@param	array	$attributeAsArray 	Array of fields wanted as an array not a string
-	 *	@return	array						Array of [id_record][ldap_field]=value
+	 *	@return	array|int					Array of [id_record][ldap_field]=value
 	 */
 	public function getRecords($search, $userDn, $useridentifier, $attributeArray, $activefilter = 0, $attributeAsArray = array())
 	{
@@ -1342,7 +1342,7 @@ class Ldap
 	 * 	UserAccountControl Flgs to more human understandable form...
 	 *
 	 *	@param	string		$uacf		UACF
-	 *	@return	void
+	 *	@return	array
 	 */
 	public function parseUACF($uacf)
 	{
@@ -1382,7 +1382,7 @@ class Ldap
 		}
 
 		//Return human friendly flags
-		return($retval);
+		return $retval;
 	}
 
 	/**
@@ -1414,7 +1414,7 @@ class Ldap
 			$retval = "UNKNOWN_TYPE_".$samtype;
 		}
 
-		return($retval);
+		return $retval;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index 66e9241d9f5..da3257b09c9 100644
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -175,7 +175,7 @@ class RssParser
 	/**
 	 * getItems
 	 *
-	 * @return string
+	 * @return array
 	 */
 	public function getItems()
 	{
@@ -801,8 +801,8 @@ class RssParser
 /**
  * Function to convert an XML object into an array
  *
- * @param	SimpleXMLElement	$xml		Xml
- * @return	void
+ * @param	SimpleXMLElement			$xml		Xml
+ * @return	array|string
  */
 function xml2php($xml)
 {
diff --git a/htdocs/core/lib/ftp.lib.php b/htdocs/core/lib/ftp.lib.php
index 807bae63b0a..e49972a4a97 100644
--- a/htdocs/core/lib/ftp.lib.php
+++ b/htdocs/core/lib/ftp.lib.php
@@ -35,11 +35,10 @@
  * @param 	string	$ftp_password	FTP password
  * @param 	string	$section		Directory
  * @param	integer	$ftp_passive	Use a passive mode
- * @return	int 	<0 if OK, >0 if KO
+ * @return	array					Result of connect
  */
 function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $section, $ftp_passive = 0)
 {
-
 	global $langs, $conf;
 
 	$ok = 1;
@@ -127,7 +126,6 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect
  */
 function ftp_isdir($connect_id, $dir)
 {
-
 	if (@ftp_chdir($connect_id, $dir)) {
 		ftp_cdup($connect_id);
 		return 1;
@@ -140,11 +138,10 @@ function ftp_isdir($connect_id, $dir)
  * Tell if an entry is a FTP directory
  *
  * @param 		resource	$connect_id		Connection handler
- * @return		result
+ * @return		boolean						Result of closing
  */
 function dol_ftp_close($connect_id)
 {
-
 	global $conf;
 
 	// Close FTP connection
@@ -196,7 +193,7 @@ function dol_ftp_delete($connect_id, $file, $newsection)
  * @param 		string		$localfile		The local file path
  * @param 		string		$file					The remote file path
  * @param 		string		$newsection			$newsection
- * @return		result
+ * @return		bool|resource
  */
 function dol_ftp_get($connect_id, $localfile, $file, $newsection)
 {
@@ -226,11 +223,10 @@ function dol_ftp_get($connect_id, $localfile, $file, $newsection)
  * @param 		string		$file			File name
  * @param 		string		$localfile		The path to the local file
  * @param 		string		$newsection		$newsection
- * @return		result
+ * @return		boolean
  */
 function dol_ftp_put($connect_id, $file, $localfile, $newsection)
 {
-
 	global $conf;
 
 	if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
@@ -255,11 +251,10 @@ function dol_ftp_put($connect_id, $file, $localfile, $newsection)
  * @param 		resource	$connect_id		Connection handler
  * @param 		string		$file			File
  * @param 		string		$newsection			$newsection
- * @return		result
+ * @return		boolean
  */
 function dol_ftp_rmdir($connect_id, $file, $newsection)
 {
-
 	global $conf;
 
 	if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
@@ -285,11 +280,10 @@ function dol_ftp_rmdir($connect_id, $file, $newsection)
  * @param 		resource	$connect_id		Connection handler
  * @param 		string		$newdir			Dir create
  * @param 		string		$newsection		$newsection
- * @return		result
+ * @return		boolean|string
  */
 function dol_ftp_mkdir($connect_id, $newdir, $newsection)
 {
-
 	global $conf;
 
 	if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 80fcefc7b68..1305be68bc2 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -1734,9 +1734,9 @@ class ExpenseReport extends CommonObject
 	/**
 	 *  Update total of an expense report when you add a line.
 	 *
-	 *  @param    string    $ligne_total_ht    Amount without taxes
+	 *  @param    string    $ligne_total_ht    	Amount without taxes
 	 *  @param    string    $ligne_total_tva    Amount of all taxes
-	 *  @return    void
+	 *  @return   int
 	 */
 	public function update_totaux_add($ligne_total_ht, $ligne_total_tva)
 	{
@@ -1885,7 +1885,7 @@ class ExpenseReport extends CommonObject
 	 *
 	 * @param	int		$type		Type of line
 	 * @param	string	$seller		Seller, but actually he is unknown
-	 * @return 						true or false
+	 * @return 	boolean				true or false
 	 */
 	public function checkRules($type = 0, $seller = '')
 	{
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 89e190f92c1..c9f1eb76b41 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -4086,11 +4086,11 @@ function migrate_rename_directories($db, $langs, $conf, $oldname, $newname)
  * @param	DoliDB		$db			Database handler
  * @param	Translate	$langs		Object langs
  * @param	Conf		$conf		Object conf
- * @return	void
+ * @return	boolean
  */
 function migrate_delete_old_files($db, $langs, $conf)
 {
-	$result = true;
+	$ret = true;
 
 	dolibarr_install_syslog("upgrade2::migrate_delete_old_files");
 
@@ -4155,7 +4155,6 @@ function migrate_delete_old_files($db, $langs, $conf)
 
 	foreach ($filetodeletearray as $filetodelete) {
 		//print '<b>'DOL_DOCUMENT_ROOT.$filetodelete."</b><br>\n";
-		$result = 1;
 		if (file_exists(DOL_DOCUMENT_ROOT.$filetodelete)) {
 			$result = dol_delete_file(DOL_DOCUMENT_ROOT.$filetodelete, 0, 0, 0, null, true, false);
 			if (!$result) {
@@ -4167,7 +4166,8 @@ function migrate_delete_old_files($db, $langs, $conf)
 			}
 		}
 	}
-	return $result;
+
+	return $ret;
 }
 
 /**
@@ -4176,11 +4176,11 @@ function migrate_delete_old_files($db, $langs, $conf)
  * @param	DoliDB		$db			Database handler
  * @param	Translate	$langs		Object langs
  * @param	Conf		$conf		Object conf
- * @return	void
+ * @return	boolean
  */
 function migrate_delete_old_dir($db, $langs, $conf)
 {
-	$result = true;
+	$ret = true;
 
 	dolibarr_install_syslog("upgrade2::migrate_delete_old_dir");
 
@@ -4206,7 +4206,8 @@ function migrate_delete_old_dir($db, $langs, $conf)
 			print ' '.$langs->trans("RemoveItManuallyAndPressF5ToContinue").'</div>';
 		}
 	}
-	return $result;
+
+	return $ret;
 }
 
 
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 30d6a3660a3..c977a14d9ca 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -1487,7 +1487,7 @@ class Mo extends CommonObject
 	/**
 	 * Function used to return childs of Mo
 	 *
-	 * @return array if OK, -1 if KO
+	 * @return array|int 			array if OK, -1 if KO
 	 */
 	public function getMoChilds()
 	{
@@ -1525,11 +1525,10 @@ class Mo extends CommonObject
 	/**
 	 * Function used to return childs of Mo
 	 *
-	 * @return object Mo if OK, -1 if KO, 0 if not exist
+	 * @return Object|int			MO object if OK, -1 if KO, 0 if not exist
 	 */
 	public function getMoParent()
 	{
-
 		$MoParent = new Mo($this->db);
 		$error = 0;
 
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 7a10293d7e4..a81b342740b 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -1079,8 +1079,8 @@ class Products extends DolibarrApi
 	/**
 	 * Get attribute by ID.
 	 *
-	 * @param  int $id ID of Attribute
-	 * @return array
+	 * @param  	int 		$id	 		ID of Attribute
+	 * @return 	Object    				Object with cleaned properties
 	 *
 	 * @throws RestException 401
 	 * @throws RestException 404
@@ -1116,7 +1116,7 @@ class Products extends DolibarrApi
 		$obj = $this->db->fetch_object($resql);
 		$prodattr->is_used_by_products = (int) $obj->nb;
 
-		return $prodattr;
+		return $this->_cleanObjectDatas($prodattr);
 	}
 
 	/**
@@ -1213,6 +1213,7 @@ class Products extends DolibarrApi
 
 		$resql = $this->db->query($sql);
 		$obj = $this->db->fetch_object($resql);
+
 		$attr["is_used_by_products"] = (int) $obj->nb;
 
 		return $attr;
@@ -1246,15 +1247,16 @@ class Products extends DolibarrApi
 		if ($resid <= 0) {
 			throw new RestException(500, "Error creating new attribute");
 		}
+
 		return $resid;
 	}
 
 	/**
 	 * Update attributes by id.
 	 *
-	 * @param  int $id    ID of Attribute
-	 * @param  array $request_data Datas
-	 * @return array
+	 * @param  	int 	$id    			ID of Attribute
+	 * @param  	array 	$request_data 	Datas
+	 * @return 	Object    				Object with cleaned properties
 	 *
 	 * @throws RestException
 	 * @throws RestException 401
@@ -1291,7 +1293,7 @@ class Products extends DolibarrApi
 			} elseif ($result < 0) {
 				throw new RestException(500, "Error fetching attribute");
 			} else {
-				return $prodattr;
+				return $this->_cleanObjectDatas($prodattr);
 			}
 		}
 		throw new RestException(500, "Error updating attribute");
@@ -1560,9 +1562,9 @@ class Products extends DolibarrApi
 	/**
 	 * Update attribute value.
 	 *
-	 * @param  int $id ID of Attribute
-	 * @param  array $request_data Datas
-	 * @return array
+	 * @param  	int 	$id 			ID of Attribute
+	 * @param  	array 	$request_data 	Datas
+	 * @return 	Object    				Object with cleaned properties
 	 *
 	 * @throws RestException 401
 	 * @throws RestException 500	System error
@@ -1598,7 +1600,7 @@ class Products extends DolibarrApi
 			} elseif ($result < 0) {
 				throw new RestException(500, "Error fetching attribute");
 			} else {
-				return $objectval;
+				return $this->_cleanObjectDatas($objectval);
 			}
 		}
 		throw new RestException(500, "Error updating attribute");
@@ -1887,7 +1889,7 @@ class Products extends DolibarrApi
 	 *
 	 * @param  int $id ID of Product
 	 * @param  int $selected_warehouse_id ID of warehouse
-	 * @return int
+	 * @return array
 	 *
 	 * @throws RestException 500	System error
 	 * @throws RestException 401
@@ -1897,7 +1899,6 @@ class Products extends DolibarrApi
 	 */
 	public function getStock($id, $selected_warehouse_id = null)
 	{
-
 		if (!DolibarrApiAccess::$user->rights->produit->lire || !DolibarrApiAccess::$user->rights->stock->lire) {
 			throw new RestException(401);
 		}
@@ -1923,7 +1924,7 @@ class Products extends DolibarrApi
 			throw new RestException(404, 'No stock found');
 		}
 
-		return ['stock_warehouses'=>$stockData];
+		return array('stock_warehouses'=>$stockData);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 458921adfc6..d836c1ef319 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -812,7 +812,7 @@ class Task extends CommonObjectLine
 	 * @param   array   $search_array_options Array of search
 	 * @param   int     $loadextras         Fetch all Extrafields on each task
 	 * @param	int		$loadRoleMode		1= will test Roles on task;  0 used in delete project action
-	 * @return 	array						Array of tasks
+	 * @return 	array|string				Array of tasks
 	 */
 	public function getTasksArray($usert = null, $userp = null, $projectid = 0, $socid = 0, $mode = 0, $filteronproj = '', $filteronprojstatus = '-1', $morewherefilter = '', $filteronprojuser = 0, $filterontaskuser = 0, $extrafields = array(), $includebilltime = 0, $search_array_options = array(), $loadextras = 0, $loadRoleMode = 1)
 	{
@@ -1063,7 +1063,7 @@ class Task extends CommonObjectLine
 	 * @param 	int			$projectid		      Project id list separated with , to filter on project
 	 * @param 	int			$taskid			      Task id to filter on a task
 	 * @param	integer		$filteronprojstatus	  Filter on project status if userp is set. Not used if userp not defined.
-	 * @return 	array						      Array (projectid => 'list of roles for project' or taskid => 'list of roles for task')
+	 * @return 	array|int					      Array (projectid => 'list of roles for project' or taskid => 'list of roles for task')
 	 */
 	public function getUserRolesForProjectsOrTasks($userp, $usert, $projectid = '', $taskid = 0, $filteronprojstatus = -1)
 	{
@@ -1398,12 +1398,10 @@ class Task extends CommonObjectLine
 	 *
 	 *  @param  User|int	$userobj			Filter on user. null or 0=No filter
 	 *  @param	string		$morewherefilter	Add more filter into where SQL request (must start with ' AND ...')
-	 *  @return array		 					Array of info for task array('min_date', 'max_date', 'total_duration', 'total_amount', 'nblines', 'nblinesnull')
+	 *  @return array|int	 					Array of info for task array('min_date', 'max_date', 'total_duration', 'total_amount', 'nblines', 'nblinesnull')
 	 */
 	public function getSummaryOfTimeSpent($userobj = null, $morewherefilter = '')
 	{
-		global $langs;
-
 		if (is_object($userobj)) {
 			$userid = $userobj->id;
 		} else {
@@ -1567,14 +1565,12 @@ class Task extends CommonObjectLine
 	/**
 	 *  Load all records of time spent
 	 *
-	 *  @param	User	$userobj			User object
-	 *  @param	string	$morewherefilter	Add more filter into where SQL request (must start with ' AND ...')
-	 *  @return int							<0 if KO, array of time spent if OK
+	 *  @param	User		$userobj			User object
+	 *  @param	string		$morewherefilter	Add more filter into where SQL request (must start with ' AND ...')
+	 *  @return array|int						<0 if KO, array of time spent if OK
 	 */
 	public function fetchAllTimeSpent(User $userobj, $morewherefilter = '')
 	{
-		global $langs;
-
 		$arrayres = array();
 
 		$sql = "SELECT";
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 85d84767816..cd69b2c6420 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -1789,11 +1789,11 @@ class Ticket extends CommonObject
 	/**
 	 *     Search and fetch thirparties by email
 	 *
-	 *     @param  string $email   		Email
-	 *     @param  int    $type    		Type of thirdparties (0=any, 1=customer, 2=prospect, 3=supplier)
-	 *     @param  array  $filters 		Array of couple field name/value to filter the companies with the same name
-	 *     @param  string $clause  		Clause for filters
-	 *     @return array        		Array of thirdparties object
+	 *     @param  string 		$email   		Email
+	 *     @param  int    		$type    		Type of thirdparties (0=any, 1=customer, 2=prospect, 3=supplier)
+	 *     @param  array  		$filters 		Array of couple field name/value to filter the companies with the same name
+	 *     @param  string 		$clause  		Clause for filters
+	 *     @return array|int    		   		Array of thirdparties object
 	 */
 	public function searchSocidByEmail($email, $type = '0', $filters = array(), $clause = 'AND')
 	{
@@ -1854,10 +1854,10 @@ class Ticket extends CommonObject
 	/**
 	 *     Search and fetch contacts by email
 	 *
-	 *     @param  string $email 	Email
-	 *     @param  array  $socid 	Limit to a thirdparty
-	 *     @param  string $case  	Respect case
-	 *     @return array        	Array of contacts object
+	 *     @param  string 		$email 		Email
+	 *     @param  array  		$socid 		Limit to a thirdparty
+	 *     @param  string 		$case  		Respect case
+	 *     @return array|int        		Array of contacts object
 	 */
 	public function searchContactByEmail($email, $socid = '', $case = '')
 	{
@@ -1900,8 +1900,8 @@ class Ticket extends CommonObject
 	/**
 	 *    Define parent commany of current ticket
 	 *
-	 *    @param  int $id Id of thirdparty to set or '' to remove
-	 *    @return int             <0 if KO, >0 if OK
+	 *    @param  int $id		Id of thirdparty to set or '' to remove
+	 *    @return int           <0 if KO, >0 if OK
 	 */
 	public function setCustomer($id)
 	{
@@ -2075,7 +2075,7 @@ class Ticket extends CommonObject
 	 *    @param	string 	$source 	Source of contact: external or thirdparty (llx_socpeople) or internal (llx_user)
 	 *    @param	int    	$list   	0:Return array contains all properties, 1:Return array contains just id
 	 *    @param    string  $code       Filter on this code of contact type ('SHIPPING', 'BILLING', ...)
-	 *    @return 	array          		Array of contacts
+	 *    @return 	array|int      		Array of contacts
 	 */
 	public function listeContact($status = -1, $source = 'external', $list = 0, $code = '')
 	{
@@ -2364,7 +2364,7 @@ class Ticket extends CommonObject
 			}
 		}
 
-		return;
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/variants/class/ProductAttribute.class.php b/htdocs/variants/class/ProductAttribute.class.php
index ae82873d8bd..f89adcce0f8 100644
--- a/htdocs/variants/class/ProductAttribute.class.php
+++ b/htdocs/variants/class/ProductAttribute.class.php
@@ -119,6 +119,11 @@ class ProductAttribute extends CommonObject
 	 */
 	public $line;
 
+	/**
+	 * @var int		Number of product that use this attribute
+	 */
+	public $is_used_by_products;
+
 
 	/**
 	 * Constructor

From 969377e583a142e033aae85483abb9bc0b348b63 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Jan 2023 12:40:21 +0100
Subject: [PATCH 300/816] NEW Show module into list of emails templates

---
 htdocs/admin/mails_templates.php | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 16929336565..09dd4c3ba87 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -69,6 +69,7 @@ $search_type_template = GETPOST('search_type_template', 'alpha');
 $search_lang = GETPOST('search_lang', 'alpha');
 $search_fk_user = GETPOST('search_fk_user', 'intcomma');
 $search_topic = GETPOST('search_topic', 'alpha');
+$search_module = GETPOST('search_module', 'alpha');
 
 $acts = array();
 $actl = array();
@@ -108,7 +109,7 @@ $tabname[25] = MAIN_DB_PREFIX."c_email_templates";
 
 // Nom des champs en resultat de select pour affichage du dictionnaire
 $tabfield = array();
-$tabfield[25] = "label,lang,type_template,fk_user,private,position,topic,joinfiles,content";
+$tabfield[25] = "label,lang,type_template,fk_user,private,position,module,topic,joinfiles,content";
 if (!empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) {
 	$tabfield[25] .= ',content_lines';
 }
@@ -290,6 +291,7 @@ if (empty($reshook)) {
 		$search_lang = '';
 		$search_fk_user = '';
 		$search_topic = '';
+		$search_module = '';
 		$toselect = array();
 		$search_array_options = array();
 	}
@@ -598,6 +600,9 @@ if ($search_lang) {
 if ($search_fk_user != '' && $search_fk_user != '-1') {
 	$sql .= natural_search('fk_user', $search_fk_user, 2);
 }
+if ($search_module) {
+	$sql .= natural_search('module', $search_module);
+}
 if ($search_topic) {
 	$sql .= natural_search('topic', $search_topic);
 }
@@ -703,6 +708,9 @@ if ($action == 'create') {
 		$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
 		$valuetoshow = $langs->trans($valuetoshow); // try to translate
 		$align = "left";
+		if ($fieldlist[$field] == 'module') {
+			continue;
+		}
 		if ($fieldlist[$field] == 'fk_user') {
 			$valuetoshow = $langs->trans("Owner");
 		}
@@ -804,7 +812,7 @@ if ($action == 'create') {
 	foreach ($fieldsforcontent as $tmpfieldlist) {
 		print '<tr class="impair nodrag nodrop nohover"><td colspan="7" class="nobottom">';
 
-		// Label
+		// Topic of email
 		if ($tmpfieldlist == 'topic') {
 			print '<strong>'.$form->textwithpicto($langs->trans("Topic"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong> ';
 		}
@@ -882,6 +890,9 @@ if ($search_type_template != '-1') {
 if ($search_fk_user > 0) {
 	$param .= '&search_fk_user='.urlencode($search_fk_user);
 }
+if ($search_module) {
+	$param .= '&search_module='.urlencode($search_module);
+}
 if ($search_topic) {
 	$param .= '&search_topic='.urlencode($search_topic);
 }
@@ -909,7 +920,9 @@ if ($num > $listlimit) {
 print '<tr class="liste_titre">';
 
 foreach ($fieldlist as $field => $value) {
-	if ($value == 'label') {
+	if ($value == 'module') {
+		print '<td class="liste_titre"><input type="text" name="search_module" class="maxwidth75" value="'.dol_escape_htmltag($search_module).'"></td>';
+	} elseif ($value == 'label') {
 		print '<td class="liste_titre"><input type="text" name="search_label" class="maxwidth200" value="'.dol_escape_htmltag($search_label).'"></td>';
 	} elseif ($value == 'lang') {
 		print '<td class="liste_titre">';
@@ -917,7 +930,7 @@ foreach ($fieldlist as $field => $value) {
 		print '</td>';
 	} elseif ($value == 'fk_user') {
 		print '<td class="liste_titre">';
-		print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, ($user->admin ? '' : 'hierarchyme'), null, 0, 0, 0, '', 0, '', 'maxwidth125', 1);
+		print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, ($user->admin ? '' : 'hierarchyme'), null, 0, 0, 0, '', 0, '', 'maxwidth100', 1);
 		print '</td>';
 	} elseif ($value == 'topic') {
 		print '<td class="liste_titre"><input type="text" name="search_topic" value="'.dol_escape_htmltag($search_topic).'"></td>';
@@ -958,6 +971,9 @@ foreach ($fieldlist as $field => $value) {
 	*/
 	$valuetoshow = ucfirst($fieldlist[$field]); // By defaut
 	$valuetoshow = $langs->trans($valuetoshow); // try to translate
+	if ($fieldlist[$field] == 'module') {
+		$align = 'tdoverflowmax100';
+	}
 	if ($fieldlist[$field] == 'fk_user') {
 		$valuetoshow = $langs->trans("Owner");
 	}
@@ -1273,13 +1289,16 @@ $db->close();
  */
 function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 {
-	global $conf, $langs, $user, $db;
+	global $langs, $user, $db;
 	global $form;
 	global $elementList;
 
 	$formadmin = new FormAdmin($db);
 
 	foreach ($fieldlist as $field => $value) {
+		if ($value == 'module') {
+			continue;
+		}
 		if ($value == 'fk_user') {
 			print '<td>';
 			if ($user->admin) {

From 0f62c3d2fa2c256ca3b1df69f1ff35f7562939a8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Jan 2023 13:01:11 +0100
Subject: [PATCH 301/816] Fix css

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

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 09dd4c3ba87..1cb418cb6c9 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -709,7 +709,7 @@ if ($action == 'create') {
 		$valuetoshow = $langs->trans($valuetoshow); // try to translate
 		$align = "left";
 		if ($fieldlist[$field] == 'module') {
-			continue;
+			$valuetoshow = '';
 		}
 		if ($fieldlist[$field] == 'fk_user') {
 			$valuetoshow = $langs->trans("Owner");
@@ -810,7 +810,7 @@ if ($action == 'create') {
 		$fieldsforcontent = array('topic', 'joinfiles', 'content', 'content_lines');
 	}
 	foreach ($fieldsforcontent as $tmpfieldlist) {
-		print '<tr class="impair nodrag nodrop nohover"><td colspan="7" class="nobottom">';
+		print '<tr class="impair nodrag nodrop nohover"><td colspan="8" class="nobottom">';
 
 		// Topic of email
 		if ($tmpfieldlist == 'topic') {
@@ -1072,7 +1072,7 @@ if ($num) {
 					if ($showfield) {
 						// Show line for topic, joinfiles and content
 						print '</tr><tr class="oddeven" nohover tr-'.$tmpfieldlist.'-'.$rowid.' ">';
-						print '<td colspan="8">';
+						print '<td colspan="9">';
 						if ($tmpfieldlist == 'topic') {
 							print '<strong>'.$form->textwithpicto($langs->trans("Topic"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong> ';
 							print '<input type="text" class="flat minwidth500" name="'.$tmpfieldlist.'-'.$rowid.'" value="'.(!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '').'">';
@@ -1088,7 +1088,6 @@ if ($num) {
 							if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) {
 								$okforextended = false;
 							}
-
 							$doleditor = new DolEditor($tmpfieldlist.'-'.$rowid, (!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 500, 'dolibarr_mailings', 'In', 0, $acceptlocallinktomedia, $okforextended, ROWS_6, '90%');
 							print $doleditor->Create(1);
 						}
@@ -1297,12 +1296,11 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 
 	foreach ($fieldlist as $field => $value) {
 		if ($value == 'module') {
-			continue;
-		}
-		if ($value == 'fk_user') {
+			print '<td></td>';
+		} elseif ($value == 'fk_user') {
 			print '<td>';
 			if ($user->admin) {
-				print $form->select_dolusers(empty($obj->$value) ? '' : $obj->$value, 'fk_user', 1, null, 0, ($user->admin ? '' : 'hierarchyme'), null, 0, 0, 0, '', 0, '', 'minwidth150 maxwidth200');
+				print $form->select_dolusers(empty($obj->$value) ? '' : $obj->$value, 'fk_user', 1, null, 0, ($user->admin ? '' : 'hierarchyme'), null, 0, 0, 0, '', 0, '', 'minwidth75 maxwidth100');
 			} else {
 				if ($context == 'add') {	// I am not admin and we show the add form
 					print $user->getNomUrl(1); // Me
@@ -1328,7 +1326,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				if ($context == 'edit') {
 					$selectedlang = $obj->lang;
 				}
-				print $formadmin->select_language($selectedlang, 'langcode', 0, null, 1, 0, 0, 'maxwidth150');
+				print $formadmin->select_language($selectedlang, 'langcode', 0, null, 1, 0, 0, 'maxwidth100');
 			} else {
 				if (!empty($obj->lang)) {
 					print $obj->lang.' - '.$langs->trans('Language_'.$obj->lang);
@@ -1348,7 +1346,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				print '<input type="hidden" name="type_template" value="'.$obj->type_template.'">';
 				print $obj->type_template;
 			} else {
-				print $form->selectarray('type_template', $elementList, (!empty($obj->type_template) ? $obj->type_template:''), 1, 0, 0, '', 0, 0, 0, '', 'minwidth150', 1, '', 0, 1);
+				print $form->selectarray('type_template', $elementList, (!empty($obj->type_template) ? $obj->type_template:''), 1, 0, 0, '', 0, 0, 0, '', 'minwidth75 maxwidth125', 1, '', 0, 1);
 			}
 			print '</td>';
 		} elseif ($context == 'add' && in_array($value, array('topic', 'joinfiles', 'content', 'content_lines'))) {

From a4472f52e298d642f7557060bdfb5358170cb178 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Jan 2023 14:15:07 +0100
Subject: [PATCH 302/816] Debug v17

---
 htdocs/admin/hrm.php                          | 8 ++++----
 htdocs/modulebuilder/template/admin/setup.php | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/htdocs/admin/hrm.php b/htdocs/admin/hrm.php
index 838e9bf9a0b..08ece979e21 100644
--- a/htdocs/admin/hrm.php
+++ b/htdocs/admin/hrm.php
@@ -53,7 +53,7 @@ $label = GETPOST('label', 'alpha');
 $modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
 
 $scandir = GETPOST('scan_dir', 'alpha');
-$type = 'myobject';
+$type = 'evaluation';
 
 $arrayofparameters = array(
 	'HRM_MAXRANK'=>array('type'=>'integer','enabled'=>1),
@@ -210,10 +210,10 @@ print dol_get_fiche_head($head, 'settings', $langs->trans($page_name), -1, "hrm"
 
 $moduledir = 'hrm';
 $myTmpObjects = array();
-$myTmpObjects['evaluation'] = array('includerefgeneration'=>1, 'includedocgeneration'=>0);
+$myTmpObjects['evaluation'] = array('label'=>'Evaluation', 'includerefgeneration'=>1, 'includedocgeneration'=>0);
 
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
-	if ($myTmpObjectKey == 'MyObject') {
+	if ($myTmpObjectKey != $type) {
 		continue;
 	}
 	if ($myTmpObjectArray['includerefgeneration']) {
@@ -222,7 +222,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 		 */
 		$setupnotempty++;
 
-		print load_fiche_titre($langs->trans("NumberingModules", $myTmpObjectKey), '', '');
+		print load_fiche_titre($langs->trans("NumberingModules").' ('.$myTmpObjectArray['label'].')', '', '');
 
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index c235dec7e63..e2108405160 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -318,11 +318,12 @@ if ($action == 'edit') {
 
 $moduledir = 'mymodule';
 $myTmpObjects = array();
-$myTmpObjects['MyObject'] = array('includerefgeneration'=>0, 'includedocgeneration'=>0);
+// TODO Scan list of objects
+$myTmpObjects['myobject'] = array('label'=>'MyObject', 'includerefgeneration'=>0, 'includedocgeneration'=>0);
 
 
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
-	if ($myTmpObjectKey == 'MyObject') {
+	if ($myTmpObjectKey != $type) {
 		continue;
 	}
 	if ($myTmpObjectArray['includerefgeneration']) {
@@ -331,7 +332,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 		 */
 		$setupnotempty++;
 
-		print load_fiche_titre($langs->trans("NumberingModules", $myTmpObjectKey), '', '');
+		print load_fiche_titre($langs->trans("NumberingModules", $myTmpObjectArray['label']), '', '');
 
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';

From eed3cdd9cce55ced3b19b2b4729ac83362ddfcbc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Jan 2023 15:10:09 +0100
Subject: [PATCH 303/816] Debug v17

---
 htdocs/admin/bom.php                          |  4 ++--
 htdocs/admin/chequereceipts.php               |  4 ++--
 htdocs/admin/commande.php                     |  4 ++--
 htdocs/admin/contract.php                     |  4 ++--
 htdocs/admin/delivery.php                     |  4 ++--
 htdocs/admin/eventorganization.php            |  4 ++--
 htdocs/admin/expedition.php                   |  4 ++--
 htdocs/admin/expensereport.php                |  4 ++--
 htdocs/admin/facture.php                      | 16 +++++++-------
 htdocs/admin/fichinter.php                    |  4 ++--
 htdocs/admin/holiday.php                      |  4 ++--
 htdocs/admin/hrm.php                          |  4 ++--
 htdocs/admin/knowledgemanagement.php          |  6 ++---
 htdocs/admin/mrp.php                          |  4 ++--
 htdocs/admin/payment.php                      |  4 ++--
 htdocs/admin/propal.php                       |  4 ++--
 htdocs/admin/reception_setup.php              |  4 ++--
 htdocs/admin/stocktransfer.php                |  4 ++--
 htdocs/admin/supplier_invoice.php             | 22 ++++++++++---------
 htdocs/admin/supplier_order.php               |  4 ++--
 htdocs/admin/supplier_payment.php             |  4 ++--
 htdocs/admin/supplier_proposal.php            |  4 ++--
 htdocs/admin/ticket.php                       | 20 ++++++++---------
 htdocs/admin/webhook.php                      |  4 ++--
 htdocs/admin/workstation.php                  |  6 ++---
 htdocs/asset/admin/setup.php                  |  4 ++--
 htdocs/bookcal/admin/setup.php                |  4 ++--
 .../core/modules/asset/mod_asset_advanced.php |  2 +-
 .../doc/doc_generic_ticket_odt.modules.php    |  4 ++--
 .../mod_knowledgerecord_advanced.php          |  2 +-
 htdocs/modulebuilder/template/admin/setup.php |  4 ++--
 .../partnership/mod_partnership_advanced.php  |  2 +-
 htdocs/product/admin/product_lot.php          |  8 +++----
 htdocs/projet/admin/project.php               |  8 +++----
 htdocs/recruitment/admin/setup.php            |  4 ++--
 .../recruitment/admin/setup_candidatures.php  |  4 ++--
 htdocs/takepos/admin/setup.php                |  4 ++--
 37 files changed, 101 insertions(+), 99 deletions(-)

diff --git a/htdocs/admin/bom.php b/htdocs/admin/bom.php
index a35aef780d2..57b4b5aad06 100644
--- a/htdocs/admin/bom.php
+++ b/htdocs/admin/bom.php
@@ -51,10 +51,10 @@ $type = 'bom';
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask') {
-	$maskconstbom = GETPOST('maskconstBom', 'alpha');
+	$maskconstbom = GETPOST('maskconstBom', 'aZ09');
 	$maskbom = GETPOST('maskBom', 'alpha');
 
-	if ($maskconstbom) {
+	if ($maskconstbom && preg_match('/_MASK$/', $maskconstbom)) {
 		$res = dolibarr_set_const($db, $maskconstbom, $maskbom, 'chaine', 0, '', $conf->entity);
 	}
 
diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index ed05180ef24..77994debadb 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -54,9 +54,9 @@ if (empty($conf->global->CHEQUERECEIPTS_ADDON)) {
  */
 
 if ($action == 'updateMask') {
-	$maskconstchequereceipts = GETPOST('maskconstchequereceipts', 'alpha');
+	$maskconstchequereceipts = GETPOST('maskconstchequereceipts', 'aZ09');
 	$maskchequereceipts = GETPOST('maskchequereceipts', 'alpha');
-	if ($maskconstchequereceipts) {
+	if ($maskconstchequereceipts && preg_match('/_MASK$/', $maskconstchequereceipts)) {
 		$res = dolibarr_set_const($db, $maskconstchequereceipts, $maskchequereceipts, 'chaine', 0, '', $conf->entity);
 	}
 
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 34a5e281fac..79c42f6e2db 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -61,10 +61,10 @@ $type = 'order';
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask') {
-	$maskconstorder = GETPOST('maskconstorder', 'alpha');
+	$maskconstorder = GETPOST('maskconstorder', 'aZ09');
 	$maskorder = GETPOST('maskorder', 'alpha');
 
-	if ($maskconstorder) {
+	if ($maskconstorder && preg_match('/_MASK$/', $maskconstorder)) {
 		$res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
 	}
 
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 48247bf0b8e..c5a4d1a3463 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -58,9 +58,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 $error=0;
 
 if ($action == 'updateMask') {
-	$maskconst = GETPOST('maskconstcontract', 'alpha');
+	$maskconst = GETPOST('maskconstcontract', 'aZ09');
 	$maskvalue = GETPOST('maskcontract', 'alpha');
-	if ($maskconst) {
+	if ($maskconst && preg_match('/_MASK$/', $maskconst)) {
 		$res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
 	}
 
diff --git a/htdocs/admin/delivery.php b/htdocs/admin/delivery.php
index a1fef4091ce..9094762f68d 100644
--- a/htdocs/admin/delivery.php
+++ b/htdocs/admin/delivery.php
@@ -90,9 +90,9 @@ if ($action == 'activate_delivery') {
 }
 
 if ($action == 'updateMask') {
-	$maskconstdelivery = GETPOST('maskconstdelivery', 'alpha');
+	$maskconstdelivery = GETPOST('maskconstdelivery', 'aZ09');
 	$maskdelivery = GETPOST('maskdelivery', 'alpha');
-	if ($maskconstdelivery) {
+	if ($maskconstdelivery && preg_match('/_MASK$/', $maskconstdelivery)) {
 		$res = dolibarr_set_const($db, $maskconstdelivery, $maskdelivery, 'chaine', 0, '', $conf->entity);
 	}
 
diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php
index cc9b8d7bca8..31df0ffe142 100644
--- a/htdocs/admin/eventorganization.php
+++ b/htdocs/admin/eventorganization.php
@@ -88,10 +88,10 @@ if ((float) DOL_VERSION >= 6) {
 }
 
 if ($action == 'updateMask') {
-	$maskconstorder = GETPOST('maskconstorder', 'alpha');
+	$maskconstorder = GETPOST('maskconstorder', 'aZ09');
 	$maskorder = GETPOST('maskorder', 'alpha');
 
-	if ($maskconstorder) {
+	if ($maskconstorder && preg_match('/_MASK$/', $maskconstorder)) {
 		$res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
 		if (!($res > 0)) {
 			$error++;
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 485ce901e5c..1db6a9cc9d6 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -62,9 +62,9 @@ if (empty($conf->global->EXPEDITION_ADDON_NUMBER)) {
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask') {
-	$maskconst = GETPOST('maskconstexpedition', 'alpha');
+	$maskconst = GETPOST('maskconstexpedition', 'aZ09');
 	$maskvalue = GETPOST('maskexpedition', 'alpha');
-	if (!empty($maskconst)) {
+	if (!empty($maskconst) && preg_match('/_MASK$/', $maskconst)) {
 		$res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
 	}
 
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index 8c20b493105..25bef9fde22 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -58,9 +58,9 @@ $type = 'expensereport';
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask') {
-	$maskconst = GETPOST('maskconst', 'alpha');
+	$maskconst = GETPOST('maskconst', 'aZ09');
 	$maskvalue = GETPOST('maskvalue', 'alpha');
-	if ($maskconst) {
+	if ($maskconst && preg_match('/_MASK$/', $maskconst)) {
 		$res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
 	}
 
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 10746c794be..a715004529e 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -58,24 +58,24 @@ $type = 'invoice';
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask') {
-	$maskconstinvoice = GETPOST('maskconstinvoice', 'alpha');
-	$maskconstreplacement = GETPOST('maskconstreplacement', 'alpha');
-	$maskconstcredit = GETPOST('maskconstcredit', 'alpha');
-	$maskconstdeposit = GETPOST('maskconstdeposit', 'alpha');
+	$maskconstinvoice = GETPOST('maskconstinvoice', 'aZ09');
+	$maskconstreplacement = GETPOST('maskconstreplacement', 'aZ09');
+	$maskconstcredit = GETPOST('maskconstcredit', 'aZ09');
+	$maskconstdeposit = GETPOST('maskconstdeposit', 'aZ09');
 	$maskinvoice = GETPOST('maskinvoice', 'alpha');
 	$maskreplacement = GETPOST('maskreplacement', 'alpha');
 	$maskcredit = GETPOST('maskcredit', 'alpha');
 	$maskdeposit = GETPOST('maskdeposit', 'alpha');
-	if ($maskconstinvoice) {
+	if ($maskconstinvoice && preg_match('/_MASK_/', $maskconstinvoice)) {
 		$res = dolibarr_set_const($db, $maskconstinvoice, $maskinvoice, 'chaine', 0, '', $conf->entity);
 	}
-	if ($maskconstreplacement) {
+	if ($maskconstreplacement && preg_match('/_MASK_/', $maskconstreplacement)) {
 		$res = dolibarr_set_const($db, $maskconstreplacement, $maskreplacement, 'chaine', 0, '', $conf->entity);
 	}
-	if ($maskconstcredit) {
+	if ($maskconstcredit && preg_match('/_MASK_/', $maskconstcredit)) {
 		$res = dolibarr_set_const($db, $maskconstcredit, $maskcredit, 'chaine', 0, '', $conf->entity);
 	}
-	if ($maskconstdeposit) {
+	if ($maskconstdeposit && preg_match('/_MASK_/', $maskconstdeposit)) {
 		$res = dolibarr_set_const($db, $maskconstdeposit, $maskdeposit, 'chaine', 0, '', $conf->entity);
 	}
 
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index cf637d37329..2e331b3cc80 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -58,9 +58,9 @@ $type = 'ficheinter';
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask') {
-	$maskconst = GETPOST('maskconst', 'alpha');
+	$maskconst = GETPOST('maskconst', 'aZ09');
 	$maskvalue = GETPOST('maskvalue', 'alpha');
-	if ($maskconst) {
+	if ($maskconst && preg_match('/_MASK$/', $maskconst)) {
 		$res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
 	}
 
diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
index 9a60c6b9b84..b85e257c69e 100644
--- a/htdocs/admin/holiday.php
+++ b/htdocs/admin/holiday.php
@@ -58,9 +58,9 @@ if (empty($conf->global->HOLIDAY_ADDON)) {
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask') {
-	$maskconst = GETPOST('maskconstholiday', 'alpha');
+	$maskconst = GETPOST('maskconstholiday', 'aZ09');
 	$maskvalue = GETPOST('maskholiday', 'alpha');
-	if ($maskconst) {
+	if ($maskconst && preg_match('/_MASK$/', $maskconst)) {
 		$res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
 	}
 
diff --git a/htdocs/admin/hrm.php b/htdocs/admin/hrm.php
index 08ece979e21..81968a945f1 100644
--- a/htdocs/admin/hrm.php
+++ b/htdocs/admin/hrm.php
@@ -91,10 +91,10 @@ if ($action == 'update') {
 		}
 	}
 } elseif ($action == 'updateMask') {
-	$maskconstorder = GETPOST('maskconstorder', 'alpha');
+	$maskconstorder = GETPOST('maskconstorder', 'aZ09');
 	$maskorder = GETPOST('maskorder', 'alpha');
 
-	if ($maskconstorder) {
+	if ($maskconstorder && preg_match('/_MASK$/', $maskconstorder)) {
 		$res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
 		if (!($res > 0)) {
 			$error++;
diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index b1710a53839..e93128a6a0c 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -69,11 +69,11 @@ if (!$user->admin) {
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask') {
-	$maskconstorder = GETPOST('maskconstorder', 'alpha');
+	$maskconst = GETPOST('maskconst', 'aZ09');
 	$maskorder = GETPOST('maskorder', 'alpha');
 
-	if ($maskconstorder) {
-		$res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
+	if ($maskconst && preg_match('/_MASK$/', $maskconst)) {
+		$res = dolibarr_set_const($db, $maskconst, $maskorder, 'chaine', 0, '', $conf->entity);
 		if (!($res > 0)) {
 			$error++;
 		}
diff --git a/htdocs/admin/mrp.php b/htdocs/admin/mrp.php
index 36a82e965f4..21fff1c45e6 100644
--- a/htdocs/admin/mrp.php
+++ b/htdocs/admin/mrp.php
@@ -52,10 +52,10 @@ $type = 'mrp';
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask') {
-	$maskconstmrp = GETPOST('maskconstMo', 'alpha');
+	$maskconstmrp = GETPOST('maskconstMo', 'aZ09');
 	$maskmrp = GETPOST('maskMo', 'alpha');
 
-	if ($maskconstmrp) {
+	if ($maskconstmrp && preg_match('/_MASK$/', $maskconstmrp)) {
 		$res = dolibarr_set_const($db, $maskconstmrp, $maskmrp, 'chaine', 0, '', $conf->entity);
 	}
 
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index 59da712b266..7b0d0acbf06 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -51,9 +51,9 @@ if (empty($conf->global->PAYMENT_ADDON)) {
  */
 
 if ($action == 'updateMask') {
-	$maskconstpayment = GETPOST('maskconstpayment', 'alpha');
+	$maskconstpayment = GETPOST('maskconstpayment', 'aZ09');
 	$maskpayment = GETPOST('maskpayment', 'alpha');
-	if ($maskconstpayment) {
+	if ($maskconstpayment && preg_match('/_MASK$/', $maskconstpayment)) {
 		$res = dolibarr_set_const($db, $maskconstpayment, $maskpayment, 'chaine', 0, '', $conf->entity);
 	}
 
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 7883cc7da20..10044e33b5b 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -58,9 +58,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 $error = 0;
 if ($action == 'updateMask') {
-	$maskconstpropal = GETPOST('maskconstpropal', 'alpha');
+	$maskconstpropal = GETPOST('maskconstpropal', 'aZ09');
 	$maskpropal = GETPOST('maskpropal', 'alpha');
-	if ($maskconstpropal) {
+	if ($maskconstpropal && preg_match('/_MASK$/', $maskconstpropal)) {
 		$res = dolibarr_set_const($db, $maskconstpropal, $maskpropal, 'chaine', 0, '', $conf->entity);
 	}
 
diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php
index c86db66e464..32f6c5b226e 100644
--- a/htdocs/admin/reception_setup.php
+++ b/htdocs/admin/reception_setup.php
@@ -65,9 +65,9 @@ if (empty($conf->global->RECEPTION_ADDON_NUMBER)) {
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask') {
-	$maskconst = GETPOST('maskconstreception', 'alpha');
+	$maskconst = GETPOST('maskconstreception', 'aZ09');
 	$maskvalue = GETPOST('maskreception', 'alpha');
-	if (!empty($maskconst)) {
+	if (!empty($maskconst) && preg_match('/_MASK$/', $maskconst)) {
 		$res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
 	}
 
diff --git a/htdocs/admin/stocktransfer.php b/htdocs/admin/stocktransfer.php
index 3bcd00c1fe8..02c73bb2a76 100644
--- a/htdocs/admin/stocktransfer.php
+++ b/htdocs/admin/stocktransfer.php
@@ -64,10 +64,10 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 
 if ($action == 'updateMask') {
-	$maskconststocktransfer = GETPOST('maskconststocktransfer', 'alpha');
+	$maskconststocktransfer = GETPOST('maskconststocktransfer', 'aZ09');
 	$maskstocktransfer = GETPOST('maskStockTransfer', 'alpha');
 
-	if ($maskconststocktransfer) {
+	if ($maskconststocktransfer && preg_match('/_MASK$/', $maskconststocktransfer)) {
 		$res = dolibarr_set_const($db, $maskconststocktransfer, $maskstocktransfer, 'chaine', 0, '', $conf->entity);
 		if ($res <= 0) $error++;
 	}
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 3524111c96e..7b1831e759d 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -38,10 +38,6 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "other", "orders"));
 
-if (!$user->admin) {
-	accessforbidden();
-}
-
 $type = GETPOST('type', 'alpha');
 $value = GETPOST('value', 'alpha');
 $action = GETPOST('action', 'aZ09');
@@ -52,26 +48,32 @@ $scandir = GETPOST('scan_dir', 'alpha');
 $specimenthirdparty = new Societe($db);
 $specimenthirdparty->initAsSpecimen();
 
+$error = 0;
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
 
 /*
  * Actions
  */
 
 if ($action == 'updateMask') {
-	$maskconstinvoice = GETPOST('maskconstinvoice', 'alpha');
-	$maskconstcredit = GETPOST('maskconstcredit', 'alpha');
-	$maskconstdeposit = GETPOST('maskconstdeposit', 'alpha');
+	$maskconstinvoice = GETPOST('maskconstinvoice', 'aZ09');
+	$maskconstcredit = GETPOST('maskconstcredit', 'aZ09');
+	$maskconstdeposit = GETPOST('maskconstdeposit', 'aZ09');
 	$maskinvoice = GETPOST('maskinvoice', 'alpha');
 	$maskcredit = GETPOST('maskcredit', 'alpha');
 	$maskdeposit = GETPOST('maskdeposit', 'alpha');
 
-	if ($maskconstinvoice) {
+	if ($maskconstinvoice && preg_match('/_MASK$/', $maskconstinvoice)) {
 		$res = dolibarr_set_const($db, $maskconstinvoice, $maskinvoice, 'chaine', 0, '', $conf->entity);
 	}
-	if ($maskconstcredit) {
+	if ($maskconstcredit && preg_match('/_MASK$/', $maskconstcredit)) {
 		$res = dolibarr_set_const($db, $maskconstcredit, $maskcredit, 'chaine', 0, '', $conf->entity);
 	}
-	if ($maskconstdeposit) {
+	if ($maskconstdeposit && preg_match('/_MASK$/', $maskconstdeposit)) {
 		$res = dolibarr_set_const($db, $maskconstdeposit, $maskdeposit, 'chaine', 0, '', $conf->entity);
 	}
 
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index bb1b94d4385..abee8200cef 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -61,10 +61,10 @@ $specimenthirdparty->initAsSpecimen();
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask') {
-	$maskconstorder = GETPOST('maskconstorder', 'alpha');
+	$maskconstorder = GETPOST('maskconstorder', 'aZ09');
 	$maskvalue = GETPOST('maskorder', 'alpha');
 
-	if ($maskconstorder) {
+	if ($maskconstorder && preg_match('/_MASK$/', $maskconstorder)) {
 		$res = dolibarr_set_const($db, $maskconstorder, $maskvalue, 'chaine', 0, '', $conf->entity);
 	}
 
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index 86fcccfb8f2..ac00e4846ac 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -52,9 +52,9 @@ $type = 'supplier_payment';
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask') {
-	$maskconstsupplierpayment = GETPOST('maskconstsupplierpayment', 'alpha');
+	$maskconstsupplierpayment = GETPOST('maskconstsupplierpayment', 'aZ09');
 	$masksupplierpayment = GETPOST('masksupplierpayment', 'alpha');
-	if ($maskconstsupplierpayment) {
+	if ($maskconstsupplierpayment && preg_match('/_MASK$/', $maskconstsupplierpayment)) {
 		$res = dolibarr_set_const($db, $maskconstsupplierpayment, $masksupplierpayment, 'chaine', 0, '', $conf->entity);
 	}
 
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 993e19fc796..62be111449d 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -55,9 +55,9 @@ $error = 0;
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask') {
-	$maskconstsupplier_proposal = GETPOST('maskconstsupplier_proposal', 'alpha');
+	$maskconstsupplier_proposal = GETPOST('maskconstsupplier_proposal', 'aZ09');
 	$masksupplier_proposal = GETPOST('masksupplier_proposal', 'alpha');
-	if ($maskconstsupplier_proposal) {
+	if ($maskconstsupplier_proposal && preg_match('/_MASK$/', $maskconstsupplier_proposal)) {
 		$res = dolibarr_set_const($db, $maskconstsupplier_proposal, $masksupplier_proposal, 'chaine', 0, '', $conf->entity);
 	}
 
diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php
index 9cebbc3b36d..6a6201642ee 100644
--- a/htdocs/admin/ticket.php
+++ b/htdocs/admin/ticket.php
@@ -47,7 +47,7 @@ $scandir = GETPOST('scandir', 'alpha');
 $type = 'ticket';
 
 $error = 0;
-
+$reg = array();
 
 /*
  * Actions
@@ -56,10 +56,10 @@ $error = 0;
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask') {
-	$maskconstticket = GETPOST('maskconstticket', 'alpha');
+	$maskconstticket = GETPOST('maskconstticket', 'aZ09');
 	$maskticket = GETPOST('maskticket', 'alpha');
 
-	if ($maskconstticket) {
+	if ($maskconstticket && preg_match('/_MASK$/', $maskconstticket)) {
 		$res = dolibarr_set_const($db, $maskconstticket, $maskticket, 'chaine', 0, '', $conf->entity);
 	}
 
@@ -484,7 +484,7 @@ foreach ($dirmodels as $reldir) {
 								// Preview
 								print '<td class="center">';
 								if ($module->type == 'pdf') {
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.urlencode($name).'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 								} else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
@@ -526,7 +526,7 @@ if ($conf->use_javascript_ajax) {
 	print ajax_constantonoff('TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND');
 } else {
 	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-	print $formcategory->selectarray("TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND", $arrval, $conf->global->TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND);
+	print $formcategory->selectarray("TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND", $arrval, getDolGlobalString('TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND'));
 }
 print '</td>';
 print '<td class="center">';
@@ -542,7 +542,7 @@ if ($conf->use_javascript_ajax) {
 	print ajax_constantonoff('TICKET_AUTO_ASSIGN_USER_CREATE');
 } else {
 	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-	print $formcategory->selectarray("TICKET_AUTO_ASSIGN_USER_CREATE", $arrval, $conf->global->TICKET_AUTO_ASSIGN_USER_CREATE);
+	print $formcategory->selectarray("TICKET_AUTO_ASSIGN_USER_CREATE", $arrval, getDolGlobalString('TICKET_AUTO_ASSIGN_USER_CREATE'));
 }
 print '</td>';
 print '<td class="center">';
@@ -557,7 +557,7 @@ if ($conf->use_javascript_ajax) {
 	print ajax_constantonoff('TICKET_NOTIFY_AT_CLOSING');
 } else {
 	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-	print $formcategory->selectarray("TICKET_NOTIFY_AT_CLOSING", $arrval, $conf->global->TICKET_NOTIFY_AT_CLOSING);
+	print $formcategory->selectarray("TICKET_NOTIFY_AT_CLOSING", $arrval, getDolGlobalString('TICKET_NOTIFY_AT_CLOSING'));
 }
 print '</td>';
 print '<td class="center">';
@@ -569,7 +569,7 @@ 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, $htmlname);
+	$formcategory->selectProductCategory(getDolGlobalString('TICKET_PRODUCT_CATEGORY'), $htmlname);
 	if ($conf->use_javascript_ajax) {
 		print ajax_combobox('select_'.$htmlname);
 	}
@@ -583,7 +583,7 @@ if (isModEnabled('product')) {
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("TicketsDelayBeforeFirstAnswer")."</td>";
 print '<td class="left">
-	<input type="number" value="'.$conf->global->TICKET_DELAY_BEFORE_FIRST_RESPONSE.'" name="delay_first_response" class="width50">
+	<input type="number" value="'.getDolGlobalString('TICKET_DELAY_BEFORE_FIRST_RESPONSE').'" name="delay_first_response" class="width50">
 	</td>';
 print '<td class="center">';
 print $formcategory->textwithpicto('', $langs->trans("TicketsDelayBeforeFirstAnswerHelp"), 1, 'help');
@@ -593,7 +593,7 @@ print '</tr>';
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("TicketsDelayBetweenAnswers")."</td>";
 print '<td class="left">
-	<input type="number" value="'.$conf->global->TICKET_DELAY_SINCE_LAST_RESPONSE.'" name="delay_between_responses" class="width50">
+	<input type="number" value="'.getDolGlobalString('TICKET_DELAY_SINCE_LAST_RESPONSE').'" name="delay_between_responses" class="width50">
 	</td>';
 print '<td class="center">';
 print $formcategory->textwithpicto('', $langs->trans("TicketsDelayBetweenAnswersHelp"), 1, 'help');
diff --git a/htdocs/admin/webhook.php b/htdocs/admin/webhook.php
index b589eac4079..1267b84e5e4 100644
--- a/htdocs/admin/webhook.php
+++ b/htdocs/admin/webhook.php
@@ -150,10 +150,10 @@ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask') {
-	$maskconst = GETPOST('maskconst', 'alpha');
+	$maskconst = GETPOST('maskconst', 'aZ09');
 	$maskvalue = GETPOST('maskvalue', 'alpha');
 
-	if ($maskconst) {
+	if ($maskconst && preg_match('/_MASK$/', $maskconst)) {
 		$res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
 		if (!($res > 0)) {
 			$error++;
diff --git a/htdocs/admin/workstation.php b/htdocs/admin/workstation.php
index bdd7ba662cd..314e6d13a91 100644
--- a/htdocs/admin/workstation.php
+++ b/htdocs/admin/workstation.php
@@ -63,11 +63,11 @@ if (!$user->admin) {
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask') {
-	$maskconstorder = GETPOST('maskconstWorkstation', 'alpha');
+	$maskconst = GETPOST('maskconstWorkstation', 'aZ09');
 	$maskorder = GETPOST('maskWorkstation', 'alpha');
 
-	if ($maskconstorder) {
-		$res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
+	if ($maskconst && preg_match('/_MASK$/', $maskconst)) {
+		$res = dolibarr_set_const($db, $maskconst, $maskorder, 'chaine', 0, '', $conf->entity);
 	}
 
 	if (!($res > 0)) {
diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index 67448b0e304..8bc52174b29 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -73,10 +73,10 @@ if ((float) DOL_VERSION >= 6) {
 }
 
 if ($action == 'updateMask') {
-	$maskconstorder = GETPOST('maskconstorder', 'alpha');
+	$maskconstorder = GETPOST('maskconstorder', 'aZ09');
 	$maskorder = GETPOST('maskorder', 'alpha');
 
-	if ($maskconstorder) {
+	if ($maskconstorder && preg_match('/_MASK$/', $maskconstorder)) {
 		$res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
 		if (!($res > 0)) {
 			$error++;
diff --git a/htdocs/bookcal/admin/setup.php b/htdocs/bookcal/admin/setup.php
index c4fd74404eb..1f76f9c819b 100644
--- a/htdocs/bookcal/admin/setup.php
+++ b/htdocs/bookcal/admin/setup.php
@@ -178,10 +178,10 @@ if ( versioncompare(explode('.', DOL_VERSION), array(15)) < 0 && $action == 'upd
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask') {
-	$maskconst = GETPOST('maskconst', 'alpha');
+	$maskconst = GETPOST('maskconst', 'aZ09');
 	$maskvalue = GETPOST('maskvalue', 'alpha');
 
-	if ($maskconst) {
+	if ($maskconst && preg_match('/_MASK$/', $maskconst)) {
 		$res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
 		if (!($res > 0)) {
 			$error++;
diff --git a/htdocs/core/modules/asset/mod_asset_advanced.php b/htdocs/core/modules/asset/mod_asset_advanced.php
index 34780c3423f..db1e55f7f83 100644
--- a/htdocs/core/modules/asset/mod_asset_advanced.php
+++ b/htdocs/core/modules/asset/mod_asset_advanced.php
@@ -67,7 +67,7 @@ class mod_asset_advanced extends ModeleNumRefAsset
 		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="action" value="updateMask">';
-		$texte .= '<input type="hidden" name="maskconstBom" value="ASSET_ASSET_ADVANCED_MASK">';
+		$texte .= '<input type="hidden" name="maskconst" value="ASSET_ASSET_ADVANCED_MASK">';
 		$texte .= '<table class="nobordernopadding" width="100%">';
 
 		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Asset"), $langs->transnoentities("Asset"));
diff --git a/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php b/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
index 1a2d1e537cc..84a5a9f423b 100644
--- a/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
+++ b/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
@@ -122,7 +122,7 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 		// List of directories area
 		$texte .= '<tr><td>';
 		$texttitle = $langs->trans("ListOfDirectories");
-		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->TICKET_ADDON_PDF_ODT_PATH)));
+		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim(getDolGlobalString('TICKET_ADDON_PDF_ODT_PATH'))));
 		$listoffiles = array();
 		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
@@ -148,7 +148,7 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 		$texte .= $form->textwithpicto($texttitle, $texthelp, 1, 'help', '', 1);
 		$texte .= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
 		$texte .= '<textarea class="flat" cols="60" name="value1">';
-		$texte .= $conf->global->TICKET_ADDON_PDF_ODT_PATH;
+		$texte .= getDolGlobalString('TICKET_ADDON_PDF_ODT_PATH');
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
 		$texte .= '<input type="submit" class="button small reposition" name="modify" value="'.$langs->trans("Modify").'">';
diff --git a/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php
index ba0cf9818dc..b05519dd692 100644
--- a/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php
+++ b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php
@@ -68,7 +68,7 @@ class mod_knowledgerecord_advanced extends ModeleNumRefKnowledgeRecord
 		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="action" value="updateMask">';
-		$texte .= '<input type="hidden" name="maskconstBom" value="KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADVANCED_MASK">';
+		$texte .= '<input type="hidden" name="maskconst" value="KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADVANCED_MASK">';
 		$texte .= '<table class="nobordernopadding" width="100%">';
 
 		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("KnowledgeRecord"), $langs->transnoentities("KnowledgeRecord"));
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index e2108405160..7b7376d22c7 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -181,10 +181,10 @@ if ( versioncompare(explode('.', DOL_VERSION), array(15)) < 0 && $action == 'upd
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask') {
-	$maskconst = GETPOST('maskconst', 'alpha');
+	$maskconst = GETPOST('maskconst', 'aZ09');
 	$maskvalue = GETPOST('maskvalue', 'alpha');
 
-	if ($maskconst) {
+	if ($maskconst && preg_match('/_MASK$/', $maskconst)) {
 		$res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
 		if (!($res > 0)) {
 			$error++;
diff --git a/htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php b/htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php
index 676de032659..8a86340d212 100644
--- a/htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php
+++ b/htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php
@@ -68,7 +68,7 @@ class mod_partnership_advanced extends ModeleNumRefPartnership
 		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="action" value="updateMask">';
-		$texte .= '<input type="hidden" name="maskconstBom" value="PARTNERSHIP_ADVANCED_MASK">';
+		$texte .= '<input type="hidden" name="maskconst" value="PARTNERSHIP_ADVANCED_MASK">';
 		$texte .= '<table class="nobordernopadding" width="100%">';
 
 		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Partnership"), $langs->transnoentities("Partnership"));
diff --git a/htdocs/product/admin/product_lot.php b/htdocs/product/admin/product_lot.php
index 8f46412871a..19b2b32eac6 100644
--- a/htdocs/product/admin/product_lot.php
+++ b/htdocs/product/admin/product_lot.php
@@ -47,10 +47,10 @@ $error = 0;
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMaskLot') {
-	$maskconstbatch = GETPOST('maskconstLot', 'alpha');
+	$maskconstbatch = GETPOST('maskconstLot', 'aZ09');
 	$maskbatch = GETPOST('maskLot', 'alpha');
 
-	if ($maskconstbatch) {
+	if ($maskconstbatch && preg_match('/_MASK$/', $maskconstbatch)) {
 		$res = dolibarr_set_const($db, $maskconstbatch, $maskbatch, 'chaine', 0, '', $conf->entity);
 		if ($res <= 0) $error++;
 	}
@@ -61,10 +61,10 @@ if ($action == 'updateMaskLot') {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 } elseif ($action == 'updateMaskSN') {
-	$maskconstbatch = GETPOST('maskconstSN', 'alpha');
+	$maskconstbatch = GETPOST('maskconstSN', 'aZ09');
 	$maskbatch = GETPOST('maskSN', 'alpha');
 
-	if ($maskconstbatch) {
+	if ($maskconstbatch && preg_match('/_MASK$/', $maskconstbatch)) {
 		$res = dolibarr_set_const($db, $maskconstbatch, $maskbatch, 'chaine', 0, '', $conf->entity);
 		if ($res <= 0) $error++;
 	}
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index 37eb33d9206..20a4f01bc82 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -55,10 +55,10 @@ $type = 'project';
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask') {
-	$maskconstproject = GETPOST('maskconstproject', 'alpha');
+	$maskconstproject = GETPOST('maskconstproject', 'aZ09');
 	$maskproject = GETPOST('maskproject', 'alpha');
 
-	if ($maskconstproject) {
+	if ($maskconstproject && preg_match('/_MASK$/', $maskconstproject)) {
 		$res = dolibarr_set_const($db, $maskconstproject, $maskproject, 'chaine', 0, '', $conf->entity);
 	}
 
@@ -74,10 +74,10 @@ if ($action == 'updateMask') {
 }
 
 if ($action == 'updateMaskTask') {
-	$maskconstmasktask = GETPOST('maskconsttask', 'alpha');
+	$maskconstmasktask = GETPOST('maskconsttask', 'aZ09');
 	$masktaskt = GETPOST('masktask', 'alpha');
 
-	if ($maskconstmasktask) {
+	if ($maskconstmasktask && preg_match('/_MASK$/', $maskconstmasktask)) {
 		$res = dolibarr_set_const($db, $maskconstmasktask, $masktaskt, 'chaine', 0, '', $conf->entity);
 	}
 
diff --git a/htdocs/recruitment/admin/setup.php b/htdocs/recruitment/admin/setup.php
index 120c476de90..c06561f4b2e 100644
--- a/htdocs/recruitment/admin/setup.php
+++ b/htdocs/recruitment/admin/setup.php
@@ -92,10 +92,10 @@ if ((float) DOL_VERSION >= 6) {
 }
 
 if ($action == 'updateMask') {
-	$maskconstjob = GETPOST('maskconstjob', 'alpha');
+	$maskconstjob = GETPOST('maskconstjob', 'aZ09');
 	$maskjob = GETPOST('maskjob', 'alpha');
 
-	if ($maskconstjob) {
+	if ($maskconstjob && preg_match('/_MASK$/', $maskconstjob)) {
 		$res = dolibarr_set_const($db, $maskconstjob, $maskjob, 'chaine', 0, '', $conf->entity);
 	}
 
diff --git a/htdocs/recruitment/admin/setup_candidatures.php b/htdocs/recruitment/admin/setup_candidatures.php
index b53fff4213a..723c98b6f83 100644
--- a/htdocs/recruitment/admin/setup_candidatures.php
+++ b/htdocs/recruitment/admin/setup_candidatures.php
@@ -92,10 +92,10 @@ if ((float) DOL_VERSION >= 6) {
 }
 
 if ($action == 'updateMask') {
-	$maskconstcand = GETPOST('maskconstcand', 'alpha');
+	$maskconstcand = GETPOST('maskconstcand', 'aZ09');
 	$maskcand = GETPOST('maskcand', 'alpha');
 
-	if ($maskconstcand) {
+	if ($maskconstcand && preg_match('/_MASK$/', $maskconstcand)) {
 		$res = dolibarr_set_const($db, $maskconstcand, $maskcand, 'chaine', 0, '', $conf->entity);
 	}
 
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index 38cd6d1275d..a175fa3c6c3 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -100,9 +100,9 @@ if ($action == 'set') {
 		$db->rollback();
 	}
 } elseif ($action == 'updateMask') {
-	$maskconst = GETPOST('maskconst', 'alpha');
+	$maskconst = GETPOST('maskconst', 'aZ09');
 	$maskvalue = GETPOST('maskvalue', 'alpha');
-	if ($maskconst) {
+	if ($maskconst && preg_match('/_MASK$/', $maskconst)) {
 		$res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
 	}
 	if (!($res > 0)) {

From 71970851262bad9bb8f4f09cbdc2f3874d2b71d1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Jan 2023 15:16:40 +0100
Subject: [PATCH 304/816] FIX saving of numbering module for jobs

---
 htdocs/core/modules/hrm/mod_evaluation_advanced.php       | 2 +-
 htdocs/recruitment/admin/setup.php                        | 8 ++++----
 .../recruitment/mod_recruitmentjobposition_advanced.php   | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/modules/hrm/mod_evaluation_advanced.php b/htdocs/core/modules/hrm/mod_evaluation_advanced.php
index 0468c9ebb30..5a74d34e236 100644
--- a/htdocs/core/modules/hrm/mod_evaluation_advanced.php
+++ b/htdocs/core/modules/hrm/mod_evaluation_advanced.php
@@ -68,7 +68,7 @@ class mod_evaluation_advanced extends ModeleNumRefEvaluation
 		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="action" value="updateMask">';
-		$texte .= '<input type="hidden" name="maskconstBom" value="HRM_EVALUATION_ADVANCED_MASK">';
+		$texte .= '<input type="hidden" name="maskconstEvaluation" value="HRM_EVALUATION_ADVANCED_MASK">';
 		$texte .= '<table class="nobordernopadding" width="100%">';
 
 		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Evaluation"), $langs->transnoentities("Evaluation"));
diff --git a/htdocs/recruitment/admin/setup.php b/htdocs/recruitment/admin/setup.php
index 30434b207fc..ada2be5448c 100644
--- a/htdocs/recruitment/admin/setup.php
+++ b/htdocs/recruitment/admin/setup.php
@@ -93,11 +93,11 @@ if ((float) DOL_VERSION >= 6) {
 }
 
 if ($action == 'updateMask') {
-	$maskconstorder = GETPOST('maskconstorder', 'alpha');
-	$maskorder = GETPOST('maskorder', 'alpha');
+	$maskconst = GETPOST('maskconst', 'alpha');
+	$maskvalue = GETPOST('maskRecruitmentJobPosition', 'alpha');
 
-	if ($maskconstorder) {
-		$res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
+	if ($maskconst) {
+		$res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
 	}
 
 	if (!($res > 0)) {
diff --git a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php
index fcc476abacf..af418f927fd 100644
--- a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php
+++ b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php
@@ -68,8 +68,8 @@ class mod_recruitmentjobposition_advanced extends ModeleNumRefRecruitmentJobPosi
 		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="action" value="updateMask">';
-		$texte .= '<input type="hidden" name="maskconstBom" value="RECRUITMENT_RECRUITMENTJOBPOSITION_ADVANCED_MASK">';
-		$texte .= '<table class="nobordernopadding" width="100%">';
+		$texte .= '<input type="hidden" name="maskconst" value="RECRUITMENT_RECRUITMENTJOBPOSITION_ADVANCED_MASK">';
+		$texte .= '<table class="nobordernopadding centpercent">';
 
 		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("RecruitmentJobPosition"), $langs->transnoentities("RecruitmentJobPosition"));
 		$tooltip .= $langs->trans("GenericMaskCodes2");

From c2b98856d395b73533a11e59065ee61dec1de95b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Jan 2023 15:32:31 +0100
Subject: [PATCH 305/816] Debug v17

---
 htdocs/hrm/admin/admin_establishment.php | 11 +++++------
 htdocs/langs/en_US/hrm.lang              |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index 99212988488..59192bc5ca5 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -145,13 +145,12 @@ if ($result) {
 			$establishmentstatic->label = $obj->label;
 			$establishmentstatic->status = $obj->status;
 
-
 			print '<tr class="oddeven">';
 			print '<td>'.$establishmentstatic->getNomUrl(1).'</td>';
-			print '<td>'.$obj->label.'</td>';
-			print '<td class="left">'.$obj->address.'</td>';
-			print '<td class="left">'.$obj->zip.'</td>';
-			print '<td class="left">'.$obj->town.'</td>';
+			print '<td>'.dol_escape_htmltag($obj->label).'</td>';
+			print '<td>'.dol_escape_htmltag($obj->address).'</td>';
+			print '<td>'.dol_escape_htmltag($obj->zip).'</td>';
+			print '<td>'.dol_escape_htmltag($obj->town).'</td>';
 			print '<td class="right">';
 			print $establishmentstatic->getLibStatut(5);
 			print '</td>';
@@ -160,7 +159,7 @@ if ($result) {
 			$i++;
 		}
 	} else {
-		print '<tr class="oddeven"><td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+		print '<tr class="oddeven"><td colspan="7"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 	}
 
 	print '</table>';
diff --git a/htdocs/langs/en_US/hrm.lang b/htdocs/langs/en_US/hrm.lang
index 966f2399a13..592009b8697 100644
--- a/htdocs/langs/en_US/hrm.lang
+++ b/htdocs/langs/en_US/hrm.lang
@@ -86,7 +86,7 @@ SaveAddSkill = Skill(s) added
 SaveLevelSkill = Skill(s) level saved
 DeleteSkill = Skill removed
 SkillsExtraFields=Attributs supplémentaires (Compétences)
-JobsExtraFields=Attributs supplémentaires (Emplois)
+JobsExtraFields=Attributs supplémentaires (Job profile)
 EvaluationsExtraFields=Attributs supplémentaires (Evaluations)
 NeedBusinessTravels=Need business travels
 NoDescription=No description
\ No newline at end of file

From cfa974df2599ca895432a080285ba1f684571512 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Jan 2023 15:48:23 +0100
Subject: [PATCH 306/816] Look and feel v17

---
 htdocs/admin/modulehelp.php | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index e18e65e47a0..9a0c34aea2b 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -372,13 +372,13 @@ if ($mode == 'feature') {
 	if (count($objMod->depends)) {
 		$text .= join(',', $objMod->depends);
 	} else {
-		$text .= $langs->trans("None");
+		$text .= '<span class="opacitymedium">'.$langs->trans("None").'</span>';
 	}
 	$text .= '<br><strong>'.$langs->trans("RequiredBy").':</strong> ';
 	if (count($objMod->requiredby)) {
 		$text .= join(',', $objMod->requiredby);
 	} else {
-		$text .= $langs->trans("None");
+		$text .= '<span class="opacitymedium">'.$langs->trans("None").'</span>';
 	}
 
 	$text .= '<br><br>';
@@ -395,7 +395,7 @@ if ($mode == 'feature') {
 			$i++;
 		}
 	} else {
-		$text .= $langs->trans("No");
+		$text .= '<span class="opacitymedium">'.$langs->trans("No").'</span>';
 	}
 
 	$text .= '<br>';
@@ -408,7 +408,7 @@ if ($mode == 'feature') {
 			$i++;
 		}
 	} else {
-		$text .= $langs->trans("No");
+		$text .= '<span class="opacitymedium">'.$langs->trans("No").'</span>';
 	}
 
 	$text .= '<br>';
@@ -418,7 +418,7 @@ if ($mode == 'feature') {
 	if (dol_is_file($filedata)) {
 		$text .= $langs->trans("Yes").' <span class="opacitymedium">('.$moduledir.'/sql/data.sql)</span>';
 	} else {
-		$text .= $langs->trans("No");
+		$text .= '<span class="opacitymedium">'.$langs->trans("No").'</span>';
 	}
 
 	$text .= '<br>';
@@ -437,7 +437,7 @@ if ($mode == 'feature') {
 			}
 		}
 	} else {
-		$text .= $langs->trans("No");
+		$text .= '<span class="opacitymedium">'.$langs->trans("No").'</span>';
 	}
 
 	$text .= '<br>';
@@ -446,7 +446,7 @@ if ($mode == 'feature') {
 	if (isset($objMod->module_parts) && isset($objMod->module_parts['models']) && $objMod->module_parts['models']) {
 		$text .= $langs->trans("Yes");
 	} else {
-		$text .= $langs->trans("No");
+		$text .= '<span class="opacitymedium">'.$langs->trans("No").'</span>';
 	}
 
 	$text .= '<br>';
@@ -455,7 +455,7 @@ if ($mode == 'feature') {
 	if (isset($objMod->module_parts) && isset($objMod->module_parts['substitutions']) && $objMod->module_parts['substitutions']) {
 		$text .= $langs->trans("Yes");
 	} else {
-		$text .= $langs->trans("No");
+		$text .= '<span class="opacitymedium">'.$langs->trans("No").'</span>';
 	}
 
 	$text .= '<br>';
@@ -468,7 +468,7 @@ if ($mode == 'feature') {
 			$i++;
 		}
 	} else {
-		$text .= $langs->trans("No");
+		$text .= '<span class="opacitymedium">'.$langs->trans("No").'</span>';
 	}
 
 	$text .= '<br>';
@@ -502,7 +502,7 @@ if ($mode == 'feature') {
 			$i++;
 		}
 	} else {
-		$text .= $langs->trans("No");
+		$text .= '<span class="opacitymedium">'.$langs->trans("No").'</span>';
 	}
 
 	$text .= '<br>';
@@ -531,7 +531,7 @@ if ($mode == 'feature') {
 			$i++;
 		}
 	} else {
-		$text .= $langs->trans("No");
+		$text .= '<span class="opacitymedium">'.$langs->trans("No").'</span>';
 	}
 
 	$text .= '<br>';
@@ -544,7 +544,7 @@ if ($mode == 'feature') {
 			$i++;
 		}
 	} else {
-		$text .= $langs->trans("No");
+		$text .= '<span class="opacitymedium">'.$langs->trans("No").'</span>';
 	}
 
 	$text .= '<br>';
@@ -553,7 +553,7 @@ if ($mode == 'feature') {
 	if (isset($objMod->menu) && !empty($objMod->menu)) { // objMod can be an array or just an int 1
 		$text .= $langs->trans("Yes");
 	} else {
-		$text .= $langs->trans("No");
+		$text .= '<span class="opacitymedium">'.$langs->trans("No").'</span>';
 	}
 
 	$text .= '<br>';
@@ -566,7 +566,7 @@ if ($mode == 'feature') {
 			$i++;
 		}
 	} else {
-		$text .= $langs->trans("No");
+		$text .= '<span class="opacitymedium">'.$langs->trans("No").'</span>';
 	}
 
 	$text .= '<br>';
@@ -579,13 +579,13 @@ if ($mode == 'feature') {
 			$i++;
 		}
 	} else {
-		$text .= $langs->trans("No");
+		$text .= '<span class="opacitymedium">'.$langs->trans("No").'</span>';
 	}
 
 	$text .= '<br>';
 
 	$text .= '<br><strong>'.$langs->trans("AddOtherPagesOrServices").':</strong> ';
-	$text .= $langs->trans("DetectionNotPossible");
+	$text .= '<span class="opacitymedium">'.$langs->trans("DetectionNotPossible").'</span>';
 }
 
 
@@ -594,7 +594,7 @@ if ($mode == 'changelog') {
 	if ($changelog) {
 		$text .= '<div class="moduledesclong">'.$changelog.'<div>';
 	} else {
-		$text .= '<div class="moduledesclong">'.$langs->trans("NotAvailable").'</div>';
+		$text .= '<div class="moduledesclong"><span class="opacitymedium">'.$langs->trans("NotAvailable").'</span></div>';
 	}
 }
 

From 28ff94fd67c337ac60f3aa9201f5200c69c87c3b Mon Sep 17 00:00:00 2001
From: hystepik <lucas.marcouiller@gmail.com>
Date: Wed, 4 Jan 2023 16:09:55 +0100
Subject: [PATCH 307/816] Fix : facture-rec 's deletion process

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

diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 26fb26d4cdb..7896b26e8b0 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -271,7 +271,7 @@ if (empty($reshook)) {
 	}
 
 	// Delete
-	if ($action == 'confirm_deleteinvoice' && $confirm == 'yes' && $user->rights->facture->supprimer) {
+	if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->facture->supprimer) {
 		$object->delete($user);
 
 		header("Location: ".DOL_URL_ROOT.'/compta/facture/invoicetemplate_list.php');
@@ -1175,8 +1175,8 @@ if ($action == 'create') {
 		}
 
 		// Confirm delete of repeatable invoice
-		if ($action == 'ask_deleteinvoice') {
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteRepeatableInvoice'), $langs->trans('ConfirmDeleteRepeatableInvoice'), 'confirm_deleteinvoice', '', 'no', 1);
+		if ($action == 'delete') {
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteRepeatableInvoice'), $langs->trans('ConfirmDeleteRepeatableInvoice'), 'confirm_delete', '', 'no', 1);
 		}
 
 		// Call Hook formConfirm

From 78b12c8298ca412e5ddd1c5d193fccdd9ee7fd41 Mon Sep 17 00:00:00 2001
From: Christian Humpel <christian.humpel@gmail.com>
Date: Wed, 4 Jan 2023 16:33:39 +0100
Subject: [PATCH 308/816] Fix: #23415 correct numbering on 'ref'.

---
 htdocs/bom/class/api_boms.class.php | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/htdocs/bom/class/api_boms.class.php b/htdocs/bom/class/api_boms.class.php
index fb7d175a229..36cc2850db0 100644
--- a/htdocs/bom/class/api_boms.class.php
+++ b/htdocs/bom/class/api_boms.class.php
@@ -205,6 +205,11 @@ class Boms extends DolibarrApi
 		foreach ($request_data as $field => $value) {
 			$this->bom->$field = $value;
 		}
+
+		// Check Ref Numbering
+		// We check that object has a temporary ref
+		$this->CheckRefNumbering();
+
 		if (!$this->bom->create(DolibarrApiAccess::$user)) {
 			throw new RestException(500, "Error creating BOM", array_merge(array($this->bom->error), $this->bom->errors));
 		}
@@ -241,6 +246,10 @@ class Boms extends DolibarrApi
 			$this->bom->$field = $value;
 		}
 
+		// Check Ref Numbering
+		// We check that object has a temporary ref
+		$this->CheckRefNumbering();
+
 		if ($this->bom->update(DolibarrApiAccess::$user) > 0) {
 			return $this->get($id);
 		} else {
@@ -526,7 +535,7 @@ class Boms extends DolibarrApi
 	{
 		$myobject = array();
 		foreach ($this->bom->fields as $field => $propfield) {
-			if (in_array($field, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat')) || $propfield['notnull'] != 1) {
+			if (in_array($field, array('rowid', 'entity', 'ref', 'date_creation', 'tms', 'fk_user_creat')) || $propfield['notnull'] != 1) {
 				continue; // Not a mandatory field
 			}
 			if (!isset($data[$field])) {
@@ -536,4 +545,19 @@ class Boms extends DolibarrApi
 		}
 		return $myobject;
 	}
+
+	/**
+	 * Validate the ref field and get the next Number if it's necessary.
+	 *
+	 * @return void
+	 */
+	private function CheckRefNumbering(): void
+	{
+		$ref = substr($this->bom->ref, 1, 4);
+		if ($this->bom->status > 0 && (empty($this->bom->ref) || $ref == 'PROV')) {
+			$this->bom->fetch_product();
+			$numref = $this->bom->getNextNumRef($this->bom->product);
+			$this->bom->ref = $numref;
+		}
+	}
 }

From 7d5dec6bb7f8fcc37915ede68a3d9dde05e40ab0 Mon Sep 17 00:00:00 2001
From: Christian Humpel <christian.humpel@gmail.com>
Date: Wed, 4 Jan 2023 16:39:50 +0100
Subject: [PATCH 309/816] Remove comment.

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

diff --git a/htdocs/bom/class/api_boms.class.php b/htdocs/bom/class/api_boms.class.php
index 36cc2850db0..37008475160 100644
--- a/htdocs/bom/class/api_boms.class.php
+++ b/htdocs/bom/class/api_boms.class.php
@@ -206,8 +206,6 @@ class Boms extends DolibarrApi
 			$this->bom->$field = $value;
 		}
 
-		// Check Ref Numbering
-		// We check that object has a temporary ref
 		$this->CheckRefNumbering();
 
 		if (!$this->bom->create(DolibarrApiAccess::$user)) {
@@ -246,8 +244,6 @@ class Boms extends DolibarrApi
 			$this->bom->$field = $value;
 		}
 
-		// Check Ref Numbering
-		// We check that object has a temporary ref
 		$this->CheckRefNumbering();
 
 		if ($this->bom->update(DolibarrApiAccess::$user) > 0) {

From 9d2fb85f59c455f1fac5699afd5459a7046111d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20NASSIET?= <sebastien.nassiet@comaite.com>
Date: Wed, 4 Jan 2023 17:04:54 +0100
Subject: [PATCH 310/816] =?UTF-8?q?correction=20bug=20sur=20le=20filtre=20?=
 =?UTF-8?q?des=20langues=20pour=20l'ajout=20aux=20liste=20d'emailing.=20Lo?=
 =?UTF-8?q?rsque=20'Activer=20la=20prise=20en=20charge=20multilingue=20pou?=
 =?UTF-8?q?r=20la=20relation=20client=20ou=20fournisseur'=20=C3=A9tait=20d?=
 =?UTF-8?q?=C3=A9sactiv=C3=A9,=20le=20champ=20langue=20des=20contacts=20et?=
 =?UTF-8?q?=20des=20tiers=20est=20egal=20=C3=A0=20NULL=20et=20ne=20corresp?=
 =?UTF-8?q?ond=20jamais=20au=20filtre=20de=20langue=20(le=20filtre=20de=20?=
 =?UTF-8?q?langue=20est=20donc=20maintenant=20d=C3=A9sactiv=C3=A9=20dans?=
 =?UTF-8?q?=20le=20module=20thirdparties)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/core/modules/mailings/contacts1.modules.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index 83e9e3ff277..9a9be018b79 100644
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -120,7 +120,7 @@ class mailing_contacts1 extends MailingTargets
 	 */
 	public function formFilter()
 	{
-		global $langs;
+		global $conf,$langs;
 
 		// Load translation files required by the page
 		$langs->loadLangs(array("commercial", "companies", "suppliers", "categories"));
@@ -305,11 +305,13 @@ class mailing_contacts1 extends MailingTargets
 
 		$s .= ajax_combobox("filter_category_supplier_contact");
 
-		// 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', 0, 0, 1, 0, 0, '', 0, 0, 0, null, 1);
+		if (getDolGlobalInt('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;
 	}

From f964f14c850537e82812b7c0fead7f62966ff6e3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Jan 2023 17:36:31 +0100
Subject: [PATCH 311/816] Fix phpunit

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

diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index 0c62be0a85a..30b3ea76975 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -75,7 +75,7 @@ abstract class DoliDB implements Database
 
 
 	/**
-	 *	Return the DB prefix found into prefix_db (if it was set manually by doing $db->prefix_db=...).
+	 *	Return the DB prefix found into prefix_db (if it was set manually by doing $dbhandler->prefix_db=...).
 	 *  Otherwise return MAIN_DB_PREFIX (common use).
 	 *
 	 *	@return string		The DB prefix

From b72a1c9964286e7735fd07887d6324807ccc8e39 Mon Sep 17 00:00:00 2001
From: Christian Humpel <christian.humpel@gmail.com>
Date: Wed, 4 Jan 2023 17:41:26 +0100
Subject: [PATCH 312/816] Rename Methode "checkRefNumbering".

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

diff --git a/htdocs/bom/class/api_boms.class.php b/htdocs/bom/class/api_boms.class.php
index 37008475160..e7376dfbdfa 100644
--- a/htdocs/bom/class/api_boms.class.php
+++ b/htdocs/bom/class/api_boms.class.php
@@ -206,7 +206,7 @@ class Boms extends DolibarrApi
 			$this->bom->$field = $value;
 		}
 
-		$this->CheckRefNumbering();
+		$this->checkRefNumbering();
 
 		if (!$this->bom->create(DolibarrApiAccess::$user)) {
 			throw new RestException(500, "Error creating BOM", array_merge(array($this->bom->error), $this->bom->errors));
@@ -244,7 +244,7 @@ class Boms extends DolibarrApi
 			$this->bom->$field = $value;
 		}
 
-		$this->CheckRefNumbering();
+		$this->checkRefNumbering();
 
 		if ($this->bom->update(DolibarrApiAccess::$user) > 0) {
 			return $this->get($id);
@@ -547,7 +547,7 @@ class Boms extends DolibarrApi
 	 *
 	 * @return void
 	 */
-	private function CheckRefNumbering(): void
+	private function checkRefNumbering(): void
 	{
 		$ref = substr($this->bom->ref, 1, 4);
 		if ($this->bom->status > 0 && (empty($this->bom->ref) || $ref == 'PROV')) {

From 9dd6045412611830873e2bdb2d15573685b0ad40 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 4 Jan 2023 17:06:16 +0000
Subject: [PATCH 313/816] Fixing style errors.

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

diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 6652b57304a..3c8597cd862 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -1630,7 +1630,6 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 		}
 
 		if (!empty($arrayfields['t.task_duration']['checked'])) {
-
 			if ($search_timespent_starthour || $search_timespent_startmin) {
 				$timespent_duration_start = $search_timespent_starthour * 60 * 60; // We store duration in seconds
 				$timespent_duration_start += ($search_timespent_startmin ? $search_timespent_startmin : 0) * 60; // We store duration in seconds
@@ -1642,7 +1641,6 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				$timespent_duration_end += ($search_timespent_endmin ? $search_timespent_endmin : 0) * 60; // We store duration in seconds
 				$sql .= " AND t.task_duration <= " . $timespent_duration_end;
 			}
-			
 		}
 
 		$sql .= dolSqlDateFilter('t.task_datehour', $search_day, $search_month, $search_year);

From 6c4809bcf58b30813af9bfee897af1658aae025d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Jan 2023 18:11:40 +0100
Subject: [PATCH 314/816] Standardize code: same code for message from public
 and backoffice

---
 htdocs/ticket/class/ticket.class.php | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 54d09e28288..c7813b708c8 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -2369,7 +2369,7 @@ class Ticket extends CommonObject
 
 	/**
 	 * Add new message on a ticket (private/public area).
-	 * Can also send it be email if GETPOST('send_email', 'int') is set. For such email, header and footer is added.
+	 * Can also send it by email if GETPOST('send_email', 'int') is set. For such email, header and footer is added.
 	 *
 	 * @param   User    $user       User for action
 	 * @param   string  $action     Action string
@@ -2438,8 +2438,13 @@ class Ticket extends CommonObject
 					 * Send emails to assigned users (public area notification)
 					 */
 					if (!empty($conf->global->TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_ENABLED)) {
+						// Retrieve internal contact datas
+						$internal_contacts = $object->getInfosTicketInternalContact();
+
 						$assigned_user_dont_have_email = '';
+
 						$sendto = array();
+
 						if ($this->fk_user_assign > 0) {
 							$assigned_user = new User($this->db);
 							$assigned_user->fetch($this->fk_user_assign);
@@ -2449,16 +2454,21 @@ class Ticket extends CommonObject
 								$assigned_user_dont_have_email = $assigned_user->getFullName($langs);
 							}
 						}
-						if (!empty($conf->global->TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_ALSO_CONTRIBUTOR)) {
-							$contactList = $object->liste_contact(-1, 'internal', 0, 'CONTRIBUTOR');
-							if (is_array($contactList)) {
-								foreach ($contactList as $contactArray) {
-									if (!empty($contactArray['email'])) {
-										$sendto[] = dolGetFirstLastname($contactArray['firstname'], $contactArray['lastname']) . " <" . $contactArray['email'] . ">";
-									}
+
+						// Build array to display recipient list
+						foreach ($internal_contacts as $key => $info_sendto) {
+							// Avoid duplicate notifications
+							if ($info_sendto['id'] == $user->id) {
+								continue;
+							}
+
+							if ($info_sendto['email'] != '') {
+								if (!empty($info_sendto['email'])) {
+									$sendto[] = dolGetFirstLastname($info_sendto['firstname'], $info_sendto['lastname'])." <".$info_sendto['email'].">";
 								}
 							}
 						}
+
 						if (empty($sendto)) {
 							if (!empty($conf->global->TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL)) {
 								$sendto[] = $conf->global->TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL;

From 8a42999bdaa97f2ebfaddf5b9d4977f8c53b6003 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Jan 2023 18:12:13 +0100
Subject: [PATCH 315/816] Debug v17

---
 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 27cdf8d164b..d4e0148f662 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -2535,7 +2535,7 @@ class Ticket extends CommonObject
 
 								if ($info_sendto['email'] != '') {
 									if (!empty($info_sendto['email'])) {
-										$sendto[] = trim($info_sendto['firstname']." ".$info_sendto['lastname'])." <".$info_sendto['email'].">";
+										$sendto[] = dolGetFirstLastname($info_sendto['firstname'], $info_sendto['lastname'])." <".$info_sendto['email'].">";
 									}
 
 									// Contact type

From de4986a57047b4cef6ba52be0318c8c80c170f8b Mon Sep 17 00:00:00 2001
From: Christian Humpel <christian.humpel@gmail.com>
Date: Wed, 4 Jan 2023 18:14:58 +0100
Subject: [PATCH 316/816] integrate auto increment on 'auto' keyword.

---
 htdocs/bom/class/api_boms.class.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/htdocs/bom/class/api_boms.class.php b/htdocs/bom/class/api_boms.class.php
index e7376dfbdfa..302054ceb86 100644
--- a/htdocs/bom/class/api_boms.class.php
+++ b/htdocs/bom/class/api_boms.class.php
@@ -531,7 +531,7 @@ class Boms extends DolibarrApi
 	{
 		$myobject = array();
 		foreach ($this->bom->fields as $field => $propfield) {
-			if (in_array($field, array('rowid', 'entity', 'ref', 'date_creation', 'tms', 'fk_user_creat')) || $propfield['notnull'] != 1) {
+			if (in_array($field, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat')) || $propfield['notnull'] != 1) {
 				continue; // Not a mandatory field
 			}
 			if (!isset($data[$field])) {
@@ -550,10 +550,18 @@ class Boms extends DolibarrApi
 	private function checkRefNumbering(): void
 	{
 		$ref = substr($this->bom->ref, 1, 4);
-		if ($this->bom->status > 0 && (empty($this->bom->ref) || $ref == 'PROV')) {
-			$this->bom->fetch_product();
-			$numref = $this->bom->getNextNumRef($this->bom->product);
-			$this->bom->ref = $numref;
+		if ($this->bom->status > 0 && $ref == 'PROV') {
+			throw new RestException(400, "Wrong naming scheme '(PROV%)' is only allowed on 'DRAFT' status. For automatic increment use 'auto' on the 'ref' field.");
+		}
+
+		if ($this->bom->ref == 'auto'){
+			if (empty($this->bom->id) && $this->bom->status == 0){
+				$this->bom->ref = ''; // 'ref' will auto incremented with '(PROV' + newID + ')'
+			} else {
+				$this->bom->fetch_product();
+				$numref = $this->bom->getNextNumRef($this->bom->product);
+				$this->bom->ref = $numref;
+			}
 		}
 	}
 }

From 18550211c8179b29a4159a5f05abf1b1434a414c Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 4 Jan 2023 17:32:30 +0000
Subject: [PATCH 317/816] Fixing style errors.

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

diff --git a/htdocs/bom/class/api_boms.class.php b/htdocs/bom/class/api_boms.class.php
index 302054ceb86..e0e6cfd69dd 100644
--- a/htdocs/bom/class/api_boms.class.php
+++ b/htdocs/bom/class/api_boms.class.php
@@ -554,8 +554,8 @@ class Boms extends DolibarrApi
 			throw new RestException(400, "Wrong naming scheme '(PROV%)' is only allowed on 'DRAFT' status. For automatic increment use 'auto' on the 'ref' field.");
 		}
 
-		if ($this->bom->ref == 'auto'){
-			if (empty($this->bom->id) && $this->bom->status == 0){
+		if ($this->bom->ref == 'auto') {
+			if (empty($this->bom->id) && $this->bom->status == 0) {
 				$this->bom->ref = ''; // 'ref' will auto incremented with '(PROV' + newID + ')'
 			} else {
 				$this->bom->fetch_product();

From 27792fe1adc45eef1e6a05536121fb042b9ee6bc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Jan 2023 18:34:54 +0100
Subject: [PATCH 318/816] Fix qodana

---
 htdocs/commande/class/api_orders.class.php          |  6 +++---
 htdocs/compta/bank/class/api_bankaccounts.class.php | 10 +++++-----
 htdocs/core/class/comment.class.php                 |  6 ++++--
 htdocs/core/class/evalmath.class.php                | 13 +++++++------
 htdocs/core/class/html.formticket.class.php         |  3 +--
 htdocs/core/class/openid.class.php                  |  4 ++--
 .../core/modules/propale/doc/pdf_azur.modules.php   |  2 +-
 .../supplier_proposal/doc/pdf_aurore.modules.php    |  2 +-
 htdocs/projet/class/api_projects.class.php          |  5 ++---
 htdocs/projet/class/project.class.php               |  2 +-
 htdocs/user/class/user.class.php                    |  2 +-
 htdocs/user/class/usergroup.class.php               | 12 ++++++------
 12 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index 8e389d862d3..1a879173684 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -108,11 +108,11 @@ class Orders extends DolibarrApi
 	 *
 	 * Return an array with order informations
 	 *
-	 * @param       int         $id            ID of order
+	 * @param       int         $id            	ID of order
 	 * @param		string		$ref			Ref of object
 	 * @param		string		$ref_ext		External reference of object
-	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
-	 * @return 	array|mixed data without useless information
+	 * @param       int         $contact_list  	0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
+	 * @return  	Object              		Object with cleaned properties
 	 *
 	 * @throws 	RestException
 	 */
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index c9886a176f0..537c7c9acb6 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -122,8 +122,8 @@ class BankAccounts extends DolibarrApi
 	/**
 	 * Get account by ID.
 	 *
-	 * @param int    $id    ID of account
-	 * @return array Account object
+	 * @param 	int	$id    						ID of account
+	 * @return  	Object              		Object with cleaned properties
 	 *
 	 * @throws RestException
 	 */
@@ -313,9 +313,9 @@ class BankAccounts extends DolibarrApi
 	/**
 	 * Update account
 	 *
-	 * @param int    $id              ID of account
-	 * @param array  $request_data    data
-	 * @return int
+	 * @param 	int    $id              ID of account
+	 * @param 	array  $request_data    data
+	 * @return	Object              	Object with cleaned properties
 	 */
 	public function put($id, $request_data = null)
 	{
diff --git a/htdocs/core/class/comment.class.php b/htdocs/core/class/comment.class.php
index 960d2ac4744..4a743e5b070 100644
--- a/htdocs/core/class/comment.class.php
+++ b/htdocs/core/class/comment.class.php
@@ -351,16 +351,18 @@ class Comment extends CommonObject
 
 
 	/**
-	 * Load comments linked with current task
+	 * Load comments linked with current task into ->comments
 	 *
 	 * @param	string		$element_type		Element type
 	 * @param	int			$fk_element			Id of element
-	 * @return 	array							Comment array
+	 * @return 	int								Result
 	 */
 	public function fetchAllFor($element_type, $fk_element)
 	{
 		global $db, $conf;
+
 		$this->comments = array();
+
 		if (!empty($element_type) && !empty($fk_element)) {
 			$sql = "SELECT";
 			$sql .= " c.rowid";
diff --git a/htdocs/core/class/evalmath.class.php b/htdocs/core/class/evalmath.class.php
index f2dfb80960e..9c01f133bf6 100644
--- a/htdocs/core/class/evalmath.class.php
+++ b/htdocs/core/class/evalmath.class.php
@@ -198,9 +198,9 @@ class EvalMath
 	}
 
 	/**
-	 * vars
+	 * Function vars
 	 *
-	 * @return string Output
+	 * @return array	Output
 	 */
 	public function vars()
 	{
@@ -211,9 +211,9 @@ class EvalMath
 	}
 
 	/**
-	 * vars
+	 * Function funcs
 	 *
-	 * @return string Output
+	 * @return array	Output
 	 */
 	private function funcs()
 	{
@@ -229,8 +229,8 @@ class EvalMath
 	/**
 	 * Convert infix to postfix notation
 	 *
-	 * @param string $expr		Expression
-	 * @return string 			Output
+	 * @param 	string 			$expr		Expression
+	 * @return 	boolean|array 				Output
 	 */
 	private function nfx($expr)
 	{
@@ -367,6 +367,7 @@ class EvalMath
 			}
 			$output[] = $op;
 		}
+
 		return $output;
 	}
 
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 0aa2c39de91..a34861e17d6 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -779,7 +779,7 @@ class FormTicket
 	 *      @param	string		$morecss			More CSS
 	 * 		@param	int 		$use_multilevel		If > 0 create a multilevel select which use $htmlname example: $use_multilevel = 1 permit to have 2 select boxes.
 	 * 		@param	Translate	$outputlangs		Output language
-	 *      @return void
+	 *      @return string|void						String of HTML component
 	 */
 	public function selectGroupTickets($selected = '', $htmlname = 'ticketcategory', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss = '', $use_multilevel = 0, $outputlangs = null)
 	{
@@ -985,7 +985,6 @@ class FormTicket
 					}
 					$sql = substr($sql, 0, -2);
 					$sql .= ")";
-				} else {
 				}
 				$sql .= $this->db->order('ctc.pos', 'ASC');
 
diff --git a/htdocs/core/class/openid.class.php b/htdocs/core/class/openid.class.php
index 79cf9137a99..7198f532358 100644
--- a/htdocs/core/class/openid.class.php
+++ b/htdocs/core/class/openid.class.php
@@ -178,7 +178,7 @@ class SimpleOpenID
 	/**
 	 * SetOpenIDServer
 	 *
-	 * @return	void
+	 * @return	array
 	 */
 	public function GetError()
 	{
@@ -225,7 +225,7 @@ class SimpleOpenID
 	 * splitResponse
 	 *
 	 * @param	string	$response		Server
-	 * @return	void
+	 * @return	array
 	 */
 	public function splitResponse($response)
 	{
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index ff5283e2bb8..eac6e0261ee 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -907,7 +907,7 @@ class pdf_azur extends ModelePDFPropales
 	 *   @param		Propal		$object			Object to show
 	 *   @param		int			$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
-	 *   @return	void
+	 *   @return	int
 	 */
 	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
 	{
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 8e25a227ad7..ff90b500969 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -744,7 +744,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 	 *   @param		Object		$object			Object to show
 	 *   @param		int			$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
-	 *   @return	void
+	 *   @return	int
 	 */
 	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
 	{
diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index 6a18057afd5..8cbb3949cd5 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -29,7 +29,6 @@
  */
 class Projects extends DolibarrApi
 {
-
 	/**
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
@@ -267,10 +266,9 @@ class Projects extends DolibarrApi
 	 *
 	 * @param   int   $id             Id of project
 	 * @param   int   $userid         Id of user (0 = connected user)
+	 * @return array
 	 *
 	 * @url	GET {id}/roles
-	 *
-	 * @return int
 	 */
 	public function getRoles($id, $userid = 0)
 	{
@@ -301,6 +299,7 @@ class Projects extends DolibarrApi
 		foreach ($this->project->roles as $line) {
 			array_push($result, $this->_cleanObjectDatas($line));
 		}
+
 		return $result;
 	}
 
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 57235d491da..79ea13dcd40 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1480,7 +1480,7 @@ class Project extends CommonObject
 	 * @param 	int		$list			0=Return array, 1=Return string list
 	 * @param	int		$socid			0=No filter on third party, id of third party
 	 * @param	string	$filter			additionnal filter on project (statut, ref, ...)
-	 * @return 	array or string			Array of projects id, or string with projects id separated with "," if list is 1
+	 * @return 	array|string			Array of projects id, or string with projects id separated with "," if list is 1
 	 */
 	public function getProjectsAuthorizedForUser($user, $mode = 0, $list = 0, $socid = 0, $filter = '')
 	{
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 5c0f3f15b45..a4d4c7acfe6 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -3489,7 +3489,7 @@ class User extends CommonObject
 	 *
 	 *  @param      int		$deleteafterid      Removed all users including the leaf $deleteafterid (and all its child) in user tree.
 	 *  @param		string	$filter				SQL filter on users. This parameter must not come from user intput.
-	 *	@return		array		      		  	Array of users $this->users. Note: $this->parentof is also set.
+	 *	@return		array|int	      		  	Array of users $this->users. Note: $this->parentof is also set.
 	 */
 	public function get_full_tree($deleteafterid = 0, $filter = '')
 	{
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 849b08bc7f6..71339991172 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -180,9 +180,9 @@ class UserGroup extends CommonObject
 	/**
 	 *  Return array of groups objects for a particular user
 	 *
-	 *  @param		int		$userid 		User id to search
-	 *  @param		boolean	$load_members	Load all members of the group
-	 *  @return		array     				Array of groups objects
+	 *  @param		int			$userid 		User id to search
+	 *  @param		boolean		$load_members	Load all members of the group
+	 *  @return		array|int     				Array of groups objects
 	 */
 	public function listGroupsForUser($userid, $load_members = true)
 	{
@@ -544,7 +544,7 @@ class UserGroup extends CommonObject
 	 *  Charge dans l'objet group, la liste des permissions auquels le groupe a droit
 	 *
 	 *  @param      string	$moduletag	 	Name of module we want permissions ('' means all)
-	 *	@return     int						<0 if KO, >0 if OK
+	 *	@return     int						<0 if KO, >=0 if OK
 	 */
 	public function getrights($moduletag = '')
 	{
@@ -552,12 +552,12 @@ class UserGroup extends CommonObject
 
 		if ($moduletag && isset($this->_tab_loaded[$moduletag]) && $this->_tab_loaded[$moduletag]) {
 			// Rights for this module are already loaded, so we leave
-			return;
+			return 0;
 		}
 
 		if (!empty($this->all_permissions_are_loaded)) {
 			// We already loaded all rights for this group, so we leave
-			return;
+			return 0;
 		}
 
 		/*

From a2e8d06ccc2e230b7ad194d8278dd3e8c50b1dab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20NASSIET?= <sebastien.nassiet@comaite.com>
Date: Wed, 4 Jan 2023 18:42:26 +0100
Subject: [PATCH 319/816] correctif erreur de copier coller dans le commit
 9d2fb85

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

diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index 9a9be018b79..3787874bdad 100644
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -310,7 +310,7 @@ class mailing_contacts1 extends MailingTargets
 			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);
+			$s .= $formadmin->select_language($langs->getDefaultLang(1), 'filter_lang', 0, null, 1, 0, 0, '', 0, 0, 0, null, 1);
 		}
 
 		return $s;

From 7719f8e9a5ec30a19cb86788d5692096e6f698d3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 5 Jan 2023 00:34:18 +0100
Subject: [PATCH 320/816] Fix github action

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

diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml
index 700d9fe64bf..3a1314422f2 100644
--- a/.github/workflows/code_quality.yml
+++ b/.github/workflows/code_quality.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-          php-version: '7.1'
+          #php-version: '7.1'
       - name: 'Qodana Scan'
         uses: JetBrains/qodana-action@v2022.3.0
         env:

From 7430dd73696a0d2183573fa0e324579e849437ff Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 5 Jan 2023 00:35:06 +0100
Subject: [PATCH 321/816] Try to force php version

---
 .github/workflows/code_quality.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml
index 3a1314422f2..aa7621cec11 100644
--- a/.github/workflows/code_quality.yml
+++ b/.github/workflows/code_quality.yml
@@ -19,5 +19,7 @@ jobs:
           #php-version: '7.1'
       - name: 'Qodana Scan'
         uses: JetBrains/qodana-action@v2022.3.0
+        with:
+          php-version: '7.1'
         env:
           QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
\ No newline at end of file

From 0e276fba5ed702ab96584f3278313e4a5b11708e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 5 Jan 2023 00:37:46 +0100
Subject: [PATCH 322/816] Optimize

---
 .github/workflows/code_quality.yml    | 2 +-
 .github/workflows/exakat.yml.disabled | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml
index aa7621cec11..ea80f3232ba 100644
--- a/.github/workflows/code_quality.yml
+++ b/.github/workflows/code_quality.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          fetch-depth: 0
+          fetch-depth: 1
           #php-version: '7.1'
       - name: 'Qodana Scan'
         uses: JetBrains/qodana-action@v2022.3.0
diff --git a/.github/workflows/exakat.yml.disabled b/.github/workflows/exakat.yml.disabled
index f5ecdb8c614..1e9121a0e00 100644
--- a/.github/workflows/exakat.yml.disabled
+++ b/.github/workflows/exakat.yml.disabled
@@ -16,6 +16,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
+      with:
+        fetch-depth: 1
     - name: Exakat
       uses: docker://exakat/exakat-ga
       with:

From 761ca8ca435c9f97c3f6b2773da465fc6a84f4be Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 5 Jan 2023 03:12:52 +0100
Subject: [PATCH 323/816] Enhance select2 component to allow onrightofpage

---
 htdocs/core/lib/ajax.lib.php     | 11 +++++++----
 htdocs/product/list.php          |  6 +++---
 htdocs/theme/eldy/global.inc.php |  5 +++++
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 27532c7a820..cacd22269ad 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -480,8 +480,11 @@ function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete =
 		<script>
 			$(document).ready(function () {
 				$(\''.(preg_match('/^\./', $htmlname) ? $htmlname : '#'.$htmlname).'\').'.$tmpplugin.'({
-					dir: \'ltr\',
-					width: \''.dol_escape_js($widthTypeOfAutocomplete).'\',		/* off or resolve */
+					dir: \'ltr\',';
+	if (preg_match('/onrightofpage/', $morecss)) {	// when $morecss contains 'onrightofpage', the select2 component must also be inside a parent with class="parentonrightofpage"
+		$msg .= ' dropdownAutoWidth: true, dropdownParent: $(\'#'.$htmlname.'\').parent(), '."\n";
+	}
+	$msg .= '		width: \''.dol_escape_js($widthTypeOfAutocomplete).'\',		/* off or resolve */
 					minimumInputLength: '.((int) $minLengthToAutocomplete).',
 					language: select2arrayoflanguage,
 					matcher: function (params, data) {
@@ -499,6 +502,7 @@ function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete =
 					theme: \'default'.$moreselect2theme.'\',		/* to add css on generated html components */
 					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 */
+					dropdownCssClass: \'ui-dialog\',
 					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")); }
@@ -515,8 +519,7 @@ function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete =
 					},
 					escapeMarkup: function(markup) {
 						return markup;
-					},
-					dropdownCssClass: \'ui-dialog\'
+					}
 				})';
 	if ($forcefocus) {
 		$msg .= '.select2(\'focus\')';
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 411ab569a0b..f98f4da1ad5 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -1142,12 +1142,12 @@ if (!empty($arrayfields['p.tms']['checked'])) {
 	print '</td>';
 }
 if (!empty($arrayfields['p.tosell']['checked'])) {
-	print '<td class="liste_titre center">';
+	print '<td class="liste_titre center parentonrightofpage">';
 	print $form->selectarray('search_tosell', array('0'=>$langs->trans('ProductStatusNotOnSellShort'), '1'=>$langs->trans('ProductStatusOnSellShort')), $search_tosell, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
-	print '</td >';
+	print '</td>';
 }
 if (!empty($arrayfields['p.tobuy']['checked'])) {
-	print '<td class="liste_titre center">';
+	print '<td class="liste_titre center parentonrightofpage">';
 	print $form->selectarray('search_tobuy', array('0'=>$langs->trans('ProductStatusNotOnBuyShort'), '1'=>$langs->trans('ProductStatusOnBuyShort')), $search_tobuy, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
 	print '</td>';
 }
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 46e34549731..bb33f694a1d 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1715,6 +1715,11 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
 	display: inline-block;
 }
 
+.parentonrightofpage {
+  direction: rtl;
+}
+
+
 /* Force values for small screen 767 */
 @media only screen and (max-width: 767px)
 {

From 9aa6e59f9b80f719a3a8303191ecfce38f9a4c44 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 5 Jan 2023 04:04:16 +0100
Subject: [PATCH 324/816] Look and feel v18

---
 htdocs/adherents/list.php                       |  4 ++--
 htdocs/bom/bom_list.php                         |  2 +-
 htdocs/comm/propal/list.php                     |  8 ++++----
 htdocs/commande/list.php                        |  4 ++--
 htdocs/compta/bank/list.php                     |  2 +-
 htdocs/compta/facture/list.php                  |  4 ++--
 htdocs/compta/sociales/list.php                 |  4 ++--
 htdocs/compta/tva/list.php                      |  4 ++--
 htdocs/contact/list.php                         |  4 ++--
 htdocs/core/class/html.formpropal.class.php     | 16 +++++++++-------
 htdocs/cron/list.php                            |  2 +-
 htdocs/don/list.php                             |  4 ++--
 htdocs/expedition/list.php                      |  4 ++--
 htdocs/fichinter/list.php                       |  4 ++--
 htdocs/fourn/commande/list.php                  |  4 ++--
 htdocs/fourn/facture/list.php                   |  4 ++--
 htdocs/modulebuilder/template/myobject_list.php |  4 ++--
 htdocs/product/stock/list.php                   |  4 ++--
 htdocs/projet/list.php                          |  4 ++--
 htdocs/reception/list.php                       |  4 ++--
 htdocs/salaries/list.php                        |  4 ++--
 htdocs/societe/list.php                         |  4 ++--
 htdocs/supplier_proposal/list.php               |  4 ++--
 htdocs/theme/eldy/global.inc.php                | 10 +++++-----
 htdocs/theme/md/style.css.php                   |  6 +++++-
 25 files changed, 62 insertions(+), 56 deletions(-)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 0c61f94a93d..50bbbca42d7 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -835,14 +835,14 @@ if (!empty($arrayfields['d.tms']['checked'])) {
 }
 // Status
 if (!empty($arrayfields['d.statut']['checked'])) {
-	print '<td class="liste_titre right maxwidthonsmartphone">';
+	print '<td class="liste_titre right parentonrightofpage">';
 	$liststatus = array(
 		Adherent::STATUS_DRAFT => $langs->trans("Draft"),
 		Adherent::STATUS_VALIDATED => $langs->trans("Validated"),
 		Adherent::STATUS_RESILIATED => $langs->trans("MemberStatusResiliatedShort"),
 		Adherent::STATUS_EXCLUDED =>$langs->trans("MemberStatusExcludedShort")
 	);
-	print $form->selectarray('search_status', $liststatus, $search_status, -3, 0, 0, '', 0, 0, 0, '', 'onrightofpage');
+	print $form->selectarray('search_status', $liststatus, $search_status, -3, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
 	print '</td>';
 }
 if (!empty($arrayfields['d.import_key']['checked'])) {
diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index d07a20774f5..3ce0b173fd3 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -562,7 +562,7 @@ foreach ($object->fields as $key => $val) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
-		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
+		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').($key == 'status' ? ' parentonrightofpage' : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
 			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100'.($key == 'status' ? ' search_status onrightofpage' : ''), 1);
 		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 2426abad9f4..0b03fc57c09 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -1386,8 +1386,8 @@ if ($resql) {
 	}
 	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 class="liste_titre">';
+		print '<input class="flat maxwidth75" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'">';
 		print '</td>';
 	}
 	if (!empty($arrayfields['sale_representative']['checked'])) {
@@ -1443,8 +1443,8 @@ if ($resql) {
 	}
 	// Status
 	if (!empty($arrayfields['p.fk_statut']['checked'])) {
-		print '<td class="liste_titre maxwidthonsmartphone right">';
-		$formpropal->selectProposalStatus($search_status, 1, 0, 1, 'customer', 'search_statut', 'search_status maxwidth125 onrightofpage');
+		print '<td class="liste_titre right parentonrightofpage">';
+		$formpropal->selectProposalStatus($search_status, 1, 0, 1, 'customer', 'search_statut', 'search_status width100 onrightofpage');
 		print '</td>';
 	}
 	// Action column
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 191d3dcde39..8a361d2f302 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1734,7 +1734,7 @@ if ($resql) {
 	}
 	// Status
 	if (!empty($arrayfields['c.fk_statut']['checked'])) {
-		print '<td class="liste_titre maxwidthonsmartphone center">';
+		print '<td class="liste_titre center parentonrightofpage">';
 		$liststatus = array(
 			Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraftShort"),
 			Commande::STATUS_VALIDATED=>$langs->trans("StatusOrderValidated"),
@@ -1744,7 +1744,7 @@ if ($resql) {
 			-2=>$langs->trans("StatusOrderValidatedShort").'+'.$langs->trans("StatusOrderSentShort"),
 			Commande::STATUS_CANCELED=>$langs->trans("StatusOrderCanceledShort")
 		);
-		print $form->selectarray('search_status', $liststatus, $search_status, -5, 0, 0, '', 0, 0, 0, '', 'maxwidth125 onrightofpage', 1);
+		print $form->selectarray('search_status', $liststatus, $search_status, -5, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage', 1);
 		print '</td>';
 	}
 	// Action column
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 38b666cc2ef..098489e6f7b 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -483,7 +483,7 @@ if (!empty($arrayfields['b.tms']['checked'])) {
 }
 // Status
 if (!empty($arrayfields['b.clos']['checked'])) {
-	print '<td class="liste_titre center">';
+	print '<td class="liste_titre center parentonrightofpage">';
 	$array = array(
 		'opened'=>$langs->trans("Opened"),
 		'closed'=>$langs->trans("Closed")
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index afc31d7efe3..22f51f3543c 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -1590,9 +1590,9 @@ if ($resql) {
 	}
 	// Status
 	if (!empty($arrayfields['f.fk_statut']['checked'])) {
-		print '<td class="liste_titre maxwidthonsmartphone right">';
+		print '<td class="liste_titre right parentonrightofpage">';
 		$liststatus = array('0'=>$langs->trans("BillShortStatusDraft"), '0,1'=>$langs->trans("BillShortStatusDraft").'+'.$langs->trans("BillShortStatusNotPaid"), '1'=>$langs->trans("BillShortStatusNotPaid"), '1,2'=>$langs->trans("BillShortStatusNotPaid").'+'.$langs->trans("BillShortStatusPaid"), '2'=>$langs->trans("BillShortStatusPaid"), '3'=>$langs->trans("BillShortStatusCanceled"));
-		print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'width100 onrightofpage', 1);
+		print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage', 1);
 		print '</td>';
 	}
 	// Action column
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index f70ed44de0c..83690816801 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -501,9 +501,9 @@ if (!empty($arrayfields['cs.amount']['checked'])) {
 
 // Filter: Status
 if (!empty($arrayfields['cs.paye']['checked'])) {
-	print '<td class="liste_titre maxwidthonsmartphone right">';
+	print '<td class="liste_titre right parentonrightofpage">';
 	$liststatus = array('0'=>$langs->trans("Unpaid"), '1'=>$langs->trans("Paid"));
-	print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100 onrightofpage', 1);
+	print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage', 1);
 	print '</td>';
 }
 
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 1c70cf93c22..001ef1e7b38 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -398,9 +398,9 @@ if (!empty($arrayfields['t.amount']['checked'])) {
 
 // Status
 if (!empty($arrayfields['t.status']['checked'])) {
-	print '<td class="liste_titre maxwidthonsmartphone right">';
+	print '<td class="liste_titre right parentonrightofpage">';
 	$liststatus = array('0' => $langs->trans("Unpaid"), '1' => $langs->trans("Paid"));
-	print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'onrightofpage');
+	print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
 	print '</td>';
 }
 
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 49c5fbd1f3f..987c0d3937e 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -1057,8 +1057,8 @@ 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, 0, 0, 0, '', 0, 0, 0, '', 'minwidth75 onrightofpage');
+	print '<td class="liste_titre center parentonrightofpage">';
+	print $form->selectarray('search_status', array('-1'=>'', '0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $search_status, 0, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
 	print '</td>';
 }
 if (!empty($arrayfields['p.import_key']['checked'])) {
diff --git a/htdocs/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php
index 7cce3c839c5..894bedebe00 100644
--- a/htdocs/core/class/html.formpropal.class.php
+++ b/htdocs/core/class/html.formpropal.class.php
@@ -133,14 +133,16 @@ class FormPropal
 			print '</option>';
 			$i++;
 		}
-		//Option for Signed+Billed
-		if ($selected != '' && $selected == "2,4") {
-			print '<option value="2,4" selected>';
-		} else {
-			print '<option value="2,4">';
+		// Option for Signed+Billed
+		if ($mode == 'customer') {
+			if ($selected != '' && $selected == "2,4") {
+				print '<option value="2,4" selected>';
+			} else {
+				print '<option value="2,4">';
+			}
+			print ($langs->trans($prefix.'Signed'.($short ? 'Short' : '')).' '.$langs->trans("or").' '.$langs->trans($prefix.'Billed'.($short ? 'Short' : '')));
+			print '</option>';
 		}
-		print ($langs->trans($prefix.'Signed'.($short ? 'Short' : '')).' '.$langs->trans("or").' '.$langs->trans($prefix.'Billed'.($short ? 'Short' : '')));
-		print '</option>';
 		print '</select>';
 
 		print ajax_combobox($htmlname, array(), 0, 0, 'resolve', ($showempty < 0 ? (string) $showempty : '-1'), $morecss);
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 30f195b550b..aaccb39e68e 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -448,7 +448,7 @@ print '<td class="liste_titre center"><input type="text" class="width50" name="s
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre center">';
-print $form->selectarray('search_status', array('0'=>$langs->trans("Disabled"), '1'=>$langs->trans("Scheduled")), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'onrightofpage');
+print $form->selectarray('search_status', array('0'=>$langs->trans("Disabled"), '1'=>$langs->trans("Scheduled")), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
 print '</td><td class="liste_titre right">';
 $searchpicto = $form->showFilterButtons();
 print $searchpicto;
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index ac704571daa..386a4bc2f6b 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -232,14 +232,14 @@ if ($resql) {
 		print '</td>';
 	}
 	print '<td class="liste_titre right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
-	print '<td class="liste_titre right">';
+	print '<td class="liste_titre right parentonrightofpage">';
 	$liststatus = array(
 		Don::STATUS_DRAFT=>$langs->trans("DonationStatusPromiseNotValidated"),
 		Don::STATUS_VALIDATED=>$langs->trans("DonationStatusPromiseValidated"),
 		Don::STATUS_PAID=>$langs->trans("DonationStatusPaid"),
 		Don::STATUS_CANCELED=>$langs->trans("Canceled")
 	);
-	print $form->selectarray('search_status', $liststatus, $search_status, -4, 0, 0, '', 0, 0, 0, '', 'maxwidth100 onrightofpage');
+	print $form->selectarray('search_status', $liststatus, $search_status, -4, 0, 0, '', 0, 0, 0, '', 'search_status maxwidth100 onrightofpage');
 	print '</td>';
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterAndCheckAddButtons(0);
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 0d73dbd3438..26cafe14b5d 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -794,8 +794,8 @@ if (!empty($arrayfields['e.tms']['checked'])) {
 }
 // Status
 if (!empty($arrayfields['e.fk_statut']['checked'])) {
-	print '<td class="liste_titre maxwidthonsmartphone right">';
-	print $form->selectarray('search_status', array('0'=>$langs->trans('StatusSendingDraftShort'), '1'=>$langs->trans('StatusSendingValidatedShort'), '2'=>$langs->trans('StatusSendingProcessedShort')), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'onrightofpage');
+	print '<td class="liste_titre right parentonrightofpage">';
+	print $form->selectarray('search_status', array('0'=>$langs->trans('StatusSendingDraftShort'), '1'=>$langs->trans('StatusSendingValidatedShort'), '2'=>$langs->trans('StatusSendingProcessedShort')), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
 	print '</td>';
 }
 // Status billed
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index d43b4166f1d..89be444d4af 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -569,13 +569,13 @@ if (!empty($arrayfields['f.note_private']['checked'])) {
 }
 // Status
 if (!empty($arrayfields['f.fk_statut']['checked'])) {
-	print '<td class="liste_titre right">';
+	print '<td class="liste_titre right parentonrightofpage">';
 	$tmp = $objectstatic->LibStatut(0); // To load $this->statuts_short
 	$liststatus = $objectstatic->statuts_short;
 	if (empty($conf->global->FICHINTER_CLASSIFY_BILLED)) {
 		unset($liststatus[2]); // Option deprecated. In a future, billed must be managed with a dedicated field to 0 or 1
 	}
-	print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 1, 0, 0, '', 'onrightofpage');
+	print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 1, 0, 0, '', 'search_status width100 onrightofpage');
 	print '</td>';
 }
 // Fields of detail line
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index f02d2df24ca..1b8dbed46e2 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -1469,8 +1469,8 @@ if ($resql) {
 	}
 	// Status billed
 	if (!empty($arrayfields['cf.billed']['checked'])) {
-		print '<td class="liste_titre center">';
-		print $form->selectyesno('search_billed', $search_billed, 1, false, 1, 1, 'maxwidth100 onrightofpage');
+		print '<td class="liste_titre center parentonrightofpage">';
+		print $form->selectyesno('search_billed', $search_billed, 1, false, 1, 1, 'search_status width100 onrightofpage');
 		print '</td>';
 	}
 	// Date valid
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index be215e891eb..126883f6202 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -1226,9 +1226,9 @@ if (!empty($arrayfields['f.tms']['checked'])) {
 }
 // Status
 if (!empty($arrayfields['f.fk_statut']['checked'])) {
-	print '<td class="liste_titre maxwidthonsmartphone right">';
+	print '<td class="liste_titre right parentonrightofpage">';
 	$liststatus = array('0'=>$langs->trans("Draft"), '1'=>$langs->trans("Unpaid"), '2'=>$langs->trans("Paid"));
-	print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'onrightofpage', 1);
+	print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage', 1);
 	print '</td>';
 }
 // Action column
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 5defa10af43..edc2b9ae9da 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -570,9 +570,9 @@ foreach ($object->fields as $key => $val) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
-		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
+		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').($key == 'status' ? ' parentonrightofpage' : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100'.($key == 'status' ? ' search_status onrightofpage' : ''), 1);
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100'.($key == 'status' ? ' search_status width100 onrightofpage' : ''), 1);
 		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
 			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', $cssforfield.' maxwidth250', 1);
 		} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index cca0a1a8bd0..9ab992d537b 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -542,8 +542,8 @@ print $hookmanager->resPrint;
 
 // Status
 if (!empty($arrayfields['t.statut']['checked'])) {
-	print '<td class="liste_titre center">';
-	print $form->selectarray('search_status', $warehouse->statuts, $search_status, 1, 0, 0, '', 1, 0, 0, '', 'onrightofpage');
+	print '<td class="liste_titre center parentonrightofpage">';
+	print $form->selectarray('search_status', $warehouse->statuts, $search_status, 1, 0, 0, '', 1, 0, 0, '', 'search_status width100 onrightofpage');
 	print '</td>';
 }
 
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 411e6d5fcd8..5292d03458e 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -1187,13 +1187,13 @@ if (!empty($arrayfields['p.import_key']['checked'])) {
 	print '</td>';
 }
 if (!empty($arrayfields['p.fk_statut']['checked'])) {
-	print '<td class="liste_titre nowrap center">';
+	print '<td class="liste_titre center parentonrightofpage">';
 	$arrayofstatus = array();
 	foreach ($object->statuts_short as $key => $val) {
 		$arrayofstatus[$key] = $langs->trans($val);
 	}
 	$arrayofstatus['99'] = $langs->trans("NotClosed").' ('.$langs->trans('Draft').' + '.$langs->trans('Opened').')';
-	print $form->selectarray('search_status', $arrayofstatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth125 onrightofpage', 1);
+	print $form->selectarray('search_status', $arrayofstatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage', 1);
 	print '</td>';
 }
 // Action column
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index d6e39e64eeb..42deedd5419 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -959,8 +959,8 @@ if (!empty($arrayfields['e.tms']['checked'])) {
 }
 // Status
 if (!empty($arrayfields['e.fk_statut']['checked'])) {
-	print '<td class="liste_titre maxwidthonsmartphone right">';
-	print $form->selectarray('search_status', array('0'=>$langs->trans('StatusReceptionDraftShort'), '1'=>$langs->trans('StatusReceptionValidatedShort'), '2'=>$langs->trans('StatusReceptionProcessedShort')), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status onrightofpage');
+	print '<td class="liste_titre right parentonrightofpage">';
+	print $form->selectarray('search_status', array('0'=>$langs->trans('StatusReceptionDraftShort'), '1'=>$langs->trans('StatusReceptionValidatedShort'), '2'=>$langs->trans('StatusReceptionProcessedShort')), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
 	print '</td>';
 }
 // Status billed
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 361107005a6..f1e94eddd8f 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -449,9 +449,9 @@ if (isModEnabled("banque")) {
 print '<td class="liste_titre right"><input name="search_amount" class="flat" type="text" size="8" value="'.$db->escape($search_amount).'"></td>';
 
 //Status
-print '<td class="liste_titre maxwidthonsmartphone right">';
+print '<td class="liste_titre right parentonrightofpage">';
 $liststatus = array('0' => $langs->trans("Unpaid"), '1' => $langs->trans("Paid"));
-print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'onrightofpage');
+print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
 print '</td>';
 
 // Extra fields
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 3e69b1ff76e..14213883790 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -1313,8 +1313,8 @@ if (!empty($arrayfields['s.tms']['checked'])) {
 }
 // Status
 if (!empty($arrayfields['s.status']['checked'])) {
-	print '<td class="liste_titre center minwidth75imp">';
-	print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status minwidth75imp maxwidth125 onrightofpage', 1);
+	print '<td class="liste_titre center minwidth75imp parentonrightofpage">';
+	print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage', 1);
 	print '</td>';
 }
 if (!empty($arrayfields['s.import_key']['checked'])) {
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index add084e91ab..ab89c4a43b8 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -851,8 +851,8 @@ if ($resql) {
 	}
 	// Status
 	if (!empty($arrayfields['sp.fk_statut']['checked'])) {
-		print '<td class="liste_titre right">';
-		$formpropal->selectProposalStatus($search_status, 1, 0, 1, 'supplier', 'search_status', 'minwidth75imp onrightofpage');
+		print '<td class="liste_titre right parentonrightofpage">';
+		$formpropal->selectProposalStatus($search_status, 1, 0, 1, 'supplier', 'search_status', 'search_status width100 onrightofpage');
 		print '</td>';
 	}
 	// Action column
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index bb33f694a1d..4a148611a76 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1715,10 +1715,6 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
 	display: inline-block;
 }
 
-.parentonrightofpage {
-  direction: rtl;
-}
-
 
 /* Force values for small screen 767 */
 @media only screen and (max-width: 767px)
@@ -6519,6 +6515,10 @@ ul.select2-results__options li {
 	font-size: 0.95em;
 }
 
+.parentonrightofpage {
+  direction: rtl;
+}
+
 @media only screen and (min-width: 767px)
 {
 	/* CSS to have the dropdown boxes larger that the input search area */
@@ -6715,7 +6715,7 @@ dl.dropdown {
 	z-index: 1;
 }
 .dropdown dd ul.selectedfieldsleft {
-	right: auto;
+	<?php echo $right; ?>: auto;
 }
 .dropdown dd ul li {
 	white-space: nowrap;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index a90e5e351a2..6fd33800eb0 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -6441,6 +6441,10 @@ ul.select2-results__options li {
 	}
 }
 
+.parentonrightofpage {
+  direction: rtl;
+}
+
 
 /* ============================================================================== */
 /*  For categories                                                                */
@@ -6609,7 +6613,7 @@ dl.dropdown {
 	z-index: 1;
 }
 .dropdown dd ul.selectedfieldsleft {
-	right: auto;
+	<?php echo $right; ?>: auto;
 }
 .dropdown dd ul li {
 	white-space: nowrap;

From 2a491ce1a645173480cc0c0f33cbe8bd5b7ea1e4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 5 Jan 2023 04:08:22 +0100
Subject: [PATCH 325/816] Fix qodana

---
 .github/workflows/code_quality.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml
index ea80f3232ba..65f350e1b53 100644
--- a/.github/workflows/code_quality.yml
+++ b/.github/workflows/code_quality.yml
@@ -19,7 +19,7 @@ jobs:
           #php-version: '7.1'
       - name: 'Qodana Scan'
         uses: JetBrains/qodana-action@v2022.3.0
-        with:
-          php-version: '7.1'
+        #with:
+        #  php-version: '7.1'
         env:
           QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
\ No newline at end of file

From cc5f8e6a530b12826c9882cc36fdedc3c9f3f974 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 5 Jan 2023 04:17:36 +0100
Subject: [PATCH 326/816] Fix kanban view

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

diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 3796522e70e..f516efdd819 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -302,7 +302,13 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 
 		$membertype = new AdherentType($db);
 
-		while ($i < $num) {
+		$i = 0;
+		/*$savnbfield = $totalarray['nbfield'];
+		$totalarray = array();
+		$totalarray['nbfield'] = 0;*/
+
+		$imaxinloop = ($limit ? min($num, $limit) : $num);
+		while ($i < $imaxinloop) {
 			$objp = $db->fetch_object($result);
 
 			$membertype->id = $objp->rowid;
@@ -313,7 +319,6 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 			$membertype->amount = $objp->amount;
 			$membertype->caneditamount = $objp->caneditamount;
 
-
 			if ($mode == 'kanban') {
 				if ($i == 0) {
 					print '<tr><td colspan="12">';
@@ -321,7 +326,7 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 				}
 				//output kanban
 				$membertype->label = $objp->label;
-				$membertype->getKanbanView('');
+				print $membertype->getKanbanView('');
 				if ($i == ($imaxinloop - 1)) {
 					print '</div>';
 					print '</td></tr>';

From 9a755d8d5058f5508435422019f683fb201d037d Mon Sep 17 00:00:00 2001
From: jpb <jean-pascal.boudet@atm-consulting>
Date: Thu, 5 Jan 2023 10:24:17 +0100
Subject: [PATCH 327/816] add border left on image product when conf activated

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

diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 1ed76728b92..65bb0c45f3a 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -1940,6 +1940,7 @@ class pdf_cyan extends ModelePDFPropales
 
 		if (!empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE) && !empty($this->atleastonephoto)) {
 			$this->cols['photo']['status'] = true;
+			$this->cols['photo']['border-left'] = true;
 		}
 
 

From 665fd9cc0e1a22903db85362497b67dc42aeeb1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20David?= <theo.evarisk@gmail.com>
Date: Thu, 5 Jan 2023 10:46:08 +0100
Subject: [PATCH 328/816] FIX : wrong check on $search_categ value causing
 fatal error

---
 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 d15d5797dd6..3f76d0a1c5b 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -452,7 +452,7 @@ if (!empty($arrayfields['t.tobill']['checked']) || !empty($arrayfields['t.billed
 	$sql .= " s.nom, s.rowid,";
 	$sql .= " t.datec, t.dateo, t.datee, t.tms,";
 	$sql .= " t.rowid, t.ref, t.label, t.planned_workload, t.duration_effective, t.progress,t.budget_amount, t.fk_statut";
-	if ($search_categ) {
+	if ($search_categ > 0) {
 		$sql .= ", cs.fk_categorie, cs.fk_project";
 	}
 	// Add fields from extrafields

From ffc314d1a7d657f864b9be7ad747374ce33e372b Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Thu, 5 Jan 2023 11:13:11 +0100
Subject: [PATCH 329/816] FIX module builder template setup.php for default doc
 model.

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

diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 7b7376d22c7..8b9feb7b60a 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -530,7 +530,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 
 										// Default
 										print '<td class="center">';
-										$constforvar = 'MYMODULE_'.strtoupper($myTmpObjectKey).'_ADDON';
+										$constforvar = 'MYMODULE_'.strtoupper($myTmpObjectKey).'_ADDON_PDF';
 										if (getDolGlobalString($constforvar) == $name) {
 											//print img_picto($langs->trans("Default"), 'on');
 											// Even if choice is the default value, we allow to disable it. Replace this with previous line if you need to disable unset

From 5b2c2335b00e095814073989c2cfb35c95d53787 Mon Sep 17 00:00:00 2001
From: Christian Humpel <christian.humpel@gmail.com>
Date: Thu, 5 Jan 2023 11:55:37 +0100
Subject: [PATCH 330/816] strtolower for keyword 'auto'

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

diff --git a/htdocs/bom/class/api_boms.class.php b/htdocs/bom/class/api_boms.class.php
index e0e6cfd69dd..e199650be30 100644
--- a/htdocs/bom/class/api_boms.class.php
+++ b/htdocs/bom/class/api_boms.class.php
@@ -554,7 +554,7 @@ class Boms extends DolibarrApi
 			throw new RestException(400, "Wrong naming scheme '(PROV%)' is only allowed on 'DRAFT' status. For automatic increment use 'auto' on the 'ref' field.");
 		}
 
-		if ($this->bom->ref == 'auto') {
+		if (strtolower($this->bom->ref) == 'auto') {
 			if (empty($this->bom->id) && $this->bom->status == 0) {
 				$this->bom->ref = ''; // 'ref' will auto incremented with '(PROV' + newID + ')'
 			} else {

From a7de5e4c724caf98266ec8fe447241508dcb7a08 Mon Sep 17 00:00:00 2001
From: mgabriel <m.gabriel@aycad.com>
Date: Thu, 5 Jan 2023 11:59:43 +0100
Subject: [PATCH 331/816] Added &$arrayfields to $parameters so that hooks can
 manipulate list columns.

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

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index dc4c4339f1e..8e14e99b1c6 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -277,7 +277,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid'=>$socid,'arrayfields'=>&$arrayfields);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 29ad812f6e6..ab06e1b5fe6 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -223,7 +223,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid'=>$socid,'arrayfields'=>&$arrayfields);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 9e6af61a9f6..9baa1b63f60 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -296,7 +296,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid'=>$socid,'arrayfields'=>&$arrayfields);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

From 9718061ae68dd044fee768275b8c9b72cd8c0b15 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 5 Jan 2023 13:59:19 +0100
Subject: [PATCH 332/816] Debug v17

---
 htdocs/hrm/job_card.php          |   2 +-
 htdocs/hrm/job_contact.php       | 194 -------
 htdocs/hrm/position.php          | 864 ++++++++++++++++++++++---------
 htdocs/hrm/position_agenda.php   |   4 +-
 htdocs/hrm/position_card.php     |  12 +-
 htdocs/hrm/position_contact.php  | 195 -------
 htdocs/hrm/position_document.php |   4 +-
 htdocs/hrm/position_note.php     |   5 +-
 htdocs/hrm/skill_contact.php     | 198 -------
 htdocs/hrm/skill_tab.php         | 119 +++--
 10 files changed, 711 insertions(+), 886 deletions(-)
 delete mode 100644 htdocs/hrm/job_contact.php
 delete mode 100644 htdocs/hrm/position_contact.php
 delete mode 100644 htdocs/hrm/skill_contact.php

diff --git a/htdocs/hrm/job_card.php b/htdocs/hrm/job_card.php
index ba4198497b0..d9bc8629e9f 100644
--- a/htdocs/hrm/job_card.php
+++ b/htdocs/hrm/job_card.php
@@ -323,7 +323,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '<div class="fichecenter">';
 	print '<div class="fichehalfleft">';
 	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent tableforfield">' . "\n";
+	print '<table class="border centpercent tableforfield">'."\n";
 
 	// Common attributes
 	//$keyforbreak='fieldkeytoswitchonsecondcolumn';	// We change column just before this field
diff --git a/htdocs/hrm/job_contact.php b/htdocs/hrm/job_contact.php
deleted file mode 100644
index dc25ad6eae2..00000000000
--- a/htdocs/hrm/job_contact.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php
-/* Copyright (C) 2007-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>
- *
- * This 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/hrm/job_contact.php
- *    \ingroup    hrm
- *    \brief      Tab for contacts linked to Job
- */
-
-// 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 . '/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', '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');
-$socid  = GETPOST('socid', 'int');
-$action = GETPOST('action', 'aZ09');
-
-// Initialize technical objects
-$object = new Job($db);
-$extrafields = new ExtraFields($db);
-$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('jobcontact', '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
-$permission = $user->rights->hrm->job->write;
-
-// Security check (enable the most restrictive one)
-//if ($user->socid > 0) accessforbidden();
-//if ($user->socid > 0) $socid = $user->socid;
-//$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
-//restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-//if (empty($conf->hrm->enabled)) accessforbidden();
-//if (!$permissiontoread) accessforbidden();
-
-
-/*
- * Add a new contact
- */
-
-if ($action == 'addcontact' && $permission) {
-	$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
-	$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
-	$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
-
-	if ($result >= 0) {
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	} else {
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		} else {
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-	}
-} elseif ($action == 'swapstatut' && $permission) {
-	// Toggle the status of a contact
-	$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
-} elseif ($action == 'deletecontact' && $permission) {
-	// Deletes a contact
-	$result = $object->delete_contact($lineid);
-
-	if ($result >= 0) {
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	} else {
-		dol_print_error($db);
-	}
-}
-
-
-/*
- * View
- */
-
-$title = $langs->trans('Job')." - ".$langs->trans('ContactsAddresses');
-$help_url = '';
-//$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('', $title, $help_url);
-
-$form = new Form($db);
-$formcompany = new FormCompany($db);
-$contactstatic = new Contact($db);
-$userstatic = new User($db);
-
-
-/* *************************************************************************** */
-/*                                                                             */
-/* View and edit mode                                                         */
-/*                                                                             */
-/* *************************************************************************** */
-
-if ($object->id) {
-	/*
-	 * Show tabs
-	 */
-	$head = jobPrepareHead($object);
-
-	print dol_get_fiche_head($head, 'contact', '', -1, $object->picto);
-
-	$linkback = '<a href="'.dol_buildpath('/hrm/job_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
-
-	$morehtmlref = '<div class="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 (isModEnabled('project'))
-	 {
-	 $langs->load("projects");
-	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-	 if ($permissiontoadd)
-	 {
-	 if ($action != 'classify')
-	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-	 $morehtmlref.=' : ';
-	 if ($action == 'classify') {
-	 //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	 $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	 $morehtmlref.='<input type="hidden" name="action" value="classin">';
-	 $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
-	 $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	 $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	 $morehtmlref.='</form>';
-	 } else {
-	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	 }
-	 } else {
-	 if (!empty($object->fk_project)) {
-	 $proj = new Project($db);
-	 $proj->fetch($object->fk_project);
-	 $morehtmlref .= ': '.$proj->getNomUrl();
-	 } else {
-	 $morehtmlref .= '';
-	 }
-	 }
-	 }*/
-	$morehtmlref .= '</div>';
-
-	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
-
-	print dol_get_fiche_end();
-
-	print '<br>';
-
-	// Contacts lines (modules that overwrite templates must declare this into descriptor)
-	$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
-	foreach ($dirtpls as $reldir) {
-		$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
-		if ($res) {
-			break;
-		}
-	}
-}
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/hrm/position.php b/htdocs/hrm/position.php
index 4d6b130d1e0..35f47f2a187 100644
--- a/htdocs/hrm/position.php
+++ b/htdocs/hrm/position.php
@@ -25,59 +25,8 @@
  *    \brief      Page to create/edit/view position
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"] . "/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME'];
-$tmp2 = realpath(__FILE__);
-$i = strlen($tmp) - 1;
-$j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--;
-	$j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1)) . "/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1)) . "/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1))) . "/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1))) . "/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
-
+require '../main.inc.php';
 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';
@@ -85,20 +34,45 @@ require_once DOL_DOCUMENT_ROOT . '/hrm/class/position.class.php';
 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';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
 
 
+// Load translation files required by the page
+$langs->loadLangs(array("hrm", "other", 'products'));
+
+$action 	 = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$massaction  = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
+$show_files  = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$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') : 'jobpositionlist'; // To manage different context of search
+$optioncss 	 = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$id 		 = GETPOST('id', 'int');
+$fk_job 	 = GETPOST('fk_job', 'int');
+
+// Load variable for pagination
+$limit 	     = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield   = GETPOST('sortfield', 'aZ09comma');
+$sortorder   = GETPOST('sortorder', 'aZ09comma');
+$page 	     = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	// If $page is not defined, or '' or -1 or if we click on clear filters
+	$page = 0;
+}
+$offset     = $limit * $page;
+$pageprev   = $page - 1;
+$pagenext   = $page + 1;
+
 // Get parameters
 $id 	 = GETPOST('fk_job', 'int');
+$ref 	= GETPOST('ref', 'alpha');
 $fk_job  = GETPOST('fk_job', 'int');
 $fk_user = GETPOST('fk_user', 'int');
 //$start_date = date('Y-m-d', GETPOST('date_startyear', 'int').'-'.GETPOST('date_startmonth', 'int').'-'.GETPOST('date_startday', 'int'));
 $start_date = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
 
-$ref 	= GETPOST('ref', 'alpha');
-$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');
@@ -106,27 +80,75 @@ $fk_job 	= GETPOST('fk_job', 'int');
 
 // Initialize technical objects
 $object = new Job($db);
+$objectposition = new Position($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
+$hookmanager->initHooks(array('jobpositionlist', 'globalcard')); // Note that conf->hooks_modules contains array
+
 
 // Fetch optionals attributes and labels
-$extrafields->fetch_name_optionals_label($object->table_element);
+$extrafields->fetch_name_optionals_label($objectposition->table_element);
+//$extrafields->fetch_name_optionals_label($object->table_element_line);
 
-$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+$search_array_options = $extrafields->getOptionalsFromPost($objectposition->table_element, '', 'search_');
+
+// Default sort order (if not yet defined by previous GETPOST)
+if (!$sortfield) {
+	reset($objectposition->fields);                    // Reset is required to avoid key() to return null.
+	$sortfield = "t." . key($objectposition->fields); // Set here default search field. By default 1st field in definition.
+}
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
 
 // Initialize array of search criterias
-$search_all = GETPOST("search_all", 'alpha');
+$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
 $search = array();
-foreach ($object->fields as $key => $val) {
-	if (GETPOST('search_' . $key, 'alpha')) {
+foreach ($objectposition->fields as $key => $val) {
+	if (GETPOST('search_' . $key, 'alpha') !== '') {
 		$search[$key] = GETPOST('search_' . $key, 'alpha');
 	}
+	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+		$search[$key . '_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_' . $key . '_dtstartmonth', 'int'), GETPOST('search_' . $key . '_dtstartday', 'int'), GETPOST('search_' . $key . '_dtstartyear', 'int'));
+		$search[$key . '_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_' . $key . '_dtendmonth', 'int'), GETPOST('search_' . $key . '_dtendday', 'int'), GETPOST('search_' . $key . '_dtendyear', 'int'));
+	}
 }
 
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array();
+foreach ($objectposition->fields as $key => $val) {
+	if (!empty($val['searchall'])) {
+		$fieldstosearchall['t.' . $key] = $val['label'];
+	}
+}
+
+// Definition of array of fields for columns
+$arrayfields = array();
+foreach ($objectposition->fields as $key => $val) {
+	// If $val['visible']==0, then we never show the field
+	if (!empty($val['visible'])) {
+		$visible = (int) dol_eval($val['visible'], 1, 1, '1');
+		$arrayfields['t.' . $key] = array(
+			'label' => $val['label'],
+			'checked' => (($visible < 0) ? 0 : 1),
+			'enabled' => ($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
+			'position' => $val['position'],
+			'help' => isset($val['help']) ? $val['help'] : ''
+		);
+	}
+}
+// Extra fields
+include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_array_fields.tpl.php';
+
+$objectposition->fields = dol_sort_array($objectposition->fields, 'position');
+$arrayfields = dol_sort_array($arrayfields, 'position');
+
+
+
+
 // Load object
 include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
 
@@ -175,48 +197,97 @@ if (empty($reshook)) {
 		}
 	}
 
-	$triggermodname = 'hrm_POSITION_MODIFY'; // Name of trigger action code to execute when we modify record
+	$triggermodname = 'HRM_POSITION_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
 	$job = $object;
 	$object = new Position($db);
+
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php';
+
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+		foreach ($object->fields as $key => $val) {
+			$search[$key] = '';
+			if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+				$search[$key . '_dtstart'] = '';
+				$search[$key . '_dtend'] = '';
+			}
+		}
+		$toselect = array();
+		$search_array_options = array();
+	}
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
+			$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
+	}
+
+	// Mass actions
+	$objectclass = 'Position';
+	$objectlabel = 'Position';
+	$uploaddir = $conf->hrm->dir_output;
+	include DOL_DOCUMENT_ROOT . '/core/actions_massactions.inc.php';
+
 	include DOL_DOCUMENT_ROOT . '/core/actions_addupdatedelete.inc.php';
+	$object = $job;
 }
 
-// Load translation files required by the page
-$langs->loadLangs(array("hrm", "other", 'products'));
+/*
+ * View
+ */
 
 $title = $langs->trans("Position");
 $help_url = '';
 llxHeader('', $title, $help_url);
 
-if ($job->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
-	DisplayJob($job);
-	DisplayPositionList();
+$now = dol_now();
+
+// Part to create
+if ($action == 'create') {
+	$object = new Position($db);
+	// Fetch optionals attributes and labels
+	$extrafields->fetch_name_optionals_label($object->table_element);
+	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("Position")), '', 'object_' . $object->picto);
+
+	print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '">';
+	print '<input type="hidden" name="token" value="' . newToken() . '">';
+	print '<input type="hidden" name="action" value="add">';
+	if ($backtopage) {
+		print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
+	}
+
+	if ($backtopageforcancel) {
+		print '<input type="hidden" name="backtopageforcancel" value="' . $backtopageforcancel . '">';
+	}
+
+	print dol_get_fiche_head(array(), '');
+
+	print '<table class="border centpercent tableforfieldcreate">' . "\n";
+
+	// Common attributes
+	include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_add.tpl.php';
+
+	// Other attributes
+	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_add.tpl.php';
+
+	print '</table>' . "\n";
+
+	print dol_get_fiche_end();
+
+	print '<div class="center">';
+
+	print '<input type="submit" class="button" name="add" value="' . dol_escape_htmltag($langs->trans("Create")) . '">';
+	print '&nbsp; ';
+	print '<input type="' . ($backtopage ? "submit" : "button") . '" class="button button-cancel" name="cancel" value="' . dol_escape_htmltag($langs->trans("Cancel")) . '"' . ($backtopage ? '' : ' onclick="javascript:history.go(-1)"') . '>'; // Cancel for create does not post form if we don't know the backtopage
+	print '</div>';
+
+	print '</form>';
+
+	//dol_set_focus('input[name="ref"]');
 }
 
-
-/**
- * 		Show the top of the page including informations of a job
- *
- * 		@param	Job		 	     $object		  Job object
- *
- * 		@return void
- */
-function DisplayJob($object)
-{
-	global $conf, $langs, $db, $extrafields, $hookmanager, $action, $backtopage, $backtopageforcancel, $permissiontoadd;
-
-	/*
-	 * View
-	 *
-	 * Put here all code to build page
-	 */
-
-	$form = new Form($db);
-	$formfile = new FormFile($db);
-	$formproject = new FormProjets($db);
-
+if ($job->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
 	if ($backtopage) {
 		print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
 	}
@@ -226,47 +297,490 @@ function DisplayJob($object)
 
 	// Part to show record
 
-		$res = $object->fetch_optionals();
+	$res = $object->fetch_optionals();
 
-		$head = jobPrepareHead($object);
-		print dol_get_fiche_head($head, 'position', $langs->trans("Workstation"), -1, $object->picto);
+	$head = jobPrepareHead($object);
 
-		// Object card
-		// ------------------------------------------------------------
-		$linkback = '<a href="' . dol_buildpath('/hrm/position_list.php', 1) . '?restore_lastsearch_values=1' . (!empty($fk_job) ? '&fk_job=' . $fk_job : '') . '">' . $langs->trans("BackToList") . '</a>';
+	print dol_get_fiche_head($head, 'position', $langs->trans("Workstation"), -1, $object->picto);
 
-		$morehtmlref = '<div class="refid">';
-		$morehtmlref.= $object->label;
-		$morehtmlref .= '</div>';
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="' . dol_buildpath('/hrm/position_list.php', 1) . '?restore_lastsearch_values=1' . (!empty($fk_job) ? '&fk_job=' . $fk_job : '') . '">' . $langs->trans("BackToList") . '</a>';
 
-		dol_banner_tab($object, 'fk_job', $linkback, 1, 'rowid', 'rowid', $morehtmlref);
+	$morehtmlref = '<div class="refid">';
+	$morehtmlref.= $object->label;
+	$morehtmlref .= '</div>';
+
+	dol_banner_tab($object, 'fk_job', $linkback, 1, 'rowid', 'rowid', $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='fieldkeytoswitchonsecondcolumn';	// We change column just before this field
-		//unset($object->fields['fk_project']);				// Hide field already shown in banner
-		//unset($object->fields['fk_soc']);					// Hide field already shown in banner
-		$object->fields['label']['visible']=0; // Already in banner
-		include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php';
+	// Common attributes
+	//$keyforbreak='fieldkeytoswitchonsecondcolumn';	// We change column just before this field
+	//unset($object->fields['fk_project']);				// Hide field already shown in banner
+	//unset($object->fields['fk_soc']);					// Hide field already shown in banner
+	$object->fields['label']['visible']=0; // Already in banner
+	include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php';
 
-		// Other attributes. Fields from hook formObjectOptions and Extrafields.
-		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+	// Other attributes. Fields from hook formObjectOptions and Extrafields.
+	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
-		print '</table>';
-		print '</div>';
+	print '</table>';
+	print '</div>';
+	print '</div>';
+
+	print '<div class="clearboth"></div>';
+
+	print dol_get_fiche_end();
+
+
+	// List of positions
+
+	$object = $objectposition;
+
+
+	//$help_url="EN:Module_Position|FR:Module_Position_FR|ES:Módulo_Position";
+	$help_url = '';
+	$title = $langs->trans("Positions");
+	$morejs = array();
+	$morecss = array();
+
+
+	// Build and execute select
+	// --------------------------------------------------------------------
+	$sql = 'SELECT ';
+	$sql .= $object->getFieldList('t');
+	// Add fields from extrafields
+	if (!empty($extrafields->attributes[$object->table_element]['label'])) {
+		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+			$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef." . $key . " as options_" . $key . ', ' : '');
+		}
+	}
+	// Add fields from hooks
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
+	$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
+	$sql = preg_replace('/,\s*$/', '', $sql);
+	$sql .= " FROM " . MAIN_DB_PREFIX . $object->table_element . " as t";
+	if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $object->table_element . "_extrafields as ef on (t.rowid = ef.fk_object)";
+	}
+	// Add table from hooks
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
+	$sql .= $hookmanager->resPrint;
+	if ($object->ismultientitymanaged == 1) {
+		$sql .= " WHERE t.entity IN (" . getEntity($object->element) . ")";
+	} else {
+		$sql .= " WHERE 1 = 1";
+	}
+	$sql .= " AND t.fk_job =  " . ((int) $fk_job) . " ";
+
+	foreach ($search as $key => $val) {
+		if (array_key_exists($key, $object->fields)) {
+			if ($key == 'status' && $search[$key] == -1) {
+				continue;
+			}
+			$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
+			if ((strpos($object->fields[$key]['type'], 'integer:') === 0) || (strpos($object->fields[$key]['type'], 'sellist:') === 0) || !empty($object->fields[$key]['arrayofkeyval'])) {
+				if ($search[$key] == '-1' || $search[$key] === '0') {
+					$search[$key] = '';
+				}
+				$mode_search = 2;
+			}
+			if ($search[$key] != '') {
+				$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+			}
+		} else {
+			if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
+				$columnName = preg_replace('/(_dtstart|_dtend)$/', '', $key);
+				if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
+					if (preg_match('/_dtstart$/', $key)) {
+						$sql .= " AND t." . $columnName . " >= '" . $db->idate($search[$key]) . "'";
+					}
+					if (preg_match('/_dtend$/', $key)) {
+						$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
+					}
+				}
+			}
+		}
+	}
+	if ($search_all) {
+		$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+	}
+	//$sql.= dolSqlDateFilter("t.field", $search_xxxday, $search_xxxmonth, $search_xxxyear);
+	// Add where from extra fields
+	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_sql.tpl.php';
+	// Add where from hooks
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
+	$sql .= $hookmanager->resPrint;
+
+	$sql .= $db->order($sortfield, $sortorder);
+
+	// Count total nb of records
+	$nbtotalofrecords = '';
+	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+		$resql = $db->query($sql);
+		$nbtotalofrecords = $db->num_rows($resql);
+		if (($page * $limit) > $nbtotalofrecords) {    // if total of record found is smaller than page * limit, goto and load page 0
+			$page = 0;
+			$offset = 0;
+		}
+	}
+	// if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
+	if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit))) {
+		$num = $nbtotalofrecords;
+	} else {
+		if ($limit) {
+			$sql .= $db->plimit($limit + 1, $offset);
+		}
+
+		$resql = $db->query($sql);
+		if (!$resql) {
+			dol_print_error($db);
+			exit;
+		}
+
+		$num = $db->num_rows($resql);
+	}
+
+	// Direct jump if only one record found
+	if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
+		$obj = $db->fetch_object($resql);
+		$id = $obj->rowid;
+		header("Location: " . dol_buildpath('/hrm/position.php', 1) . '?id=' . $id);
+		exit;
+	}
+
+	$arrayofselected = is_array($toselect) ? $toselect : array();
+
+	$param = 'fk_job=' . $fk_job;
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+		$param .= '&contextpage=' . urlencode($contextpage);
+	}
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit=' . urlencode($limit);
+	}
+	foreach ($search as $key => $val) {
+		if (is_array($search[$key]) && count($search[$key])) {
+			foreach ($search[$key] as $skey) {
+				$param .= '&search_' . $key . '[]=' . urlencode($skey);
+			}
+		} else {
+			$param .= '&search_' . $key . '=' . urlencode($search[$key]);
+		}
+	}
+	if ($optioncss != '') {
+		$param .= '&optioncss=' . urlencode($optioncss);
+	}
+	// Add $param from extra fields
+	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_param.tpl.php';
+	// Add $param from hooks
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
+	$param .= $hookmanager->resPrint;
+
+	// List of mass actions available
+	$arrayofmassactions = array(
+		//'validate'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate"),
+		//'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
+		//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
+		//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
+	);
+	if ($permissiontodelete) {
+		$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"') . $langs->trans("Delete");
+	}
+	if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+		$arrayofmassactions = array();
+	}
+	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+
+	print '<form method="POST" id="searchFormList" action="' . $_SERVER["PHP_SELF"] . '?fk_job=' . $fk_job . '">' . "\n";
+	if ($optioncss != '') {
+		print '<input type="hidden" name="optioncss" value="' . $optioncss . '">';
+	}
+	print '<input type="hidden" name="token" value="' . newToken() . '">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="action" value="list">';
+	print '<input type="hidden" name="massaction" value="' . $massaction . '">';
+	print '<input type="hidden" name="sortfield" value="' . $sortfield . '">';
+	print '<input type="hidden" name="sortorder" value="' . $sortorder . '">';
+	print '<input type="hidden" name="page" value="' . $page . '">';
+	print '<input type="hidden" name="contextpage" value="' . $contextpage . '">';
+
+	$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/position.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']).'&fk_job='.((int) $fk_job), '', $permissiontoadd);
+
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_' . $object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
+
+	// Add code for pre mass action (confirmation or email presend form)
+	$topicmail = "SendPositionRef";
+	$modelmail = "position";
+	$objecttmp = new Position($db);
+	$trackid = 'xxxx' . $object->id;
+	include DOL_DOCUMENT_ROOT . '/core/tpl/massactions_pre.tpl.php';
+
+	if ($search_all) {
+		foreach ($fieldstosearchall as $key => $val) {
+			$fieldstosearchall[$key] = $langs->trans($val);
+		}
+		print '<div class="divsearchfieldfilter">' . $langs->trans("FilterOnInto", $search_all) . join(', ', $fieldstosearchall) . '</div>';
+	}
+
+	$moreforfilter = '';
+	/*$moreforfilter.='<div class="divsearchfield">';
+	 $moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
+	 $moreforfilter.= '</div>';*/
+
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+	if (empty($reshook)) {
+		$moreforfilter .= $hookmanager->resPrint;
+	} else {
+		$moreforfilter = $hookmanager->resPrint;
+	}
+
+	if (!empty($moreforfilter)) {
+		print '<div class="liste_titre liste_titre_bydiv centpercent">';
+		print $moreforfilter;
 		print '</div>';
+	}
 
-		print '<div class="clearboth"></div>';
+	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-		print dol_get_fiche_end();
+	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<table class="tagtable nobottomiftotal liste' . ($moreforfilter ? " listwithfilterbefore" : "") . '">' . "\n";
+
+	// Fields title search
+	// --------------------------------------------------------------------
+	print '<tr class="liste_titre">';
+	foreach ($object->fields as $key => $val) {
+		$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
+		if ($key == 'status') {
+			$cssforfield .= ($cssforfield ? ' ' : '') . 'center';
+		} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '') . 'center';
+		} elseif (in_array($val['type'], array('timestamp'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '') . 'nowrap';
+		} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
+			$cssforfield .= ($cssforfield ? ' ' : '') . 'right';
+		}
+		if (!empty($arrayfields['t.' . $key]['checked'])) {
+			print '<td class="liste_titre' . ($cssforfield ? ' ' . $cssforfield : '') . '">';
+			if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
+				print $form->selectarray('search_' . $key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+			} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
+				print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth125', 1);
+			} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+				print '<input type="text" class="flat maxwidth75" name="search_' . $key . '" value="' . dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '') . '">';
+			} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+				print '<div class="nowrap">';
+				print $form->selectDate($search[$key . '_dtstart'] ? $search[$key . '_dtstart'] : '', "search_" . $key . "_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+				print '</div>';
+				print '<div class="nowrap">';
+				print $form->selectDate($search[$key . '_dtend'] ? $search[$key . '_dtend'] : '', "search_" . $key . "_dtend", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+				print '</div>';
+			}
+			print '</td>';
+		}
+	}
+	// Extra fields
+	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_input.tpl.php';
+
+	// Fields from hook
+	$parameters = array('arrayfields' => $arrayfields);
+	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	// Action column
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+	print '</tr>' . "\n";
+
+
+	// Fields title label
+	// --------------------------------------------------------------------
+	print '<tr class="liste_titre">';
+	foreach ($object->fields as $key => $val) {
+		$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
+		if ($key == 'status') {
+			$cssforfield .= ($cssforfield ? ' ' : '') . 'center';
+		} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '') . 'center';
+		} elseif (in_array($val['type'], array('timestamp'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '') . 'nowrap';
+		} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
+			$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";
+		}
+	}
+	// Extra fields
+	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_title.tpl.php';
+	// Hook fields
+	$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
+	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	// Action column
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ') . "\n";
+	print '</tr>' . "\n";
+
+	// Detect if we need a fetch on each output line
+	$needToFetchEachLine = 0;
+	if (isset($extrafields->attributes[$object->table_element]['computed']) && is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
+		foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val) {
+			if (preg_match('/\$object/', $val)) {
+				$needToFetchEachLine++; // There is at least one compute field that use $object
+			}
+		}
+	}
+
+
+	// Loop on record
+	// --------------------------------------------------------------------
+	$i = 0;
+	$totalarray = array();
+	$totalarray['nbfield'] = 0;
+	while ($i < ($limit ? min($num, $limit) : $num)) {
+		$obj = $db->fetch_object($resql);
+		if (empty($obj)) {
+			break; // Should not happen
+		}
+
+		// Store properties in $object
+		$object->setVarsFromFetchObj($obj);
+
+		// Show here line of result
+		print '<tr class="oddeven">';
+		foreach ($object->fields as $key => $val) {
+			$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
+			if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+				$cssforfield .= ($cssforfield ? ' ' : '') . 'center';
+			} elseif ($key == 'status') {
+				$cssforfield .= ($cssforfield ? ' ' : '') . 'center';
+			}
+
+			if (in_array($val['type'], array('timestamp'))) {
+				$cssforfield .= ($cssforfield ? ' ' : '') . 'nowrap';
+			} elseif ($key == 'ref') {
+				$cssforfield .= ($cssforfield ? ' ' : '') . 'nowrap';
+			}
+
+			if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
+				$cssforfield .= ($cssforfield ? ' ' : '') . 'right';
+			}
+			//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
+
+			if (!empty($arrayfields['t.' . $key]['checked'])) {
+				print '<td' . ($cssforfield ? ' class="' . $cssforfield . '"' : '') . '>';
+				if ($key == 'status') {
+					print $object->getLibStatut(5);
+				} elseif ($key == 'rowid') {
+					print $object->getNomUrl(1);
+				} else {
+					print $object->showOutputField($val, $key, $object->$key, '');
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
+					if (!$i) {
+						$totalarray['pos'][$totalarray['nbfield']] = 't.' . $key;
+					}
+					if (!isset($totalarray['val'])) {
+						$totalarray['val'] = array();
+					}
+					if (!isset($totalarray['val']['t.' . $key])) {
+						$totalarray['val']['t.' . $key] = 0;
+					}
+					$totalarray['val']['t.' . $key] += $object->$key;
+				}
+			}
+		}
+		// Extra fields
+		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_print_fields.tpl.php';
+		// Fields from hook
+		$parameters = array('arrayfields' => $arrayfields, 'object' => $object, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		// Action column
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($object->id, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb' . $object->id . '" class="flat checkforselect" type="checkbox" name="toselect[]" value="' . $object->id . '"' . ($selected ? ' checked="checked"' : '') . '>';
+		}
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+
+		print '</tr>' . "\n";
+
+		$i++;
+	}
+
+	// Show total line
+	include DOL_DOCUMENT_ROOT . '/core/tpl/list_print_total.tpl.php';
+
+	// If no record found
+	if ($num == 0) {
+		$colspan = 1;
+		foreach ($arrayfields as $key => $val) {
+			if (!empty($val['checked'])) {
+				$colspan++;
+			}
+		}
+		print '<tr><td colspan="' . $colspan . '" class="opacitymedium">' . $langs->trans("NoRecordFound") . '</td></tr>';
+	}
+
+
+	$db->free($resql);
+
+	$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
+	$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+
+	print '</table>' . "\n";
+	print '</div>' . "\n";
+
+	print '</form>' . "\n";
+
+	if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+		$hidegeneratedfilelistifempty = 1;
+		if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+			$hidegeneratedfilelistifempty = 0;
+		}
+
+		require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
+		$formfile = new FormFile($db);
+
+		// Show list of available documents
+		$urlsource = $_SERVER['PHP_SELF'] . '?sortfield=' . $sortfield . '&sortorder=' . $sortorder;
+		$urlsource .= str_replace('&amp;', '&', $param);
+
+		$filedir = $diroutputmassaction;
+		$genallowed = $permissiontoread;
+		$delallowed = $permissiontoadd;
+
+		print $formfile->showdocuments('massfilesarea_hrm', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+	}
 }
 
 
+
+
 /**
  * 		Show a list of positions for the current job
  *
@@ -276,16 +790,6 @@ function DisplayPositionList()
 {
 	global $user, $langs, $db, $conf, $extrafields, $hookmanager, $permissiontoadd, $permissiontodelete;
 
-	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 hrm libraries
-	require_once __DIR__ . '/class/position.class.php';
-
-	// for other modules
-	//dol_include_once('/othermodule/class/otherobject.class.php');
-
 	$action 	 = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 	$massaction  = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
 	$show_files  = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
@@ -389,68 +893,6 @@ function DisplayPositionList()
 	//if (!$permissiontoread) accessforbidden();
 
 
-	/*
-	 * Actions
-	 */
-
-	if (GETPOST('cancel', 'alpha')) {
-		$action = 'list';
-		$massaction = '';
-	}
-	if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
-		$massaction = '';
-	}
-
-	$parameters = array();
-	$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-	if ($reshook < 0) {
-		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	}
-
-	if (empty($reshook)) {
-		// Selection of new fields
-		include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php';
-
-		// Purge search criteria
-		if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
-			foreach ($object->fields as $key => $val) {
-				$search[$key] = '';
-				if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-					$search[$key . '_dtstart'] = '';
-					$search[$key . '_dtend'] = '';
-				}
-			}
-			$toselect = array();
-			$search_array_options = array();
-		}
-		if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
-			|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
-			$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
-		}
-
-		// Mass actions
-		$objectclass = 'Position';
-		$objectlabel = 'Position';
-		$uploaddir = $conf->hrm->dir_output;
-		include DOL_DOCUMENT_ROOT . '/core/actions_massactions.inc.php';
-	}
-
-
-	/*
-	 * View
-	 */
-
-	$form = new Form($db);
-
-	$now = dol_now();
-
-	//$help_url="EN:Module_Position|FR:Module_Position_FR|ES:Módulo_Position";
-	$help_url = '';
-	$title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("Positions"));
-	$morejs = array();
-	$morecss = array();
-
-
 	// Build and execute select
 	// --------------------------------------------------------------------
 	$sql = 'SELECT ';
@@ -898,50 +1340,6 @@ function DisplayPositionList()
 	}
 }
 
-// Part to create
-if ($action == 'create') {
-	$object = new Position($db);
-	// Fetch optionals attributes and labels
-	$extrafields->fetch_name_optionals_label($object->table_element);
-	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("Position")), '', 'object_' . $object->picto);
-
-	print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '">';
-	print '<input type="hidden" name="token" value="' . newToken() . '">';
-	print '<input type="hidden" name="action" value="add">';
-	if ($backtopage) {
-		print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
-	}
-
-	if ($backtopageforcancel) {
-		print '<input type="hidden" name="backtopageforcancel" value="' . $backtopageforcancel . '">';
-	}
-
-	print dol_get_fiche_head(array(), '');
-
-	print '<table class="border centpercent tableforfieldcreate">' . "\n";
-
-	// Common attributes
-	include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_add.tpl.php';
-
-	// Other attributes
-	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_add.tpl.php';
-
-	print '</table>' . "\n";
-
-	print dol_get_fiche_end();
-
-	print '<div class="center">';
-
-	print '<input type="submit" class="button" name="add" value="' . dol_escape_htmltag($langs->trans("Create")) . '">';
-	print '&nbsp; ';
-	print '<input type="' . ($backtopage ? "submit" : "button") . '" class="button button-cancel" name="cancel" value="' . dol_escape_htmltag($langs->trans("Cancel")) . '"' . ($backtopage ? '' : ' onclick="javascript:history.go(-1)"') . '>'; // Cancel for create does not post form if we don't know the backtopage
-	print '</div>';
-
-	print '</form>';
-
-	//dol_set_focus('input[name="ref"]');
-}
-
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/hrm/position_agenda.php b/htdocs/hrm/position_agenda.php
index 846202e26a0..af60ddea1b8 100644
--- a/htdocs/hrm/position_agenda.php
+++ b/htdocs/hrm/position_agenda.php
@@ -155,10 +155,10 @@ if ($object->id > 0) {
 	$morehtmlref = '<div class="refidno">';
 	$u_position = new User(($db));
 	$u_position->fetch($object->fk_user);
-	$morehtmlref .= $langs->trans('Employee').' : '.$u_position->getNomUrl(1);
+	$morehtmlref .= ($u_position->id > 0 ? $u_position->getNomUrl(1) : $langs->trans('Employee').' : ');
 	$job = new Job($db);
 	$job->fetch($object->fk_job);
-	$morehtmlref .= '<br>'.$langs->trans('Job').' : '.$job->getNomUrl(1);
+	$morehtmlref .= '<br>'.$langs->trans('JobPosition').' : '.$job->getNomUrl(1);
 	$morehtmlref .= '</div>';
 
 
diff --git a/htdocs/hrm/position_card.php b/htdocs/hrm/position_card.php
index 31328b4f625..fae9efd76ba 100644
--- a/htdocs/hrm/position_card.php
+++ b/htdocs/hrm/position_card.php
@@ -174,9 +174,14 @@ if (empty($reshook)) {
 }
 
 
+/*
+ * View
+ */
+
 displayPositionCard($object);
 
 
+
 /**
  * 		Show the card of a position
  *
@@ -275,16 +280,15 @@ function displayPositionCard(&$object)
 
 		// Object card
 		// ------------------------------------------------------------
-		//      $linkback = '<a href="' . dol_buildpath('/hrm/position.php', 1) . '?restore_lastsearch_values=1' . (!empty($object->fk_job) ? '&fk_job=' . $object->fk_job : '') . '">' . $langs->trans("BackToList") . '</a>';
-		$linkback = '<a href="' . dol_buildpath('/hrm/position_list.php', 1) . '">' . $langs->trans("BackToList") . '</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/position_list.php">'.$langs->trans("BackToList").'</a>';
 
 		$morehtmlref = '<div class="refidno">';
 		$u_position = new User(($db));
 		$u_position->fetch($object->fk_user);
-		$morehtmlref .= $langs->trans('Employee').' : '.($u_position->id > 0 ? $u_position->getNomUrl(1) : '');
+		$morehtmlref .= ($u_position->id > 0 ? $u_position->getNomUrl(1) : $langs->trans('Employee').' : ');
 		$job = new Job($db);
 		$job->fetch($object->fk_job);
-		$morehtmlref .= '<br>'.$langs->trans('Job').' : '.$job->getNomUrl(1);
+		$morehtmlref .= '<br>'.$langs->trans('JobPosition').' : '.$job->getNomUrl(1);
 		$morehtmlref .= '</div>';
 
 		dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref);
diff --git a/htdocs/hrm/position_contact.php b/htdocs/hrm/position_contact.php
deleted file mode 100644
index 4d85987f4d6..00000000000
--- a/htdocs/hrm/position_contact.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-/* Copyright (C) 2007-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>
- *
- * This 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/hrm/position_contact.php
- *    \ingroup    hrm
- *    \brief      Tab for contacts linked to Job Position
- */
-
-// 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 . '/hrm/class/position.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_position.lib.php';
-
-// 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');
-$socid  = GETPOST('socid', 'int');
-$action = GETPOST('action', 'aZ09');
-
-// Initialize technical objects
-$object = new Position($db);
-$extrafields = new ExtraFields($db);
-$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('positioncontact', '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
-$permission = $user->rights->hrm->position->write;
-
-// Security check (enable the most restrictive one)
-//if ($user->socid > 0) accessforbidden();
-//if ($user->socid > 0) $socid = $user->socid;
-//$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
-//restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-//if (empty($conf->hrm->enabled)) accessforbidden();
-//if (!$permissiontoread) accessforbidden();
-
-
-/*
- * Add a new contact
- */
-
-if ($action == 'addcontact' && $permission) {
-	$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
-	$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
-	$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
-
-	if ($result >= 0) {
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	} else {
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		} else {
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-	}
-} elseif ($action == 'swapstatut' && $permission) {
-	// Toggle the status of a contact
-	$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
-} elseif ($action == 'deletecontact' && $permission) {
-	// Deletes a contact
-	$result = $object->delete_contact($lineid);
-
-	if ($result >= 0) {
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	} else {
-		dol_print_error($db);
-	}
-}
-
-
-/*
- * View
- */
-
-$title = $langs->trans('Position')." - ".$langs->trans('ContactsAddresses');
-$help_url = '';
-//$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('', $title, $help_url);
-
-$form = new Form($db);
-$formcompany = new FormCompany($db);
-$contactstatic = new Contact($db);
-$userstatic = new User($db);
-
-
-/* *************************************************************************** */
-/*                                                                             */
-/* View and edit mode                                                         */
-/*                                                                             */
-/* *************************************************************************** */
-
-if ($object->id) {
-	/*
-	 * Show tabs
-	 */
-	$head = positionCardPrepareHead($object);
-
-	print dol_get_fiche_head($head, 'contact', '', -1, $object->picto);
-
-	$linkback = '<a href="'.dol_buildpath('/hrm/position_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 (isModEnabled('project'))
-	 {
-	 $langs->load("projects");
-	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-	 if ($permissiontoadd)
-	 {
-	 if ($action != 'classify')
-	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-	 $morehtmlref.=' : ';
-	 if ($action == 'classify') {
-	 //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	 $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	 $morehtmlref.='<input type="hidden" name="action" value="classin">';
-	 $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
-	 $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	 $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	 $morehtmlref.='</form>';
-	 } else {
-	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	 }
-	 } else {
-	 if (!empty($object->fk_project)) {
-	 $proj = new Project($db);
-	 $proj->fetch($object->fk_project);
-	 $morehtmlref .= ': '.$proj->getNomUrl();
-	 } else {
-	 $morehtmlref .= '';
-	 }
-	 }
-	 }*/
-	$morehtmlref .= '</div>';
-
-	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
-
-	print dol_get_fiche_end();
-
-	print '<br>';
-
-	// Contacts lines (modules that overwrite templates must declare this into descriptor)
-	$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
-	foreach ($dirtpls as $reldir) {
-		$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
-		if ($res) {
-			break;
-		}
-	}
-}
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/hrm/position_document.php b/htdocs/hrm/position_document.php
index 30f33453c03..521d6b0ec24 100644
--- a/htdocs/hrm/position_document.php
+++ b/htdocs/hrm/position_document.php
@@ -133,10 +133,10 @@ if ($object->id) {
 	$morehtmlref = '<div class="refidno">';
 	$u_position = new User(($db));
 	$u_position->fetch($object->fk_user);
-	$morehtmlref .= $langs->trans('Employee').' : '.$u_position->getNomUrl(1);
+	$morehtmlref .= ($u_position->id > 0 ? $u_position->getNomUrl(1) : $langs->trans('Employee').' : ');
 	$job = new Job($db);
 	$job->fetch($object->fk_job);
-	$morehtmlref .= '<br>'.$langs->trans('Job').' : '.$job->getNomUrl(1);
+	$morehtmlref .= '<br>'.$langs->trans('JobPosition').' : '.$job->getNomUrl(1);
 	$morehtmlref .= '</div>';
 
 
diff --git a/htdocs/hrm/position_note.php b/htdocs/hrm/position_note.php
index a816692b86c..a09b0e99699 100644
--- a/htdocs/hrm/position_note.php
+++ b/htdocs/hrm/position_note.php
@@ -28,7 +28,6 @@
 
 // Load Dolibarr environment
 require '../main.inc.php';
-
 require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';;
 require_once DOL_DOCUMENT_ROOT . '/hrm/class/position.class.php';
 require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_position.lib.php';
@@ -109,10 +108,10 @@ if ($id > 0 || !empty($ref)) {
 	$morehtmlref = '<div class="refidno">';
 	$u_position = new User(($db));
 	$u_position->fetch($object->fk_user);
-	$morehtmlref .= $langs->trans('Employee').' : '.$u_position->getNomUrl(1);
+	$morehtmlref .= ($u_position->id > 0 ? $u_position->getNomUrl(1) : $langs->trans('Employee').' : ');
 	$job = new Job($db);
 	$job->fetch($object->fk_job);
-	$morehtmlref .= '<br>'.$langs->trans('Job').' : '.$job->getNomUrl(1);
+	$morehtmlref .= '<br>'.$langs->trans('JobPosition').' : '.$job->getNomUrl(1);
 	$morehtmlref .= '</div>';
 
 
diff --git a/htdocs/hrm/skill_contact.php b/htdocs/hrm/skill_contact.php
deleted file mode 100644
index 562421a5272..00000000000
--- a/htdocs/hrm/skill_contact.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-/* Copyright (C) 2007-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>
- *
- * This 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/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 . '/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'));
-
-
-// Get Parameters
-$id     = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
-$ref    = GETPOST('ref', 'alpha');
-$lineid = GETPOST('lineid', 'int');
-$socid  = GETPOST('socid', 'int');
-$action = GETPOST('action', 'aZ09');
-
-// Initialize technical objects
-$object = new Skill($db);
-$extrafields = new ExtraFields($db);
-$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('skillcontact', '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
-$permission = $user->rights->hrm->skill->write;
-
-// Security check (enable the most restrictive one)
-//if ($user->socid > 0) accessforbidden();
-//if ($user->socid > 0) $socid = $user->socid;
-//$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
-//restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-//if (empty($conf->hrm->enabled)) accessforbidden();
-//if (!$permissiontoread) accessforbidden();
-
-
-/*
- * 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'));
-	$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
-
-	if ($result >= 0) {
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	} else {
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		} else {
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-	}
-} elseif ($action == 'swapstatut' && $permission) {
-	// Toggle the status of a contact
-	$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
-} elseif ($action == 'deletecontact' && $permission) {
-	// Deletes a contact
-	$result = $object->delete_contact($lineid);
-
-	if ($result >= 0) {
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	} else {
-		dol_print_error($db);
-	}
-}
-
-
-/*
- * View
- */
-
-$title = $langs->trans('Skill')." - ".$langs->trans('ContactsAddresses');
-$help_url = '';
-//$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('', $title, $help_url);
-
-$form = new Form($db);
-$formcompany = new FormCompany($db);
-$contactstatic = new Contact($db);
-$userstatic = new User($db);
-
-
-/* *************************************************************************** */
-/*                                                                             */
-/* View and edit mode                                                         */
-/*                                                                             */
-/* *************************************************************************** */
-
-if ($object->id) {
-	/*
-	 * Show tabs
-	 */
-	$head = skillPrepareHead($object);
-
-	print dol_get_fiche_head($head, 'contact', '', -1, $object->picto);
-
-	$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/skill_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
-
-	$morehtmlref = '<div class="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 (isModEnabled('project'))
-	 {
-	 $langs->load("projects");
-	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-	 if ($permissiontoadd)
-	 {
-	 if ($action != 'classify')
-	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-	 $morehtmlref.=' : ';
-	 if ($action == 'classify') {
-	 //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	 $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	 $morehtmlref.='<input type="hidden" name="action" value="classin">';
-	 $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
-	 $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	 $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	 $morehtmlref.='</form>';
-	 } else {
-	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	 }
-	 } else {
-	 if (!empty($object->fk_project)) {
-	 $proj = new Project($db);
-	 $proj->fetch($object->fk_project);
-	 $morehtmlref .= ': '.$proj->getNomUrl();
-	 } else {
-	 $morehtmlref .= '';
-	 }
-	 }
-	 }*/
-	$morehtmlref .= '</div>';
-
-	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
-
-	print dol_get_fiche_end();
-
-	print '<br>';
-
-	// Contacts lines (modules that overwrite templates must declare this into descriptor)
-	$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
-	foreach ($dirtpls as $reldir) {
-		$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
-		if ($res) {
-			break;
-		}
-	}
-}
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/hrm/skill_tab.php b/htdocs/hrm/skill_tab.php
index 83482d53ee3..b30484de54f 100644
--- a/htdocs/hrm/skill_tab.php
+++ b/htdocs/hrm/skill_tab.php
@@ -33,6 +33,7 @@ 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 . '/user/class/user.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
 require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
 require_once DOL_DOCUMENT_ROOT . '/hrm/class/skillrank.class.php';
 require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
@@ -59,7 +60,6 @@ $skill = new SkillRank($db);
 // Initialize technical objects
 if (in_array($objecttype, $TAuthorizedObjects)) {
 	if ($objecttype == 'job') {
-		require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
 		$object = new Job($db);
 	} elseif ($objecttype == "user") {
 		$object = new User($db);
@@ -215,14 +215,23 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	// Object card
 	// ------------------------------------------------------------
-	$linkback = '<a href="' . $listLink . '?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	if ($objecttype == 'job') {
+		$linkback = '<a href="' . dol_buildpath('/hrm/job_list.php', 1) . '?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
-	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid">';
-	$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
-	$morehtmlref .= '</a>';
+		$morehtmlref = '<div class="refid">';
+		$morehtmlref.= $object->label;
+		$morehtmlref .= '</div>';
 
-	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref, '&objecttype='.$objecttype);
+		dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref);
+	} else {
+		$linkback = '<a href="' . $listLink . '?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
+		$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid">';
+		$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
+		$morehtmlref .= '</a>';
+
+		dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref, '&objecttype='.$objecttype);
+	}
 
 	// Get all available skills
 	$static_skill = new Skill($db);
@@ -250,59 +259,59 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '<div class="fichehalfleft">';
 
 	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent tableforfield">';
+	print '<table class="border centpercent tableforfield">'."\n";
 
-	// Login
-	print '<tr><td class="titlefield">'.$langs->trans("Login").'</td>';
-	if (!empty($object->ldap_sid) && $object->statut == 0) {
-		print '<td class="error">';
-		print $langs->trans("LoginAccountDisableInDolibarr");
-		print '</td>';
+	if ($objecttype == 'job') {
+		// Common attributes
+		//$keyforbreak='fieldkeytoswitchonsecondcolumn';	// We change column just before this field
+		//unset($object->fields['fk_project']);				// Hide field already shown in banner
+		//unset($object->fields['fk_soc']);					// Hide field already shown in banner
+		$object->fields['label']['visible']=0; // Already in banner
+		include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php';
+
+		// Other attributes. Fields from hook formObjectOptions and Extrafields.
+		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 	} else {
-		print '<td>';
-		$addadmin = '';
-		if (property_exists($object, 'admin')) {
-			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"');
+		// Login
+		print '<tr><td class="titlefield">'.$langs->trans("Login").'</td>';
+		if (!empty($object->ldap_sid) && $object->statut == 0) {
+			print '<td class="error">';
+			print $langs->trans("LoginAccountDisableInDolibarr");
+			print '</td>';
+		} else {
+			print '<td>';
+			$addadmin = '';
+			if (property_exists($object, 'admin')) {
+				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"');
+				}
 			}
+			print showValueWithClipboardCPButton(!empty($object->login) ? $object->login : '').$addadmin;
+			print '</td>';
 		}
-		print showValueWithClipboardCPButton(!empty($object->login) ? $object->login : '').$addadmin;
+		print '</tr>'."\n";
+
+		$object->fields['label']['visible']=0; // Already in banner
+		$object->fields['firstname']['visible']=0; // Already in banner
+		$object->fields['lastname']['visible']=0; // Already in banner
+		//include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php';
+
+		// Ref employee
+		print '<tr><td class="titlefield">'.$langs->trans("RefEmployee").'</td>';
+		print '<td class="error">';
+		print showValueWithClipboardCPButton(!empty($object->ref_employee) ? $object->ref_employee : '');
 		print '</td>';
+		print '</tr>'."\n";
+
+		// National Registration Number
+		print '<tr><td class="titlefield">'.$langs->trans("NationalRegistrationNumber").'</td>';
+		print '<td class="error">';
+		print showValueWithClipboardCPButton(!empty($object->national_registration_number) ? $object->national_registration_number : '');
+		print '</td>';
+		print '</tr>'."\n";
 	}
-	print '</tr>'."\n";
-
-	$object->fields['label']['visible']=0; // Already in banner
-	$object->fields['firstname']['visible']=0; // Already in banner
-	$object->fields['lastname']['visible']=0; // Already in banner
-	//include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php';
-
-	// Ref employee
-	print '<tr><td class="titlefield">'.$langs->trans("RefEmployee").'</td>';
-	print '<td class="error">';
-	print showValueWithClipboardCPButton(!empty($object->ref_employee) ? $object->ref_employee : '');
-	print '</td>';
-	print '</tr>'."\n";
-
-	// National Registration Number
-	print '<tr><td class="titlefield">'.$langs->trans("NationalRegistrationNumber").'</td>';
-	print '<td class="error">';
-	print showValueWithClipboardCPButton(!empty($object->national_registration_number) ? $object->national_registration_number : '');
-	print '</td>';
-	print '</tr>'."\n";
-
-	/*print '<tr><td class="titlefield">'.$langs->trans("NbOfActiveNotifications").'</td>';   // Notification for this thirdparty
-	 print '<td colspan="3">';
-	 $nbofrecipientemails=0;
-	 $notify=new Notify($db);
-	 $tmparray = $notify->getNotificationsArray('', 0, null, $object->id, array('user'));
-	 foreach($tmparray as $tmpkey => $tmpval)
-	 {
-	 $nbofrecipientemails++;
-	 }
-	 print $nbofrecipientemails;
-	 print '</td></tr>';*/
 
 	print '</table>';
 
@@ -323,7 +332,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '<table id="tablelines" class="noborder noshadow" width="100%">';
 		print '<tr><td style="width:90%">' . $langs->trans('AddSkill') . '</td><td style="width:10%"></td></tr>';
 		print '<tr>';
-		print '<td>' . $form->multiselectarray('fk_skill', array_diff_key($TAllSkillsFormatted, $TAlreadyUsedSkill), array(), 0, 0, '', 0, '100%') . '</td>';
+		print '<td>';
+		print img_picto('', 'shapes', 'class="pictofixedwidth"');
+		print $form->multiselectarray('fk_skill', array_diff_key($TAllSkillsFormatted, $TAlreadyUsedSkill), array(), 0, 0, 'widthcentpercentminusx') . '</td>';
 		print '<td><input class="button reposition" type="submit" value="' . $langs->trans('Add') . '"></td>';
 		print '</tr>';
 		print '</table>';

From fc0a859e9530bdbeb00d941f3b9707645cf91020 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 5 Jan 2023 15:35:09 +0100
Subject: [PATCH 333/816] No mode need for doxygen github action

---
 .../{doxygen-gh-pages.yml => doxygen-gh-pages.yml.disabled}       | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/workflows/{doxygen-gh-pages.yml => doxygen-gh-pages.yml.disabled} (100%)

diff --git a/.github/workflows/doxygen-gh-pages.yml b/.github/workflows/doxygen-gh-pages.yml.disabled
similarity index 100%
rename from .github/workflows/doxygen-gh-pages.yml
rename to .github/workflows/doxygen-gh-pages.yml.disabled

From e7d31a821c35fe6237a35b49dd9caf186e7f48e5 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Thu, 5 Jan 2023 15:41:57 +0100
Subject: [PATCH 334/816] FIX : hierarchyme and not hierachyme

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

diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index 6e474ea8568..21741a55f01 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -418,7 +418,7 @@ if (! empty($conf->categorie->enabled))
 // If the user can view user other than himself
 $moreforfilter .= '<div class="divsearchfield">';
 $moreforfilter .= '<div class="inline-block hideonsmartphone"></div>';
-$includeonly = 'hierachyme';
+$includeonly = 'hierarchyme';
 if (empty($user->rights->user->user->lire)) {
 	$includeonly = array($user->id);
 }

From 8c1b189c691458763a478fedb3e05c2bde269cc3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 5 Jan 2023 15:44:58 +0100
Subject: [PATCH 335/816] Fix doxygen v17

---
 build/doxygen/dolibarr-doxygen-build.pl |   10 +-
 build/doxygen/dolibarr-doxygen.doxyfile |   96 +-
 build/doxygen/doxygen-awesome.css       | 2413 +++++++++++++++++++++++
 3 files changed, 2476 insertions(+), 43 deletions(-)
 create mode 100644 build/doxygen/doxygen-awesome.css

diff --git a/build/doxygen/dolibarr-doxygen-build.pl b/build/doxygen/dolibarr-doxygen-build.pl
index 75a5cceddbe..5a4849a3a5b 100755
--- a/build/doxygen/dolibarr-doxygen-build.pl
+++ b/build/doxygen/dolibarr-doxygen-build.pl
@@ -17,9 +17,9 @@ use Cwd;
 my $dir = getcwd;
 
 print "Current dir is: $dir\n";
-print "Running dir for doxygen must be: $DIR\n";
+#print "Running dir for doxygen must be: $DIR\n";
 
-if (! -s $CONFFILE)
+if (! -s "build/doxygen/$CONFFILE")
 {
     print "Error: current directory for building Dolibarr doxygen documentation is not correct.\n";
     print "\n";
@@ -30,7 +30,7 @@ if (! -s $CONFFILE)
     exit 1;   
 }
 
-$SOURCE="../..";
+$SOURCE=".";
 
 # Get version $MAJOR, $MINOR and $BUILD
 $result = open( IN, "< " . $SOURCE . "/htdocs/filefunc.inc.php" );
@@ -47,8 +47,8 @@ $version=$MAJOR.".".$MINOR.".".$BUILD;
 
 
 print "Running doxygen for version ".$version.", please wait...\n";
-print "cat $CONFFILE | sed -e 's/x\.y\.z/".$version."/' | doxygen $OPTIONS - 2>&1\n";
-$result=`cat $CONFFILE | sed -e 's/x\.y\.z/$version/' | doxygen $OPTIONS - 2>&1`;
+print "cat build/doxygen/$CONFFILE | sed -e 's/x\.y\.z/".$version."/' | doxygen $OPTIONS - 2>&1\n";
+$result=`cat build/doxygen/$CONFFILE | sed -e 's/x\.y\.z/$version/' | doxygen $OPTIONS - 2>&1`;
 
 print $result;
 
diff --git a/build/doxygen/dolibarr-doxygen.doxyfile b/build/doxygen/dolibarr-doxygen.doxyfile
index 31400661ecc..20ff102f0a2 100644
--- a/build/doxygen/dolibarr-doxygen.doxyfile
+++ b/build/doxygen/dolibarr-doxygen.doxyfile
@@ -1,14 +1,17 @@
-# Doxyfile 1.7.3
+# Doxyfile 1.8.16
 
 # This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
+# doxygen (www.doxygen.org) for a project.
 #
-# All text after a hash (#) is considered a comment and will be ignored
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
 # The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
 
 #---------------------------------------------------------------------------
 # Project related configuration options
@@ -38,7 +41,7 @@ PROJECT_NUMBER = x.y.z
 # If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY = ../../build
+OUTPUT_DIRECTORY = build
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
 # 4096 sub-directories (in 2 levels) under the output directory of each output
@@ -114,7 +117,7 @@ FULL_PATH_NAMES = YES
 # If left blank the directory from which doxygen is run is used as the
 # path to strip.
 
-STRIP_FROM_PATH = "../.."
+STRIP_FROM_PATH = ""
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
 # the path mentioned in the documentation of a class, which tells
@@ -287,7 +290,7 @@ TYPEDEF_HIDES_STRUCT = NO
 # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
 # corresponding to a cache size of 2^16 = 65536 symbols
 
-SYMBOL_CACHE_SIZE = 0
+#SYMBOL_CACHE_SIZE = 0
 
 #---------------------------------------------------------------------------
 # Build related configuration options
@@ -448,7 +451,7 @@ GENERATE_TODOLIST = NO
 # disable (NO) the test list. This list is created by putting \test
 # commands in the documentation.
 
-GENERATE_TESTLIST = YES
+GENERATE_TESTLIST = NO
 
 # The GENERATE_BUGLIST tag can be used to enable (YES) or
 # disable (NO) the bug list. This list is created by putting \bug
@@ -487,7 +490,7 @@ SHOW_USED_FILES = YES
 # then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
 # in the documentation. The default is NO.
 
-SHOW_DIRECTORIES = YES
+#SHOW_DIRECTORIES = YES
 
 # Set the SHOW_FILES tag to NO to disable the generation of the Files page.
 # This will remove the Files entry from the Quick Index and from the
@@ -571,7 +574,7 @@ WARN_FORMAT = "$file:$line: $text"
 # and error messages should be written. If left blank the output is written
 # to stderr.
 
-WARN_LOGFILE = doxygen_warnings.log
+WARN_LOGFILE = build/html/doxygen_warnings.log
 
 #---------------------------------------------------------------------------
 # configuration options related to the input files
@@ -582,7 +585,7 @@ WARN_LOGFILE = doxygen_warnings.log
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT = ../../htdocs ../../scripts
+INPUT = htdocs scripts
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -611,7 +614,7 @@ RECURSIVE = YES
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE = ../../build ../../dev ../../doc ../../document ../../documents ../../htdocs/conf/conf.php ../../htdocs/custom ../../htdocs/document ../../htdocs/documents ../../htdocs/includes
+EXCLUDE = build dev doc document documents htdocs/conf/conf.php htdocs/custom htdocs/document htdocs/documents htdocs/includes htdocs/install/doctemplates
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or
 # directories that are symbolic links (a Unix filesystem feature) are excluded
@@ -625,7 +628,7 @@ EXCLUDE_SYMLINKS = YES
 # against the file with absolute path, so to exclude all test directories
 # for example use the pattern */test/*
 
-EXCLUDE_PATTERNS = */CVS/* *google* *pibarcode*
+EXCLUDE_PATTERNS = */CVS/*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
@@ -639,27 +642,27 @@ EXCLUDE_SYMBOLS =
 # directories that contain example code fragments that are included (see
 # the \include command).
 
-EXAMPLE_PATH = ../../htdocs/modulebuilder/template 
+#EXAMPLE_PATH = htdocs/modulebuilder/template 
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
 # and *.h) to filter out the source-files in the directories. If left
 # blank all files are included.
 
-EXAMPLE_PATTERNS = *.php
+#EXAMPLE_PATTERNS = *.php
 
 # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
 # searched for input files to be used with the \include or \dontinclude
 # commands irrespective of the value of the RECURSIVE tag.
 # Possible values are YES and NO. If left blank NO is used.
 
-EXAMPLE_RECURSIVE = NO
+#EXAMPLE_RECURSIVE = NO
 
 # The IMAGE_PATH tag can be used to specify one or more files or
 # directories that contain image that are included in the documentation (see
 # the \image command).
 
-IMAGE_PATH = ../../doc/images
+IMAGE_PATH = doc/images
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
@@ -762,7 +765,7 @@ ALPHABETICAL_INDEX = YES
 # the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
 # in which this list will be split (can be a number in the range [1..20])
 
-COLS_IN_ALPHA_INDEX = 5
+#COLS_IN_ALPHA_INDEX = 5
 
 # In case all classes in a project start with a common prefix, all
 # classes will be put under the same header in the alphabetical index.
@@ -775,14 +778,16 @@ IGNORE_PREFIX =
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
 
 GENERATE_HTML = YES
 
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_OUTPUT = html
 
@@ -797,14 +802,14 @@ HTML_FILE_EXTENSION = .html
 # standard header.
 
 # Does not work with 1.7.3
-#HTML_HEADER = doxygen_header.html
+#HTML_HEADER = build/doxygen/doxygen_header.html
 
 # The HTML_FOOTER tag can be used to specify a personal HTML footer for
 # each generated HTML page. If it is left blank doxygen will generate a
 # standard footer.
 
 # Does not work with 1.7.3
-HTML_FOOTER = doxygen_footer.html
+HTML_FOOTER = build/doxygen/doxygen_footer.html
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading
 # style sheet that is used by each HTML page. It can be used to
@@ -850,7 +855,18 @@ HTML_TIMESTAMP = YES
 # files or namespaces will be aligned in HTML using tables. If set to
 # NO a bullet list will be used.
 
-HTML_ALIGN_MEMBERS = YES
+#HTML_ALIGN_MEMBERS = YES
+
+# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
+# documentation will contain a main index with vertical navigation menus that
+# are dynamically created via Javascript. If disabled, the navigation index will
+# consists of multiple levels of tabs that are statically embedded in every HTML
+# page. Disable this option to support browsers that do not have Javascript,
+# like the Qt help browser.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_MENUS     = NO
 
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 # documentation will contain sections that can be hidden and shown after the
@@ -858,7 +874,7 @@ HTML_ALIGN_MEMBERS = YES
 # JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
 # Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
 
-HTML_DYNAMIC_SECTIONS = YES
+HTML_DYNAMIC_SECTIONS = NO
 
 # If the GENERATE_DOCSET tag is set to YES, additional index files
 # will be generated that can be used as input for Apple's Xcode 3
@@ -1003,7 +1019,7 @@ QHG_LOCATION =
 # the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
 # the help appears.
 
-GENERATE_ECLIPSEHELP = YES
+GENERATE_ECLIPSEHELP = NO
 
 # A unique identifier for the eclipse help plugin. When installing the plugin
 # the directory name containing the HTML and XML files should also have
@@ -1035,7 +1051,7 @@ GENERATE_TREEVIEW = NO
 # By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
 # and Class Hierarchy pages using a tree view instead of an ordered list.
 
-USE_INLINE_TREES = NO
+#USE_INLINE_TREES = NO
 
 # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
 # used to set the initial width (in pixels) of the frame in which the tree
@@ -1072,7 +1088,7 @@ FORMULA_TRANSPARENT = YES
 # typically be disabled. For large projects the javascript based search engine
 # can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
 
-SEARCHENGINE = NO
+SEARCHENGINE = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
 # implemented using a PHP enabled web server instead of at the web client
@@ -1260,13 +1276,13 @@ XML_OUTPUT = xml
 # which can be used by a validating XML parser to check the
 # syntax of the XML files.
 
-XML_SCHEMA = 
+#XML_SCHEMA = 
 
 # The XML_DTD tag can be used to specify an XML DTD,
 # which can be used by a validating XML parser to check the
 # syntax of the XML files.
 
-XML_DTD = 
+#XML_DTD = 
 
 # If the XML_PROGRAMLISTING tag is set to YES Doxygen will
 # dump the program listings (including syntax highlighting
@@ -1431,7 +1447,7 @@ EXTERNAL_GROUPS = YES
 # The PERL_PATH should be the absolute path and name of the perl script
 # interpreter (i.e. the result of `which perl').
 
-PERL_PATH = /usr/bin/perl
+#PERL_PATH = /usr/bin/perl
 
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
@@ -1453,7 +1469,7 @@ CLASS_DIAGRAMS = NO
 # the mscgen tool resides. If left empty the tool is assumed to be found in the
 # default search path.
 
-MSCGEN_PATH = 
+#MSCGEN_PATH = 
 
 # If set to YES, the inheritance and collaboration graphs will hide
 # inheritance and usage relations if the target is undocumented
@@ -1485,7 +1501,7 @@ DOT_NUM_THREADS = 0
 # DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
 # containing the font.
 
-DOT_FONTNAME = FreeSans.ttf
+#DOT_FONTNAME = FreeSans.ttf
 
 # The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
 # The default size is 10pt.
@@ -1634,3 +1650,7 @@ GENERATE_LEGEND = YES
 # the various graphs.
 
 DOT_CLEANUP = YES
+
+
+FULL_SIDEBAR = NO
+HTML_EXTRA_STYLESHEET = build/doxygen/doxygen-awesome.css
diff --git a/build/doxygen/doxygen-awesome.css b/build/doxygen/doxygen-awesome.css
new file mode 100644
index 00000000000..0b1c8c20892
--- /dev/null
+++ b/build/doxygen/doxygen-awesome.css
@@ -0,0 +1,2413 @@
+/**
+
+Doxygen Awesome
+https://github.com/jothepro/doxygen-awesome-css
+
+MIT License
+
+Copyright (c) 2021 - 2022 jothepro
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+*/
+
+html {
+    /* primary theme color. This will affect the entire websites color scheme: links, arrows, labels, ... */
+    --primary-color: #1779c4;
+    --primary-dark-color: #335c80;
+    --primary-light-color: #70b1e9;
+
+    /* page base colors */
+    --page-background-color: #ffffff;
+    --page-foreground-color: #2f4153;
+    --page-secondary-foreground-color: #6f7e8e;
+
+    /* color for all separators on the website: hr, borders, ... */
+    --separator-color: #dedede;
+
+    /* border radius for all rounded components. Will affect many components, like dropdowns, memitems, codeblocks, ... */
+    --border-radius-large: 8px;
+    --border-radius-small: 4px;
+    --border-radius-medium: 6px;
+
+    /* default spacings. Most components reference these values for spacing, to provide uniform spacing on the page. */
+    --spacing-small: 5px;
+    --spacing-medium: 10px;
+    --spacing-large: 16px;
+
+    /* default box shadow used for raising an element above the normal content. Used in dropdowns, search result, ... */
+    --box-shadow: 0 2px 8px 0 rgba(0,0,0,.075);
+
+    --odd-color: rgba(0,0,0,.028);
+
+    /* font-families. will affect all text on the website
+     * font-family: the normal font for text, headlines, menus
+     * font-family-monospace: used for preformatted text in memtitle, code, fragments
+     */
+    --font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif;
+    --font-family-monospace: ui-monospace,SFMono-Regular,SF Mono,Menlo,Consolas,Liberation Mono,monospace;
+
+    /* font sizes */
+    --page-font-size: 15.6px;
+    --navigation-font-size: 14.4px;
+    --toc-font-size: 13.4px;
+    --code-font-size: 14px; /* affects code, fragment */
+    --title-font-size: 22px;
+
+    /* content text properties. These only affect the page content, not the navigation or any other ui elements */
+    --content-line-height: 27px;
+    /* The content is centered and constraint in it's width. To make the content fill the whole page, set the variable to auto.*/
+    --content-maxwidth: 1050px;
+    --table-line-height: 24px;
+    --toc-sticky-top: var(--spacing-medium);
+    --toc-width: 200px;
+    --toc-max-height: calc(100vh - 2 * var(--spacing-medium) - 85px);
+
+    /* colors for various content boxes: @warning, @note, @deprecated @bug */
+    --warning-color: #f8d1cc;
+    --warning-color-dark: #b61825;
+    --warning-color-darker: #75070f;
+    --note-color: #faf3d8;
+    --note-color-dark: #f3a600;
+    --note-color-darker: #5f4204;
+    --todo-color: #e4f3ff;
+    --todo-color-dark: #1879C4;
+    --todo-color-darker: #274a5c;
+    --deprecated-color: #ecf0f3;
+    --deprecated-color-dark: #5b6269;
+    --deprecated-color-darker: #43454a;
+    --bug-color: #e4dafd;
+    --bug-color-dark: #5b2bdd;
+    --bug-color-darker: #2a0d72;
+    --invariant-color: #d8f1e3;
+    --invariant-color-dark: #44b86f;
+    --invariant-color-darker: #265532;
+
+    /* blockquote colors */
+    --blockquote-background: #f8f9fa;
+    --blockquote-foreground: #636568;
+
+    /* table colors */
+    --tablehead-background: #f1f1f1;
+    --tablehead-foreground: var(--page-foreground-color);
+
+    /* menu-display: block | none
+     * Visibility of the top navigation on screens >= 768px. On smaller screen the menu is always visible.
+     * `GENERATE_TREEVIEW` MUST be enabled!
+     */
+    --menu-display: block;
+
+    --menu-focus-foreground: var(--page-background-color);
+    --menu-focus-background: var(--primary-color);
+    --menu-selected-background: rgba(0,0,0,.05);
+
+
+    --header-background: var(--page-background-color);
+    --header-foreground: var(--page-foreground-color);
+
+    /* searchbar colors */
+    --searchbar-background: var(--side-nav-background);
+    --searchbar-foreground: var(--page-foreground-color);
+
+    /* searchbar size
+     * (`searchbar-width` is only applied on screens >= 768px.
+     * on smaller screens the searchbar will always fill the entire screen width) */
+    --searchbar-height: 33px;
+    --searchbar-width: 210px;
+    --searchbar-border-radius: var(--searchbar-height);
+
+    /* code block colors */
+    --code-background: #f5f5f5;
+    --code-foreground: var(--page-foreground-color);
+
+    /* fragment colors */
+    --fragment-background: #F8F9FA;
+    --fragment-foreground: #37474F;
+    --fragment-keyword: #bb6bb2;
+    --fragment-keywordtype: #8258b3;
+    --fragment-keywordflow: #d67c3b;
+    --fragment-token: #438a59;
+    --fragment-comment: #969696;
+    --fragment-link: #5383d6;
+    --fragment-preprocessor: #46aaa5;
+    --fragment-linenumber-color: #797979;
+    --fragment-linenumber-background: #f4f4f5;
+    --fragment-linenumber-border: #e3e5e7;
+    --fragment-lineheight: 20px;
+
+    /* sidebar navigation (treeview) colors */
+    --side-nav-background: #fbfbfb;
+    --side-nav-foreground: var(--page-foreground-color);
+    --side-nav-arrow-opacity: 0;
+    --side-nav-arrow-hover-opacity: 0.9;
+
+    --toc-background: var(--side-nav-background);
+    --toc-foreground: var(--side-nav-foreground);
+
+    /* height of an item in any tree / collapsable table */
+    --tree-item-height: 30px;
+
+    --memname-font-size: var(--code-font-size);
+    --memtitle-font-size: 18px;
+
+    --webkit-scrollbar-size: 7px;
+    --webkit-scrollbar-padding: 4px;
+    --webkit-scrollbar-color: var(--separator-color);
+}
+
+@media screen and (max-width: 767px) {
+    html {
+        --page-font-size: 16px;
+        --navigation-font-size: 16px;
+        --toc-font-size: 15px;
+        --code-font-size: 15px; /* affects code, fragment */
+        --title-font-size: 22px;
+    }
+}
+
+@media (prefers-color-scheme: dark) {
+    html:not(.light-mode) {
+        color-scheme: dark;
+
+        --primary-color: #1982d2;
+        --primary-dark-color: #86a9c4;
+        --primary-light-color: #4779ac;
+
+        --box-shadow: 0 2px 8px 0 rgba(0,0,0,.35);
+
+        --odd-color: rgba(100,100,100,.06);
+
+        --menu-selected-background: rgba(0,0,0,.4);
+
+        --page-background-color: #1C1D1F;
+        --page-foreground-color: #d2dbde;
+        --page-secondary-foreground-color: #859399;
+        --separator-color: #38393b;
+        --side-nav-background: #252628;
+
+        --code-background: #2a2c2f;
+
+        --tablehead-background: #2a2c2f;
+    
+        --blockquote-background: #222325;
+        --blockquote-foreground: #7e8c92;
+
+        --warning-color: #2e1917;
+        --warning-color-dark: #ad2617;
+        --warning-color-darker: #f5b1aa;
+        --note-color: #3b2e04;
+        --note-color-dark: #f1b602;
+        --note-color-darker: #ceb670;
+        --todo-color: #163750;
+        --todo-color-dark: #1982D2;
+        --todo-color-darker: #dcf0fa;
+        --deprecated-color: #2e323b;
+        --deprecated-color-dark: #738396;
+        --deprecated-color-darker: #abb0bd;
+        --bug-color: #2a2536;
+        --bug-color-dark: #7661b3;
+        --bug-color-darker: #ae9ed6;
+        --invariant-color: #303a35;
+        --invariant-color-dark: #76ce96;
+        --invariant-color-darker: #cceed5;
+
+        --fragment-background: #282c34;
+        --fragment-foreground: #dbe4eb;
+        --fragment-keyword: #cc99cd;
+        --fragment-keywordtype: #ab99cd;
+        --fragment-keywordflow: #e08000;
+        --fragment-token: #7ec699;
+        --fragment-comment: #999999;
+        --fragment-link: #98c0e3;
+        --fragment-preprocessor: #65cabe;
+        --fragment-linenumber-color: #cccccc;
+        --fragment-linenumber-background: #35393c;
+        --fragment-linenumber-border: #1f1f1f;
+    }
+}
+
+/* dark mode variables are defined twice, to support both the dark-mode without and with doxygen-awesome-darkmode-toggle.js */
+html.dark-mode {
+    color-scheme: dark;
+
+    --primary-color: #1982d2;
+    --primary-dark-color: #86a9c4;
+    --primary-light-color: #4779ac;
+
+    --box-shadow: 0 2px 8px 0 rgba(0,0,0,.30);
+
+    --odd-color: rgba(100,100,100,.06);
+
+    --menu-selected-background: rgba(0,0,0,.4);
+
+    --page-background-color: #1C1D1F;
+    --page-foreground-color: #d2dbde;
+    --page-secondary-foreground-color: #859399;
+    --separator-color: #38393b;
+    --side-nav-background: #252628;
+
+    --code-background: #2a2c2f;
+
+    --tablehead-background: #2a2c2f;
+
+    --blockquote-background: #222325;
+    --blockquote-foreground: #7e8c92;
+
+    --warning-color: #2e1917;
+    --warning-color-dark: #ad2617;
+    --warning-color-darker: #f5b1aa;
+    --note-color: #3b2e04;
+    --note-color-dark: #f1b602;
+    --note-color-darker: #ceb670;
+    --todo-color: #163750;
+    --todo-color-dark: #1982D2;
+    --todo-color-darker: #dcf0fa;
+    --deprecated-color: #2e323b;
+    --deprecated-color-dark: #738396;
+    --deprecated-color-darker: #abb0bd;
+    --bug-color: #2a2536;
+    --bug-color-dark: #7661b3;
+    --bug-color-darker: #ae9ed6;
+    --invariant-color: #303a35;
+    --invariant-color-dark: #76ce96;
+    --invariant-color-darker: #cceed5;
+
+    --fragment-background: #282c34;
+    --fragment-foreground: #dbe4eb;
+    --fragment-keyword: #cc99cd;
+    --fragment-keywordtype: #ab99cd;
+    --fragment-keywordflow: #e08000;
+    --fragment-token: #7ec699;
+    --fragment-comment: #999999;
+    --fragment-link: #98c0e3;
+    --fragment-preprocessor: #65cabe;
+    --fragment-linenumber-color: #cccccc;
+    --fragment-linenumber-background: #35393c;
+    --fragment-linenumber-border: #1f1f1f;
+}
+
+body {
+    color: var(--page-foreground-color);
+    background-color: var(--page-background-color);
+    font-size: var(--page-font-size);
+}
+
+body, table, div, p, dl, #nav-tree .label, .title,
+.sm-dox a, .sm-dox a:hover, .sm-dox a:focus, #projectname,
+.SelectItem, #MSearchField, .navpath li.navelem a,
+.navpath li.navelem a:hover, p.reference, p.definition {
+    font-family: var(--font-family);
+}
+
+h1, h2, h3, h4, h5 {
+    margin-top: .9em;
+    font-weight: 600;
+    line-height: initial;
+}
+
+p, div, table, dl, p.reference, p.definition {
+    font-size: var(--page-font-size);
+}
+
+p.reference, p.definition {
+    color: var(--page-secondary-foreground-color);
+}
+
+a:link, a:visited, a:hover, a:focus, a:active {
+    color: var(--primary-color) !important;
+    font-weight: 500;
+}
+
+a.anchor {
+    scroll-margin-top: var(--spacing-large);
+    display: block;
+}
+
+/*
+ Title and top navigation
+ */
+
+#top {
+    background: var(--header-background);
+    border-bottom: 1px solid var(--separator-color);
+}
+
+@media screen and (min-width: 768px) {
+    #top {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: space-between;
+        align-items: center;
+    }
+}
+
+#main-nav {
+    flex-grow: 5;
+    padding: var(--spacing-small) var(--spacing-medium);
+}
+
+#titlearea {
+    width: auto;
+    padding: var(--spacing-medium) var(--spacing-large);
+    background: none;
+    color: var(--header-foreground);
+    border-bottom: none;
+}
+
+@media screen and (max-width: 767px) {
+    #titlearea {
+        padding-bottom: var(--spacing-small);
+    }
+}
+
+#titlearea table tbody tr {
+    height: auto !important;
+}
+
+#projectname {
+    font-size: var(--title-font-size);
+    font-weight: 600;
+}
+
+#projectnumber {
+    font-family: inherit;
+    font-size: 60%;
+}
+
+#projectbrief {
+    font-family: inherit;
+    font-size: 80%;
+}
+
+#projectlogo {
+    vertical-align: middle;
+}
+
+#projectlogo img {
+    max-height: calc(var(--title-font-size) * 2);
+    margin-right: var(--spacing-small);
+}
+
+.sm-dox, .tabs, .tabs2, .tabs3 {
+    background: none;
+    padding: 0;
+}
+
+.tabs, .tabs2, .tabs3 {
+    border-bottom: 1px solid var(--separator-color);
+    margin-bottom: -1px;
+}
+
+.main-menu-btn-icon, .main-menu-btn-icon:before, .main-menu-btn-icon:after {
+    background: var(--page-secondary-foreground-color);
+}
+
+@media screen and (max-width: 767px) {
+    .sm-dox a span.sub-arrow {
+        background: var(--code-background);
+    }
+
+    #main-menu a.has-submenu span.sub-arrow {
+        color: var(--page-secondary-foreground-color);
+        border-radius: var(--border-radius-medium);
+    }
+
+    #main-menu a.has-submenu:hover span.sub-arrow {
+        color: var(--page-foreground-color);
+    }
+}
+
+@media screen and (min-width: 768px) {
+    .sm-dox li, .tablist li {
+        display: var(--menu-display);
+    }
+
+    .sm-dox a span.sub-arrow {
+        border-color: var(--header-foreground) transparent transparent transparent;
+    }
+
+    .sm-dox a:hover span.sub-arrow {
+        border-color: var(--menu-focus-foreground) transparent transparent transparent;
+    }
+
+    .sm-dox ul a span.sub-arrow {
+        border-color: transparent transparent transparent var(--page-foreground-color);
+    }
+
+    .sm-dox ul a:hover span.sub-arrow {
+        border-color: transparent transparent transparent var(--menu-focus-foreground);
+    }
+}
+
+.sm-dox ul {
+    background: var(--page-background-color);
+    box-shadow: var(--box-shadow);
+    border: 1px solid var(--separator-color);
+    border-radius: var(--border-radius-medium) !important;
+    padding: var(--spacing-small);
+    animation: ease-out 150ms slideInMenu;
+}
+
+@keyframes slideInMenu {
+    from {
+        opacity: 0;
+        transform: translate(0px, -2px);
+    }
+
+    to {
+        opacity: 1;
+        transform: translate(0px, 0px);
+    }
+}
+
+.sm-dox ul a {
+    color: var(--page-foreground-color) !important;
+    background: var(--page-background-color);
+    font-size: var(--navigation-font-size);
+}
+
+.sm-dox>li>ul:after {
+    border-bottom-color: var(--page-background-color) !important;
+}
+
+.sm-dox>li>ul:before {
+    border-bottom-color: var(--separator-color) !important;
+}
+
+.sm-dox ul a:hover, .sm-dox ul a:active, .sm-dox ul a:focus {
+    font-size: var(--navigation-font-size) !important;
+    color: var(--menu-focus-foreground) !important;
+    text-shadow: none;
+    background-color: var(--menu-focus-background);
+    border-radius: var(--border-radius-small) !important;
+}
+
+.sm-dox a, .sm-dox a:focus, .tablist li, .tablist li a, .tablist li.current a {
+    text-shadow: none;
+    background: transparent;
+    background-image: none !important;
+    color: var(--header-foreground) !important;
+    font-weight: normal;
+    font-size: var(--navigation-font-size);
+    border-radius: var(--border-radius-small) !important;
+}
+
+.sm-dox a:focus {
+    outline: auto;
+}
+
+.sm-dox a:hover, .sm-dox a:active, .tablist li a:hover {
+    text-shadow: none;
+    font-weight: normal;
+    background: var(--menu-focus-background);
+    color: var(--menu-focus-foreground) !important;
+    border-radius: var(--border-radius-small) !important;
+    font-size: var(--navigation-font-size);
+}
+
+.tablist li.current {
+    border-radius: var(--border-radius-small);
+    background: var(--menu-selected-background);
+}
+
+.tablist li {
+    margin: var(--spacing-small) 0 var(--spacing-small) var(--spacing-small);
+}
+
+.tablist a {
+    padding: 0 var(--spacing-large);
+}
+
+
+/*
+ Search box
+ */
+
+#MSearchBox {
+    height: var(--searchbar-height);
+    background: var(--searchbar-background);
+    border-radius: var(--searchbar-border-radius);
+    border: 1px solid var(--separator-color);
+    overflow: hidden;
+    width: var(--searchbar-width);
+    position: relative;
+    box-shadow: none;
+    display: block;
+    margin-top: 0;
+}
+
+/* until Doxygen 1.9.4 */
+.left img#MSearchSelect {
+    left: 0;
+    user-select: none;
+    padding-left: 8px;
+}
+
+/* Doxygen 1.9.5 */
+.left span#MSearchSelect {
+    left: 0;
+    user-select: none;
+    margin-left: 8px;
+    padding: 0;
+}
+
+.left #MSearchSelect[src$=".png"] {
+    padding-left: 0
+}
+
+.SelectionMark {
+    user-select: none;
+}
+
+.tabs .left #MSearchSelect {
+    padding-left: 0;
+}
+
+.tabs #MSearchBox {
+    position: absolute;
+    right: var(--spacing-medium);
+}
+
+@media screen and (max-width: 767px) {
+    .tabs #MSearchBox {
+        position: relative;
+        right: 0;
+        margin-left: var(--spacing-medium);
+        margin-top: 0;
+    }
+}
+
+#MSearchSelectWindow, #MSearchResultsWindow {
+    z-index: 9999;
+}
+
+#MSearchBox.MSearchBoxActive {
+    border-color: var(--primary-color);
+    box-shadow: inset 0 0 0 1px var(--primary-color);
+}
+
+#main-menu > li:last-child {
+    margin-right: 0;
+}
+
+@media screen and (max-width: 767px) {
+    #main-menu > li:last-child {
+        height: 50px;
+    }
+}
+
+#MSearchField {
+    font-size: var(--navigation-font-size);
+    height: calc(var(--searchbar-height) - 2px);
+    background: transparent;
+    width: calc(var(--searchbar-width) - 64px);
+}
+
+.MSearchBoxActive #MSearchField {
+    color: var(--searchbar-foreground);
+}
+
+#MSearchSelect {
+    top: calc(calc(var(--searchbar-height) / 2) - 11px);
+}
+
+#MSearchBox span.left, #MSearchBox span.right {
+    background: none;
+    background-image: none;
+}
+
+#MSearchBox span.right {
+    padding-top: calc(calc(var(--searchbar-height) / 2) - 12px);
+    position: absolute;
+    right: var(--spacing-small);
+}
+
+.tabs #MSearchBox span.right {
+    top: calc(calc(var(--searchbar-height) / 2) - 12px);
+}
+
+@keyframes slideInSearchResults {
+    from {
+        opacity: 0;
+        transform: translate(0, 15px);
+    }
+
+    to {
+        opacity: 1;
+        transform: translate(0, 20px);
+    }
+}
+
+#MSearchResultsWindow {
+    left: auto !important;
+    right: var(--spacing-medium);
+    border-radius: var(--border-radius-large);
+    border: 1px solid var(--separator-color);
+    transform: translate(0, 20px);
+    box-shadow: var(--box-shadow);
+    animation: ease-out 280ms slideInSearchResults;
+    background: var(--page-background-color);
+}
+
+iframe#MSearchResults {
+    margin: 4px;
+}
+
+iframe {
+    color-scheme: normal;
+}
+
+@media (prefers-color-scheme: dark) {
+    html:not(.light-mode) iframe#MSearchResults {
+        filter: invert() hue-rotate(180deg);
+    }
+}
+
+html.dark-mode iframe#MSearchResults {
+    filter: invert() hue-rotate(180deg);
+}
+
+#MSearchResults .SRPage {
+    background-color: transparent;
+}
+
+#MSearchResults .SRPage .SREntry {
+    font-size: 10pt;
+    padding: var(--spacing-small) var(--spacing-medium);
+}
+
+#MSearchSelectWindow {
+    border: 1px solid var(--separator-color);
+    border-radius: var(--border-radius-medium);
+    box-shadow: var(--box-shadow);
+    background: var(--page-background-color);
+    padding-top: var(--spacing-small);
+    padding-bottom: var(--spacing-small);
+}
+
+#MSearchSelectWindow a.SelectItem {
+    font-size: var(--navigation-font-size);
+    line-height: var(--content-line-height);
+    margin: 0 var(--spacing-small);
+    border-radius: var(--border-radius-small);
+    color: var(--page-foreground-color) !important;
+    font-weight: normal;
+}
+
+#MSearchSelectWindow a.SelectItem:hover {
+    background: var(--menu-focus-background);
+    color: var(--menu-focus-foreground) !important;
+}
+
+@media screen and (max-width: 767px) {
+    #MSearchBox {
+        margin-top: var(--spacing-medium);
+        margin-bottom: var(--spacing-medium);
+        width: calc(100vw - 30px);
+    }
+
+    #main-menu > li:last-child {
+        float: none !important;
+    }
+
+    #MSearchField {
+        width: calc(100vw - 110px);
+    }
+
+    @keyframes slideInSearchResultsMobile {
+        from {
+            opacity: 0;
+            transform: translate(0, 15px);
+        }
+
+        to {
+            opacity: 1;
+            transform: translate(0, 20px);
+        }
+    }
+
+    #MSearchResultsWindow {
+        left: var(--spacing-medium) !important;
+        right: var(--spacing-medium);
+        overflow: auto;
+        transform: translate(0, 20px);
+        animation: ease-out 280ms slideInSearchResultsMobile;
+        width: auto !important;
+    }
+
+    /*
+     * Overwrites for fixing the searchbox on mobile in doxygen 1.9.2
+     */
+    label.main-menu-btn ~ #searchBoxPos1 {
+        top: 3px !important;
+        right: 6px !important;
+        left: 45px;
+        display: flex;
+    }
+
+    label.main-menu-btn ~ #searchBoxPos1 > #MSearchBox {
+        margin-top: 0;
+        margin-bottom: 0;
+        flex-grow: 2;
+        float: left;
+    }
+}
+
+/*
+ Tree view
+ */
+
+#side-nav {
+    padding: 0 !important;
+    background: var(--side-nav-background);
+}
+
+@media screen and (max-width: 767px) {
+    #side-nav {
+        display: none;
+    }
+
+    #doc-content {
+        margin-left: 0 !important;
+    }
+}
+
+#nav-tree {
+    background: transparent;
+}
+
+#nav-tree .label {
+    font-size: var(--navigation-font-size);
+}
+
+#nav-tree .item {
+    height: var(--tree-item-height);
+    line-height: var(--tree-item-height);
+}
+
+#nav-sync {
+    bottom: 12px;
+    right: 12px;
+    top: auto !important;
+    user-select: none;
+}
+
+#nav-tree .selected {
+    text-shadow: none;
+    background-image: none;
+    background-color: transparent;
+    position: relative;
+}
+
+#nav-tree .selected::after {
+    content: "";
+    position: absolute;
+    top: 1px;
+    bottom: 1px;
+    left: 0;
+    width: 4px;
+    border-radius: 0 var(--border-radius-small) var(--border-radius-small) 0;
+    background: var(--primary-color);
+}
+
+
+#nav-tree a {
+    color: var(--side-nav-foreground) !important;
+    font-weight: normal;
+}
+
+#nav-tree a:focus {
+    outline-style: auto;
+}
+
+#nav-tree .arrow {
+    opacity: var(--side-nav-arrow-opacity);
+}
+
+.arrow {
+    color: inherit;
+    cursor: pointer;
+    font-size: 45%;
+    vertical-align: middle;
+    margin-right: 2px;
+    font-family: serif;
+    height: auto;
+    text-align: right;
+}
+
+#nav-tree div.item:hover .arrow, #nav-tree a:focus .arrow {
+    opacity: var(--side-nav-arrow-hover-opacity);
+}
+
+#nav-tree .selected a {
+    color: var(--primary-color) !important;
+    font-weight: bolder;
+    font-weight: 600;
+}
+
+.ui-resizable-e {
+    background: var(--separator-color);
+    width: 1px;
+}
+
+/*
+ Contents
+ */
+
+div.header {
+    border-bottom: 1px solid var(--separator-color);
+    background-color: var(--page-background-color);
+    background-image: none;
+}
+
+@media screen and (min-width: 1000px) {
+    #doc-content > div > div.contents,
+    .PageDoc > div.contents {
+        display: flex;
+        flex-direction: row-reverse;
+        flex-wrap: nowrap;
+        align-items: flex-start;
+    }
+    
+    div.contents .textblock {
+        min-width: 200px;
+        flex-grow: 1;
+    }
+}
+
+div.contents, div.header .title, div.header .summary {
+    max-width: var(--content-maxwidth);
+}
+
+div.contents, div.header .title  {
+    line-height: initial;
+    margin: calc(var(--spacing-medium) + .2em) auto var(--spacing-medium) auto;
+}
+
+div.header .summary {
+    margin: var(--spacing-medium) auto 0 auto;
+}
+
+div.headertitle {
+    padding: 0;
+}
+
+div.header .title {
+    font-weight: 600;
+    font-size: 225%;
+    padding: var(--spacing-medium) var(--spacing-large);
+    word-break: break-word;
+}
+
+div.header .summary {
+    width: auto;
+    display: block;
+    float: none;
+    padding: 0 var(--spacing-large);
+}
+
+td.memSeparator {
+    border-color: var(--separator-color);
+}
+
+span.mlabel {
+    background: var(--primary-color);
+    border: none;
+    padding: 4px 9px;
+    border-radius: 12px;
+    margin-right: var(--spacing-medium);
+}
+
+span.mlabel:last-of-type {
+    margin-right: 2px;
+}
+
+div.contents {
+    padding: 0 var(--spacing-large);
+}
+
+div.contents p, div.contents li {
+    line-height: var(--content-line-height);
+}
+
+div.contents div.dyncontent {
+    margin: var(--spacing-medium) 0;
+}
+
+@media (prefers-color-scheme: dark) {
+    html:not(.light-mode) div.contents div.dyncontent img,
+    html:not(.light-mode) div.contents center img,
+    html:not(.light-mode) div.contents > table img,
+    html:not(.light-mode) div.contents div.dyncontent iframe,
+    html:not(.light-mode) div.contents center iframe,
+    html:not(.light-mode) div.contents table iframe {
+        filter: hue-rotate(180deg) invert();
+    }
+}
+
+html.dark-mode div.contents div.dyncontent img,
+html.dark-mode div.contents center img,
+html.dark-mode div.contents > table img,
+html.dark-mode div.contents div.dyncontent iframe,
+html.dark-mode div.contents center iframe,
+html.dark-mode div.contents table iframe {
+    filter: hue-rotate(180deg) invert();
+}
+
+h2.groupheader {
+    border-bottom: 0px;
+    color: var(--page-foreground-color);
+    box-shadow: 
+        100px 0 var(--page-background-color), 
+        -100px 0 var(--page-background-color),
+        100px 0.75px var(--separator-color),
+        -100px 0.75px var(--separator-color),
+        500px 0 var(--page-background-color), 
+        -500px 0 var(--page-background-color),
+        500px 0.75px var(--separator-color),
+        -500px 0.75px var(--separator-color),
+        900px 0 var(--page-background-color), 
+        -900px 0 var(--page-background-color),
+        900px 0.75px var(--separator-color),
+        -900px 0.75px var(--separator-color),
+        1400px 0 var(--page-background-color),
+        -1400px 0 var(--page-background-color), 
+        1400px 0.75px var(--separator-color),
+        -1400px 0.75px var(--separator-color),
+        1900px 0 var(--page-background-color),
+        -1900px 0 var(--page-background-color),
+        1900px 0.75px var(--separator-color),
+        -1900px 0.75px var(--separator-color);
+}
+
+blockquote {
+    margin: 0 var(--spacing-medium) 0 var(--spacing-medium);
+    padding: var(--spacing-small) var(--spacing-large);
+    background: var(--blockquote-background);
+    color: var(--blockquote-foreground);
+    border-left: 0;
+    overflow: visible;
+    border-radius: var(--border-radius-medium);
+    overflow: visible;
+    position: relative;
+}
+
+blockquote::before, blockquote::after {
+    font-weight: bold;
+    font-family: serif;
+    font-size: 360%;
+    opacity: .15;
+    position: absolute;
+}
+
+blockquote::before {
+    content: "“";
+    left: -10px;
+    top: 4px;
+}
+
+blockquote::after {
+    content: "”";
+    right: -8px;
+    bottom: -25px;
+}
+
+blockquote p {
+    margin: var(--spacing-small) 0 var(--spacing-medium) 0;
+}
+.paramname {
+    font-weight: 600;
+    color: var(--primary-dark-color);
+}
+
+.paramname > code {
+    border: 0;
+}
+
+table.params .paramname {
+    font-weight: 600;
+    font-family: var(--font-family-monospace);
+    font-size: var(--code-font-size);
+    padding-right: var(--spacing-small);
+    line-height: var(--table-line-height);
+}
+
+h1.glow, h2.glow, h3.glow, h4.glow, h5.glow, h6.glow {
+    text-shadow: 0 0 15px var(--primary-light-color);
+}
+
+.alphachar a {
+    color: var(--page-foreground-color);
+}
+
+/*
+ Table of Contents
+ */
+
+div.contents .toc {
+    max-height: var(--toc-max-height);
+    min-width: var(--toc-width);
+    border: 0;
+    border-left: 1px solid var(--separator-color);
+    border-radius: 0;
+    background-color: transparent;
+    box-shadow: none;
+    position: sticky;
+    top: var(--toc-sticky-top);
+    padding: 0 var(--spacing-large);
+    margin: var(--spacing-small) 0 var(--spacing-large) var(--spacing-large);
+}
+
+div.toc h3 {
+    color: var(--toc-foreground);
+    font-size: var(--navigation-font-size);
+    margin: var(--spacing-large) 0 var(--spacing-medium) 0;
+}
+
+div.toc li {
+    padding: 0;
+    background: none;
+    line-height: var(--toc-font-size);
+    margin: var(--toc-font-size) 0 0 0;
+}
+
+div.toc li::before {
+    display: none;
+}
+
+div.toc ul {
+    margin-top: 0
+}
+
+div.toc li a {
+    font-size: var(--toc-font-size);
+    color: var(--page-foreground-color) !important;
+    text-decoration: none;
+}
+
+div.toc li a:hover, div.toc li a.active {
+    color: var(--primary-color) !important;
+}
+
+div.toc li a.aboveActive {
+    color: var(--page-secondary-foreground-color) !important;
+}
+
+
+@media screen and (max-width: 999px) {
+    div.contents .toc {
+        max-height: 45vh;
+        float: none;
+        width: auto;
+        margin: 0 0 var(--spacing-medium) 0;
+        position: relative;
+        top: 0;
+        position: relative;
+        border: 1px solid var(--separator-color);
+        border-radius: var(--border-radius-medium);
+        background-color: var(--toc-background);
+        box-shadow: var(--box-shadow);
+    }
+
+    div.contents .toc.interactive {
+        max-height: calc(var(--navigation-font-size) + 2 * var(--spacing-large));
+        overflow: hidden;
+    }
+
+    div.contents .toc > h3 {
+        -webkit-tap-highlight-color: transparent;
+        cursor: pointer;
+        position: sticky;
+        top: 0;
+        background-color: var(--toc-background);
+        margin: 0;
+        padding: var(--spacing-large) 0;
+        display: block;
+    }
+
+    div.contents .toc.interactive > h3::before {
+        content: "";
+        width: 0; 
+        height: 0; 
+        border-left: 4px solid transparent;
+        border-right: 4px solid transparent;
+        border-top: 5px solid var(--primary-color);
+        display: inline-block;
+        margin-right: var(--spacing-small);
+        margin-bottom: calc(var(--navigation-font-size) / 4);
+        transform: rotate(-90deg);
+        transition: transform 0.25s ease-out;
+    }
+
+    div.contents .toc.interactive.open > h3::before {
+        transform: rotate(0deg);
+    }
+
+    div.contents .toc.interactive.open {
+        max-height: 45vh;
+        overflow: auto;
+        transition: max-height 0.2s ease-in-out;
+    }
+
+    div.contents .toc a, div.contents .toc a.active {
+        color: var(--primary-color) !important;
+    }
+
+    div.contents .toc a:hover {
+        text-decoration: underline;
+    }
+}
+
+/*
+ Code & Fragments
+ */
+
+code, div.fragment, pre.fragment {
+    border-radius: var(--border-radius-small);
+    border: 1px solid var(--separator-color);
+    overflow: hidden;
+}
+
+code {
+    display: inline;
+    background: var(--code-background);
+    color: var(--code-foreground);
+    padding: 2px 6px;
+}
+
+div.fragment, pre.fragment {
+    margin: var(--spacing-medium) 0;
+    padding: calc(var(--spacing-large) - (var(--spacing-large) / 6)) var(--spacing-large);
+    background: var(--fragment-background);
+    color: var(--fragment-foreground);
+    overflow-x: auto;
+}
+
+@media screen and (max-width: 767px) {
+    div.fragment, pre.fragment {
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
+        border-right: 0;
+    }
+
+    .contents > div.fragment,
+    .textblock > div.fragment,
+    .textblock > pre.fragment,
+    .contents > .doxygen-awesome-fragment-wrapper > div.fragment,
+    .textblock > .doxygen-awesome-fragment-wrapper > div.fragment,
+    .textblock > .doxygen-awesome-fragment-wrapper > pre.fragment {
+        margin: var(--spacing-medium) calc(0px - var(--spacing-large));
+        border-radius: 0;
+        border-left: 0;
+    }
+
+    .textblock li > .fragment,
+    .textblock li > .doxygen-awesome-fragment-wrapper > .fragment {
+        margin: var(--spacing-medium) calc(0px - var(--spacing-large));
+    }
+
+    .memdoc li > .fragment,
+    .memdoc li > .doxygen-awesome-fragment-wrapper > .fragment {
+        margin: var(--spacing-medium) calc(0px - var(--spacing-medium));
+    }
+
+    .textblock ul, .memdoc ul {
+        overflow: initial;
+    }
+
+    .memdoc > div.fragment,
+    .memdoc > pre.fragment,
+    dl dd > div.fragment,
+    dl dd pre.fragment,
+    .memdoc > .doxygen-awesome-fragment-wrapper > div.fragment,
+    .memdoc > .doxygen-awesome-fragment-wrapper > pre.fragment,
+    dl dd > .doxygen-awesome-fragment-wrapper > div.fragment,
+    dl dd .doxygen-awesome-fragment-wrapper > pre.fragment {
+        margin: var(--spacing-medium) calc(0px - var(--spacing-medium));
+        border-radius: 0;
+        border-left: 0;
+    }
+}
+
+code, code a, pre.fragment, div.fragment, div.fragment .line, div.fragment span, div.fragment .line a, div.fragment .line span {
+    font-family: var(--font-family-monospace);
+    font-size: var(--code-font-size) !important;
+}
+
+div.line:after {
+    margin-right: var(--spacing-medium);
+}
+
+div.fragment .line, pre.fragment {
+    white-space: pre;
+    word-wrap: initial;
+    line-height: var(--fragment-lineheight);
+}
+
+div.fragment span.keyword {
+    color: var(--fragment-keyword);
+}
+
+div.fragment span.keywordtype {
+    color: var(--fragment-keywordtype);
+}
+
+div.fragment span.keywordflow {
+    color: var(--fragment-keywordflow);
+}
+
+div.fragment span.stringliteral {
+    color: var(--fragment-token)
+}
+
+div.fragment span.comment {
+    color: var(--fragment-comment);
+}
+
+div.fragment a.code {
+    color: var(--fragment-link) !important;
+}
+
+div.fragment span.preprocessor {
+    color: var(--fragment-preprocessor);
+}
+
+div.fragment span.lineno {
+    display: inline-block;
+    width: 27px;
+    border-right: none;
+    background: var(--fragment-linenumber-background);
+    color: var(--fragment-linenumber-color);
+}
+
+div.fragment span.lineno a {
+    background: none;
+    color: var(--fragment-link) !important;
+}
+
+div.fragment .line:first-child .lineno {
+    box-shadow: -999999px 0px 0 999999px var(--fragment-linenumber-background), -999998px 0px 0 999999px var(--fragment-linenumber-border);
+}
+
+div.line {
+    border-radius: var(--border-radius-small);
+}
+
+div.line.glow {
+    background-color: var(--primary-light-color);
+    box-shadow: none;
+}
+
+/*
+ dl warning, attention, note, deprecated, bug, ...
+ */
+
+dl.bug dt a, dl.deprecated dt a, dl.todo dt a {
+    font-weight: bold !important;
+}
+
+dl.warning, dl.attention, dl.note, dl.deprecated, dl.bug, dl.invariant, dl.pre, dl.todo, dl.remark {
+    padding: var(--spacing-medium);
+    margin: var(--spacing-medium) 0;
+    color: var(--page-background-color);
+    overflow: hidden;
+    margin-left: 0;
+    border-radius: var(--border-radius-small);
+}
+
+dl.section dd {
+    margin-bottom: 2px;
+}
+
+dl.warning, dl.attention {
+    background: var(--warning-color);
+    border-left: 8px solid var(--warning-color-dark);
+    color: var(--warning-color-darker);
+}
+
+dl.warning dt, dl.attention dt {
+    color: var(--warning-color-dark);
+}
+
+dl.note, dl.remark {
+    background: var(--note-color);
+    border-left: 8px solid var(--note-color-dark);
+    color: var(--note-color-darker);
+}
+
+dl.note dt, dl.remark dt {
+    color: var(--note-color-dark);
+}
+
+dl.todo {
+    background: var(--todo-color);
+    border-left: 8px solid var(--todo-color-dark);
+    color: var(--todo-color-darker);
+}
+
+dl.todo dt {
+    color: var(--todo-color-dark);
+}
+
+dl.bug dt a {
+    color: var(--todo-color-dark) !important;
+}
+
+dl.bug {
+    background: var(--bug-color);
+    border-left: 8px solid var(--bug-color-dark);
+    color: var(--bug-color-darker);
+}
+
+dl.bug dt a {
+    color: var(--bug-color-dark) !important;
+}
+
+dl.deprecated {
+    background: var(--deprecated-color);
+    border-left: 8px solid var(--deprecated-color-dark);
+    color: var(--deprecated-color-darker);
+}
+
+dl.deprecated dt a {
+    color: var(--deprecated-color-dark) !important;
+}
+
+dl.section dd, dl.bug dd, dl.deprecated dd, dl.todo dd {
+    margin-inline-start: 0px;
+}
+
+dl.invariant, dl.pre {
+    background: var(--invariant-color);
+    border-left: 8px solid var(--invariant-color-dark);
+    color: var(--invariant-color-darker);
+}
+
+dl.invariant dt, dl.pre dt {
+    color: var(--invariant-color-dark);
+}
+
+/*
+ memitem
+ */
+
+div.memdoc, div.memproto, h2.memtitle {
+    box-shadow: none;
+    background-image: none;
+    border: none;
+}
+
+div.memdoc {
+    padding: 0 var(--spacing-medium);
+    background: var(--page-background-color);
+}
+
+h2.memtitle, div.memitem {
+    border: 1px solid var(--separator-color);
+    box-shadow: var(--box-shadow);
+}
+
+h2.memtitle {
+    box-shadow: 0px var(--spacing-medium) 0 -1px var(--fragment-background), var(--box-shadow);
+}
+
+div.memitem {
+    transition: none;
+}
+
+div.memproto, h2.memtitle {
+    background: var(--fragment-background);
+}
+
+h2.memtitle {
+    font-weight: 500;
+    font-size: var(--memtitle-font-size);
+    font-family: var(--font-family-monospace);
+    border-bottom: none;
+    border-top-left-radius: var(--border-radius-medium);
+    border-top-right-radius: var(--border-radius-medium);
+    word-break: break-all;
+    position: relative;
+}
+
+h2.memtitle:after {
+    content: "";
+    display: block;
+    background: var(--fragment-background);
+    height: var(--spacing-medium);
+    bottom: calc(0px - var(--spacing-medium));
+    left: 0;
+    right: -14px;
+    position: absolute;
+    border-top-right-radius: var(--border-radius-medium);
+}
+
+h2.memtitle > span.permalink {
+    font-size: inherit;
+}
+
+h2.memtitle > span.permalink > a {
+    text-decoration: none;
+    padding-left: 3px;
+    margin-right: -4px;
+    user-select: none;
+    display: inline-block;
+    margin-top: -6px;
+}
+
+h2.memtitle > span.permalink > a:hover {
+    color: var(--primary-dark-color) !important;
+}
+
+a:target + h2.memtitle, a:target + h2.memtitle + div.memitem {
+    border-color: var(--primary-light-color);
+}
+
+div.memitem {
+    border-top-right-radius: var(--border-radius-medium);
+    border-bottom-right-radius: var(--border-radius-medium);
+    border-bottom-left-radius: var(--border-radius-medium);
+    overflow: hidden;
+    display: block !important;
+}
+
+div.memdoc {
+    border-radius: 0;
+}
+
+div.memproto {
+    border-radius: 0 var(--border-radius-small) 0 0;
+    overflow: auto;
+    border-bottom: 1px solid var(--separator-color);
+    padding: var(--spacing-medium);
+    margin-bottom: -1px;
+}
+
+div.memtitle {
+    border-top-right-radius: var(--border-radius-medium);
+    border-top-left-radius: var(--border-radius-medium);
+}
+
+div.memproto table.memname {
+    font-family: var(--font-family-monospace);
+    color: var(--page-foreground-color);
+    font-size: var(--memname-font-size);
+    text-shadow: none;
+}
+
+div.memproto div.memtemplate {
+    font-family: var(--font-family-monospace);
+    color: var(--primary-dark-color);
+    font-size: var(--memname-font-size);
+    margin-left: 2px;
+    text-shadow: none;
+}
+
+table.mlabels, table.mlabels > tbody {
+    display: block;
+}
+
+td.mlabels-left {
+    width: auto;
+}
+
+td.mlabels-right {
+    margin-top: 3px;
+    position: sticky;
+    left: 0;
+}
+
+table.mlabels > tbody > tr:first-child {
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+}
+
+.memname, .memitem span.mlabels {
+    margin: 0
+}
+
+/*
+ reflist
+ */
+
+dl.reflist {
+    box-shadow: var(--box-shadow);
+    border-radius: var(--border-radius-medium);
+    border: 1px solid var(--separator-color);
+    overflow: hidden;
+    padding: 0;
+}
+
+
+dl.reflist dt, dl.reflist dd {
+    box-shadow: none;
+    text-shadow: none;
+    background-image: none;
+    border: none;
+    padding: 12px;
+}
+
+
+dl.reflist dt {
+    font-weight: 500;
+    border-radius: 0;
+    background: var(--code-background);
+    border-bottom: 1px solid var(--separator-color);
+    color: var(--page-foreground-color)
+}
+
+
+dl.reflist dd {
+    background: none;
+}
+
+/*
+ Table
+ */
+
+.contents table:not(.memberdecls):not(.mlabels):not(.fieldtable):not(.memname),
+.contents table:not(.memberdecls):not(.mlabels):not(.fieldtable):not(.memname) tbody {
+    display: inline-block;
+    max-width: 100%;
+}
+
+.contents > table:not(.memberdecls):not(.mlabels):not(.fieldtable):not(.memname):not(.classindex) {
+    margin-left: calc(0px - var(--spacing-large));
+    margin-right: calc(0px - var(--spacing-large));
+    max-width: calc(100% + 2 * var(--spacing-large));
+}
+
+table.fieldtable,
+table.markdownTable tbody,
+table.doxtable tbody {
+    border: none;
+    margin: var(--spacing-medium) 0;
+    box-shadow: 0 0 0 1px var(--separator-color);
+    border-radius: var(--border-radius-small);
+}
+
+table.doxtable caption {
+    display: block;
+}
+
+table.fieldtable {
+    border-collapse: collapse;
+    width: 100%;
+}
+
+th.markdownTableHeadLeft,
+th.markdownTableHeadRight,
+th.markdownTableHeadCenter,
+th.markdownTableHeadNone,
+table.doxtable th {
+    background: var(--tablehead-background);
+    color: var(--tablehead-foreground);
+    font-weight: 600;
+    font-size: var(--page-font-size);
+}
+
+th.markdownTableHeadLeft:first-child,
+th.markdownTableHeadRight:first-child,
+th.markdownTableHeadCenter:first-child,
+th.markdownTableHeadNone:first-child,
+table.doxtable tr th:first-child {
+    border-top-left-radius: var(--border-radius-small);
+}
+
+th.markdownTableHeadLeft:last-child,
+th.markdownTableHeadRight:last-child,
+th.markdownTableHeadCenter:last-child,
+th.markdownTableHeadNone:last-child,
+table.doxtable tr th:last-child {
+    border-top-right-radius: var(--border-radius-small);
+}
+
+table.markdownTable td,
+table.markdownTable th,
+table.fieldtable td,
+table.fieldtable th,
+table.doxtable td,
+table.doxtable th {
+    border: 1px solid var(--separator-color);
+    padding: var(--spacing-small) var(--spacing-medium);
+}
+
+table.markdownTable td:last-child,
+table.markdownTable th:last-child,
+table.fieldtable td:last-child,
+table.fieldtable th:last-child,
+table.doxtable td:last-child,
+table.doxtable th:last-child {
+    border-right: none;
+}
+
+table.markdownTable td:first-child,
+table.markdownTable th:first-child,
+table.fieldtable td:first-child,
+table.fieldtable th:first-child,
+table.doxtable td:first-child,
+table.doxtable th:first-child {
+    border-left: none;
+}
+
+table.markdownTable tr:first-child td,
+table.markdownTable tr:first-child th,
+table.fieldtable tr:first-child td,
+table.fieldtable tr:first-child th,
+table.doxtable tr:first-child td,
+table.doxtable tr:first-child th {
+    border-top: none;
+}
+
+table.markdownTable tr:last-child td,
+table.markdownTable tr:last-child th,
+table.fieldtable tr:last-child td,
+table.fieldtable tr:last-child th,
+table.doxtable tr:last-child td,
+table.doxtable tr:last-child th {
+    border-bottom: none;
+}
+
+table.markdownTable tr, table.doxtable tr {
+    border-bottom: 1px solid var(--separator-color);
+}
+
+table.markdownTable tr:last-child, table.doxtable tr:last-child {
+    border-bottom: none;
+}
+
+table.fieldtable th {
+    font-size: var(--page-font-size);
+    font-weight: 600;
+    background-image: none;
+    background-color: var(--tablehead-background);
+    color: var(--tablehead-foreground);
+}
+
+table.fieldtable td.fieldtype, .fieldtable td.fieldname, .fieldtable td.fielddoc, .fieldtable th {
+    border-bottom: 1px solid var(--separator-color);
+    border-right: 1px solid var(--separator-color);
+}
+
+table.fieldtable tr:last-child td:first-child {
+    border-bottom-left-radius: var(--border-radius-small);
+}
+
+table.fieldtable tr:last-child td:last-child {
+    border-bottom-right-radius: var(--border-radius-small);
+}
+
+.memberdecls td.glow, .fieldtable tr.glow {
+    background-color: var(--primary-light-color);
+    box-shadow: none;
+}
+
+table.memberdecls {
+    display: block;
+    -webkit-tap-highlight-color: transparent;
+}
+
+table.memberdecls tr[class^='memitem'] {
+    font-family: var(--font-family-monospace);
+    font-size: var(--code-font-size);
+}
+
+table.memberdecls tr[class^='memitem'] .memTemplParams {
+    font-family: var(--font-family-monospace);
+    font-size: var(--code-font-size);
+    color: var(--primary-dark-color);
+    white-space: normal;
+}
+
+table.memberdecls .memItemLeft,
+table.memberdecls .memItemRight,
+table.memberdecls .memTemplItemLeft,
+table.memberdecls .memTemplItemRight,
+table.memberdecls .memTemplParams {
+    transition: none;
+    padding-top: var(--spacing-small);
+    padding-bottom: var(--spacing-small);
+    border-top: 1px solid var(--separator-color);
+    border-bottom: 1px solid var(--separator-color);
+    background-color: var(--fragment-background);
+}
+
+table.memberdecls .memTemplItemLeft,
+table.memberdecls .memTemplItemRight {
+    padding-top: 2px;
+}
+
+table.memberdecls .memTemplParams {
+    border-bottom: 0;
+    border-left: 1px solid var(--separator-color);
+    border-right: 1px solid var(--separator-color);
+    border-radius: var(--border-radius-small) var(--border-radius-small) 0 0;
+    padding-bottom: var(--spacing-small);
+}
+
+table.memberdecls .memTemplItemLeft {
+    border-radius: 0 0 0 var(--border-radius-small);
+    border-left: 1px solid var(--separator-color);
+    border-top: 0;
+}
+
+table.memberdecls .memTemplItemRight {
+    border-radius: 0 0 var(--border-radius-small) 0;
+    border-right: 1px solid var(--separator-color);
+    padding-left: 0;
+    border-top: 0;
+}
+
+table.memberdecls .memItemLeft {
+    border-radius: var(--border-radius-small) 0 0 var(--border-radius-small);
+    border-left: 1px solid var(--separator-color);
+    padding-left: var(--spacing-medium);
+    padding-right: 0;
+}
+
+table.memberdecls .memItemRight  {
+    border-radius: 0 var(--border-radius-small) var(--border-radius-small) 0;
+    border-right: 1px solid var(--separator-color);
+    padding-right: var(--spacing-medium);
+    padding-left: 0;
+
+}
+
+table.memberdecls .mdescLeft, table.memberdecls .mdescRight {
+    background: none;
+    color: var(--page-foreground-color);
+    padding: var(--spacing-small) 0;
+}
+
+table.memberdecls .memItemLeft,
+table.memberdecls .memTemplItemLeft {
+    padding-right: var(--spacing-medium);
+}
+
+table.memberdecls .memSeparator {
+    background: var(--page-background-color);
+    height: var(--spacing-large);
+    border: 0;
+    transition: none;
+}
+
+table.memberdecls .groupheader {
+    margin-bottom: var(--spacing-large);
+}
+
+table.memberdecls .inherit_header td {
+    padding: 0 0 var(--spacing-medium) 0;
+    text-indent: -12px;
+    color: var(--page-secondary-foreground-color);
+}
+
+table.memberdecls img[src="closed.png"],
+table.memberdecls img[src="open.png"],
+div.dynheader img[src="open.png"],
+div.dynheader img[src="closed.png"] {
+    width: 0; 
+    height: 0; 
+    border-left: 4px solid transparent;
+    border-right: 4px solid transparent;
+    border-top: 5px solid var(--primary-color);
+    margin-top: 8px;
+    display: block;
+    float: left;
+    margin-left: -10px;
+    transition: transform 0.25s ease-out;
+}
+
+table.memberdecls img {
+    margin-right: 10px;
+}
+
+table.memberdecls img[src="closed.png"],
+div.dynheader img[src="closed.png"] {
+    transform: rotate(-90deg);
+    
+}
+
+.compoundTemplParams {
+    font-family: var(--font-family-monospace);
+    color: var(--primary-dark-color);
+    font-size: var(--code-font-size);
+}
+
+@media screen and (max-width: 767px) {
+
+    table.memberdecls .memItemLeft,
+    table.memberdecls .memItemRight,
+    table.memberdecls .mdescLeft,
+    table.memberdecls .mdescRight,
+    table.memberdecls .memTemplItemLeft,
+    table.memberdecls .memTemplItemRight,
+    table.memberdecls .memTemplParams {
+        display: block;
+        text-align: left;
+        padding-left: var(--spacing-large);
+        margin: 0 calc(0px - var(--spacing-large)) 0 calc(0px - var(--spacing-large));
+        border-right: none;
+        border-left: none;
+        border-radius: 0;
+        white-space: normal;
+    }
+
+    table.memberdecls .memItemLeft,
+    table.memberdecls .mdescLeft,
+    table.memberdecls .memTemplItemLeft {
+        border-bottom: 0;
+        padding-bottom: 0;
+    }
+
+    table.memberdecls .memTemplItemLeft {
+        padding-top: 0;
+    }
+
+    table.memberdecls .mdescLeft {
+        margin-bottom: calc(0px - var(--page-font-size));
+    }
+
+    table.memberdecls .memItemRight, 
+    table.memberdecls .mdescRight,
+    table.memberdecls .memTemplItemRight {
+        border-top: 0;
+        padding-top: 0;
+        padding-right: var(--spacing-large);
+        overflow-x: auto;
+    }
+
+    table.memberdecls tr[class^='memitem']:not(.inherit) {
+        display: block;
+        width: calc(100vw - 2 * var(--spacing-large));
+    }
+
+    table.memberdecls .mdescRight {
+        color: var(--page-foreground-color);
+    }
+
+    table.memberdecls tr.inherit {
+        visibility: hidden;
+    }
+
+    table.memberdecls tr[style="display: table-row;"] {
+        display: block !important;
+        visibility: visible;
+        width: calc(100vw - 2 * var(--spacing-large));
+        animation: fade .5s;
+    }
+
+    @keyframes fade {
+        0% {
+            opacity: 0;
+            max-height: 0;
+        }
+
+        100% {
+            opacity: 1;
+            max-height: 200px;
+        }
+    }
+}
+
+
+/*
+ Horizontal Rule
+ */
+
+hr {
+    margin-top: var(--spacing-large);
+    margin-bottom: var(--spacing-large);
+    height: 1px;
+    background-color: var(--separator-color);
+    border: 0;
+}
+
+.contents hr {
+    box-shadow: 100px 0 0 var(--separator-color),
+                -100px 0 0 var(--separator-color),
+                500px 0 0 var(--separator-color),
+                -500px 0 0 var(--separator-color),
+                1500px 0 0 var(--separator-color),
+                -1500px 0 0 var(--separator-color),
+                2000px 0 0 var(--separator-color),
+                -2000px 0 0 var(--separator-color);
+}
+
+.contents img, .contents .center, .contents center, .contents div.image object {
+    max-width: 100%;
+    overflow: auto;
+}
+
+@media screen and (max-width: 767px) {
+    .contents .dyncontent > .center, .contents > center {
+        margin-left: calc(0px - var(--spacing-large));
+        margin-right: calc(0px - var(--spacing-large));
+        max-width: calc(100% + 2 * var(--spacing-large));
+    }
+}
+
+/*
+ Directories
+ */
+div.directory {
+    border-top: 1px solid var(--separator-color);
+    border-bottom: 1px solid var(--separator-color);
+    width: auto;
+}
+
+table.directory {
+    font-family: var(--font-family);
+    font-size: var(--page-font-size);
+    font-weight: normal;
+    width: 100%;
+}
+
+table.directory td.entry, table.directory td.desc {
+    padding: calc(var(--spacing-small) / 2) var(--spacing-small);
+    line-height: var(--table-line-height);
+}
+
+table.directory tr.even td:last-child {
+    border-radius: 0 var(--border-radius-small) var(--border-radius-small) 0;
+}
+
+table.directory tr.even td:first-child {
+    border-radius: var(--border-radius-small) 0 0 var(--border-radius-small);
+}
+
+table.directory tr.even:last-child td:last-child {
+    border-radius: 0 var(--border-radius-small) 0 0;
+}
+
+table.directory tr.even:last-child td:first-child {
+    border-radius: var(--border-radius-small) 0 0 0;
+}
+
+table.directory td.desc {
+    min-width: 250px;
+}
+
+table.directory tr.even {
+    background-color: var(--odd-color);
+}
+
+table.directory tr.odd {
+    background-color: transparent;
+}
+
+.icona {
+    width: auto;
+    height: auto;
+    margin: 0 var(--spacing-small);
+}
+
+.icon {
+    background: var(--primary-color);
+    border-radius: var(--border-radius-small);
+    font-size: var(--page-font-size);
+    padding: calc(var(--page-font-size) / 5);
+    line-height: var(--page-font-size);
+    transform: scale(0.8);
+    height: auto;
+    width: var(--page-font-size);
+    user-select: none;
+}
+
+.iconfopen, .icondoc, .iconfclosed {
+    background-position: center;
+    margin-bottom: 0;
+    height: var(--table-line-height);
+}
+
+.icondoc {
+    filter: saturate(0.2);
+}
+
+@media screen and (max-width: 767px) {
+    div.directory {
+        margin-left: calc(0px - var(--spacing-large));
+        margin-right: calc(0px - var(--spacing-large));
+    }
+}
+
+@media (prefers-color-scheme: dark) {
+    html:not(.light-mode) .iconfopen, html:not(.light-mode) .iconfclosed {
+        filter: hue-rotate(180deg) invert();
+    }
+}
+
+html.dark-mode .iconfopen, html.dark-mode .iconfclosed {
+    filter: hue-rotate(180deg) invert();
+}
+
+/*
+ Class list
+ */
+
+.classindex dl.odd {
+    background: var(--odd-color);
+    border-radius: var(--border-radius-small);
+}
+
+.classindex dl.even {
+    background-color: transparent;
+}
+
+/* 
+ Class Index Doxygen 1.8 
+*/
+
+table.classindex {
+    margin-left: 0;
+    margin-right: 0;
+    width: 100%;
+}
+
+table.classindex table div.ah {
+    background-image: none;
+    background-color: initial;
+    border-color: var(--separator-color);
+    color: var(--page-foreground-color);
+    box-shadow: var(--box-shadow);
+    border-radius: var(--border-radius-large);
+    padding: var(--spacing-small);
+}
+
+div.qindex {
+    background-color: var(--odd-color);
+    border-radius: var(--border-radius-small);
+    border: 1px solid var(--separator-color);
+    padding: var(--spacing-small) 0;
+}
+
+/*
+  Footer and nav-path
+ */
+
+#nav-path {
+    width: 100%;
+}
+
+#nav-path ul {
+    background-image: none;
+    background: var(--page-background-color);
+    border: none;
+    border-top: 1px solid var(--separator-color);
+    border-bottom: 1px solid var(--separator-color);
+    border-bottom: 0;
+    box-shadow: 0 0.75px 0 var(--separator-color);
+    font-size: var(--navigation-font-size);
+}
+
+img.footer {
+    width: 60px;
+}
+
+.navpath li.footer {
+    color: var(--page-secondary-foreground-color);
+}
+
+address.footer {
+    color: var(--page-secondary-foreground-color);
+    margin-bottom: var(--spacing-large);
+}
+
+#nav-path li.navelem {
+    background-image: none;
+    display: flex;
+    align-items: center;
+}
+
+.navpath li.navelem a {
+    text-shadow: none;
+    display: inline-block;
+    color: var(--primary-color) !important;
+}
+
+.navpath li.navelem b {
+    color: var(--primary-dark-color);
+    font-weight: 500;
+}
+
+li.navelem {
+    padding: 0;
+    margin-left: -8px;
+}
+
+li.navelem:first-child {
+    margin-left: var(--spacing-large);
+}
+
+li.navelem:first-child:before {
+    display: none;
+}
+
+#nav-path li.navelem:after {
+    content: '';
+    border: 5px solid var(--page-background-color);
+    border-bottom-color: transparent;
+    border-right-color: transparent;
+    border-top-color: transparent;
+    transform: translateY(-1px) scaleY(4.2);
+    z-index: 10;
+    margin-left: 6px;
+}
+
+#nav-path li.navelem:before {
+    content: '';
+    border: 5px solid var(--separator-color);
+    border-bottom-color: transparent;
+    border-right-color: transparent;
+    border-top-color: transparent;
+    transform: translateY(-1px) scaleY(3.2);
+    margin-right: var(--spacing-small);
+}
+
+.navpath li.navelem a:hover {
+    color: var(--primary-color);
+}
+
+/*
+ Scrollbars for Webkit
+*/
+
+#nav-tree::-webkit-scrollbar,
+div.fragment::-webkit-scrollbar,
+pre.fragment::-webkit-scrollbar,
+div.memproto::-webkit-scrollbar,
+.contents center::-webkit-scrollbar,
+.contents .center::-webkit-scrollbar,
+.contents table:not(.memberdecls):not(.mlabels):not(.fieldtable):not(.memname) tbody::-webkit-scrollbar,
+div.contents .toc::-webkit-scrollbar {
+    background: transparent;
+    width: calc(var(--webkit-scrollbar-size) + var(--webkit-scrollbar-padding) + var(--webkit-scrollbar-padding));
+    height: calc(var(--webkit-scrollbar-size) + var(--webkit-scrollbar-padding) + var(--webkit-scrollbar-padding));
+}
+
+#nav-tree::-webkit-scrollbar-thumb,
+div.fragment::-webkit-scrollbar-thumb,
+pre.fragment::-webkit-scrollbar-thumb,
+div.memproto::-webkit-scrollbar-thumb,
+.contents center::-webkit-scrollbar-thumb,
+.contents .center::-webkit-scrollbar-thumb,
+.contents table:not(.memberdecls):not(.mlabels):not(.fieldtable):not(.memname) tbody::-webkit-scrollbar-thumb,
+div.contents .toc::-webkit-scrollbar-thumb {
+    background-color: transparent;
+    border: var(--webkit-scrollbar-padding) solid transparent;
+    border-radius: calc(var(--webkit-scrollbar-padding) + var(--webkit-scrollbar-padding));
+    background-clip: padding-box;  
+}
+
+#nav-tree:hover::-webkit-scrollbar-thumb,
+div.fragment:hover::-webkit-scrollbar-thumb,
+pre.fragment:hover::-webkit-scrollbar-thumb,
+div.memproto:hover::-webkit-scrollbar-thumb,
+.contents center:hover::-webkit-scrollbar-thumb,
+.contents .center:hover::-webkit-scrollbar-thumb,
+.contents table:not(.memberdecls):not(.mlabels):not(.fieldtable):not(.memname) tbody:hover::-webkit-scrollbar-thumb,
+div.contents .toc:hover::-webkit-scrollbar-thumb {
+    background-color: var(--webkit-scrollbar-color);
+}
+
+#nav-tree::-webkit-scrollbar-track,
+div.fragment::-webkit-scrollbar-track,
+pre.fragment::-webkit-scrollbar-track,
+div.memproto::-webkit-scrollbar-track,
+.contents center::-webkit-scrollbar-track,
+.contents .center::-webkit-scrollbar-track,
+.contents table:not(.memberdecls):not(.mlabels):not(.fieldtable):not(.memname) tbody::-webkit-scrollbar-track,
+div.contents .toc::-webkit-scrollbar-track {
+    background: transparent;
+}
+
+#nav-tree::-webkit-scrollbar-corner {
+    background-color: var(--side-nav-background);
+}
+
+#nav-tree,
+div.fragment,
+pre.fragment,
+div.memproto,
+.contents center,
+.contents .center,
+.contents table:not(.memberdecls):not(.mlabels):not(.fieldtable):not(.memname) tbody,
+div.contents .toc {
+    overflow-x: auto;
+    overflow-x: overlay;
+}
+
+#nav-tree {
+    overflow-x: auto;
+    overflow-y: auto;
+    overflow-y: overlay;
+}
+
+/*
+ Scrollbars for Firefox
+*/
+
+#nav-tree,
+div.fragment,
+pre.fragment,
+div.memproto,
+.contents center,
+.contents .center,
+.contents table:not(.memberdecls):not(.mlabels):not(.fieldtable):not(.memname) tbody,
+div.contents .toc {
+    scrollbar-width: thin;
+}
+
+/*
+  Optional Dark mode toggle button
+*/
+
+doxygen-awesome-dark-mode-toggle {
+    display: inline-block;
+    margin: 0 0 0 var(--spacing-small);
+    padding: 0;
+    width: var(--searchbar-height);
+    height: var(--searchbar-height);
+    background: none;
+    border: none;
+    border-radius: var(--searchbar-height);
+    vertical-align: middle;
+    text-align: center;
+    line-height: var(--searchbar-height);
+    font-size: 22px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    user-select: none;
+    cursor: pointer;
+}
+
+doxygen-awesome-dark-mode-toggle > svg {
+    transition: transform .1s ease-in-out;
+}
+
+doxygen-awesome-dark-mode-toggle:active > svg {
+    transform: scale(.5);
+}
+
+doxygen-awesome-dark-mode-toggle:hover {
+    background-color: rgba(0,0,0,.03);
+}
+
+html.dark-mode doxygen-awesome-dark-mode-toggle:hover {
+    background-color: rgba(0,0,0,.18);
+}
+
+/*
+ Optional fragment copy button
+*/
+.doxygen-awesome-fragment-wrapper {
+    position: relative;
+}
+
+doxygen-awesome-fragment-copy-button {
+    opacity: 0;
+    background: var(--fragment-background);
+    width: 28px;
+    height: 28px;
+    position: absolute;
+    right: calc(var(--spacing-large) - (var(--spacing-large) / 2.5));
+    top: calc(var(--spacing-large) - (var(--spacing-large) / 2.5));
+    border: 1px solid var(--fragment-foreground);
+    cursor: pointer;
+    border-radius: var(--border-radius-small);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.doxygen-awesome-fragment-wrapper:hover doxygen-awesome-fragment-copy-button, doxygen-awesome-fragment-copy-button.success {
+    opacity: .28;
+}
+
+doxygen-awesome-fragment-copy-button:hover, doxygen-awesome-fragment-copy-button.success {
+    opacity: 1 !important;
+}
+
+doxygen-awesome-fragment-copy-button:active:not([class~=success]) svg {
+    transform: scale(.91);
+}
+
+doxygen-awesome-fragment-copy-button svg {
+    fill: var(--fragment-foreground);
+    width: 18px;
+    height: 18px;
+}
+
+doxygen-awesome-fragment-copy-button.success svg {
+    fill: rgb(14, 168, 14);
+}
+
+doxygen-awesome-fragment-copy-button.success {
+    border-color: rgb(14, 168, 14);
+}
+
+@media screen and (max-width: 767px) {
+    .textblock > .doxygen-awesome-fragment-wrapper > doxygen-awesome-fragment-copy-button,
+    .textblock li > .doxygen-awesome-fragment-wrapper > doxygen-awesome-fragment-copy-button,
+    .memdoc li > .doxygen-awesome-fragment-wrapper > doxygen-awesome-fragment-copy-button,
+    .memdoc > .doxygen-awesome-fragment-wrapper > doxygen-awesome-fragment-copy-button,
+    dl dd > .doxygen-awesome-fragment-wrapper > doxygen-awesome-fragment-copy-button {
+        right: 0;
+    }
+}
+
+/*
+ Optional paragraph link button
+*/
+
+a.anchorlink {
+    font-size: 90%;
+    margin-left: var(--spacing-small);
+    color: var(--page-foreground-color) !important;
+    text-decoration: none;
+    opacity: .15;
+    display: none;
+    transition: opacity .1s ease-in-out, color .1s ease-in-out;
+}
+
+a.anchorlink svg {
+    fill: var(--page-foreground-color);
+}
+
+h3 a.anchorlink svg, h4 a.anchorlink svg {
+    margin-bottom: -3px;
+    margin-top: -4px;
+}
+
+a.anchorlink:hover {
+    opacity: .45;
+}
+
+h2:hover a.anchorlink, h1:hover a.anchorlink, h3:hover a.anchorlink, h4:hover a.anchorlink  {
+    display: inline-block;
+}
+
+
+#MSearchBox .left {
+	background: none !important;	
+}
+#MSearchBox .right {
+	background: none !important;	
+}

From 8600424eee7d60728d1a8558b51947aac3d3fa2b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 5 Jan 2023 15:52:14 +0100
Subject: [PATCH 336/816] Test doxygen

---
 build/doxygen/dolibarr-doxygen.doxyfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/doxygen/dolibarr-doxygen.doxyfile b/build/doxygen/dolibarr-doxygen.doxyfile
index 20ff102f0a2..6f668ebad7e 100644
--- a/build/doxygen/dolibarr-doxygen.doxyfile
+++ b/build/doxygen/dolibarr-doxygen.doxyfile
@@ -117,7 +117,7 @@ FULL_PATH_NAMES = YES
 # If left blank the directory from which doxygen is run is used as the
 # path to strip.
 
-STRIP_FROM_PATH = ""
+STRIP_FROM_PATH = "/home/dolibarr/doxygen.dolibarr.org/"
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
 # the path mentioned in the documentation of a class, which tells
@@ -1098,7 +1098,7 @@ SEARCHENGINE = YES
 # full text search. The disadvances is that it is more difficult to setup
 # and does not have live searching capabilities.
 
-SERVER_BASED_SEARCH = NO
+SERVER_BASED_SEARCH = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output

From 813f16fecb9a502f0fbd5d3025fb24e7ddb0bc97 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Thu, 5 Jan 2023 20:28:07 +0100
Subject: [PATCH 337/816] Fix php 8 errors

---
 htdocs/fourn/commande/dispatch.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 9e3a9ba7808..b209b6905f3 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -68,7 +68,7 @@ $hookmanager->initHooks(array('ordersupplierdispatch'));
 
 // Recuperation de l'id de projet
 $projectid = 0;
-if ($_GET["projectid"]) {
+if (isset($_GET["projectid"])) {
 	$projectid = GETPOST("projectid", 'int');
 }
 
@@ -782,7 +782,8 @@ if ($id > 0 || !empty($ref)) {
 				if (!$objp->fk_product > 0) {
 					$nbfreeproduct++;
 				} else {
-					$remaintodispatch = price2num($objp->qty - ((float) $products_dispatched[$objp->rowid]), 5); // Calculation of dispatched
+					$alreadydispatched = isset($products_dispatched[$objp->rowid])?$products_dispatched[$objp->rowid]:0;
+					$remaintodispatch = price2num($objp->qty - ((float) $alreadydispatched), 5); // Calculation of dispatched
 					if ($remaintodispatch < 0 && empty($conf->global->SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDER_RETURN)) {
 						$remaintodispatch = 0;
 					}
@@ -799,7 +800,7 @@ if ($id > 0 || !empty($ref)) {
 						print '<!-- Line to dispatch '.$suffix.' -->'."\n";
 						// hidden fields for js function
 						print '<input id="qty_ordered'.$suffix.'" type="hidden" value="'.$objp->qty.'">';
-						print '<input id="qty_dispatched'.$suffix.'" type="hidden" value="'.(float) $products_dispatched[$objp->rowid].'">';
+						print '<input id="qty_dispatched'.$suffix.'" type="hidden" value="'.(float) $alreadydispatched.'">';
 						print '<tr class="oddeven">';
 
 						if (empty($conf->cache['product'][$objp->fk_product])) {
@@ -860,7 +861,7 @@ if ($id > 0 || !empty($ref)) {
 						print '<td class="right">'.$objp->qty.'</td>';
 
 						// Already dispatched
-						print '<td class="right">'.$products_dispatched[$objp->rowid].'</td>';
+						print '<td class="right">'.$alreadydispatched.'</td>';
 
 						if (isModEnabled('productbatch') && $objp->tobatch > 0) {
 							$type = 'batch';

From 10018d48a97bc949d677309365e9ac27d58c1059 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9=20Cendrier?= <noe.cendrier@altairis.fr>
Date: Fri, 6 Jan 2023 11:46:59 +0100
Subject: [PATCH 338/816] do not add <br> when dol_concatdesc already does it

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

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index eff818fe01d..fef33262a0f 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -2307,10 +2307,10 @@ function pdf_getLinkedObjects(&$object, $outputlangs)
 			$outputlangs->load('orders');
 
 			if (count($objects) > 1 && count($objects) <= (getDolGlobalInt("MAXREFONDOC") ? getDolGlobalInt("MAXREFONDOC") : 10)) {
-				$object->note_public = dol_concatdesc($object->note_public, '<br>'.$outputlangs->transnoentities("RefOrder").' : <br>');
+				$object->note_public = dol_concatdesc($object->note_public, $outputlangs->transnoentities("RefOrder").' :');
 				foreach ($objects as $elementobject) {
 					$object->note_public = dol_concatdesc($object->note_public, $outputlangs->transnoentities($elementobject->ref).($elementobject->ref_client ? ' ('.$elementobject->ref_client.')' : '').($elementobject->ref_supplier ? ' ('.$elementobject->ref_supplier.')' : '').' ');
-					$object->note_public = dol_concatdesc($object->note_public, $outputlangs->transnoentities("OrderDate").' : '.dol_print_date($elementobject->date, 'day', '', $outputlangs).'<br>');
+					$object->note_public = dol_concatdesc($object->note_public, $outputlangs->transnoentities("OrderDate").' : '.dol_print_date($elementobject->date, 'day', '', $outputlangs));
 				}
 			} elseif (count($objects) == 1) {
 				$elementobject = array_shift($objects);
@@ -2341,9 +2341,9 @@ function pdf_getLinkedObjects(&$object, $outputlangs)
 			if (count($objects) > 1) {
 				$order = null;
 				if (empty($object->linkedObjects['commande']) && $object->element != 'commande') {
-					$object->note_public = dol_concatdesc($object->note_public, '<br>'.$outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending").' : <br>');
+					$object->note_public = dol_concatdesc($object->note_public, $outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending").' :');
 				} else {
-					$object->note_public = dol_concatdesc($object->note_public, '<br>'.$outputlangs->transnoentities("RefSending").' : <br>');
+					$object->note_public = dol_concatdesc($object->note_public, $outputlangs->transnoentities("RefSending").' :');
 				}
 				// We concat this record info into fields xxx_value. title is overwrote.
 				foreach ($objects as $elementobject) {
@@ -2361,11 +2361,9 @@ function pdf_getLinkedObjects(&$object, $outputlangs)
 
 					if (! is_object($order)) {
 						$object->note_public = dol_concatdesc($object->note_public, $outputlangs->transnoentities($elementobject->ref));
-						$object->note_public = dol_concatdesc($object->note_public, '<br>');
 					} else {
 						$object->note_public = dol_concatdesc($object->note_public, $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : ''));
 						$object->note_public = dol_concatdesc($object->note_public, ' / '.$outputlangs->transnoentities($elementobject->ref));
-						$object->note_public = dol_concatdesc($object->note_public, '<br>');
 					}
 				}
 			} elseif (count($objects) == 1) {

From 68e4e710051de7903d5eff14660f51b3779be682 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Jan 2023 12:08:40 +0100
Subject: [PATCH 339/816] FIX: Amount of localtax1 and 2 not correctly save on
 purchase order (the rate was saved instead)

---
 ChangeLog                                     | 32 +++++++++
 htdocs/core/tpl/objectline_view.tpl.php       | 67 +++++++++++--------
 htdocs/filefunc.inc.php                       |  2 +-
 .../class/fournisseur.commande.class.php      |  4 +-
 htdocs/fourn/commande/card.php                |  1 -
 htdocs/langs/en_US/main.lang                  |  1 +
 6 files changed, 76 insertions(+), 31 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1abc487eff1..bd98b41d9b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,38 @@ English Dolibarr ChangeLog
 --------------------------------------------------------------
 
 
+***** ChangeLog for 16.0.4 compared to 16.0.2 *****
+
+FIX: Amount of localtax1 and 2 not correctly save on purchase order (the rate was saved instead)
+FIX: #20415
+FIX: #21280 FIX: #23008
+FIX: #22271
+FIX: #22837
+FIX: #23019 Impossible to add task times to an existing draft invoice
+FIX: #23072
+FIX: #23087
+FIX: #23115 FIX: #23116
+FIX: #23281
+FIX: bad selection of barcode numbering module
+FIX: Can't see all time spent by all user
+FIX: CI
+FIX: CommonObject - showOptionals - Display blank td when MAIN_VIEW_LINE_NUMBER is enabled and action is confirm_valid
+FIX: Documents API inconsistency
+FIX|Fix [#23075]
+FIX|Fix[#23117]
+FIX: get multicurrency infos of propal when create order from propal with "WORKFLOW_PROPAL_AUTOCREATE_ORDER" conf
+FIX: Give predictable order to inventory lines
+FIX: include class multicurrency
+FIX: methods declaration (backport fix 67b9a7dc07d708231d12b5e58800334d4a01ef98)
+FIX: multicurrency_tx and not currency_tx
+FIX: PGSQL Integer type does not have a free lenght
+FIX: PGSQL Int type does not have a free lenght
+FIX: Product list in setup.php in new Module
+FIX: propal and order stats broken on Tag+User(retricted customer list)
+FIX: saving of numbering module for jobs
+FIX: Stickler
+FIX: travis
+
 
 ***** ChangeLog for 16.0.3 compared to 16.0.2 *****
 
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index c2d81b81eb5..37b1d9af25e 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -255,11 +255,40 @@ if (!empty($conf->accounting->enabled) && $line->fk_accounting_account > 0) {
 }
 
 print '</td>';
+// Vendor price ref
 if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier' || $object->element == 'invoice_supplier_rec') {	// We must have same test in printObjectLines
 	print '<td class="linecolrefsupplier">';
 	print ($line->ref_fourn ? $line->ref_fourn : $line->ref_supplier);
 	print '</td>';
 }
+
+$tooltiponprice = '';
+$tooltiponpriceend = '';
+if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+	$tooltiponprice = $langs->transcountry("TotalHT", $mysoc->country_code).'='.price($line->total_ht);
+	$tooltiponprice .= '<br>'.$langs->transcountry("TotalVAT", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'='.price($line->total_tva);
+	$seller = ($senderissupplier ? (is_object($object->thirdparty) ? $object->thirdparty : null) : $mysoc);
+	if ($seller) {
+		if ($seller->useLocalTax(1)) {
+			if (($mysoc->country_code == $object->thirdparty->country_code) || $seller->useLocalTax(1)) {
+				$tooltiponprice .= '<br>'.$langs->transcountry("TotalLT1", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'='.price($line->total_localtax1);
+			} else {
+				$tooltiponprice .= '<br>'.$langs->transcountry("TotalLT1", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'=<span class="opacitymedium">'.$langs->trans("NotUsedForThis".($senderissupplier ? "Vendor" : "Customer")).'</span>';
+			}
+		}
+		if ($seller->useLocalTax(2)) {
+			if (($mysoc->country_code == $object->thirdparty->country_code) || $seller->useLocalTax(2)) {
+				$tooltiponprice .= '<br>'.$langs->transcountry("TotalLT2", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'='.price($line->total_localtax2);
+			} else {
+				$tooltiponprice .= '<br>'.$langs->transcountry("TotalLT2", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'=<span class="opacitymedium">'.$langs->trans("NotUsedForThis".($senderissupplier ? "Vendor" : "Customer")).'</span>';
+			}
+		}
+	}
+	$tooltiponprice .= '<br>'.$langs->transcountry("TotalTTC", $mysoc->country_code).'='.price($line->total_ttc);
+	$tooltiponprice = '<span class="classfortooltip" title="'.dol_escape_htmltag($tooltiponprice).'">';
+	$tooltiponpriceend = '</span>';
+}
+
 // VAT Rate
 print '<td class="linecolvat nowrap right">';
 $coldisplay++;
@@ -276,8 +305,9 @@ if (price2num($line->total_localtax2)) {
 if (empty($positiverates)) {
 	$positiverates = '0';
 }
+print $tooltiponprice;
 print vatrate($positiverates.($line->vat_src_code ? ' ('.$line->vat_src_code.')' : ''), '%', $line->info_bits);
-//print vatrate($line->tva_tx.($line->vat_src_code?(' ('.$line->vat_src_code.')'):''), '%', $line->info_bits);
+print $tooltiponpriceend;
 ?></td>
 
 	<td class="linecoluht nowrap right"><?php $coldisplay++; ?><?php print price($sign * $line->subprice); ?></td>
@@ -344,45 +374,24 @@ if ($usemargins && !empty($conf->margin->enabled) && empty($user->socid)) {
 		<td class="linecolmargin2 nowrap margininfos right"><?php $coldisplay++; ?><?php print price(price2num($line->marque_tx, 'MT')).'%'; ?></td>
 	<?php }
 }
+
 // Price total without tax
 if ($line->special_code == 3) { ?>
 	<td class="linecoloption nowrap right"><?php $coldisplay++; ?><?php print $langs->trans('Option'); ?></td>
 <?php } else {
 	print '<td class="linecolht nowrap right">';
 	$coldisplay++;
-	if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
-		$tooltiponprice = $langs->transcountry("TotalHT", $mysoc->country_code).'='.price($line->total_ht);
-		$tooltiponprice .= '<br>'.$langs->transcountry("TotalVAT", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'='.price($line->total_tva);
-		if (!$senderissupplier && is_object($object->thirdparty)) {
-			if ($mysoc->useLocalTax(1)) {
-				if (($mysoc->country_code == $object->thirdparty->country_code) || $object->thirdparty->useLocalTax(1)) {
-					$tooltiponprice .= '<br>'.$langs->transcountry("TotalLT1", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'='.price($line->total_localtax1);
-				} else {
-					$tooltiponprice .= '<br>'.$langs->transcountry("TotalLT1", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'=<span class="opacitymedium">'.$langs->trans("NotUsedForThisCustomer").'</span>';
-				}
-			}
-			if ($mysoc->useLocalTax(2)) {
-				if (($mysoc->country_code == $object->thirdparty->country_code) || $object->thirdparty->useLocalTax(2)) {
-					$tooltiponprice .= '<br>'.$langs->transcountry("TotalLT2", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'='.price($line->total_localtax2);
-				} else {
-					$tooltiponprice .= '<br>'.$langs->transcountry("TotalLT2", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'=<span class="opacitymedium">'.$langs->trans("NotUsedForThisCustomer").'</span>';
-				}
-			}
-		}
-		$tooltiponprice .= '<br>'.$langs->transcountry("TotalTTC", $mysoc->country_code).'='.price($line->total_ttc);
-
-		print '<span class="classfortooltip" title="'.dol_escape_htmltag($tooltiponprice).'">';
-	}
+	print $tooltiponprice;
 	print price($sign * $line->total_ht);
-	if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
-		print '</span>';
-	}
+	print $tooltiponpriceend;
 	print '</td>';
 	if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
 		print '<td class="linecolutotalht_currency nowrap right">'.price($sign * $line->multicurrency_total_ht).'</td>';
 		$coldisplay++;
 	}
 }
+
+// Price inc tax
 if ($outputalsopricetotalwithtax) {
 	print '<td class="linecolht nowrap right">'.price($sign * $line->total_ttc).'</td>';
 	$coldisplay++;
@@ -397,6 +406,7 @@ if ($this->statut == 0 && !empty($object_rights->creer) && $action != 'selectlin
 		}
 	}
 
+	// Asset info
 	if (!empty($conf->asset->enabled) && $object->element == 'invoice_supplier') {
 		print '<td class="linecolasset center">';
 		$coldisplay++;
@@ -426,6 +436,7 @@ if ($this->statut == 0 && !empty($object_rights->creer) && $action != 'selectlin
 		print '</td>';
 	}
 
+	// Edit picto
 	print '<td class="linecoledit center">';
 	$coldisplay++;
 	if (($line->info_bits & 2) == 2 || !empty($disableedit)) {
@@ -435,6 +446,7 @@ if ($this->statut == 0 && !empty($object_rights->creer) && $action != 'selectlin
 	}
 	print '</td>';
 
+	// Delete picto
 	print '<td class="linecoldelete center">';
 	$coldisplay++;
 	if (!$situationinvoicelinewithparent && empty($disableremove)) { // For situation invoice, deletion is not possible if there is a parent company.
@@ -444,6 +456,7 @@ if ($this->statut == 0 && !empty($object_rights->creer) && $action != 'selectlin
 	}
 	print '</td>';
 
+	// Move up-down picto
 	if ($num > 1 && $conf->browser->layout != 'phone' && ($this->situation_counter == 1 || !$this->situation_cycle_ref) && empty($disablemove)) {
 		print '<td class="linecolmove tdlineupdown center">';
 		$coldisplay++;
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 7538846c6a1..f57a3730a6f 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -34,7 +34,7 @@ if (!defined('DOL_APPLICATION_TITLE')) {
 	define('DOL_APPLICATION_TITLE', 'Dolibarr');
 }
 if (!defined('DOL_VERSION')) {
-	define('DOL_VERSION', '16.0.3'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+	define('DOL_VERSION', '16.0.4'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 }
 
 if (!defined('EURO')) {
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index d39620bdb3b..92cfed778e4 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -3895,8 +3895,8 @@ class CommandeFournisseurLigne extends CommonOrderLine
 
 		$sql .= ", vat_src_code = '".(empty($this->vat_src_code) ? '' : $this->vat_src_code)."'";
 		$sql .= ", tva_tx='".price2num($this->tva_tx)."'";
-		$sql .= ", localtax1_tx='".price2num($this->total_localtax1)."'";
-		$sql .= ", localtax2_tx='".price2num($this->total_localtax2)."'";
+		$sql .= ", localtax1_tx='".price2num($this->localtax1_tx)."'";
+		$sql .= ", localtax2_tx='".price2num($this->localtax2_tx)."'";
 		$sql .= ", localtax1_type='".$this->db->escape($this->localtax1_type)."'";
 		$sql .= ", localtax2_type='".$this->db->escape($this->localtax2_type)."'";
 		$sql .= ", qty='".price2num($this->qty)."'";
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 3b0f4fdb6e5..cfe4a43d05e 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -69,7 +69,6 @@ $ref = GETPOST('ref', 'alpha');
 $action 		= GETPOST('action', 'alpha');
 $confirm		= GETPOST('confirm', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'purchaseordercard'; // To manage different context of search
-
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index cf748a60626..1acda85ed2a 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1122,6 +1122,7 @@ DeleteFileText=Do you really want delete this file?
 ShowOtherLanguages=Show other languages
 SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for this language
 NotUsedForThisCustomer=Not used for this customer
+NotUsedForThisVendor=Not used for this vendor
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
 InformationMessage=Information

From 52ba5b09133a8ca919e3382c14871ef958910d59 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Jan 2023 13:58:39 +0100
Subject: [PATCH 340/816] Trans

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

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index ebdbfce73fa..f7d4b4b8820 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1149,9 +1149,9 @@ EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Set Supervisor
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
 CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Assignement
 ConfirmAffectUser=Bulk User Assignement

From 1a7c700ed468f6f2b51867d26eb9306ab1549858 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Jan 2023 14:03:36 +0100
Subject: [PATCH 341/816] Sync transifex

---
 htdocs/langs/da_DK/main.lang                |  8 +--
 htdocs/langs/fr_FR/accountancy.lang         | 70 ++++++++++-----------
 htdocs/langs/fr_FR/admin.lang               | 52 +++++++--------
 htdocs/langs/fr_FR/agenda.lang              |  1 +
 htdocs/langs/fr_FR/bills.lang               | 13 +++-
 htdocs/langs/fr_FR/boxes.lang               |  4 +-
 htdocs/langs/fr_FR/categories.lang          |  4 +-
 htdocs/langs/fr_FR/commercial.lang          |  4 ++
 htdocs/langs/fr_FR/compta.lang              | 10 +--
 htdocs/langs/fr_FR/cron.lang                |  5 +-
 htdocs/langs/fr_FR/dict.lang                |  4 +-
 htdocs/langs/fr_FR/ecm.lang                 |  8 +--
 htdocs/langs/fr_FR/errors.lang              | 16 ++---
 htdocs/langs/fr_FR/eventorganization.lang   | 14 ++---
 htdocs/langs/fr_FR/install.lang             |  1 +
 htdocs/langs/fr_FR/interventions.lang       |  1 +
 htdocs/langs/fr_FR/knowledgemanagement.lang |  2 +-
 htdocs/langs/fr_FR/languages.lang           |  2 +
 htdocs/langs/fr_FR/loan.lang                |  6 +-
 htdocs/langs/fr_FR/main.lang                | 36 +++++------
 htdocs/langs/fr_FR/members.lang             | 16 ++---
 htdocs/langs/fr_FR/modulebuilder.lang       | 11 +++-
 htdocs/langs/fr_FR/mrp.lang                 |  6 +-
 htdocs/langs/fr_FR/other.lang               |  6 ++
 htdocs/langs/fr_FR/products.lang            |  6 +-
 htdocs/langs/fr_FR/projects.lang            | 16 ++---
 htdocs/langs/fr_FR/propal.lang              |  4 +-
 htdocs/langs/fr_FR/receptions.lang          |  1 +
 htdocs/langs/fr_FR/recruitment.lang         |  2 +-
 htdocs/langs/fr_FR/salaries.lang            |  4 +-
 htdocs/langs/fr_FR/stocks.lang              |  7 ++-
 htdocs/langs/fr_FR/stripe.lang              |  2 +
 htdocs/langs/fr_FR/ticket.lang              |  4 +-
 htdocs/langs/fr_FR/users.lang               |  4 +-
 htdocs/langs/fr_FR/website.lang             |  8 ++-
 htdocs/langs/fr_FR/withdrawals.lang         |  2 +-
 htdocs/langs/fr_FR/workflow.lang            |  2 +-
 37 files changed, 201 insertions(+), 161 deletions(-)

diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index 340ef8546b6..6037eaed8ec 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -16,10 +16,10 @@ SeparatorDecimal=,
 SeparatorThousand=.
 FormatDateShort=%d-%m-%Y
 FormatDateShortInput=%d-%m-%Y
-FormatDateShortJava=dd/MM/åååå
-FormatDateShortJavaInput=dd/MM/åååå
-FormatDateShortJQuery=dd/mm/åå
-FormatDateShortJQueryInput=dd/mm/åå
+FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShortJQuery=HH:mm
 FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index e90e62853ce..31b1ecc58f1 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -165,44 +165,44 @@ ACCOUNTANCY_COMBO_FOR_AUX=Activer la liste déroulante pour les comptes auxiliai
 ACCOUNTING_DATE_START_BINDING=Définissez une date pour commencer la liaison et le transfert en comptabilité. En dessous de cette date, les transactions ne seront jamais transférées à la comptabilité.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Sur virement comptable, quelle est la période sélectionnée par défaut
 
-ACCOUNTING_SELL_JOURNAL=Sales journal (sales and returns)
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal (purchase and returns)
-ACCOUNTING_BANK_JOURNAL=Cash journal (receipts and disbursements)
+ACCOUNTING_SELL_JOURNAL=Journal des ventes (ventes et retours)
+ACCOUNTING_PURCHASE_JOURNAL=Journal des achats (achats et retours)
+ACCOUNTING_BANK_JOURNAL=Journal de caisse (encaissements et décaissements)
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Journal des notes de frais
-ACCOUNTING_MISCELLANEOUS_JOURNAL=General journal
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Journal général
 ACCOUNTING_HAS_NEW_JOURNAL=Journal des A-nouveaux
-ACCOUNTING_INVENTORY_JOURNAL=Inventory journal
+ACCOUNTING_INVENTORY_JOURNAL=Journal d'inventaire
 ACCOUNTING_SOCIAL_JOURNAL=Journal de paie
 
 ACCOUNTING_RESULT_PROFIT=Compte de résultat (Profit)
 ACCOUNTING_RESULT_LOSS=Compte de résultat (perte)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal de fermeture
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account (from the Chart Of Account) to be used as the account for transitional bank transfers
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Compte (du plan comptable) à utiliser comme compte pour les virements bancaires transitoires
 TransitionalAccount=Compte transitoire de virement bancaire
 
-ACCOUNTING_ACCOUNT_SUSPENSE=Account (from the Chart Of Account) to be used as the account for unallocated funds either received or paid i.e. funds in "wait[ing]"
-DONATION_ACCOUNTINGACCOUNT=Account (from the Chart Of Account) to be used to register donations (Donation module)
-ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Account (from the Chart Of Account) to be used to register memberships subscriptions (Membership module - if membership recorded without invoice)
+ACCOUNTING_ACCOUNT_SUSPENSE=Compte (du plan comptable) à utiliser comme compte pour les fonds non alloués reçus ou payés, c'est-à-dire les fonds en "attente"
+DONATION_ACCOUNTINGACCOUNT=Compte (du plan comptable) à utiliser pour enregistrer les dons (module Donation)
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Compte (du plan comptable) à utiliser pour enregistrer les souscriptions d'adhésions (module d'adhésion - si adhésion enregistrée sans facture)
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be used as the default account to register customer deposit
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Compte (du plan comptable) à utiliser comme compte par défaut pour enregistrer le dépôt du client
 UseAuxiliaryAccountOnCustomerDeposit=Enregistrer le compte client comme compte individuel dans le grand livre auxiliaire pour les lignes d'acompte (si désactivé, le compte individuel pour les lignes d'acompte restera vide)
-ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
+ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Compte (du plan comptable) à utiliser par défaut
 UseAuxiliaryAccountOnSupplierDeposit=Stocker le compte fournisseur comme compte individuel dans le grand livre auxiliaire pour les lignes d'acomptes (si désactivé, le compte individuel pour les lignes d'acompte restera vide)
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased and imported from any other foreign country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the sold products (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products sold from EEC to another EEC country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products sold and exported to any other foreign country (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Compte (du plan comptable) à utiliser comme compte par défaut pour les produits achetés dans le même pays (utilisé s'il n'est pas défini dans la fiche produit)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Compte (du plan comptable) à utiliser comme compte par défaut pour les produits achetés de la CEE vers un autre pays de la CEE (utilisé si non défini dans la fiche produit)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Compte (du plan comptable) à utiliser comme compte par défaut pour les produits achetés et importés de tout autre pays étranger (utilisé s'il n'est pas défini dans la fiche produit)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Compte (du plan comptable) à utiliser comme compte par défaut pour les produits vendus (utilisé si non défini dans la fiche produit)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Compte (du Plan Comptable) à utiliser comme compte par défaut pour les produits vendus depuis la CEE vers un autre pays de la CEE (utilisé si non défini dans la fiche produit)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Compte (du plan comptable) à utiliser comme compte par défaut pour les produits vendus et exportés vers tout autre pays étranger (utilisé s'il n'est pas défini dans la fiche produit)
 
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services purchased within same country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services purchased from EEC to another EEC country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services purchased and imported from other foreign country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the sold services (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services sold from EEC to another EEC country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services sold and exported to any other foreign country (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Compte (du plan comptable) à utiliser comme compte par défaut pour les services achetés dans le même pays (utilisé s'il n'est pas défini dans la feuille de services)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Compte (du plan comptable) à utiliser comme compte par défaut pour les services achetés depuis la CEE vers un autre pays de la CEE (utilisé s'il n'est pas défini dans la feuille de services)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Compte (du plan comptable) à utiliser comme compte par défaut pour les services achetés et importés d'un autre pays étranger (utilisé s'il n'est pas défini dans la feuille de service)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Compte (du plan comptable) à utiliser comme compte par défaut pour les services vendus (utilisé s'il n'est pas défini dans la feuille de services)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Compte (du Plan Comptable) à utiliser comme compte par défaut pour les prestations vendues depuis la CEE vers un autre pays de la CEE (utilisé si non défini dans la fiche service)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Compte (du plan comptable) à utiliser comme compte par défaut pour les services vendus et exportés vers tout autre pays étranger (utilisé s'il n'est pas défini dans la feuille de service)
 
 Doctype=Type de documents
 Docdate=Date
@@ -217,7 +217,7 @@ Codejournal=Journal
 JournalLabel=Libellé journal
 NumPiece=Numéro de pièce
 TransactionNumShort=Num. transaction
-AccountingCategory=Custom group of accounts
+AccountingCategory=Groupe de comptes personnalisé
 GroupByAccountAccounting=Affichage par compte comptable
 GroupBySubAccountAccounting=Affichage par compte auxiliaire
 AccountingAccountGroupsDesc=Vous pouvez définir ici des groupes de comptes comptable. Il seront utilisés pour les reporting comptables personnalisés
@@ -271,13 +271,13 @@ Reconcilable=Rapprochable
 TotalVente=Total chiffre affaires hors taxe
 TotalMarge=Total marge
 
-DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product account from chart of account
-DescVentilMore=In most cases, if you use predefined products or services and you set the account (from chart of account) on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still have some lines not bound to an account, you will have to make a manual binding from the menu "<strong>%s</strong>".
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product account from chart of account
-DescVentilTodoCustomer=Bind invoice lines not already bound with a product account from chart of account
-ChangeAccount=Change the product/service account (from chart of account) for the selected lines with the following account:
+DescVentilCustomer=Consultez ici la liste des lignes de facture client liées (ou non) à un compte produit du plan comptable
+DescVentilMore=Dans la plupart des cas, si vous utilisez des produits ou services prédéfinis et que vous paramétrez le compte (du plan comptable) sur la fiche produit/service, l'application pourra faire toute la liaison entre vos lignes de facture et le compte comptable de votre plan comptable des comptes, juste en un clic avec le bouton <strong> "%s" </strong> . Si le compte n'a pas été défini sur les fiches produits/services ou s'il vous reste des lignes non liées à un compte, vous devrez effectuer une liaison manuelle depuis le menu " <strong> %s </strong> ".
+DescVentilDoneCustomer=Consultez ici la liste des lignes de factures clients et leur compte produit à partir du plan comptable
+DescVentilTodoCustomer=Lier les lignes de facture qui ne sont pas déjà liées à un compte produit à partir d'un plan comptable
+ChangeAccount=Modifiez le compte de produit/service (du plan comptable) pour les lignes sélectionnées avec le compte suivant :
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transfered in accountancy are visible)
+DescVentilSupplier=Consultez ici la liste des lignes de facture fournisseur liées ou non encore liées à un compte article du plan comptable (seuls les enregistrements non encore transférés en comptabilité sont visibles)
 DescVentilDoneSupplier=Consultez ici la liste des lignes de factures fournisseurs et leur compte comptable
 DescVentilTodoExpenseReport=Lier les lignes de note de frais par encore liées à un compte comptable
 DescVentilExpenseReport=Consultez ici la liste des lignes de notes de frais liées (ou non) à un compte comptable
@@ -295,14 +295,14 @@ DescValidateMovements=Toute modification ou suppression d'écriture, de lettrage
 ValidateHistory=Lier automatiquement
 AutomaticBindingDone=Liaisons automatiques effectuées (%s) - Liaison automatique impossible pour certains enregistrements (%s)
 
-ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
+ErrorAccountancyCodeIsAlreadyUse=Erreur, vous ne pouvez pas supprimer ou désactiver ce compte de plan comptable car il est utilisé
 MvtNotCorrectlyBalanced=Mouvement non équilibré. Débit = %s & Crédit = %s
 Balancing=Équilibrage
 FicheVentilation=Fiche lien
 GeneralLedgerIsWritten=Les transactions sont enregistrées dans le grand livre
 GeneralLedgerSomeRecordWasNotRecorded=Certaines des opérations n'ont pu être journalisées. S'il n'y a pas d'autres messages, c'est probablement car elles sont déjà comptabilisées.
 NoNewRecordSaved=Aucune ligne à transférer
-ListOfProductsWithoutAccountingAccount=List of products not bound to any account of chart of account
+ListOfProductsWithoutAccountingAccount=Liste des produits non liés à un compte de plan comptable
 ChangeBinding=Changer les liens
 Accounted=En comptabilité
 NotYetAccounted=Pas encore transféré en comptabilité
@@ -328,7 +328,7 @@ AccountingJournalType4=Banque
 AccountingJournalType5=Notes de frais
 AccountingJournalType8=Inventaire
 AccountingJournalType9=A-nouveaux
-GenerationOfAccountingEntries=Generation of accounting entries
+GenerationOfAccountingEntries=Génération des écritures comptables
 ErrorAccountingJournalIsAlreadyUse=Le journal est déjà utilisé
 AccountingAccountForSalesTaxAreDefinedInto=Remarque: Le compte comptable pour la TVA est défini dans le menu <b> %s </b> - <b> %s </b>
 NumberOfAccountancyEntries=Nombre d'entrées
@@ -336,10 +336,10 @@ NumberOfAccountancyMovements=Nombre de mouvements
 ACCOUNTING_DISABLE_BINDING_ON_SALES=Désactiver la liaison et le transfert en comptabilité des factures de ventes (les factures clients ne seront pas prises en compte en comptabilité).
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Désactiver la liaison et le transfert en comptabilité des factures d'achats (les factures fournisseurs ne seront pas prises en compte en comptabilité).
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Désactiver la liaison et le transfert en comptabilité des notes de frais (les notes de frais ne seront pas prises en compte en comptabilité).
-ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_LETTERING=Activer la fonction de lettrage dans la comptabilité
 
 ## Export
-NotExportLettering=Do not export the lettering when generating the file
+NotExportLettering=Ne pas exporter le lettrage lors de la génération du fichier
 NotifiedExportDate=Marquer les lignes exportées comme Exportées <span class="warning"> (pour modifier une ligne, vous devrez supprimer toute la transaction et la retransférer en comptabilité) </span>
 NotifiedValidationDate=Validez et verrouillez les entrées exportées <span class="warning"> (même effet que la fonctionnalité "%s", la modification et la suppression des lignes ne seront définitivement plus possibles) </span>
 DateValidationAndLock=Validation et verrouillage de la date
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index e55d3ad7acc..7bc99f56b19 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -974,14 +974,14 @@ Permission3301=Générer de nouveaux modules
 Permission4001=Lire compétence/emploi/poste
 Permission4002=Créer/modifier une compétence/un emploi/un poste
 Permission4003=Supprimer compétence/emploi/poste
-Permission4021=Read evaluations (yours and your subordinates)
-Permission4022=Create/modify evaluations
+Permission4021=Lire les évaluations (la vôtre et celle de vos subordonnés)
+Permission4022=Créer/modifier des évaluations
 Permission4023=Valider l'évaluation
 Permission4025=Supprimer l'évaluation
 Permission4028=Voir menu de comparaison
 Permission4031=Lire les informations personnelles
 Permission4032=Ecrire les informations personnelles
-Permission4033=Read all evaluations (even those of user not subordinates)
+Permission4033=Lire toutes les évaluations (même celles des utilisateurs non subordonnés)
 Permission10001=Lire le contenu du site
 Permission10002=Créer/modifier le contenu du site Web (contenu HTML et JavaScript)
 Permission10003=Créer/modifier le contenu du site Web (code php dynamique). Dangereux, doit être réservé à un nombre restreint de développeurs.
@@ -1303,7 +1303,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Vous devez exécuter la command
 YourPHPDoesNotHaveSSLSupport=Fonctions SSL non présentes dans votre PHP
 DownloadMoreSkins=Plus de thèmes à télécharger
 SimpleNumRefModelDesc=Renvoie le numéro sous la forme %syymm-nnnn où yy est l'année, mm le mois et nnnn un compteur séquentiel sans rupture et sans remise à 0.
-SimpleRefNumRefModelDesc=Returns the reference number in the format n where n is a sequential auto-incrementing number with no reset
+SimpleRefNumRefModelDesc=Renvoie le numéro de référence au format n où n est un numéro séquentiel auto-incrémenté sans réinitialisation
 AdvancedNumRefModelDesc=Renvoie le numéro sous la forme %syymm-nnnn où yy est l'année, mm le mois et nnnn un compteur séquentiel sans rupture et sans remise à 0.
 SimpleNumRefNoDateModelDesc=Renvoie le numéro de référence au format %s-nnnn où nnnn est un nombre séquentiel autoincrémenté sans réinitialisation
 ShowProfIdInAddress=Afficher l'identifiant professionnel dans les adresses
@@ -1391,7 +1391,7 @@ GetBarCode=Récupérer code barre
 NumberingModules=Modèles de numérotation
 DocumentModules=Modèles de documents
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters.
+PasswordGenerationStandard=Renvoie un mot de passe généré selon l'algorithme interne de Dolibarr : %s caractères contenant des nombres et des caractères partagés.
 PasswordGenerationNone=Ne pas suggérer un mot de passe généré. Le mot de passe doit être entré manuellement. 
 PasswordGenerationPerso=Renvoie un mot de passe en fonction d'une configuration personnalisée.
 SetupPerso=Selon votre configuration
@@ -1445,10 +1445,10 @@ SuppliersPayment=Règlements fournisseurs
 SupplierPaymentSetup=Configuration des règlements fournisseurs
 InvoiceCheckPosteriorDate=Vérifier la facture avant validation
 InvoiceCheckPosteriorDateHelp=Valider une facture est interdit si sa date est antérieur à la date de la dernière facture du même type
-InvoiceOptionCategoryOfOperations=Display the mention "category of operations" on the invoice.
-InvoiceOptionCategoryOfOperationsHelp=Depending on the situation, the mention will appear in the form:<br>- Category of operations: Delivery of goods<br>- Category of operations: Provision of services<br>- Category of operations: Mixed - Delivery of goods & provision of services
-InvoiceOptionCategoryOfOperationsYes1=Yes, below the address block
-InvoiceOptionCategoryOfOperationsYes2=Yes, in the lower left-hand corner
+InvoiceOptionCategoryOfOperations=Afficher la mention "catégorie d'opérations" sur la facture.
+InvoiceOptionCategoryOfOperationsHelp=Selon les cas, la mention apparaîtra sous la forme : <br> - Catégorie d'opérations : Livraison de biens <br> - Catégorie d'opérations : Prestation de services <br> - Catégorie d'opérations : Mixte - Livraison de biens & prestation de services
+InvoiceOptionCategoryOfOperationsYes1=Oui, sous le bloc d'adresse
+InvoiceOptionCategoryOfOperationsYes2=Oui, dans le coin inférieur gauche
 ##### Proposals #####
 PropalSetup=Configuration du module Propositions Commerciales
 ProposalsNumberingModules=Modèles de numérotation des propositions commerciales
@@ -1491,12 +1491,12 @@ WatermarkOnDraftContractCards=Filigrane sur les brouillons de contrats (aucun si
 ##### Members #####
 MembersSetup=Configuration du module Adhérents
 MemberMainOptions=Options principales
-MemberCodeChecker=Options for automatic generation of member codes
+MemberCodeChecker=Options de génération automatique des codes membres
 AdherentLoginRequired= Gérer un identifiant pour chaque adhérent
 AdherentMailRequired=Email obligatoire pour créer un nouvel adhérent
 MemberSendInformationByMailByDefault=Case à cocher pour envoyer un email de confirmation (validation ou nouvelle cotisation) aux adhérents est à oui par défaut.
 MemberCreateAnExternalUserForSubscriptionValidated=Créer un utilisateur externe pour chaque nouvelle cotisation adhérent validée
-VisitorCanChooseItsPaymentMode=Visitor can choose from any available payment modes
+VisitorCanChooseItsPaymentMode=Le visiteur peut choisir parmi tous les modes de paiement disponibles
 MEMBER_REMINDER_EMAIL=Activer le rappel automatique <b> par e-mail </b> des adhésions expirées. Remarque: le module <strong> %s </strong> doit être activé et configuré correctement pour qu'un rappel soit envoyé.
 MembersDocModules=Modèle de document pour le document généré depuis la fiche d'un adhérent
 ##### LDAP setup #####
@@ -1853,7 +1853,7 @@ StockDecreaseForPointOfSaleDisabledbyBatch=La décrémentation de stock depuis c
 CashDeskYouDidNotDisableStockDecease=Vous n'avez pas désactivé la réduction de stock lors d'une vente depuis le Point de vente. Par conséquent, un entrepôt est nécessaire.
 CashDeskForceDecreaseStockLabel=La diminution des stocks de produits soumis à numéros de lots a été forcée.
 CashDeskForceDecreaseStockDesc=Diminuez d'abord par les dates de DMD/DLUO ou DLC les plus anciennes
-CashDeskReaderKeyCodeForEnter=Key ASCII code for "Enter" defined in barcode reader (Example: 13)
+CashDeskReaderKeyCodeForEnter=Code ASCII clé pour "Enter" défini dans le lecteur de code-barres (Exemple : 13)
 ##### Bookmark #####
 BookmarkSetup=Configuration du module Marque-pages
 BookmarkDesc=Ce module vous permet de gérer des liens et raccourcis. Il permet aussi d'ajouter n'importe quelle page de Dolibarr ou lien web dans le menu d'accès rapide sur la gauche.
@@ -1891,7 +1891,7 @@ SuppliersInvoiceNumberingModel=Modèles de numérotation des factures fournisseu
 IfSetToYesDontForgetPermission=Si positionné sur une valeur non nulle, n'oubliez pas de donner les permissions aux groupes ou utilisateurs qui auront le droit de cette seconde approbation.
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Configuration du module GeoIP Maxmind
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation
+PathToGeoIPMaxmindCountryDataFile=Chemin d'accès au fichier contenant la traduction de l'adresse IP Maxmind vers le pays
 NoteOnPathLocation=Notez que ce fichier doit être dans un répertoire accessible à votre PHP (Vérifiez le paramètre open_basedir de votre PHP et les permissions du fichier/répertoires).
 YouCanDownloadFreeDatFileTo=Vous pouvez télécharger une <b>version démo gratuite</b> de la base Maxmind à l'adresse %s.
 YouCanDownloadAdvancedDatFileTo=Vous pouvez aussi télécharger une <b>version plus complète avec mise à jours</b> de la base Maxmind à l'adresse %s.
@@ -1942,7 +1942,7 @@ BackupDumpWizard=Assistant pour créer le fichier dump de la base de données
 BackupZipWizard=Assistant pour générer l'archive du répertoire documents
 SomethingMakeInstallFromWebNotPossible=L'installation de module externe est impossible depuis l'interface web pour la raison suivante : 
 SomethingMakeInstallFromWebNotPossible2=Pour cette raison, le processus de mise à jour décrit ici est une processus manuel que seul un utilisateur ayant des droits privilégiés peut réaliser.
-InstallModuleFromWebHasBeenDisabledContactUs=Install or development of external modules or dynamic websites, from the application, is currently locked for security purpose. Please contact us if you need to enable this feature.
+InstallModuleFromWebHasBeenDisabledContactUs=L'installation ou le développement de modules externes ou de sites Web dynamiques, à partir de l'application, est actuellement verrouillé pour des raisons de sécurité. Veuillez nous contacter si vous avez besoin d'activer cette fonctionnalité.
 InstallModuleFromWebHasBeenDisabledByFile=L'installation de module externe depuis l'application a été désactivé par l'administrator. Vous devez lui demander de supprimer le fichier <strong>%s</strong> pour permettre cette fonctionnalité.
 ConfFileMustContainCustom=Installer ou créer un module externe à partir de l'application nécessite de sauvegarder les fichiers du module dans le répertoire <strong>%s</strong>. Pour que ce répertoire soit reconnu par Dolibarr, vous devez paramétrer le fichier de configuration <strong>conf/conf.php</strong> en ajoutant les 2 lignes suivantes :<br><strong>$dolibarr_main_url_root_alt='/custom'</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Mettre en surbrillance les lignes de la table lorsque la souris passe au-dessus
@@ -2070,8 +2070,8 @@ RemoveSpecialChars=Supprimer les caractères spéciaux
 COMPANY_AQUARIUM_CLEAN_REGEX=Filtre Regex pour nettoyer la valeur (COMPANY_AQUARIUM_CLEAN_REGEX)
 COMPANY_DIGITARIA_CLEAN_REGEX=Filtre de regex pour nettoyer la valeur (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Doublons non autorisés
-RemoveSpecialWords=Clean certain words when generating sub-accounts for customers or suppliers
-RemoveSpecialWordsHelp=Specify the words to be cleaned before calculating the customer or supplier account. Use a ";" between each word
+RemoveSpecialWords=Nettoyer certains mots lors de la génération de sous-comptes pour les clients ou les fournisseurs
+RemoveSpecialWordsHelp=Précisez les mots à nettoyer avant de calculer le compte client ou fournisseur. Utiliser un ";" entre chaque mot
 GDPRContact=Responsable de la protection des données (DPO ou contact RGPD)
 GDPRContactDesc=Si vous stockez des données personnelles dans votre système d'information, vous pouvez nommer ici le contact responsable du règlement général sur la protection des données
 HelpOnTooltip=Texte d'aide à afficher dans l'info-bulle
@@ -2203,7 +2203,7 @@ ShowProjectLabel=Libellé du projet
 PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Inclure un alias dans le nom du tiers
 THIRDPARTY_ALIAS=Nom du tiers - Alias du tiers
 ALIAS_THIRDPARTY=Alias du tiers - Nom du tiers
-PDFIn2Languages=Show labels into PDF in 2 different languages
+PDFIn2Languages=Afficher les étiquettes au format PDF dans 2 langues différentes
 PDF_USE_ALSO_LANGUAGE_CODE=Si vous souhaitez que certains textes de votre PDF soient dupliqués dans 2 langues différentes dans le même PDF généré, vous devez définir ici cette deuxième langue pour que le PDF généré contienne 2 langues différentes dans la même page, celle choisie lors de la génération du PDF et celle-ci (seuls quelques modèles PDF prennent en charge cette fonction). Gardez vide pour 1 langue par PDF.
 PDF_USE_A=Générer document PDF avec le format PDF/A à la place du format PDF standard
 FafaIconSocialNetworksDesc=Entrez ici le code d'une icône FontAwesome. Si vous ne savez pas ce qu'est FontAwesome, vous pouvez utiliser la valeur générique fa-address-book.
@@ -2232,12 +2232,12 @@ MailToPartnership=Partenariat
 AGENDA_EVENT_DEFAULT_STATUS=État de l’événement par défaut lors de la création d’un événement à partir du formulaire
 YouShouldDisablePHPFunctions=Vous devriez désactiver les fonctions PHP
 IfCLINotRequiredYouShouldDisablePHPFunctions=Sauf si vous avez besoin de lancer des commandes système, vous devriez désactiver les fonctions PHP
-PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an antivirus program), you must keep PHP functions
+PHPFunctionsRequiredForCLI=À des fins de shell (comme la sauvegarde de tâches planifiées ou l'exécution d'un programme antivirus), vous devez conserver les fonctions PHP
 NoWritableFilesFoundIntoRootDir=Aucun fichier ou répertoire des programmes courants n’a été trouvé en écriture dans votre répertoire racine (Bon)
 RecommendedValueIs=Recommandé : %s
 Recommended=Recommandé
 NotRecommended=Non recommandé
-ARestrictedPath=Some restricted path for data files
+ARestrictedPath=Certains chemins restreints pour les fichiers de données
 CheckForModuleUpdate=Vérifier les mises à jour des modules externes
 CheckForModuleUpdateHelp=Cette action se connecte aux éditeurs des modules externes pour vérifier si une nouvelle version est disponible.
 ModuleUpdateAvailable=Une mise à jour est disponible
@@ -2309,8 +2309,8 @@ IconOnly=Icône uniquement - Texte sur l'info-bulle uniquement
 INVOICE_ADD_ZATCA_QR_CODE=Afficher le code QR ZATCA sur les factures
 INVOICE_ADD_ZATCA_QR_CODEMore=Certains pays arabes ont besoin de ce code QR sur leurs factures
 INVOICE_ADD_SWISS_QR_CODE=Afficher la QR-facture suisse sur les factures
-INVOICE_SHOW_SHIPPING_ADDRESS=Show shipping address
-INVOICE_SHOW_SHIPPING_ADDRESSMore=Compulsory mention for France
+INVOICE_SHOW_SHIPPING_ADDRESS=Afficher l'adresse de livraison
+INVOICE_SHOW_SHIPPING_ADDRESSMore=Mention obligatoire pour la France
 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
@@ -2330,7 +2330,7 @@ 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
-MaxNumberOfPostOnPublicPagesByIP=Max number of posts on public pages with the same IP address in a month
+MaxNumberOfPostOnPublicPagesByIP=Nombre maximum de publications sur des pages publiques avec la même adresse IP en un mois
 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 :
 ScriptIsEmpty=Le script est manquant
 ShowHideTheNRequests=Afficher/Cacher les %s requête(s) SQL.
@@ -2351,7 +2351,7 @@ LimitsAndMitigation=Limites d'accès et atténuation
 DesktopsOnly=Ordinateurs de bureau uniquement
 DesktopsAndSmartphones=Ordinateurs de bureau et smartphones
 AllowOnlineSign=Autoriser la signature en ligne
-AllowExternalDownload=Allow external download (without login, using a shared link)
-DeadlineDayVATSubmission=Deadline day for vat submission on the next month
-MaxNumberOfAttachementOnForms=Max number of joinded files in a form
-IfDefinedUseAValueBeetween=If defined, use a value between %s and %s
+AllowExternalDownload=Autoriser le téléchargement externe (sans connexion, en utilisant un lien partagé)
+DeadlineDayVATSubmission=Date limite pour la soumission de la TVA le mois suivant
+MaxNumberOfAttachementOnForms=Nombre maximum de fichiers joints dans un formulaire
+IfDefinedUseAValueBeetween=Si défini, utilisez une valeur entre %s et %s
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index 62dbae7233e..e5a5fe354c4 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -68,6 +68,7 @@ ShipmentBackToDraftInDolibarr=Expédition %s remise au statut brouillon
 ShipmentDeletedInDolibarr=Expédition %s supprimée
 ShipmentCanceledInDolibarr=Expédition %s annulée
 ReceptionValidatedInDolibarr=Réception %s validée
+ReceptionDeletedInDolibarr=Réception %s supprimée
 ReceptionClassifyClosedInDolibarr=Réception %s classée fermée
 OrderCreatedInDolibarr=Commande %s créée
 OrderValidatedInDolibarr=Commande %s validée
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 15a7901a2e9..571c9316496 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -13,10 +13,12 @@ BillsStatistics=Statistiques factures clients
 BillsStatisticsSuppliers=Statistiques factures fournisseurs
 DisabledBecauseDispatchedInBookkeeping=Action désactivée car facture comptabilisée dans le grand livre
 DisabledBecauseNotLastInvoice=Action désactivée car facture non supprimable. Des factures ont été créées après celle-ci et cela va créer un trou dans la numérotation des factures.
+DisabledBecauseNotLastSituationInvoice=Désactivé car la facture n'est pas effaçable. Cette facture n'est pas la dernière du cycle des factures de situation.
 DisabledBecauseNotErasable=Désactivé car non supprimable
 InvoiceStandard=Facture standard
 InvoiceStandardAsk=Facture standard
 InvoiceStandardDesc=Ce type de facture est la facture traditionnelle. On l'appelle aussi <b>facture de doit</b> (du verbe devoir).
+InvoiceStandardShort=Standard
 InvoiceDeposit=Facture d'acompte
 InvoiceDepositAsk=Facture d'acompte
 InvoiceDepositDesc=Ce type de facture fait suite à réception d'un acompte, s'il n'est pas encore possible de saisir le paiement sur une facture définitive.
@@ -24,6 +26,7 @@ InvoiceProForma=Facture proforma
 InvoiceProFormaAsk=Facture proforma
 InvoiceProFormaDesc=La <b>facture proforma</b> est une image de facture définitive mais qui n'a aucune valeur comptable.
 InvoiceReplacement=Facture de remplacement
+InvoiceReplacementShort=Remplacement
 InvoiceReplacementAsk=Facture de remplacement de la facture
 InvoiceReplacementDesc=La <b>facture de remplacement</b> sert à remplacer complètement une facture existante sur laquelle aucun paiement n'a encore eu lieu.<br><br>Rem: Seules les factures sans aucun paiement peuvent être remplacées. Si ces dernières ne sont pas encore fermées, elles le seront automatiquement au statut 'abandonnée'.
 InvoiceAvoir=Facture avoir
@@ -159,6 +162,7 @@ ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Cette partie ou
 ErrorInvoiceIsNotLastOfSameType=Erreur: La date de la facture %s  est %s. Elle doit être postérieur ou égale à la dernière date pour le même type de factures (%s). Veuillez, s'il vous plait, changer la date de la facture.
 BillFrom=Émetteur
 BillTo=Adressé à
+ShippingTo=Expédition à
 ActionsOnBill=Événements sur la facture
 RecurringInvoiceTemplate=Modèle de facture / Facture récurrente
 NoQualifiedRecurringInvoiceTemplateFound=Pas de facture récurrente qualifiée pour la génération
@@ -448,8 +452,8 @@ PaymentTypeShortVIR=Virement bancaire
 PaymentTypePRE=Ordre de prélèvement
 PaymentTypePREdetails=(sur compte *-%s)
 PaymentTypeShortPRE=Ordre de prélèvement
-PaymentTypeLIQ=Espèces
-PaymentTypeShortLIQ=Espèces
+PaymentTypeLIQ=Espèce
+PaymentTypeShortLIQ=Espèce
 PaymentTypeCB=Carte bancaire
 PaymentTypeShortCB=Carte bancaire
 PaymentTypeCHQ=Chèque
@@ -622,3 +626,8 @@ PaymentRegisteredAndInvoiceSetToPaid=Paiement enregistré et facture %s passée
 SendEmailsRemindersOnInvoiceDueDate=Envoyer un rappel par e-mail pour les factures impayées
 MakePaymentAndClassifyPayed=Enregistrer un paiement
 BulkPaymentNotPossibleForInvoice=L'enregistrement  de paiements en masse n'est pas possible pour la facture %s (mauvais type de facture ou statut)
+MentionVATDebitOptionIsOn=Option de paiement de taxe sur débits
+MentionCategoryOfOperations=Catégorie d'opérations
+MentionCategoryOfOperations0=Livraison de marchandises
+MentionCategoryOfOperations1=Fourniture de services
+MentionCategoryOfOperations2=Mixte - Livraison de biens & prestation de services
diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang
index 245d2997ab0..cb09a89023c 100644
--- a/htdocs/langs/fr_FR/boxes.lang
+++ b/htdocs/langs/fr_FR/boxes.lang
@@ -44,10 +44,10 @@ BoxTitleSupplierOrdersAwaitingReception=Commandes fournisseurs en attente de ré
 BoxTitleLastModifiedContacts=Les %s derniers contacts/adresses modifiés
 BoxMyLastBookmarks=Mes %s derniers marque-pages
 BoxOldestExpiredServices=Plus anciens services expirés
-BoxOldestActions=Oldest events to do
+BoxOldestActions=Événements les plus anciens à faire
 BoxLastExpiredServices=Les %s plus anciens contrats avec services actifs expirés
 BoxTitleLastActionsToDo=Les %s derniers événements à réaliser
-BoxTitleOldestActionsToDo=Oldest %s events to do, not completed
+BoxTitleOldestActionsToDo=Événements %s les plus anciens à faire, non terminés
 BoxTitleLastContracts=Les %s derniers contrats modifiés
 BoxTitleLastModifiedDonations=Les %s derniers dons modifiés
 BoxTitleLastModifiedExpenses=Les %s dernières notes de frais modifiées
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index 641cf97bacf..235602b4600 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -63,7 +63,7 @@ MembersCategoriesShort=Tags des adhérents
 ContactCategoriesShort=Tags de contacts
 AccountsCategoriesShort=Tags des comptes
 ProjectsCategoriesShort=Tags de projets
-UsersCategoriesShort=Tags utlisateurs
+UsersCategoriesShort=Tags utilisateurs
 StockCategoriesShort=Tags/catégories d’entrepôt
 ThisCategoryHasNoItems=Cette catégorie ne contient aucun élément.
 CategId=ID du(de la) tag/catégorie
@@ -88,7 +88,7 @@ DeleteFromCat=Enlever des tags/catégories
 ExtraFieldsCategories=Attributs supplémentaires
 CategoriesSetup=Configuration des tags/catégories
 CategorieRecursiv=Lier automatiquement avec le(a) tag/catégorie parent(e)
-CategorieRecursivHelp=Si l'option est activé, quand un produit est ajouté dans une sous-catégorie, le produit sera ajouté aussi dans la catégorie parente.
+CategorieRecursivHelp=Si l'option est activée, lorsque vous ajoutez un objet dans une sous-catégorie, l'objet sera également ajouté dans les catégories parentes.
 AddProductServiceIntoCategory=Ajouter le produit/service suivant
 AddCustomerIntoCategory=Assigner cette catégorie au client
 AddSupplierIntoCategory=Assigner cette catégorie au fournisseur
diff --git a/htdocs/langs/fr_FR/commercial.lang b/htdocs/langs/fr_FR/commercial.lang
index 924059a1262..4dbb9576480 100644
--- a/htdocs/langs/fr_FR/commercial.lang
+++ b/htdocs/langs/fr_FR/commercial.lang
@@ -76,10 +76,14 @@ NoLimit=Pas de limite
 ToOfferALinkForOnlineSignature=Lien pour signature en ligne
 WelcomeOnOnlineSignaturePageProposal=Bienvenue sur la page pour accepter les propositions commerciales de %s
 WelcomeOnOnlineSignaturePageContract=Bienvenue sur la page de signature du contrat PDF %s
+WelcomeOnOnlineSignaturePageFichinter=Bienvenue sur la page de signature de PDF d'intervention %s
 ThisScreenAllowsYouToSignDocFromProposal=Cet écran vous permet d'accepter et signer en ligne, ou de refuser, le devis ou la proposition commerciale
 ThisScreenAllowsYouToSignDocFromContract=Cet écran vous permet de signer en ligne un contrat au format PDF.
+ThisScreenAllowsYouToSignDocFromFichinter=Cet écran vous permet de signer en ligne une intervention au format PDF.
 ThisIsInformationOnDocumentToSignProposal=Voici les informations sur le document à accepter ou refuser
 ThisIsInformationOnDocumentToSignContract=Voici les informations sur le contrat à signer
+ThisIsInformationOnDocumentToSignFichinter=Ceci est une information sur l'intervention à signer
 SignatureProposalRef=Signature du devis ou proposition commerciale %s
 SignatureContractRef=Signature du contrat %s
+SignatureFichinterRef=Signature de l'intervention %s
 FeatureOnlineSignDisabled=Fonctionnalité pour la signature en ligne désactivée ou document généré avant l'activation de la fonctionnalité
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index faba266bf3d..58b04bc67bd 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -246,12 +246,12 @@ TurnoverPerProductInCommitmentAccountingNotRelevant=Le rapport de chiffre d'affa
 TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=Le rapport de Chiffre d'affaires encaissé par taux de TVA n'est pas disponible. Ce rapport est uniquement disponible pour le chiffre d'affaires facturé.
 CalculationMode=Mode de calcul
 AccountancyJournal=Code journal comptable
-ACCOUNTING_VAT_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for VAT on purchases (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_PAY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Account (from the Chart Of Account) used for "customer" third parties
+ACCOUNTING_VAT_SOLD_ACCOUNT=Compte (du plan comptable) à utiliser comme compte par défaut pour la TVA sur les ventes (utilisé s'il n'est pas défini dans la configuration du dictionnaire TVA)
+ACCOUNTING_VAT_BUY_ACCOUNT=Compte (du plan comptable) à utiliser comme compte par défaut pour la TVA sur les achats (utilisé s'il n'est pas défini dans la configuration du dictionnaire TVA)
+ACCOUNTING_VAT_PAY_ACCOUNT=Compte (du plan comptable) à utiliser comme compte par défaut pour le paiement de la TVA
+ACCOUNTING_ACCOUNT_CUSTOMER=Compte (du plan comptable) utilisé pour les tiers "clients"
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Le compte comptable dédié défini sur la fiche tiers sera utilisé pour l'affectation du compte auxiliaire uniquement. Celui-ci sera utilisé pour la comptabilité générale et comme valeur par défaut de la comptabilité auxiliaire si le compte comptable client dédié du ties n'est pas défini. 
-ACCOUNTING_ACCOUNT_SUPPLIER=Account (from the Chart of Account) used for the "vendor" third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Compte (du Plan Comptable) utilisé pour les tiers "fournisseurs"
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Le compte de comptabilité dédié défini sur la fiche Tiers sera utilisé pour la comptabilité auxiliaire uniquement. Celui-ci sera utilisé pour le grand livre et comme valeur par défaut de la comptabilité auxiliaire si le compte de comptabilité fournisseur dédié au tiers n'est pas défini.
 ConfirmCloneTax=Confirmer le clonage de la charge sociale/fiscale
 ConfirmCloneVAT=Confirmer le clonage d'une déclaration de TVA
diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang
index e851fd5a13a..68456166c2c 100644
--- a/htdocs/langs/fr_FR/cron.lang
+++ b/htdocs/langs/fr_FR/cron.lang
@@ -26,7 +26,7 @@ CronCommand=Commande
 CronList=Travaux planifiés
 CronDelete=Effacer les travaux planifiés
 CronConfirmDelete=Êtes-vous sûr de vouloir supprimer ces travaux planifiées?
-CronExecute=Lancer la tache planifiée
+CronExecute=Lancer maintenant
 CronConfirmExecute=Etes-vous sûr que vous voulez exécuter ces travaux planifiées maintenant?
 CronInfo=Le module de taches planifiés permet de planifier des tâches à exécuter automatiquement. Les travaux planifiés peuvent aussi être lancés manuellement.
 CronTask=Travail planifié
@@ -58,7 +58,7 @@ CronNote=Commentaire
 CronFieldMandatory=Le champ %s est obligatoire
 CronErrEndDateStartDt=La date de fin ne peux être avant la date de début
 StatusAtInstall=Statut lors de l'installation du module
-CronStatusActiveBtn=Planifier
+CronStatusActiveBtn=Activer la planification
 CronStatusInactiveBtn=Désactiver
 CronTaskInactive=Ce travail est désactivé (non planifié)
 CronId=Id
@@ -84,6 +84,7 @@ MakeLocalDatabaseDumpShort=Sauvegarde locale de base
 MakeLocalDatabaseDump=Créez un fichier dump de base local. Les paramètres sont: compression ('gz' ou 'bz' ou 'none'), type de sauvegarde ('mysql', 'pgsql', 'auto'), 1, 'auto' ou nom du fichier à générer, nombre de fichiers de sauvegarde à garder
 MakeSendLocalDatabaseDumpShort=Envoyer la sauvegarde de la base de données locale
 MakeSendLocalDatabaseDump=Envoyez la sauvegarde de la base de données locale par e-mail. Les paramètres sont : to, from, subject, message, filename (nom du fichier envoyé), filter ('sql' pour la sauvegarde de la base de données uniquement)
+BackupIsTooLargeSend=Désolé, le dernier fichier de sauvegarde est trop volumineux pour être envoyé par e-mail
 CleanUnfinishedCronjobShort=Nettoyer la tâche planifiée inachevée
 CleanUnfinishedCronjob=Nettoyer la tâche planifiée bloquée dans le traitement lorsque le processus n'est plus en cours d'exécution
 WarningCronDelayed=Attention, à des fins de performance, quelle que soit la prochaine date d'exécution des travaux activés, vos travaux peuvent être retardés jusqu'à %s heures avant d'être exécutés.
diff --git a/htdocs/langs/fr_FR/dict.lang b/htdocs/langs/fr_FR/dict.lang
index d88ecbad57e..7c7df064619 100644
--- a/htdocs/langs/fr_FR/dict.lang
+++ b/htdocs/langs/fr_FR/dict.lang
@@ -250,9 +250,9 @@ CountryMF=Saint-Martin
 
 ##### Civilities #####
 CivilityMME=Madame
-CivilityMMEShort=Mrs.
+CivilityMMEShort=Mme.
 CivilityMR=Monsieur
-CivilityMRShort=Mr.
+CivilityMRShort=M.
 CivilityMLE=Mademoiselle
 CivilityMTRE=Maître
 CivilityDR=Docteur
diff --git a/htdocs/langs/fr_FR/ecm.lang b/htdocs/langs/fr_FR/ecm.lang
index 65a9b7ef0af..e728b754dcf 100644
--- a/htdocs/langs/fr_FR/ecm.lang
+++ b/htdocs/langs/fr_FR/ecm.lang
@@ -5,7 +5,7 @@ ECMSectionManual=Répertoire manuel
 ECMSectionAuto=Répertoire automatique
 ECMSectionsManual=Arborescence manuelle
 ECMSectionsAuto=Arborescence automatique
-ECMSectionsMedias=Medias tree
+ECMSectionsMedias=Arborescence des médias
 ECMSections=Répertoires
 ECMRoot=Racine
 ECMNewSection=Nouveau répertoire
@@ -17,9 +17,9 @@ ECMNbOfFilesInSubDir=Nombre de fichiers dans les sous-répertoires
 ECMCreationUser=Créateur
 ECMArea=Espace GED
 ECMAreaDesc=L'espace GED (Gestion Électronique de Documents) vous permet de stocker, partager et chercher rapidement tout type de documents dans Dolibarr.
-ECMAreaDesc2a=* Manual directories can be used to save documents not linked to a particular element.
-ECMAreaDesc2b=* Automatic directories are filled automatically when adding documents from the page of an element.
-ECMAreaDesc3=* Medias directories are files into the subdirectory <b>/medias</b> of documents directory, readable by everybody with no need to be logged and no need to have the file shared explicitely. It is used to store image files from emailing or website module.
+ECMAreaDesc2a=* Les répertoires manuels peuvent être utilisés pour enregistrer des documents non liés à un élément particulier.
+ECMAreaDesc2b=* Les répertoires automatiques sont remplis automatiquement lors de l'ajout de documents depuis la page d'un élément.
+ECMAreaDesc3=* Les répertoires des médias sont des fichiers dans le sous-répertoire <b> /medias </b> du répertoire des documents, lisibles par tout le monde sans avoir besoin d'être connecté et pas besoin d'avoir le fichier partagé explicitement. Il est utilisé pour stocker des fichiers image à partir d'un module d'e-mailing ou de site Web.
 ECMSectionWasRemoved=Le répertoire <b>%s</b> a été effacé.
 ECMSectionWasCreated=Le répertoire <b>%s</b> a été créé.
 ECMSearchByKeywords=Recherche par mots-clés
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 876a863e422..e38c4ee0bf4 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -14,7 +14,7 @@ ErrorLoginAlreadyExists=L'identifiant %s existe déjà.
 ErrorGroupAlreadyExists=Le groupe %s existe déjà.
 ErrorEmailAlreadyExists=L'e-mail %s existe déjà.
 ErrorRecordNotFound=Enregistrement non trouvé.
-ErrorRecordNotFoundShort=Not found
+ErrorRecordNotFoundShort=Pas trouvé
 ErrorFailToCopyFile=Echec de la copie du fichier '<b>%s</b>' en '<b>%s</b>'.
 ErrorFailToCopyDir=Echec de copie du répertoire '<b>%s</b>' vers '<b>%s</b>'.
 ErrorFailToRenameFile=Echec du renommage du fichier '<b>%s</b>' en '<b>%s</b>'.
@@ -97,7 +97,7 @@ ErrorWrongValueForField=Champ <b>%s</b>: '<b>%s</b>' ne respecte pas la règle <
 ErrorHtmlInjectionForField=Champ <b> %s </b> : La valeur ' <b> %s </b> ' contient une donnée malveillante non autorisée
 ErrorFieldValueNotIn=Champ <b>%s</b>: '<b>%s</b>' n'est pas une valeur disponible dans le champ <b>%s</b> de la table <b>%s</b>
 ErrorFieldRefNotIn=Champ <b>%s</b>: '<b>%s</b>' n'est pas une référence existante comme <b>%s</b>
-ErrorMultipleRecordFoundFromRef=Several record found when searching from ref <b>%s</b>. No way to know which ID to use.
+ErrorMultipleRecordFoundFromRef=Plusieurs enregistrements trouvés lors de la recherche à partir de la référence <b> %s </b> . Aucun moyen de savoir quel ID utiliser.
 ErrorsOnXLines=Erreurs sur <b>%s</b> enregistrement(s) source
 ErrorFileIsInfectedWithAVirus=L'antivirus n'a pas pu valider ce fichier (il est probablement infecté par un virus) !
 ErrorNumRefModel=Une référence existe en base (%s) et est incompatible avec cette numérotation. Supprimez la ligne ou renommez la référence pour activer ce module.
@@ -244,7 +244,7 @@ ErrorObjectMustHaveStatusActiveToBeDisabled=Les objets doivent avoir le statut '
 ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Les objets doivent avoir le statut 'Brouillon' ou 'Désactivé' pour être activés
 ErrorNoFieldWithAttributeShowoncombobox=Aucun champ n'a la propriété 'showoncombobox' dans la définition de l'objet '%s'. Pas moyen d'afficher la liste de cases à cocher
 ErrorFieldRequiredForProduct=Le champ '%s' est obligatoire pour le produit %s
-AlreadyTooMuchPostOnThisIPAdress=You have already posted too much on this IP address.
+AlreadyTooMuchPostOnThisIPAdress=Vous avez déjà trop posté sur cette adresse IP.
 ProblemIsInSetupOfTerminal=Le problème est dans la configuration du terminal %s.
 ErrorAddAtLeastOneLineFirst=Ajouter d'abord au moins une ligne
 ErrorRecordAlreadyInAccountingDeletionNotPossible=Erreur, l'enregistrement est déjà transféré dans la comptabilité, la suppression n'est pas possible.
@@ -280,8 +280,8 @@ ErrorWrongFileName=Le nom du fichier ne peut pas contenir __SOMETHING__
 ErrorNotInDictionaryPaymentConditions=Pas dans le dictionnaire des conditions de paiement, veuillez modifier.
 ErrorIsNotADraft=%s n'est pas au statut brouillon
 ErrorExecIdFailed=Impossible d'exécuter la commande "id"
-ErrorBadCharIntoLoginName=Unauthorized character in the field %s
-ErrorRequestTooLarge=Error, request too large or session expired
+ErrorBadCharIntoLoginName=Caractère non autorisé dans le champ %s
+ErrorRequestTooLarge=Erreur, demande trop volumineuse ou session expirée
 ErrorNotApproverForHoliday=Vous n'êtes pas l'approbateur du congé %s
 ErrorAttributeIsUsedIntoProduct=Cet attribut est utilisé dans une ou plusieurs variantes de produit
 ErrorAttributeValueIsUsedIntoProduct=Cette valeur d'attribut est utilisée dans une ou plusieurs variantes de produit
@@ -301,8 +301,8 @@ ErrorCharPlusNotSupportedByImapForSearch=La recherche IMAP n'est pas en mesure d
 ErrorTableNotFound=Table <b>%s</b> introuvable
 ErrorValueForTooLow=La valeur pour <b>%s</b> est trop faible
 ErrorValueCantBeNull=La valeur pour <b>%s</b> ne peut pas être nulle
-ErrorDateOfMovementLowerThanDateOfFileTransmission=The date of the bank transaction can't be lower than the date of the file transmission
-ErrorTooMuchFileInForm=Too much files in form, the maximum number is %s file(s)
+ErrorDateOfMovementLowerThanDateOfFileTransmission=La date de l'opération bancaire ne peut être inférieure à la date de transmission du fichier
+ErrorTooMuchFileInForm=Trop de fichiers dans le formulaire, le nombre maximum est de %s fichier(s)
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Votre paramètre PHP upload_max_filesize (%s) est supérieur au paramètre PHP post_max_size (%s). Ceci n'est pas une configuration cohérente.
@@ -316,7 +316,7 @@ WarningConfFileMustBeReadOnly=Attention, votre fichier de configuration (<b>htdo
 WarningsOnXLines=Alertes sur <b>%s</b> enregistrement(s) source
 WarningNoDocumentModelActivated=Aucun modèle, pour la génération de document, n'a été activé. Un modèle sera pris par défaut en attendant la correction de configuration du module.
 WarningLockFileDoesNotExists=Attention, une fois l'installation terminée, les outils d'installation/migration doivent être désactivés en ajoutant un fichier <b>install.lock</b> dans le répertoire <b>%s</b>. L'absence de ce fichier représente une faille de sécurité.
-WarningUntilDirRemoved=This security warning will remain active as long as the vulnerability is present.
+WarningUntilDirRemoved=Cet avertissement de sécurité restera actif tant que la vulnérabilité sera présente.
 WarningCloseAlways=Attention, la fermeture se fait même lorsque le montant diffère. N'activez cette fonctionnalité qu'en connaissance de cause.
 WarningUsingThisBoxSlowDown=Attention, l'utilisation de cette boîte provoque de sérieux ralentissements des pages affichant cette boîte.
 WarningClickToDialUserSetupNotComplete=La configuration ClickToDial pour votre compte utilisateur n'est pas complète (voir l'onglet ClickToDial sur votre fiche utilisateur)
diff --git a/htdocs/langs/fr_FR/eventorganization.lang b/htdocs/langs/fr_FR/eventorganization.lang
index 214257cd853..a428430c102 100644
--- a/htdocs/langs/fr_FR/eventorganization.lang
+++ b/htdocs/langs/fr_FR/eventorganization.lang
@@ -54,7 +54,7 @@ EVENTORGANIZATION_FILTERATTENDEES_TYPE = Dans le formulaire pour créer/ajouter
 # Object
 #
 EventOrganizationConfOrBooth= Conférence ou stand
-EventOrganizationConfOrBoothes=Conferences or Boothes
+EventOrganizationConfOrBoothes=Conférences ou Stands
 ManageOrganizeEvent = Gestion d'organisation d'événements
 ConferenceOrBooth = Conférence ou stand
 ConferenceOrBoothTab = Conférence ou stand
@@ -115,15 +115,15 @@ EvntOrgRegistrationHelpMessage = Ici, vous pouvez voter pour une conférence ou
 EvntOrgRegistrationConfHelpMessage = Ici, vous pouvez suggérer une nouvelle conférence à animer pendant l'événement.
 EvntOrgRegistrationBoothHelpMessage = Ici, postulez pour tenir un stand pendant l'événement
 ListOfSuggestedConferences = Liste des conférences suggérées
-ListOfSuggestedBooths=Suggested booths
-ListOfConferencesOrBooths=Conferences or booths of event project
+ListOfSuggestedBooths=Stands suggérés
+ListOfConferencesOrBooths=Conférences ou stands de projet événementiel
 SuggestConference = Proposer une nouvelle conférence
 SuggestBooth = Proposer un stand
 ViewAndVote = Voir et voter pour les événements suggérés
 PublicAttendeeSubscriptionGlobalPage = Lien public pour l'inscription à l'événement
 PublicAttendeeSubscriptionPage = Lien d’inscription public à un événement
 MissingOrBadSecureKey = La clé de sécurité est invalide ou manquante
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the event
+EvntOrgWelcomeMessage = Ce formulaire vous permet de vous inscrire en tant que nouveau participant à l'événement
 EvntOrgDuration = Cette conférence commence le %s et se termine le %s.
 ConferenceAttendeeFee = Frais de participation à la conférence pour l'événement : '%s' se produisant du %s au %s.
 BoothLocationFee = Frais de participation à l'événement : '%s' se produisant du %s au %s.
@@ -133,7 +133,7 @@ LabelOfconference=Libellé de la conférence
 ConferenceIsNotConfirmed=L'inscription n'est pas autorisée, l'événement n'est pas confirmé
 DateMustBeBeforeThan=%s doit être avant %s
 DateMustBeAfterThan=%s doit être après %s
-MaxNbOfAttendeesReached=The maximum number of participants has been reached
+MaxNbOfAttendeesReached=Le nombre maximum de participants a été atteint
 NewSubscription=Inscription
 OrganizationEventConfRequestWasReceived=Votre suggestion de conférence a été reçue
 OrganizationEventBoothRequestWasReceived=Votre demande de stand a bien été reçue
@@ -158,7 +158,7 @@ VoteOk = Votre vote a été accepté.
 AlreadyVoted = Vous avez déjà voté pour cet événement.
 VoteError = Une erreur s'est produite lors du vote, veuillez réessayer.
 
-SubscriptionOk=Your registration has been recorded
+SubscriptionOk=Votre inscription a été enregistrée
 ConfAttendeeSubscriptionConfirmation = Confirmation de votre inscription à un événement
 Attendee = Participant
 PaymentConferenceAttendee = Paiement de participation à la conférence
@@ -166,7 +166,7 @@ PaymentBoothLocation = Paiement de l'emplacement du stand
 DeleteConferenceOrBoothAttendee=Supprimer le participant
 RegistrationAndPaymentWereAlreadyRecorder=Une inscription et un règlement sont déjà enregistrés pour l'e-mail <b>%s</b>
 EmailAttendee=E-mail du participant
-EmailCompany=Company email
+EmailCompany=E-mail de l'entreprise
 EmailCompanyForInvoice=E-mail de la société pour la facturation (si différent du participant)
 ErrorSeveralCompaniesWithEmailContactUs=Plusieurs entreprises avec cet email ont été trouvées donc nous ne pouvons pas valider automatiquement votre inscription. Veuillez nous contacter à %s pour une validation manuelle
 ErrorSeveralCompaniesWithNameContactUs=Plusieurs sociétés portant ce nom ont été trouvées, nous ne pouvons donc pas valider automatiquement votre inscription. Veuillez nous contacter à %s pour une validation manuelle
diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang
index 0888db3aca6..f8eeeef324d 100644
--- a/htdocs/langs/fr_FR/install.lang
+++ b/htdocs/langs/fr_FR/install.lang
@@ -214,3 +214,4 @@ Loaded=Chargé
 FunctionTest=Fonction test
 NodoUpgradeAfterDB=Aucune action demandée par les modules externes après la mise à jour de la base de données
 NodoUpgradeAfterFiles=Aucune action demandée par les modules externes après la mise à jour des fichiers ou des répertoires
+MigrationContractLineRank=Migrer la ligne de contrat pour utiliser le classement (et activer la réorganisation)
diff --git a/htdocs/langs/fr_FR/interventions.lang b/htdocs/langs/fr_FR/interventions.lang
index c09f8431498..9ef05378f60 100644
--- a/htdocs/langs/fr_FR/interventions.lang
+++ b/htdocs/langs/fr_FR/interventions.lang
@@ -69,3 +69,4 @@ GenerateInter=Générer intervention
 FichinterNoContractLinked=L'intervention %s a été créée sans contrat lié.
 ErrorFicheinterCompanyDoesNotExist=L'entreprise n'existe pas. L'intervention n'a pas été créée.
 NextDateToIntervention=Date de la prochaine génération d'intervention
+NoIntervention=Aucune intervention
diff --git a/htdocs/langs/fr_FR/knowledgemanagement.lang b/htdocs/langs/fr_FR/knowledgemanagement.lang
index e11d8815174..99058b6d5c6 100644
--- a/htdocs/langs/fr_FR/knowledgemanagement.lang
+++ b/htdocs/langs/fr_FR/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeRecord = Article
 KnowledgeRecordExtraFields = Atribut supplémentaires (articles)
 GroupOfTicket=Catégorisation de tickets
 YouCanLinkArticleToATicketCategory=Vous pouvez lier l'article à un groupe de tickets (ainsi l'article sera mis en évidence sur tous les tickets de ce groupe)
-SuggestedForTicketsInGroup=Suggéré pour les tickets lorsque le groupe est
+SuggestedForTicketsInGroup=Suggéré lors de la création du ticket
 
 SetObsolete=Définir comme obsolète
 ConfirmCloseKM=Confirmez-vous la fermeture de cet article comme obsolète ?
diff --git a/htdocs/langs/fr_FR/languages.lang b/htdocs/langs/fr_FR/languages.lang
index 44eed4d21a1..168b938f1cd 100644
--- a/htdocs/langs/fr_FR/languages.lang
+++ b/htdocs/langs/fr_FR/languages.lang
@@ -23,6 +23,7 @@ Language_da_DK=Danois
 Language_de_DE=Allemand
 Language_de_AT=Allemand (Autriche)
 Language_de_CH=Allemand (Suisse)
+Language_de_LU=Allemand (Luxembourg)
 Language_el_GR=Grèque
 Language_el_CY=Grec (Chypre)
 Language_en_AE=Anglais  (EAU)
@@ -35,6 +36,7 @@ Language_en_SA=Anglais (Arabie Saoudite)
 Language_en_SG=Anglais (Singapour)
 Language_en_US=Anglais (Etats-Unis)
 Language_en_ZA=Anglais (Afrique du Sud)
+Language_en_ZW=Anglais (Zimbabwe)
 Language_es_ES=Espagnol
 Language_es_AR=Espagnol (Argentine)
 Language_es_BO=Espagnol (Bolivie)
diff --git a/htdocs/langs/fr_FR/loan.lang b/htdocs/langs/fr_FR/loan.lang
index 84a90137bdf..ba9e734d14c 100644
--- a/htdocs/langs/fr_FR/loan.lang
+++ b/htdocs/langs/fr_FR/loan.lang
@@ -28,7 +28,7 @@ CantUseScheduleWithLoanStartedToPaid = Impossible de générer un échéancier p
 CantModifyInterestIfScheduleIsUsed = Vous ne pouvez pas modifier l'intérêt si vous utilisez le calendrier
 # Admin
 ConfigLoan=Configuration du module Emprunt
-LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Account (from the Chart Of Account) to be used by default for capital (Loan module)
-LOAN_ACCOUNTING_ACCOUNT_INTEREST=Account (from the Chart Of Account) to be used by default for interest (Loan module)
-LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Account (from the Chart Of Account) to be used by default for insurance (Loan module)
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Compte (du plan comptable) à utiliser par défaut pour le capital (module Prêt)
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Compte (du plan comptable) à utiliser par défaut pour les intérêts (module Prêt)
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Compte (du plan comptable) à utiliser par défaut pour l'assurance (module Prêt)
 CreateCalcSchedule=Créer / Modifier échéancier de prêt
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 76b016a0987..f6062f39db3 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -489,7 +489,7 @@ ActionsOnContact=Événements à propos de ce contact/adresse
 ActionsOnContract=Événements pour ce contrat
 ActionsOnMember=Événements vis à vis de cet adhérent
 ActionsOnProduct=Événements liés au produit
-ActionsOnAsset=Events for this fixed asset
+ActionsOnAsset=Événements pour cette immobilisation
 NActionsLate=%s en retard
 ToDo=À faire
 Completed=Terminé
@@ -1148,29 +1148,29 @@ EventReminder=Rappel d'événement
 UpdateForAllLines=Mise à jour de toutes les lignes
 OnHold=En attente
 Civility=Civilité
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Set Supervisor
+AffectTag=Affecter un tag/catégorie
+AffectUser=Attribuer un utilisateur
+SetSupervisor=Définir le responsable
 CreateExternalUser=Créer utilisateur externe
-ConfirmAffectTag=Bulk Tag Assignement
-ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project
-TasksRole=Role assigned on each task of each project
-ConfirmSetSupervisor=Bulk Supervisor Set
-ConfirmUpdatePrice=Choose a increase/decrease price rate
-ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
-ConfirmAffectUserQuestion=Are you sure you want to assign users to the %s selected record(s)?
-ConfirmSetSupervisorQuestion=Are you sure you want to set supervisor to the %s selected record(s)?
-ConfirmUpdatePriceQuestion=Are you sure you want to update the price of the %s selected record(s)?
+ConfirmAffectTag=Attribution de balises en masse
+ConfirmAffectUser=Affectation d'utilisateurs en masse
+ProjectRole=Rôle attribué sur chaque projet
+TasksRole=Rôle attribué sur chaque tâche de chaque projet
+ConfirmSetSupervisor=Ensemble de superviseur en vrac
+ConfirmUpdatePrice=Choisissez un taux de prix d'augmentation/diminution
+ConfirmAffectTagQuestion=Voulez-vous vraiment attribuer des balises aux enregistrements sélectionnés %s ?
+ConfirmAffectUserQuestion=Voulez-vous vraiment affecter des utilisateurs aux enregistrements sélectionnés %s ?
+ConfirmSetSupervisorQuestion=Êtes-vous sûr de vouloir définir le superviseur sur le ou les enregistrements sélectionnés %s ?
+ConfirmUpdatePriceQuestion=Voulez-vous vraiment mettre à jour le prix du ou des enregistrements %s sélectionnés ?
 CategTypeNotFound=Aucun type de tag trouvé pour ce type d'enregistrements
 Rate=Taux
-SupervisorNotFound=Supervisor not found
+SupervisorNotFound=Superviseur introuvable
 CopiedToClipboard=Copié dans le presse-papier
 InformationOnLinkToContract=Ce montant n’est que le total de toutes les lignes du contrat. Aucune notion de temps n’est prise en considération.
 ConfirmCancel=Êtes-vous sûr de vouloir annuler
 EmailMsgID=E-mail MsgID
 EmailDate=Date de l'e-mail
-SetToStatus=Set to status %s
+SetToStatus=Définir sur le statut %s
 SetToEnabled=Définir sur activé
 SetToDisabled=Définir sur désactivé
 ConfirmMassEnabling=confirmation d'activation en masse
@@ -1199,8 +1199,8 @@ Terminated=Résilié
 AddLineOnPosition=Ajouter une ligne à la position (si vide: à la fin)
 ConfirmAllocateCommercial=Confirmation d'assignation d'un commercial
 ConfirmAllocateCommercialQuestion=Etes-vous sûr de vouloir assigner l'enregistrement %s sélectionné ?
-CommercialsAffected=Sales representatives assigned
-CommercialAffected=Sales representative assigned
+CommercialsAffected=Des commerciaux affectés
+CommercialAffected=Représentant des ventes affecté
 YourMessage=Votre message
 YourMessageHasBeenReceived=Votre message a été reçu. Nous vous répondrons ou vous contacterons dans les plus brefs délais.
 UrlToCheck=URL à vérifier
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index f79bb716b56..024cef5226b 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -35,8 +35,8 @@ DateSubscription=Date adhésion
 DateEndSubscription=Date fin adhésion
 EndSubscription=Fin adhésion
 SubscriptionId=Id adhésion
-WithoutSubscription=Without membership
-WaitingSubscription=Membership pending
+WithoutSubscription=Sans adhésion
+WaitingSubscription=Adhésion en attente
 MemberId=ID adhérent
 MemberRef=Réf adhérent
 NewMember=Nouvel adhérent
@@ -74,12 +74,12 @@ MemberTypeCanNotBeDeleted=Ce type d'adhérent ne peut pas être supprimé
 NewSubscription=Nouvelle cotisation
 NewSubscriptionDesc=Ce formulaire permet de vous inscrire comme nouvel adhérent de l'association. Pour un renouvellement (si vous êtes déjà adhérent), contactez plutôt l'association par email %s.
 Subscription=Adhésion / cotisation
-AnyAmountWithAdvisedAmount=Any amount of your choice, recommended %s
-AnyAmountWithoutAdvisedAmount=Any amount of your choice
+AnyAmountWithAdvisedAmount=N'importe quel montant de votre choix, recommandé %s
+AnyAmountWithoutAdvisedAmount=Tout montant de votre choix
 CanEditAmountShort=Tout montant
 CanEditAmountShortForValues=recommandé, tout montant
 MembershipDuration=Durée
-GetMembershipButtonLabel=Join
+GetMembershipButtonLabel=Rejoindre
 Subscriptions=Adhésions / cotisations
 SubscriptionLate=En retard
 SubscriptionNotReceived=Cotisation non reçue
@@ -207,10 +207,10 @@ NbOfSubscriptions=Nombre de cotisations
 AmountOfSubscriptions=Montant des cotisations
 TurnoverOrBudget=Chiffre affaire (pour société) ou Budget (asso ou collectivité)
 DefaultAmount=Montant par défaut de la cotisation
-CanEditAmount=Subscription amount is free
+CanEditAmount=Le montant de l'abonnement est gratuit
 CanEditAmountDetail=Le visiteur peut choisir/modifier le montant de sa contribution quel que soit le type d'adhérent
 AmountIsLowerToMinimumNotice=Le montant est inférieur au montant minimum de %s
-MEMBER_NEWFORM_PAYONLINE=After the online registration, switch automatically on the online payment page
+MEMBER_NEWFORM_PAYONLINE=Après l'inscription en ligne, basculez automatiquement sur la page de paiement en ligne
 ByProperties=Par nature
 MembersStatisticsByProperties=Statistiques des adhérents par nature
 VATToUseForSubscriptions=Taux de TVA pour les cotisations
@@ -231,4 +231,4 @@ CreateDolibarrLoginDesc=La création d'un login utilisateur pour les membres leu
 CreateDolibarrThirdPartyDesc=Un tiers est l'entité juridique qui sera utilisée sur la facture si vous décidez de générer une facture pour chaque cotisation. Vous pourrez le créer plus tard au cours du processus d'enregistrement de la cotisation.
 MemberFirstname=Prénom du membre
 MemberLastname=Nom de famille du membre
-MemberCodeDesc=Member Code, unique for all members
+MemberCodeDesc=Code membre, unique pour tous les membres
diff --git a/htdocs/langs/fr_FR/modulebuilder.lang b/htdocs/langs/fr_FR/modulebuilder.lang
index 2bd50f4225b..9cd5fe23a00 100644
--- a/htdocs/langs/fr_FR/modulebuilder.lang
+++ b/htdocs/langs/fr_FR/modulebuilder.lang
@@ -56,6 +56,8 @@ RegenerateMissingFiles=Générer les fichiers manquant
 SpecificationFile=Fichier de documentation
 LanguageFile=Fichier langue
 ObjectProperties=Propriétés de l'objet
+Property=Propriété
+PropertyDesc=Une propriété est un attribut qui caractérise un objet. Cet attribut a un code, un libellé et un type avec plusieurs options.
 ConfirmDeleteProperty=Voulez-vous vraiment supprimer la propriété <strong> %s </strong> ? Cela modifiera le code de la classe PHP, mais supprimera également la colonne de la définition de la table de l'objet.
 NotNull=Non NULL
 NotNullDesc=1=Définir la base de données sur NOT NULL, 0=Autoriser les valeurs nulles, -1=Autoriser les valeurs nulles en forçant la valeur à NULL si vide ('' ou 0)
@@ -84,13 +86,14 @@ IsAMeasure=Est une mesure
 DirScanned=Répertoire scanné
 NoTrigger=Pas de trigger
 NoWidget=Aucun widget
-GoToApiExplorer=Explorateur d'API
+ApiExplorer=Explorateur d'API
 ListOfMenusEntries=Liste des entrées du menu
 ListOfDictionariesEntries=Liste des entrées de dictionnaires
 ListOfPermissionsDefined=Liste des permissions
 SeeExamples=Voir des exemples ici
 EnabledDesc=Condition pour que ce champs soit actif.<br><br>Exemples:<br>1<br>isModEnabled('MAIN_MODULE_MYMODULE')<br>getDolGlobalString('MYMODULE_OPTION')==2
-VisibleDesc=Le champ est-il visible ? (Exemples: 0=Jamais visible, 1=Visible sur les listes et formulaires de création/mise à jour/visualisation, 2=Visible uniquement sur les listes, 3=Visible uniquement sur le formulaire de création/mise à jour/affichage (pas les listes), 4=Visible sur les listes et formulaire de mise à jour et affichage uniquement (pas en création), 5=Visible sur les listes et formulaire en lecture (pas en création ni modification).<br><br>Utiliser une valeur négative signifie que le champ n'est pas affiché par défaut sur la liste mais peut être sélectionné pour l'affichage).<br><br>Il peut s'agir d'une expression, par exemple :<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$user->hasRight('holiday', 'define_holiday')?1:5
+VisibleDesc=Le champ est-il visible ? (Exemples : 0=Jamais visible, 1=Visible sur la liste et les formulaires de création/mise à jour/affichage, 2=Visible sur la liste uniquement, 3=Visible sur le formulaire de création/mise à jour/affichage uniquement (pas la liste), 4=Visible sur la liste et formulaire de mise à jour/affichage uniquement (pas de création), 5=Visible sur le formulaire d'affichage de fin de liste uniquement (pas de création, pas de mise à jour).
+ItCanBeAnExpression=Cela peut être une expression. Exemple : <br> preg_match('/public/', $_SERVER['PHP_SELF'])?0:1 <br> $user->hasRight('holiday', 'define_holiday')?1:5
 DisplayOnPdfDesc=Affichez ce champ sur les documents PDF compatibles, vous pouvez gérer la position avec le champ "Position". <br>  <strong> Pour le document : </strong>  <br> 0 = non affiché  <br> 1 = affiché <br> 2 = affiché uniquement si non vide <br>  <br>  <strong> Pour les lignes de document : </strong>  <br> 0 = non affiché  <br> 1 = affiché dans une colonne <br> 3 = affiché dans la colonne description après la description <br> 4 = affiché dans la colonne description après la description uniquement si non vide
 DisplayOnPdf=Sur les PDF
 IsAMeasureDesc=Peut-on cumuler la valeur du champ pour obtenir un total dans les listes ? (Exemples: 1 ou 0)
@@ -144,7 +147,9 @@ CSSViewClass=CSS pour le formulaire de lecture
 CSSListClass=CSS pour la liste
 NotEditable=Non éditable
 ForeignKey=Clé étrangère
-TypeOfFieldsHelp=Type de champs : <br> varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] <br> '1' signifie que nous ajoutons un bouton + après le combo pour créer l'enregistrement <br> 'filter' est une condition sql, exemple : 'status=1 AND fk_user=__USER_ID__ AND entity IN (__SHARED_ENTITIES__)'
+ForeignKeyDesc=Si la valeur de ce champ doit être garantie existe dans une autre table. Saisissez ici une valeur correspondant à la syntaxe : nomtable.champparentàvérifier
+TypeOfFieldsHelp=Exemple : <br> varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] <br> ' 1' signifie que nous ajoutons un bouton + après le combo pour créer l'enregistrement <br> 'filter' est une condition sql, exemple : 'status=1 AND fk_user=__USER_ID__ AND entity IN (__SHARED_ENTITIES__)'
+TypeOfFieldsHelpIntro=Il s'agit du type de champ/attribut.
 AsciiToHtmlConverter=Convertisseur Ascii en HTML
 AsciiToPdfConverter=Convertisseur Ascii en PDF
 TableNotEmptyDropCanceled=La table n’est pas vide. La suppression a été annulée.
diff --git a/htdocs/langs/fr_FR/mrp.lang b/htdocs/langs/fr_FR/mrp.lang
index 36892e941b9..557b1f09175 100644
--- a/htdocs/langs/fr_FR/mrp.lang
+++ b/htdocs/langs/fr_FR/mrp.lang
@@ -11,7 +11,7 @@ Bom=Nomenclatures produits (BOM)
 BillOfMaterials=Nomenclature BOM
 BillOfMaterialsLines=Lignes de nomenclature
 BOMsSetup=Configuration du module BOM
-ListOfBOMs=Bills of material - BOM
+ListOfBOMs=Nomenclatures - Nomenclature
 ListOfManufacturingOrders=Ordres Fabrication
 NewBOM=Nouveau BOM
 ProductBOMHelp=Produit à créer (ou désassembler) avec cette nomenclature. <br> Remarque: les produits avec la propriété 'Nature de produit' = 'Matière première' ne sont pas visibles dans cette liste.
@@ -116,5 +116,5 @@ ParentMo=OF parent
 MOChild=OF Enfant
 BomCantAddChildBom=La nomenclature %s est déjà présente dans l'arbre menant à la nomenclature %s
 BOMNetNeeds = Besoins nets
-BOMProductsList=BOM's products
-BOMServicesList=BOM's services
+BOMProductsList=Les produits de BOM
+BOMServicesList=Les services de BOM
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 6c714be2c4d..6a9f0191e25 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -46,7 +46,9 @@ Notify_ORDER_SUPPLIER_APPROVE=Commande fournisseur approuvée
 Notify_ORDER_SUPPLIER_REFUSE=Commande fournisseur refusée
 Notify_PROPAL_VALIDATE=Validation proposition commerciale client
 Notify_PROPAL_CLOSE_SIGNED=Proposition client fermée signée
+Notify_PROPAL_CLOSE_SIGNED_WEB=Proposition client fermée signée sur la page du portail
 Notify_PROPAL_CLOSE_REFUSED=Proposition client fermée refusée
+Notify_PROPAL_CLOSE_REFUSED_WEB=Proposition client fermée refusée sur la page du portail
 Notify_PROPAL_SENTBYMAIL=Envoi proposition commerciale par email
 Notify_WITHDRAW_TRANSMIT=Transmission prélèvement
 Notify_WITHDRAW_CREDIT=Crédit prélèvement
@@ -181,6 +183,7 @@ SizeUnitfoot=pied
 SizeUnitpoint=point
 BugTracker=Suivi de tickets
 SendNewPasswordDesc=Ce formulaire permet de faire une demande pour un nouveau mot de passe. Elle sera envoyée à votre adresse email.<br>La modification du mot de passe ne sera effective qu'après avoir cliqué sur le lien de confirmation dans cet email.<br>Surveillez votre messagerie.
+EnterNewPasswordHere=Entrez votre nouveau mot de passe ici
 BackToLoginPage=Retour page de connexion
 AuthenticationDoesNotAllowSendNewPassword=Le mode d'authentification de Dolibarr est configuré à "<b>%s</b>".<br>Dans ce mode, Dolibarr n'a pas la possibilité de connaître ni de modifier votre mot de passe.<br>Contactez votre administrateur pour connaitre les modalités de changement.
 EnableGDLibraryDesc=Vous devez activer ou installer la librairie GD avec votre PHP pour pouvoir activer cette option.
@@ -210,6 +213,9 @@ EMailTextInvoiceValidated=La facture %s vous concernant a été validée.
 EMailTextInvoicePayed=La facture %s a été payée.
 EMailTextProposalValidated=La proposition commerciale %s vous concernant a été validée.
 EMailTextProposalClosedSigned=La proposition %s a été clôturée signée.
+EMailTextProposalClosedSignedWeb=La proposition %s a été fermée et signée sur la page du portail.
+EMailTextProposalClosedRefused=La proposition %s a été fermée refusée.
+EMailTextProposalClosedRefusedWeb=La proposition %s a été fermée et refusée sur la page du portail.
 EMailTextOrderValidated=La commande %s a été validée.
 EMailTextOrderApproved=La commande %s a été approuvée.
 EMailTextOrderValidatedBy=La commande %s a été enregistrée par %s
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 2592548059c..0a5d3f3f8ad 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -317,7 +317,7 @@ LastUpdated=Dernière mise à jour
 CorrectlyUpdated=Mise à jour avec succès
 PropalMergePdfProductActualFile=Fichiers utilisés pour l'ajout au PDF Azur sont
 PropalMergePdfProductChooseFile=Sélectionnez les fichiers PDF
-IncludingProductWithTag=Inclure les produits/services de(s) catégorie(s)
+IncludingProductWithTag=Comprenant des produits/services avec le tag/catégorie
 DefaultPriceRealPriceMayDependOnCustomer=Prix ​​par défaut, le prix réel peut dépendre du client
 WarningSelectOneDocument=Sélectionnez au moins un document
 DefaultUnitToShow=Unité
@@ -399,7 +399,7 @@ ActionAvailableOnVariantProductOnly=Action disponible uniquement sur la variante
 ProductsPricePerCustomer=Prix produit par clients
 ProductSupplierExtraFields=Attributs supplémentaires (Prix fournisseur)
 DeleteLinkedProduct=Supprimer le produit enfant lié à la combinaison
-AmountUsedToUpdateWAP=Montant à utiliser pour mettre à jour le prix moyen pondéré
+AmountUsedToUpdateWAP=Montant unitaire à utiliser pour mettre à jour le prix moyen pondéré
 PMPValue=Prix moyen pondéré (PMP)
 PMPValueShort=PMP
 mandatoryperiod=Plage de date obligatoire
@@ -416,7 +416,7 @@ ProductsMergeSuccess=Produits fusionnés
 ErrorsProductsMerge=Erreur lors de la fusion des produits
 SwitchOnSaleStatus=Basculer le statut En vente
 SwitchOnPurchaseStatus=Basculer le statut En achat
-UpdatePrice=Augmenter/baisser le prix de vente
+UpdatePrice=Augmenter/diminuer le prix client
 StockMouvementExtraFields= Champs supplémentaires (mouvement de stock)
 InventoryExtraFields= Attributs supplémentaires (inventaire)
 ScanOrTypeOrCopyPasteYourBarCodes=Scannez ou tapez ou copiez/collez vos codes-barres
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index d5a567e1520..d3f7edb1e85 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -23,7 +23,7 @@ TasksPublicDesc=Cette vue présente tous les projets et tâches pour lesquels vo
 TasksDesc=Cette vue présente tous les projets et tâches (vos habilitations vous offrant une vue exhaustive).
 AllTaskVisibleButEditIfYouAreAssigned=Toutes les tâches des projets sont visibles mais il n'est possible de saisir du temps passé que sur celles assignées à l'utilisateur sélectionné.\nAssignez la tâche si elle ne l'est pas déjà pour pouvoir saisir du temps dessus.
 OnlyYourTaskAreVisible=Seules les tâches qui vous sont assignées sont visibles. Assignez vous une tâche pour la voir et saisir du temps dessus.
-ImportDatasetProjects=Projects or opportunities
+ImportDatasetProjects=Projets ou opportunités
 ImportDatasetTasks=Tâches des projets
 ProjectCategories=Catégories/tags de projet
 NewProject=Nouveau projet
@@ -38,9 +38,9 @@ OpportunitiesStatusForOpenedProjects=Montant des opportunités ouvertes par stat
 OpportunitiesStatusForProjects=Montant des opportunités par statut
 ShowProject=Afficher projet
 ShowTask=Afficher tâche
-SetThirdParty=Set third party
+SetThirdParty=Définir un tiers
 SetProject=Définir projet
-OutOfProject=Out of project
+OutOfProject=Hors projet
 NoProject=Aucun projet défini ou visible
 NbOfProjects=Nombre de projets
 NbOfTasks=Nb de tâches
@@ -125,8 +125,8 @@ ValidateProject=Valider projet
 ConfirmValidateProject=Êtes-vous sûr de vouloir valider ce projet ?
 CloseAProject=Clore projet
 ConfirmCloseAProject=Êtes-vous sûr de vouloir clore ce projet ?
-AlsoCloseAProject=Also close project
-AlsoCloseAProjectTooltip=Keep it open if you still need to follow production tasks on it
+AlsoCloseAProject=Fermer également le projet
+AlsoCloseAProjectTooltip=Gardez-le ouvert si vous avez encore besoin de suivre des tâches de production dessus
 ReOpenAProject=Réouvrir projet
 ConfirmReOpenAProject=Êtes-vous sûr de vouloir rouvrir ce projet ?
 ProjectContact=Contacts du projet
@@ -169,7 +169,7 @@ OpportunityProbability=Probabilité d'opportunité
 OpportunityProbabilityShort=Prob. opp.
 OpportunityAmount=Montant opportunité
 OpportunityAmountShort=Montant opportunité
-OpportunityWeightedAmount=Amount of opportunity, weighted by probability
+OpportunityWeightedAmount=Quantité d'opportunités, pondérée par la probabilité
 OpportunityWeightedAmountShort=Montant pondéré opp.
 OpportunityAmountAverageShort=Montant moyen des opportunités
 OpportunityAmountWeigthedShort=Montant pondéré des opportunités
@@ -242,7 +242,7 @@ OppStatusPENDING=En attente
 OppStatusWON=Gagné
 OppStatusLOST=Perdu
 Budget=Budget
-AllowToLinkFromOtherCompany=Allow to link an element with a project of other company<br><br><u>Supported values:</u><br>- Keep empty: Can link elements with any projects in the same company (default)<br>- "all": Can link elements with any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link elements with any projects of these third partys (Example: 123,4795,53)<br>
+AllowToLinkFromOtherCompany=Permet de lier un élément avec un projet d'une autre société <br> <br> <u> Valeurs prises en charge : </u> <br> - Garder vide : peut lier des éléments avec n'importe quel projet de la même société (par défaut) <br> - "tous" : peut lier des éléments avec n'importe quel projet, même projets d'autres sociétés <br> - Une liste d'identifiants tiers séparés par des virgules : permet de lier des éléments à n'importe quel projet de ces tiers (Exemple : 123,4795,53) <br>
 LatestProjects=Les %s derniers projets
 LatestModifiedProjects=Les %s derniers projets modifiés
 OtherFilteredTasks=Autres tâches filtrées
@@ -286,7 +286,7 @@ ProfitIsCalculatedWith=Le bénéfice est calculé sur la base de
 AddPersonToTask=Ajouter également aux tâches
 UsageOrganizeEvent=Utilisation: Organisation d'événements
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classer le projet comme étant clos lorsque toutes ses tâches sont terminées (progression 100%%)
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks already set to a progress of 100 %% won't be affected: you will have to close them manually. This option only affects open projects.
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Remarque : les projets existants avec toutes les tâches déjà définies sur une progression de 100%% ne seront pas affectés : vous devrez les fermer manuellement. Cette option n'affecte que les projets ouverts.
 SelectLinesOfTimeSpentToInvoice=Sélectionnez les lignes de temps passé non facturées, puis l'action groupée "Générer la facture" pour les facturer
 ProjectTasksWithoutTimeSpent=Tâches de projet sans temps consommé
 FormForNewLeadDesc=Veuillez remplir ce formulaire de contact ou écrivez un e-mail à <b>%s</b>.
diff --git a/htdocs/langs/fr_FR/propal.lang b/htdocs/langs/fr_FR/propal.lang
index 173e0605941..66a0093db96 100644
--- a/htdocs/langs/fr_FR/propal.lang
+++ b/htdocs/langs/fr_FR/propal.lang
@@ -95,7 +95,7 @@ DefaultModelPropalCreate=Modèle par défaut à la création
 DefaultModelPropalToBill=Modèle par défaut lors de la clôture d'une proposition commerciale (à facturer)
 DocModelAzurDescription=Un modèle de proposition complet (ancienne implémentation du modèle Cyan)
 DocModelCyanDescription=Un modèle de proposition complet
-FichinterSigned=Intervention signed
+FichinterSigned=Intervention signée
 IdProduct=ID produit
 IdProposal=ID de la proposition commerciale
 IsNotADraft=n'est pas au statut brouillon
@@ -112,7 +112,7 @@ ProposalsStatisticsSuppliers=Statistiques de propositions commerciales
 RefusePropal=Refuser la proposition
 Sign=Signer
 SignContract=Signer le contrat
-SignFichinter=Sign intervention
+SignFichinter=Signer l'intervention
 SignPropal=Accepter la proposition
 Signed=Signée
 SignedOnly=Signé seulement
diff --git a/htdocs/langs/fr_FR/receptions.lang b/htdocs/langs/fr_FR/receptions.lang
index 5411fc7142f..35e38275cb1 100644
--- a/htdocs/langs/fr_FR/receptions.lang
+++ b/htdocs/langs/fr_FR/receptions.lang
@@ -32,6 +32,7 @@ StatusReceptionDraftShort=Brouillon
 StatusReceptionValidatedShort=Validé
 StatusReceptionProcessedShort=Traités
 ReceptionSheet=Bordereau de réception
+ValidateReception=Valider la réception
 ConfirmDeleteReception=Êtes-vous sûr de vouloir supprimer cette réception ?
 ConfirmValidateReception=Êtes-vous sûr de vouloir valider cette réception sous la référence  <b> %s </b> ?
 ConfirmCancelReception=Êtes-vous sûr de vouloir annuler cette réception ?
diff --git a/htdocs/langs/fr_FR/recruitment.lang b/htdocs/langs/fr_FR/recruitment.lang
index 2dd26fdf97a..ed017d8b484 100644
--- a/htdocs/langs/fr_FR/recruitment.lang
+++ b/htdocs/langs/fr_FR/recruitment.lang
@@ -66,7 +66,7 @@ ContractRefused=Contrat refusé
 RecruitmentCandidature=Candidature
 JobPositions=Offres d'emploi
 RecruitmentCandidatures=Candidatures
-InterviewToDo=Contacts to follow
+InterviewToDo=Contacts à suivre
 AnswerCandidature=Réponse de candidature
 YourCandidature=Votre candidature
 YourCandidatureAnswerMessage=Merci de votre candidature.<br>...
diff --git a/htdocs/langs/fr_FR/salaries.lang b/htdocs/langs/fr_FR/salaries.lang
index eb1d1e606f7..9b89cf2fb68 100644
--- a/htdocs/langs/fr_FR/salaries.lang
+++ b/htdocs/langs/fr_FR/salaries.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Account (from the Chart of Account) used by default for "user" third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Compte (issu du Plan Comptable) utilisé par défaut pour les tiers "utilisateurs"
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Le compte dédié défini sur la carte utilisateur sera utilisé uniquement pour la comptabilité Subledger. Celui-ci sera utilisé pour le grand livre et comme valeur par défaut de la comptabilité auxiliaire si le compte de comptabilité utilisateur dédié à l'utilisateur n'est pas défini.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Compte comptable par défaut pour les paiements de salaires
 CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=Par défaut, laissez vide l’option "Créer automatiquement un paiement complet" lors de la création d’un salaire
 Salary=Salaire
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index a0d91884279..481ca5f312d 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -49,7 +49,7 @@ StockCorrection=Correction de stock
 CorrectStock=Corriger le stock
 StockTransfer=Transfert de stock
 TransferStock=Transférer stock
-MassStockTransferShort=Transfert stock en masse
+MassStockTransferShort=Changement de stock en vrac
 StockMovement=Mouvement de stock
 StockMovements=Mouvements de stock
 NumberOfUnit=Nombre de pièces
@@ -147,8 +147,9 @@ Replenishments=Réapprovisionnement
 NbOfProductBeforePeriod=Quantité du produit <b>%s</b> en stock avant la période sélectionnée (< <b>%s</b>)
 NbOfProductAfterPeriod=Quantité du produit <b>%s</b> en stock après la période sélectionnée (> <b>%s</b>)
 MassMovement=Mouvement en masse
-SelectProductInAndOutWareHouse=Sélectionnez un entrepôt source et un entrepôt cible, un produit et une quantité puis cliquez sur "%s". Une fois ceci fait pour tous les mouvements requis, cliquez sur "%s".
+SelectProductInAndOutWareHouse=Sélectionnez un entrepôt source (optionnel), un entrepôt cible, un produit et une quantité puis cliquez sur "%s". Une fois cela fait pour tous les mouvements requis, cliquez sur "%s".
 RecordMovement=Enregistrer transfert
+RecordMovements=Enregistrer les mouvements de stock
 ReceivingForSameOrder=Réceptions pour cette commande
 StockMovementRecorded=Mouvement de stocks enregistré
 RuleForStockAvailability=Règles d'exigence sur les stocks
@@ -271,7 +272,7 @@ InventoryStartedShort=En cours
 ErrorOnElementsInventory=Opération annulée pour la raison suivante :
 ErrorCantFindCodeInInventory=Impossible de trouver le code suivant dans l'inventaire
 QtyWasAddedToTheScannedBarcode=Succès !! La quantité a été ajoutée à tous les codes-barres demandés. Vous pouvez fermer l'outil Scanner.
-StockChangeDisabled=Changement sur stock désactivé
+StockChangeDisabled=Modification de stock désactivé
 NoWarehouseDefinedForTerminal=Aucun entrepôt défini pour le terminal
 ClearQtys=Effacer toutes les quantités
 ModuleStockTransferName=Transfert de Stock Avancé
diff --git a/htdocs/langs/fr_FR/stripe.lang b/htdocs/langs/fr_FR/stripe.lang
index cc873f0acdb..07bacfaf054 100644
--- a/htdocs/langs/fr_FR/stripe.lang
+++ b/htdocs/langs/fr_FR/stripe.lang
@@ -61,6 +61,7 @@ DeleteACard=Supprimer carte
 ConfirmDeleteCard=Êtes-vous sûr de vouloir supprimer cette carte de crédit ou de débit?
 CreateCustomerOnStripe=Créer client sur Stripe
 CreateCardOnStripe=Créer carte sur Stripe
+CreateBANOnStripe=Créer une banque sur Stripe
 ShowInStripe=Afficher dans Stripe
 StripeUserAccountForActions=Compte d'utilisateur à utiliser pour certains e-mails de notification d'événements Stripe (Stripe payouts)
 StripePayoutList=Liste des versements par Stripe
@@ -70,3 +71,4 @@ PaymentWillBeRecordedForNextPeriod=Le paiement sera enregistré pour la prochain
 ClickHereToTryAgain=<a href="%s">Cliquez ici pour essayer à nouveau...</a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=En raison des règles d'Authentification Client Forte, la création d'une carte doit être effectuée à partir du backoffice de Stripe. Vous pouvez cliquer ici pour basculer sur la fiche client Stripe: %s
 TERMINAL_LOCATION=Emplacement (adresse) des terminaux
+RequestDirectDebitWithStripe=Demander un prélèvement automatique avec Stripe
diff --git a/htdocs/langs/fr_FR/ticket.lang b/htdocs/langs/fr_FR/ticket.lang
index 4b8b66f7a19..e86f35a52ba 100644
--- a/htdocs/langs/fr_FR/ticket.lang
+++ b/htdocs/langs/fr_FR/ticket.lang
@@ -195,7 +195,7 @@ TicketAssigned=Le ticket est à présent assigné
 TicketChangeType=Changer le type
 TicketChangeCategory=Changer le code analytique
 TicketChangeSeverity=Changer la sévérité
-TicketAddMessage=Add private message
+TicketAddMessage=Ajouter un message privé
 MessageSuccessfullyAdded=Ticket créé
 TicketMessageSuccessfullyAdded=Message ajouté avec succès
 TicketMessagesList=Liste des messages
@@ -242,7 +242,7 @@ TicketMessageMailIntroAutoNewPublicMessage=Un nouveau message a été posté sur
 TicketAssignedToYou=Ticket attribué
 TicketAssignedEmailBody=Vous avez été assigné au ticket #%s par %s
 MarkMessageAsPrivate=Marquer message comme privé
-TicketMessageSendEmailHelp=An email will be sent to all assigned contact (internal contacts, but also external contacts except if the option "%s" is checked)
+TicketMessageSendEmailHelp=Un email sera envoyé à tous les contacts assignés (contacts internes, mais aussi contacts externes sauf si l'option "%s" est cochée)
 TicketMessagePrivateHelp=Ce message ne s'affichera pas pour les utilisateurs externes
 TicketEmailOriginIssuer=Émetteur à l'origine des tickets
 InitialMessage=Message initial
diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
index 4840c05740a..1d2873de4d9 100644
--- a/htdocs/langs/fr_FR/users.lang
+++ b/htdocs/langs/fr_FR/users.lang
@@ -47,7 +47,7 @@ RemoveFromGroup=Supprimer du groupe
 PasswordChangedAndSentTo=Mot de passe changé et envoyé à <b>%s</b>.
 PasswordChangeRequest=Demande de changement de mot de passe pour <b> %s </b>
 PasswordChangeRequestSent=Demande de changement de mot de passe pour <b>%s</b> envoyée à <b>%s</b>.
-IfLoginExistPasswordRequestSent=Si cet identifiant est un compte valide, un e-mail de ré-initialisation du mot de passe a été envoyé.
+IfLoginExistPasswordRequestSent=Si cette connexion est un compte valide (avec un e-mail valide), un e-mail de réinitialisation du mot de passe a été envoyé.
 IfEmailExistPasswordRequestSent=Si cet email est un compte valide, un e-mail de ré-initialisation du mot de passe a été envoyé.
 ConfirmPasswordReset=Confirmer réinitialisation du mot de passe
 MenuUsersAndGroups=Utilisateurs & Groupes
@@ -127,3 +127,5 @@ DateLastLogin=Date de la dernière connexion
 DatePreviousLogin=Date de connexion précédente
 IPLastLogin=IP dernière connexion
 IPPreviousLogin=Connexion précédente IP
+ShowAllPerms=Afficher toutes les lignes d'autorisation
+HideAllPerms=Masquer toutes les lignes d'autorisation
diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index c46c3b33e37..da4c702a2cb 100644
--- a/htdocs/langs/fr_FR/website.lang
+++ b/htdocs/langs/fr_FR/website.lang
@@ -140,7 +140,7 @@ PagesRegenerated=%s page(s)/conteneur(s) régénéré(s)
 RegenerateWebsiteContent=Régénérer les fichiers de cache du site Web
 AllowedInFrames=Autorisé dans les Frames
 DefineListOfAltLanguagesInWebsiteProperties=Définir la liste des langues disponibles dans les propriétés du site web.
-GenerateSitemaps=Générer un fichier de plan du site
+GenerateSitemaps=Générer le fichier sitemap.xml du site Web
 ConfirmGenerateSitemaps=Si vous confirmez, vous effacerez le fichier de plan du site existant...
 ConfirmSitemapsCreation=Confirmer la génération du plan du site
 SitemapGenerated=Le plan du site <b>%s</b>a été généré
@@ -150,4 +150,8 @@ ErrorFaviconSize=Le Favicon doit être de taille 16x16, 32x32 ou 64x64
 FaviconTooltip=Téléverser une image qui doit être au format png (16x16, 32x32 ou 64x64)
 NextContainer=Page/conteneur suivant(e)
 PreviousContainer=Page/conteneur précédent(e)
-WebsiteMustBeDisabled=Le site Web doit avoir le statut "désactivé"
+WebsiteMustBeDisabled=Le site web doit avoir le statut "%s"
+WebpageMustBeDisabled=La page Web doit avoir le statut "%s"
+SetWebsiteOnlineBefore=Lorsque le site Web est hors ligne, toutes les pages sont hors ligne. Changez d'abord le statut du site Web.
+Booking=Réservation
+Reservation=Réservation
diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang
index 5e8429ca3db..6620cea6f07 100644
--- a/htdocs/langs/fr_FR/withdrawals.lang
+++ b/htdocs/langs/fr_FR/withdrawals.lang
@@ -33,7 +33,7 @@ InvoiceWaitingPaymentByBankTransfer=Facture en attente de virement
 AmountToWithdraw=Somme à prélever
 AmountToTransfer=Montant du virement
 NoInvoiceToWithdraw=Aucune facture ouverte pour '%s' n'est en attente. Allez sur l'onglet '%s' sur la facture pour faire une demande.
-NoSupplierInvoiceToWithdraw=No supplier invoice with open '%s' is waiting. Go on tab '%s' on invoice card to make a request.
+NoSupplierInvoiceToWithdraw=Aucune facture fournisseur avec '%s' ouvert n'est en attente. Allez sur l'onglet '%s' sur la fiche de facturation pour faire une demande.
 ResponsibleUser=Utilisateur responsable
 WithdrawalsSetup=Configuration des prélèvements
 CreditTransferSetup=Configuration des virements bancaires
diff --git a/htdocs/langs/fr_FR/workflow.lang b/htdocs/langs/fr_FR/workflow.lang
index f79019f1c2a..c1d12c6751a 100644
--- a/htdocs/langs/fr_FR/workflow.lang
+++ b/htdocs/langs/fr_FR/workflow.lang
@@ -22,7 +22,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classer la ou les com
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Classer le bon de commande source liée comme reçu lorsqu'une réception est validée (et si la quantité reçue par toutes les réceptions est la même que dans le bon de commande à mettre à jour)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Classer le bon de commande source lié comme reçu lorsqu'une réception est clôturée (et si la quantité reçue par toutes les réceptions est la même que dans le bon de commande à mettre à jour)
 # Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Classify receptions to "billed" when a linked purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Classer les réceptions en "facturées" lorsqu'une facture d'achat liée est validée (et si le montant de la facture est égal au montant total des réceptions liées)
 # Automatically link ticket to contract
 descWORKFLOW_TICKET_LINK_CONTRACT=A la création d'un ticket, les contacts liés à au tiers sont liés au ticket.
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=Les contacts liés au tiers du ticket sont utilisés pour le ticket

From 9db7daf44951dc00162b921bdd796ad037a7463b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Jan 2023 14:16:58 +0100
Subject: [PATCH 342/816] Fix trans

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

diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang
index 1921b9ed794..8290f14a765 100644
--- a/htdocs/langs/en_US/holiday.lang
+++ b/htdocs/langs/en_US/holiday.lang
@@ -143,16 +143,16 @@ TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
 HolidaysToApprove=Holidays to approve
-NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays
-HolidayBalanceMonthlyUpdate=Monthly update of holiday balance
+NobodyHasPermissionToValidateHolidays=Nobody has permission to validate leave requests
+HolidayBalanceMonthlyUpdate=Monthly update of leave balance
 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
-IncreaseHolidays=Increase holiday
-HolidayRecordsIncreased= %s holiday records increased
-HolidayRecordIncreased=Holiday record increased
-ConfirmMassIncreaseHoliday=Bulk holiday increase
+IncreaseHolidays=Increase leave balance
+HolidayRecordsIncreased= %s leave balances increased
+HolidayRecordIncreased=Leave balance increased
+ConfirmMassIncreaseHoliday=Bulk leave balance increase
 NumberDayAddMass=Number of day to add to the selection
 ConfirmMassIncreaseHolidayQuestion=Are you sure you want to increase holiday of the %s selected record(s)?
 HolidayQtyNotModified=Balance of remaining days for %s has not been changed

From 81ed62223d97fe3c638fb31f1e181c6240501c75 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Jan 2023 14:57:06 +0100
Subject: [PATCH 343/816] Trans

---
 htdocs/core/modules/modModuleBuilder.class.php | 2 +-
 htdocs/langs/en_US/admin.lang                  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/modModuleBuilder.class.php b/htdocs/core/modules/modModuleBuilder.class.php
index 2d6cafa9c2e..8e1fa8bac06 100644
--- a/htdocs/core/modules/modModuleBuilder.class.php
+++ b/htdocs/core/modules/modModuleBuilder.class.php
@@ -48,7 +48,7 @@ class modModuleBuilder extends DolibarrModules
 		$this->module_position = '90';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
-		$this->description = "A RAD (Rapid Application Development) tool to help developers to build their own module.";
+		$this->description = "A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';
 		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index a716a84424b..421ba4f6fa2 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -660,6 +660,8 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3300Name=Module Builder
+Module3200Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=Social Networks
 Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM

From 226194142d167f9623c7e915a347b66a0927115d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Jan 2023 14:58:49 +0100
Subject: [PATCH 344/816] Doc

---
 htdocs/modulebuilder/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/modulebuilder/README.md b/htdocs/modulebuilder/README.md
index 7bafab32ae3..26b0ecf717b 100644
--- a/htdocs/modulebuilder/README.md
+++ b/htdocs/modulebuilder/README.md
@@ -7,7 +7,7 @@ has to offer for module development.
 
 If you don't need to develop your own module/application, you just don't need this.
 
-After enabling this module, you should find features to generate or edit modules/application from menu *Home - Admin tools - Module builder*
+After enabling this module, you should find features to generate or edit modules/application from menu *Home - Tools - Module builder*
 
 Documentation
 -------------

From 5ecaacf36e2bf181ee47bf537b6360166fca650a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Jan 2023 15:30:55 +0100
Subject: [PATCH 345/816] Fix tooltip

---
 htdocs/core/tpl/objectline_view.tpl.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 00ff356768e..be24a555a3c 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -292,7 +292,8 @@ if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 		}
 	}
 	$tooltiponprice .= '<br>'.$langs->transcountry("TotalTTC", $mysoc->country_code).'='.price($line->total_ttc);
-	$tooltiponprice .= '<span class="classfortooltip" title="'.dol_escape_htmltag($tooltiponprice).'">';
+
+	$tooltiponprice = '<span class="classfortooltip" title="'.dol_escape_htmltag($tooltiponprice).'">';
 	$tooltiponpriceend = '</span>';
 }
 

From b707c79d6d211637825b4544749083c8d854073d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Jan 2023 15:46:17 +0100
Subject: [PATCH 346/816] FIX look and feel v17 (always a message instead of
 empty lists)

---
 htdocs/core/tpl/contacts.tpl.php | 15 +++++++++++----
 htdocs/langs/en_US/main.lang     |  3 +++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index 9d9bd226fd6..25e0f914807 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -280,9 +280,6 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<div class="div-table-responsive-no-min">'."\n";
 print '<table class="tagtable nobottomiftotal liste">';
 
-//print '<tr class="liste_titre_filter">';
-//print '</tr>';
-
 print '<tr class="liste_titre">';
 print_liste_field_titre($arrayfields['thirdparty']['label'], $_SERVER["PHP_SELF"], "thirdparty_name", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre($arrayfields['contact']['label'], $_SERVER["PHP_SELF"], "contact_name", "", $param, "", $sortfield, $sortorder);
@@ -316,7 +313,17 @@ foreach ($list as $entry) {
 
 	print "</tr>";
 }
-
+if (empty($list)) {
+	$colspan = 5 + ($permission ? 1 : 0);
+	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">';
+	if (is_object($object) && !empty($object->thirdparty)) {
+		print $form->textwithpicto($langs->trans("NoSpecificContactAddress"), $langs->trans("NoSpecificContactAddressBis"));
+	} else {
+		print $langs->trans("NoSpecificContactAddress");
+	}
+	print '</span>';
+	print '</td></tr>';
+}
 print "</table>";
 print '</div>';
 
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index ebdbfce73fa..73dfee80a69 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1211,3 +1211,6 @@ CreatedByPublicPortal=Created from Public portal
 UserAgent=User Agent
 InternalUser=Internal user
 ExternalUser=External user
+NoSpecificContactAddress=No specific contact or address
+NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
+

From 32e566f269a55ae9289832dfecaa07ff747154fc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Jan 2023 15:47:47 +0100
Subject: [PATCH 347/816] Update dispatch.php

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

diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index b209b6905f3..504336f0a6e 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -68,7 +68,7 @@ $hookmanager->initHooks(array('ordersupplierdispatch'));
 
 // Recuperation de l'id de projet
 $projectid = 0;
-if (isset($_GET["projectid"])) {
+if (GETPOSTISSET("projectid")) {
 	$projectid = GETPOST("projectid", 'int');
 }
 

From 2755e3dad73124c126246a76385551ccd8e00f8e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Jan 2023 15:53:25 +0100
Subject: [PATCH 348/816] Fix typo

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

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 8e14e99b1c6..5a9f91ea71a 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -277,7 +277,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid,'arrayfields'=>&$arrayfields);
+$parameters = array('socid'=>$socid, 'arrayfields'=>&$arrayfields);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index ab06e1b5fe6..ed00efdf10a 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -223,7 +223,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid,'arrayfields'=>&$arrayfields);
+$parameters = array('socid'=>$socid, 'arrayfields'=>&$arrayfields);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 9baa1b63f60..7522d80f403 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -296,7 +296,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid,'arrayfields'=>&$arrayfields);
+$parameters = array('socid'=>$socid, 'arrayfields'=>&$arrayfields);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

From 4d683692deff22dda3dc412595e03b3a69da27d8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Jan 2023 16:51:01 +0100
Subject: [PATCH 349/816] Fix autofill js

---
 htdocs/salaries/card.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index 0b961648115..86a72c08053 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -658,18 +658,25 @@ if ($action == 'create' && $permissiontoadd) {
 	print '<script>';
 	print '$( document ).ready(function() {';
 		print '$("#updateAmountWithLastSalary").on("click", function updateAmountWithLastSalary() {
-					console.log("We click on link to autofill salary amount");
 					var fk_user = $("#fk_user").val()
 					var url = "'.DOL_URL_ROOT.'/salaries/ajax/ajaxsalaries.php?fk_user="+fk_user;
+					console.log("We click on link to autofill salary amount url="+url);
 					if (fk_user != -1) {
 						$.get(
 							url,
 							function( data ) {
-								if(data!=null) {
-									console.log("Data returned: "+data);
-									item = JSON.parse(data);
-									if(item[0].key == "Amount") {
+								console.log("Data returned: "+data);
+								if (data != null) {
+									if (typeof data == "object") {
+										console.log("data is already type object, no need to parse it");
+										item = data;
+									} else {
+										console.log("data is type "+(typeof data));
+										item = JSON.parse(data);
+									}
+									if (item[0].key == "Amount") {
 										value = item[0].value;
+										console.log("amount returned = "+value);
 										if (value != null) {
 											$("#amount").val(item[0].value);
 										} else {

From 22e1262ac663f84f7b7c419944eee1f0ee45a71e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Jan 2023 16:55:07 +0100
Subject: [PATCH 350/816] Can add a custom date with editfieldval

---
 htdocs/core/class/html.form.class.php   | 10 +++++++---
 htdocs/salaries/payment_salary/card.php |  4 +++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index c9332a839e7..4d8aa1e2b6e 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -278,10 +278,14 @@ class Form
 					$ret .= '</textarea>';
 				} elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') {
 					$addnowlink = empty($moreoptions['addnowlink']) ? 0 : $moreoptions['addnowlink'];
-					$ret .= $this->selectDate($value, $htmlname, 0, 0, 1, 'form'.$htmlname, 1, $addnowlink, 0, '', '', '', '', 1, '', '', $gm);
+					$adddateof = empty($moreoptions['adddateof']) ? '' : $moreoptions['adddateof'];
+					$labeladddateof = empty($moreoptions['labeladddateof']) ? '' : $moreoptions['labeladddateof'];
+					$ret .= $this->selectDate($value, $htmlname, 0, 0, 1, 'form'.$htmlname, 1, $addnowlink, 0, '', '', $adddateof, '', 1, $labeladddateof, '', $gm);
 				} elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') {
 					$addnowlink = empty($moreoptions['addnowlink']) ? 0 : $moreoptions['addnowlink'];
-					$ret .= $this->selectDate($value, $htmlname, 1, 1, 1, 'form'.$htmlname, 1, $addnowlink, 0, '', '', '', '', 1, '', '', $gm);
+					$adddateof = empty($moreoptions['adddateof']) ? '' : $moreoptions['adddateof'];
+					$labeladddateof = empty($moreoptions['labeladddateof']) ? '' : $moreoptions['labeladddateof'];
+					$ret .= $this->selectDate($value, $htmlname, 1, 1, 1, 'form'.$htmlname, 1, $addnowlink, 0, '', '', $adddateof, '', 1, $labeladddateof, '', $gm);
 				} elseif (preg_match('/^select;/', $typeofdata)) {
 					$arraydata = explode(',', preg_replace('/^select;/', '', $typeofdata));
 					$arraylist = array();
@@ -6496,7 +6500,7 @@ class Form
 	 * 	@param 	int				$disabled		Disable input fields
 	 *  @param  int				$fullday        When a checkbox with id #fullday is checked, hours are set with 00:00 (if value if 'fulldaystart') or 23:59 (if value is 'fulldayend')
 	 *  @param	string			$addplusone		Add a link "+1 hour". Value must be name of another selectDate field.
-	 *  @param  datetime    	$adddateof      Add a link "Date of ..." using the following date. See also $labeladddateof for the label used.
+	 *  @param  datetime|string	$adddateof      Add a link "Date of ..." using the following date. See also $labeladddateof for the label used.
 	 *  @param  string      	$openinghours   Specify hour start and hour end for the select ex 8,20
 	 *  @param  int         	$stepminutes    Specify step for minutes between 1 and 30
 	 *  @param	string			$labeladddateof Label to use for the $adddateof parameter.
diff --git a/htdocs/salaries/payment_salary/card.php b/htdocs/salaries/payment_salary/card.php
index b35469ab27e..e66ef74a4ee 100644
--- a/htdocs/salaries/payment_salary/card.php
+++ b/htdocs/salaries/payment_salary/card.php
@@ -133,6 +133,8 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/salaries/payments.php">'.$langs->trans("B
 
 dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'id', '');
 
+$salary->fetch($object->fk_salary);
+
 
 print '<div class="fichecenter">';
 print '<div class="underbanner clearboth"></div>';
@@ -149,7 +151,7 @@ print '</td></tr>';*/
 print '<tr><td>';
 print $form->editfieldkey("Date", 'datep', $object->datep, $object, 1, 'datehourpicker');
 print '</td><td>';
-print $form->editfieldval("Date", 'datep', $object->datep, $object, 1, 'datehourpicker', '', null, null, '', 0, '', 'id', 'tzuserrel', array('addnowlink'=>1));
+print $form->editfieldval("Date", 'datep', $object->datep, $object, 1, 'datehourpicker', '', null, null, '', 0, '', 'id', 'tzuserrel', array('addnowlink'=>1, 'adddateof'=>$salary->datesp, 'labeladddateof'=>$langs->transnoentitiesnoconv("DateStart")));
 print "</td>";
 print '</tr>';
 

From 9b96e7bc3cee7b4ca832e02f2b25ff97e6a4966f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Jan 2023 17:04:40 +0100
Subject: [PATCH 351/816] NEW Can fill date of salary payment with date of
 start of salary

---
 htdocs/salaries/paiement_salary.php     |  2 +-
 htdocs/salaries/payment_salary/card.php | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/htdocs/salaries/paiement_salary.php b/htdocs/salaries/paiement_salary.php
index 0c2c757e2dc..3cf34df6ed9 100644
--- a/htdocs/salaries/paiement_salary.php
+++ b/htdocs/salaries/paiement_salary.php
@@ -212,7 +212,7 @@ if ($action == 'create') {
 	print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
 	$datepaye = dol_mktime(GETPOST("rehour", 'int'), GETPOST("remin", 'int'), GETPOST("resec", 'int'), GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int'));
 	$datepayment = empty($conf->global->MAIN_AUTOFILL_DATE) ? (GETPOST("remonth") ? $datepaye : -1) : '';
-	print $form->selectDate($datepayment, '', 1, 1, 0, "add_payment", 1, 1);
+	print $form->selectDate($datepayment, '', 1, 1, 0, "add_payment", 1, 1, 0, '', '', $salary->dateep, '', 1, $langs->trans("DateEnd"));
 	print "</td>";
 	print '</tr>';
 
diff --git a/htdocs/salaries/payment_salary/card.php b/htdocs/salaries/payment_salary/card.php
index e66ef74a4ee..21304469296 100644
--- a/htdocs/salaries/payment_salary/card.php
+++ b/htdocs/salaries/payment_salary/card.php
@@ -133,8 +133,6 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/salaries/payments.php">'.$langs->trans("B
 
 dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'id', '');
 
-$salary->fetch($object->fk_salary);
-
 
 print '<div class="fichecenter">';
 print '<div class="underbanner clearboth"></div>';
@@ -151,7 +149,7 @@ print '</td></tr>';*/
 print '<tr><td>';
 print $form->editfieldkey("Date", 'datep', $object->datep, $object, 1, 'datehourpicker');
 print '</td><td>';
-print $form->editfieldval("Date", 'datep', $object->datep, $object, 1, 'datehourpicker', '', null, null, '', 0, '', 'id', 'tzuserrel', array('addnowlink'=>1, 'adddateof'=>$salary->datesp, 'labeladddateof'=>$langs->transnoentitiesnoconv("DateStart")));
+print $form->editfieldval("Date", 'datep', $object->datep, $object, 1, 'datehourpicker', '', null, null, '', 0, '', 'id', 'tzuserrel', array('addnowlink'=>1));
 print "</td>";
 print '</tr>';
 
@@ -164,10 +162,10 @@ print '</td></tr>';
 print '<tr><td>'.$langs->trans('Numero').'</td><td>'.dol_escape_htmltag($object->num_payment).'</td></tr>';
 
 // Montant
-print '<tr><td>'.$langs->trans('Amount').'</td><td colspan="3">'.price($object->amount, 0, $langs, 1, -1, -1, $conf->currency).'</td></tr>';
+print '<tr><td>'.$langs->trans('Amount').'</td><td>'.price($object->amount, 0, $langs, 1, -1, -1, $conf->currency).'</td></tr>';
 
 // Note
-print '<tr><td>'.$langs->trans('Note').'</td><td colspan="3">'.dol_nl2br($object->note).'</td></tr>';
+print '<tr><td>'.$langs->trans('Note').'</td><td>'.dol_nl2br($object->note_private).'</td></tr>';
 
 // Bank account
 if (isModEnabled("banque")) {
@@ -177,7 +175,7 @@ if (isModEnabled("banque")) {
 
 		print '<tr>';
 		print '<td>'.$langs->trans('BankTransactionLine').'</td>';
-		print '<td colspan="3">';
+		print '<td>';
 		print $bankline->getNomUrl(1, 0, 'showall');
 		print '</td>';
 		print '</tr>';

From 864278f3184fb7565fff62fa52ca83f9f118e71f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Jan 2023 17:46:35 +0100
Subject: [PATCH 352/816] NEW Can edit inline the vat number from supplier tab

---
 htdocs/core/class/html.form.class.php |  8 +++++--
 htdocs/fourn/card.php                 | 30 ++++++++++++++++++++-------
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 4d8aa1e2b6e..499e9779b1f 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -201,7 +201,7 @@ class Form
 	 * @param	string	$formatfunc		Call a specific function to output field in view mode (For example: 'dol_print_email')
 	 * @param	string	$paramid		Key of parameter for id ('id', 'socid')
 	 * @param	string	$gm				'auto' or 'tzuser' or 'tzuserrel' or 'tzserver' (when $typeofdata is a date)
-	 * @param	array	$moreoptions	Array with more options. For example array('addnowlink'=>1)
+	 * @param	array	$moreoptions	Array with more options. For example array('addnowlink'=>1), array('valuealreadyhtmlescaped'=>1)
 	 * @return  string					HTML edit field
 	 */
 	public function editfieldval($text, $htmlname, $value, $object, $perm, $typeofdata = 'string', $editvalue = '', $extObject = null, $custommsg = null, $moreparam = '', $notabletag = 0, $formatfunc = '', $paramid = 'id', $gm = 'auto', $moreoptions = array())
@@ -367,7 +367,11 @@ class Form
 					// clean data from some dangerous html
 					$ret .= dol_string_onlythesehtmltags(dol_htmlentitiesbr($tmpcontent));
 				} else {
-					$ret .= dol_escape_htmltag($value);
+					if (empty($moreoptions['valuealreadyhtmlescaped'])) {
+						$ret .= dol_escape_htmltag($value);
+					} else {
+						$ret .= $value;		// $value must be already html escaped.
+					}
 				}
 
 				if ($formatfunc && method_exists($object, $formatfunc)) {
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 90a760e14a1..297d8dfb4e5 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -98,7 +98,8 @@ if (empty($reshook)) {
 		$action = "";
 	}
 
-	if ($action == 'setsupplieraccountancycode') {
+	// Set supplier accounting account
+	if ($action == 'setsupplieraccountancycode' && $user->hasRight('societe', 'creer')) {
 		$result = $object->fetch($id);
 		$object->code_compta_fournisseur = GETPOST("supplieraccountancycode");
 		$result = $object->update($object->id, $user, 1, 0, 1);
@@ -106,8 +107,17 @@ if (empty($reshook)) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
+	// Set vat number accounting account
+	if ($action == 'settva_intra' && $user->hasRight('societe', 'creer')) {
+		$result = $object->fetch($id);
+		$object->tva_intra = GETPOST("tva_intra");
+		$result = $object->update($object->id, $user, 1, 0, 0);
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
 	// Set payment terms of the settlement
-	if ($action == 'setconditions' && $user->rights->societe->creer) {
+	if ($action == 'setconditions' && $user->hasRight('societe', 'creer')) {
 		$object->fetch($id);
 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_supplier_id', 'int'));
 		if ($result < 0) {
@@ -115,7 +125,7 @@ if (empty($reshook)) {
 		}
 	}
 	// Payment mode
-	if ($action == 'setmode' && $user->rights->societe->creer) {
+	if ($action == 'setmode' && $user->hasRight('societe', 'creer')) {
 		$object->fetch($id);
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_supplier_id', 'int'));
 		if ($result < 0) {
@@ -124,7 +134,7 @@ if (empty($reshook)) {
 	}
 
 	// Bank account
-	if ($action == 'setbankaccount' && $user->rights->societe->creer) {
+	if ($action == 'setbankaccount' && $user->hasRight('societe', 'creer')) {
 		$object->fetch($id);
 		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
 		if ($result < 0) {
@@ -133,7 +143,7 @@ if (empty($reshook)) {
 	}
 
 	// update supplier order min amount
-	if ($action == 'setsupplier_order_min_amount') {
+	if ($action == 'setsupplier_order_min_amount' && $user->hasRight('societe', 'creer')) {
 		$object->fetch($id);
 		$object->supplier_order_min_amount = price2num(GETPOST('supplier_order_min_amount', 'alpha'));
 		$result = $object->update($object->id, $user);
@@ -142,7 +152,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'update_extras') {
+	if ($action == 'update_extras' && $user->hasRight('societe', 'creer')) {
 		$object->fetch($id);
 
 		$object->oldcopy = dol_clone($object);
@@ -261,8 +271,12 @@ if ($object->id > 0) {
 	}
 
 	// TVA Intra
-	print '<tr><td class="nowrap">'.$langs->trans('VATIntra').'</td><td>';
-	print showValueWithClipboardCPButton(dol_escape_htmltag($object->tva_intra));
+	print '<tr><td class="nowrap">';
+	//print $langs->trans('VATIntra').'</td><td>';
+	$vattoshow = ($object->tva_intra ? showValueWithClipboardCPButton(dol_escape_htmltag($object->tva_intra)) : '');
+	print $form->editfieldkey("VATIntra", 'tva_intra', $object->tva_intra, $object, $user->hasRight('societe', 'creer'));
+	print '</td><td>';
+	print $form->editfieldval("VATIntra", 'tva_intra', $vattoshow, $object, $user->hasRight('societe', 'creer'), 'string', $object->tva_intra, null, null, '', 0, '', 'id', 'auto', array('valuealreadyhtmlescaped'=>1));
 	print '</td></tr>';
 
 	// Default terms of the settlement

From a850a735a8bc14e66079b3f25fd3a1b515d7a049 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Jan 2023 17:47:44 +0100
Subject: [PATCH 353/816] Fix missing test on permission

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

diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 90a760e14a1..cf337abf760 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -98,7 +98,7 @@ if (empty($reshook)) {
 		$action = "";
 	}
 
-	if ($action == 'setsupplieraccountancycode') {
+	if ($action == 'setsupplieraccountancycode' && $user->hasRight('societe', 'creer')) {
 		$result = $object->fetch($id);
 		$object->code_compta_fournisseur = GETPOST("supplieraccountancycode");
 		$result = $object->update($object->id, $user, 1, 0, 1);
@@ -107,7 +107,7 @@ if (empty($reshook)) {
 		}
 	}
 	// Set payment terms of the settlement
-	if ($action == 'setconditions' && $user->rights->societe->creer) {
+	if ($action == 'setconditions' && $user->hasRight('societe', 'creer')) {
 		$object->fetch($id);
 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_supplier_id', 'int'));
 		if ($result < 0) {
@@ -115,7 +115,7 @@ if (empty($reshook)) {
 		}
 	}
 	// Payment mode
-	if ($action == 'setmode' && $user->rights->societe->creer) {
+	if ($action == 'setmode' && $user->hasRight('societe', 'creer')) {
 		$object->fetch($id);
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_supplier_id', 'int'));
 		if ($result < 0) {
@@ -124,7 +124,7 @@ if (empty($reshook)) {
 	}
 
 	// Bank account
-	if ($action == 'setbankaccount' && $user->rights->societe->creer) {
+	if ($action == 'setbankaccount' && $user->hasRight('societe', 'creer')) {
 		$object->fetch($id);
 		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
 		if ($result < 0) {
@@ -133,7 +133,7 @@ if (empty($reshook)) {
 	}
 
 	// update supplier order min amount
-	if ($action == 'setsupplier_order_min_amount') {
+	if ($action == 'setsupplier_order_min_amount' && $user->hasRight('societe', 'creer')) {
 		$object->fetch($id);
 		$object->supplier_order_min_amount = price2num(GETPOST('supplier_order_min_amount', 'alpha'));
 		$result = $object->update($object->id, $user);
@@ -142,7 +142,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'update_extras') {
+	if ($action == 'update_extras' && $user->hasRight('societe', 'creer')) {
 		$object->fetch($id);
 
 		$object->oldcopy = dol_clone($object);

From 646f6c7bc7a9d470ffb2cc9b763fc173cfb3d738 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Jan 2023 17:56:45 +0100
Subject: [PATCH 354/816] New default value

---
 htdocs/core/class/html.form.class.php | 4 ++--
 htdocs/fourn/card.php                 | 2 +-
 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 499e9779b1f..ad82ae86751 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -204,7 +204,7 @@ class Form
 	 * @param	array	$moreoptions	Array with more options. For example array('addnowlink'=>1), array('valuealreadyhtmlescaped'=>1)
 	 * @return  string					HTML edit field
 	 */
-	public function editfieldval($text, $htmlname, $value, $object, $perm, $typeofdata = 'string', $editvalue = '', $extObject = null, $custommsg = null, $moreparam = '', $notabletag = 0, $formatfunc = '', $paramid = 'id', $gm = 'auto', $moreoptions = array())
+	public function editfieldval($text, $htmlname, $value, $object, $perm, $typeofdata = 'string', $editvalue = '', $extObject = null, $custommsg = null, $moreparam = '', $notabletag = 1, $formatfunc = '', $paramid = 'id', $gm = 'auto', $moreoptions = array())
 	{
 		global $conf, $langs;
 
@@ -307,7 +307,7 @@ class Form
 
 				// Button save-cancel
 				if (empty($notabletag)) {
-					$ret .= '<td class="left">';
+					$ret .= '<td>';
 				}
 				//else $ret.='<div class="clearboth"></div>';
 				$ret .= '<input type="submit" class="smallpaddingimp button'.(empty($notabletag) ? '' : ' ').'" name="modify" value="'.$langs->trans("Modify").'">';
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 297d8dfb4e5..19335656f51 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -276,7 +276,7 @@ if ($object->id > 0) {
 	$vattoshow = ($object->tva_intra ? showValueWithClipboardCPButton(dol_escape_htmltag($object->tva_intra)) : '');
 	print $form->editfieldkey("VATIntra", 'tva_intra', $object->tva_intra, $object, $user->hasRight('societe', 'creer'));
 	print '</td><td>';
-	print $form->editfieldval("VATIntra", 'tva_intra', $vattoshow, $object, $user->hasRight('societe', 'creer'), 'string', $object->tva_intra, null, null, '', 0, '', 'id', 'auto', array('valuealreadyhtmlescaped'=>1));
+	print $form->editfieldval("VATIntra", 'tva_intra', $vattoshow, $object, $user->hasRight('societe', 'creer'), 'string', $object->tva_intra, null, null, '', 1, '', 'id', 'auto', array('valuealreadyhtmlescaped'=>1));
 	print '</td></tr>';
 
 	// Default terms of the settlement

From cc6f42f926c1af929f9670a699a448ba52fbdf39 Mon Sep 17 00:00:00 2001
From: Lenin Rivas <53640168+leninrivas@users.noreply.github.com>
Date: Fri, 6 Jan 2023 12:34:45 -0500
Subject: [PATCH 355/816] Add new constant PROPALE_ADDON_NOTE_PUBLIC_DEFAULT

Add constant default public note
---
 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 5fb464a6e8e..7b58f93d7b8 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1928,7 +1928,7 @@ if ($action == 'create') {
 	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));
+	$note_public = $object->getDefaultCreateValueFor('note_public', (!empty($objectsrc) ? $objectsrc->note_public : (!empty($conf->global->PROPALE_ADDON_NOTE_PUBLIC_DEFAULT) ? $conf->global->PROPALE_ADDON_NOTE_PUBLIC_DEFAULT : 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);
 

From 5be0bf17368233de9f858600ce174ef2751afcf1 Mon Sep 17 00:00:00 2001
From: Lenin Rivas <53640168+leninrivas@users.noreply.github.com>
Date: Fri, 6 Jan 2023 13:17:19 -0500
Subject: [PATCH 356/816] FIX line brak public note default

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

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 7b58f93d7b8..39632e14e64 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -15,6 +15,7 @@
  * 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>
+ * Copyright (C) 2023	   Lenin Rivas       	 <lenin.rivas777@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1928,7 +1929,7 @@ if ($action == 'create') {
 	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 : (!empty($conf->global->PROPALE_ADDON_NOTE_PUBLIC_DEFAULT) ? $conf->global->PROPALE_ADDON_NOTE_PUBLIC_DEFAULT : null)));
+	$note_public = $object->getDefaultCreateValueFor('note_public', (!empty($objectsrc) ? $objectsrc->note_public : (!empty($conf->global->PROPALE_ADDON_NOTE_PUBLIC_DEFAULT) ? $conf->global->PROPALE_ADDON_NOTE_PUBLIC_DEFAULT : null)), 'restricthtml');
 	$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);
 

From 75d177f03a8161a70cb64a19682837078434c1b9 Mon Sep 17 00:00:00 2001
From: Lenin Rivas <53640168+leninrivas@users.noreply.github.com>
Date: Fri, 6 Jan 2023 13:23:16 -0500
Subject: [PATCH 357/816] New param $type getDefaultCreateValueFor

New param $type in fucntion getDefaultCreateValueFor
---
 htdocs/core/class/commonobject.class.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 48e5124f213..5b6dac99a4b 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -16,6 +16,7 @@
  * Copyright (C) 2018      Josep Lluís Amador   <joseplluis@lliuretic.cat>
  * Copyright (C) 2021      Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2021      Grégory Blémand      <gregory.blemand@atm-consulting.fr>
+ * Copyright (C) 2023      Lenin Rivas      	<lenin.rivas777@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -5738,15 +5739,16 @@ abstract class CommonObject
 	 *
 	 * @param   string              $fieldname          Name of field
 	 * @param   string              $alternatevalue     Alternate value to use
+	 * @param   string              $type    			Type of data
 	 * @return  string|string[]                         Default value (can be an array if the GETPOST return an array)
 	 **/
-	public function getDefaultCreateValueFor($fieldname, $alternatevalue = null)
+	public function getDefaultCreateValueFor($fieldname, $alternatevalue = null, $type = 'alphanohtml')
 	{
 		global $conf, $_POST;
 
 		// If param here has been posted, we use this value first.
 		if (GETPOSTISSET($fieldname)) {
-			return GETPOST($fieldname, 'alphanohtml', 3);
+			return GETPOST($fieldname, $type, 3);
 		}
 
 		if (isset($alternatevalue)) {

From 5280d070e38eb93eccba081b5a6b7cc44d91d7f0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Jan 2023 19:24:57 +0100
Subject: [PATCH 358/816] Fix technical debt

---
 ChangeLog                                     |  2 +-
 htdocs/commande/card.php                      |  2 +-
 htdocs/commande/class/commande.class.php      | 18 ++++---
 htdocs/compta/facture/class/facture.class.php | 10 +++-
 .../core/class/commondocgenerator.class.php   | 47 +++++++++----------
 htdocs/core/class/commonobject.class.php      | 13 +++--
 htdocs/core/class/dolgraph.class.php          | 11 +++--
 htdocs/core/class/html.formsetup.class.php    | 17 +++++--
 htdocs/core/class/lessc.class.php             |  7 +--
 htdocs/core/login/functions_ldap.php          |  2 +-
 .../class/expensereport.class.php             | 10 +++-
 htdocs/fichinter/class/fichinter.class.php    | 27 ++++++-----
 .../template/test/phpunit/MyObjectTest.php    |  2 -
 htdocs/societe/class/societe.class.php        | 13 +++--
 14 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ef974dfde12..9ec9fb4525a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,7 +9,7 @@ WARNING:
 
 Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
 * The deprecated method escapeunderscore() of database handlers has been removed. You must use escapeforlike instead.
-
+* The method nb_expedition() has been renamed into countNbOfShipments() 
 
 
 
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 3e24285a1a7..ccf706c9ac7 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2871,7 +2871,7 @@ if ($action == 'create' && $usercancreate) {
 				// Ship
 				$numshipping = 0;
 				if (isModEnabled('expedition')) {
-					$numshipping = $object->nb_expedition();
+					$numshipping = $object->countNbOfShipments();
 
 					if ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && ($object->getNbOfProductsLines() > 0 || !empty($conf->global->STOCK_SUPPORTS_SERVICES))) {
 						if ((isModEnabled('expedition_bon') && $user->rights->expedition->creer) || ($conf->delivery_note->enabled && $user->rights->expedition->delivery->creer)) {
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 25c234cc66d..29f990476ed 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1173,6 +1173,8 @@ class Commande extends CommonOrder
 					return -1;
 				}
 			}
+
+			return 0;
 		} else {
 			dol_print_error($this->db);
 			$this->db->rollback();
@@ -2307,17 +2309,13 @@ class Commande extends CommonOrder
 		}
 	}
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 * Returns a array with expeditions lines number
+	 * Returns an array with expeditions lines number
 	 *
 	 * @return	int		Nb of shipments
-	 *
-	 * TODO deprecate, move to Shipping class
 	 */
-	public function nb_expedition()
+	public function countNbOfShipments()
 	{
-		// phpcs:enable
 		$sql = 'SELECT count(*)';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'expedition as e';
 		$sql .= ', '.MAIN_DB_PREFIX.'element_element as el';
@@ -2333,6 +2331,8 @@ class Commande extends CommonOrder
 		} else {
 			dol_print_error($this->db);
 		}
+
+		return 0;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -2501,6 +2501,8 @@ class Commande extends CommonOrder
 				return -1 * $error;
 			}
 		}
+
+		return 0;
 	}
 
 
@@ -2565,6 +2567,8 @@ class Commande extends CommonOrder
 				return -1 * $error;
 			}
 		}
+
+		return 0;
 	}
 
 
@@ -3433,7 +3437,7 @@ class Commande extends CommonOrder
 		}
 
 		// Test we can delete
-		if ($this->nb_expedition() != 0) {
+		if ($this->countNbOfShipments() != 0) {
 			$this->errors[] = $langs->trans('SomeShipmentExists');
 			$error++;
 		}
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 9af2a06f7d4..69b2ea1c293 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4224,7 +4224,7 @@ class Facture extends CommonInvoice
 	 *	@param     	User	$user		User that set discount
 	 *	@param     	double	$remise		Discount
 	 *  @param     	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *	@return		int 		<0 if ko, >0 if ok
+	 *	@return		int 				<0 if KO, >0 if OK
 	 */
 	public function set_remise($user, $remise, $notrigger = 0)
 	{
@@ -4239,7 +4239,7 @@ class Facture extends CommonInvoice
 	 *	@param     	User	$user		User that set discount
 	 *	@param     	double	$remise		Discount
 	 *  @param     	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *	@return		int 		<0 if ko, >0 if ok
+	 *	@return		int 				<0 if KO, >0 if OK
 	 */
 	public function setDiscount($user, $remise, $notrigger = 0)
 	{
@@ -4291,6 +4291,8 @@ class Facture extends CommonInvoice
 				return -1 * $error;
 			}
 		}
+
+		return 0;
 	}
 
 
@@ -4356,6 +4358,8 @@ class Facture extends CommonInvoice
 				return -1 * $error;
 			}
 		}
+
+		return 0;
 	}
 
 	/**
@@ -5742,6 +5746,8 @@ class Facture extends CommonInvoice
 		} else {
 			dol_print_error($this->db);
 		}
+
+		return array();
 	}
 }
 
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 69ec9d029ef..e142e5c8d61 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1016,12 +1016,10 @@ abstract class CommonDocGenerator
 	 *      @param	int				$hidedetails		Do not show line details
 	 *      @param	int				$hidedesc			Do not show desc
 	 *      @param	int				$hideref			Do not show ref
-	 *      @return	null
+	 *      @return	void
 	 */
 	public function prepareArrayColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-		global $conf;
-
 		$this->defineColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
 
@@ -1175,7 +1173,7 @@ abstract class CommonDocGenerator
 	 *  @param	float		$curY    	curent Y position
 	 *  @param	string		$colKey    	the column key
 	 *  @param	string		$columnText   column text
-	 *  @return	null
+	 *  @return	void
 	 */
 	public function printStdColumnContent($pdf, &$curY, $colKey, $columnText = '')
 	{
@@ -1206,22 +1204,24 @@ abstract class CommonDocGenerator
 			// restore cell padding
 			$pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);
 		}
+
+		return;
 	}
 
 
 	/**
 	 *  print description column content
 	 *
-	 *  @param	TCPDF		$pdf    	pdf object
-	 *  @param	float		$curY    	curent Y position
-	 *  @param	string		$colKey    	the column key
-	 *  @param  object      $object CommonObject
-	 *  @param  int         $i  the $object->lines array key
-	 *  @param  Translate $outputlangs    Output language
-	 *  @param  int $hideref hide ref
-	 *  @param  int $hidedesc hide desc
-	 *  @param  int $issupplierline if object need supplier product
-	 *  @return null
+	 *  @param	TCPDF		$pdf    		pdf object
+	 *  @param	float		$curY    		curent Y position
+	 *  @param	string		$colKey    		the column key
+	 *  @param  object      $object 		CommonObject
+	 *  @param  int         $i  			the $object->lines array key
+	 *  @param  Translate 	$outputlangs    Output language
+	 *  @param  int 		$hideref 		hide ref
+	 *  @param  int 		$hidedesc 		hide desc
+	 *  @param  int 		$issupplierline if object need supplier product
+	 *  @return void
 	 */
 	public function printColDescContent($pdf, &$curY, $colKey, $object, $i, $outputlangs, $hideref = 0, $hidedesc = 0, $issupplierline = 0)
 	{
@@ -1265,7 +1265,7 @@ abstract class CommonDocGenerator
 		global $hookmanager;
 
 		if (empty($object->table_element)) {
-			return;
+			return '';
 		}
 
 		$extrafieldsKeyPrefix = "options_";
@@ -1317,10 +1317,10 @@ abstract class CommonDocGenerator
 	/**
 	 *  display extrafields columns content
 	 *
-	 *  @param	object		$object    	line of common object
-	 *  @param Translate $outputlangs    Output language
-	 *  @param array $params    array of additionals parameters
-	 *  @return	double  max y value
+	 *  @param	object		$object    		line of common object
+	 *  @param 	Translate 	$outputlangs    Output language
+	 *  @param 	array 		$params    		array of additionals parameters
+	 *  @return	string  					Html string
 	 */
 	public function getExtrafieldsInHtml($object, $outputlangs, $params = array())
 	{
@@ -1330,7 +1330,7 @@ abstract class CommonDocGenerator
 			return;
 		}
 
-		// Load extrafiels if not allready does
+		// Load extrafields if not allready done
 		if (empty($this->extrafieldsCache)) {
 			$this->extrafieldsCache = new ExtraFields($this->db);
 		}
@@ -1366,7 +1366,6 @@ abstract class CommonDocGenerator
 
 		$params = $params + $defaultParams;
 
-
 		/**
 		 * @var $extrafields ExtraFields
 		 */
@@ -1593,12 +1592,10 @@ abstract class CommonDocGenerator
 	 *  @param	object			$object    		common object det
 	 *  @param	Translate		$outputlangs    langs
 	 *  @param	int			   $hidedetails		Do not show line details
-	 *  @return	null
+	 *  @return	void
 	 */
 	public function defineColumnExtrafield($object, $outputlangs, $hidedetails = 0)
 	{
-		global $conf;
-
 		if (!empty($hidedetails)) {
 			return;
 		}
@@ -1674,5 +1671,7 @@ abstract class CommonDocGenerator
 				$this->insertNewColumnDef("options_".$key, $def);
 			}
 		}
+
+		return;
 	}
 }
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 48e5124f213..a23c0611589 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4539,6 +4539,8 @@ abstract class CommonObject
 			$row = $this->db->fetch_row($resql);
 			return $row[0];
 		}
+
+		return 0;
 	}
 
 	/**
@@ -5772,6 +5774,9 @@ abstract class CommonObject
 		}
 
 		// TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname
+		// store content into $conf->cache['overwrite_default']
+
+		return '';
 	}
 
 
@@ -7828,7 +7833,7 @@ abstract class CommonObject
 	 * clear validation message result for a field
 	 *
 	 * @param string $fieldKey Key of attribute to clear
-	 * @return null
+	 * @return void
 	 */
 	public function clearFieldError($fieldKey)
 	{
@@ -7841,12 +7846,14 @@ abstract class CommonObject
 	 *
 	 * @param string $fieldKey Key of attribute
 	 * @param string $msg the field error message
-	 * @return null
+	 * @return void
 	 */
 	public function setFieldError($fieldKey, $msg = '')
 	{
 		global $langs;
-		if (empty($msg)) { $msg = $langs->trans("UnknowError"); }
+		if (empty($msg)) {
+			$msg = $langs->trans("UnknowError");
+		}
 
 		$this->error = $this->validateFieldsErrors[$fieldKey] = $msg;
 	}
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 196364a84f8..1d60d03a652 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -221,8 +221,8 @@ class DolGraph
 	/**
 	 * Set y label
 	 *
-	 * @param 	string	$label		Y label
-	 * @return	boolean|null				True
+	 * @param 	string			$label		Y label
+	 * @return	void
 	 */
 	public function SetYLabel($label)
 	{
@@ -235,7 +235,7 @@ class DolGraph
 	 * Set width
 	 *
 	 * @param 	int|string		$w			Width (Example: 320 or '100%')
-	 * @return	boolean|null				True
+	 * @return	void
 	 */
 	public function SetWidth($w)
 	{
@@ -717,7 +717,7 @@ class DolGraph
 	 *
 	 * @param	string	$file    	Image file name to use to save onto disk (also used as javascript unique id)
 	 * @param	string	$fileurl	Url path to show image if saved onto disk
-	 * @return	integer|null
+	 * @return	mixed|boolean
 	 */
 	public function draw($file, $fileurl = '')
 	{
@@ -736,7 +736,8 @@ class DolGraph
 			dol_syslog(get_class($this) . "::draw " . $this->error, LOG_WARNING);
 		}
 		$call = "draw_" . $this->_library;
-		call_user_func_array(array($this, $call), array($file, $fileurl));
+
+		return call_user_func_array(array($this, $call), array($file, $fileurl));
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
index eb389454f82..60499845de0 100644
--- a/htdocs/core/class/html.formsetup.class.php
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -339,8 +339,8 @@ class FormSetup
 	/**
 	 * Method used to test  module builder convertion to this form usage
 	 *
-	 * @param array 	$params 	an array of arrays of params from old modulBuilder params
-	 * @return null
+	 * @param 	array 	$params 	an array of arrays of params from old modulBuilder params
+	 * @return 	void
 	 */
 	public function addItemsFromParamsArray($params)
 	{
@@ -683,7 +683,8 @@ class FormSetupItem
 
 	/**
 	 * Save const value based on htdocs/core/actions_setmoduleoptions.inc.php
-	 *	@return     int         			-1 if KO, 1 if OK
+	 *
+	 * @return     int         			-1 if KO, 1 if OK
 	 */
 	public function saveConfValue()
 	{
@@ -714,10 +715,13 @@ class FormSetupItem
 				return 1;
 			}
 		}
+
+		return 0;
 	}
 
 	/**
 	 * Set an override function for saving data
+	 *
 	 * @param callable $callBack a callable function
 	 * @return void
 	 */
@@ -1005,6 +1009,7 @@ class FormSetupItem
 	 * set the type from string : used for old module builder setup conf style conversion and tests
 	 * because this two class will quickly evolve it's important to not set directly $this->type (will be protected) so this method exist
 	 * to be sure we can manage evolution easily
+	 *
 	 * @param string $type possible values based on old module builder setup : 'string', 'textarea', 'category:'.Categorie::TYPE_CUSTOMER', 'emailtemplate', 'thirdparty_type'
 	 * @deprecated yes this setTypeFromTypeString came deprecated because it exists only for manage setup convertion
 	 * @return bool
@@ -1012,11 +1017,13 @@ class FormSetupItem
 	public function setTypeFromTypeString($type)
 	{
 		$this->type = $type;
+
 		return true;
 	}
 
 	/**
 	 * Add error
+	 *
 	 * @param array|string $errors the error text
 	 * @return null
 	 */
@@ -1034,7 +1041,9 @@ class FormSetupItem
 	}
 
 	/**
-	 * @return bool|string Generate the output html for this item
+	 * generateOutputField
+	 *
+	 * @return bool|string 		Generate the output html for this item
 	 */
 	public function generateOutputField()
 	{
diff --git a/htdocs/core/class/lessc.class.php b/htdocs/core/class/lessc.class.php
index cb6caf838e2..1b764e20a35 100644
--- a/htdocs/core/class/lessc.class.php
+++ b/htdocs/core/class/lessc.class.php
@@ -1011,7 +1011,7 @@ class Lessc
 		if ($list[0] == "list" && isset($list[2][$idx - 1])) {
 			return $list[2][$idx - 1];
 		}
-		return;
+		return null;
 	}
 
 	protected function lib_isnumber($value)
@@ -1306,7 +1306,7 @@ class Lessc
 		if (!is_null($color = $this->coerceColor($value))) {
 			return isset($color[4]) ? $color[4] : 1;
 		}
-		return;
+		return null;
 	}
 
 	// set the alpha of the color
@@ -1958,7 +1958,8 @@ class Lessc
 		if ($op == '+' || $op == '*') {
 			return $this->op_color_number($op, $rgt, $lft);
 		}
-		return;
+
+		return null;
 	}
 
 	protected function op_color_number($op, $lft, $rgt)
diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php
index faf0024d801..0db325736a6 100644
--- a/htdocs/core/login/functions_ldap.php
+++ b/htdocs/core/login/functions_ldap.php
@@ -61,7 +61,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 		$langs->loadLangs(array('main', 'other'));
 
 		$_SESSION["dol_loginmesg"] = $langs->transnoentitiesnoconv("ErrorLDAPFunctionsAreDisabledOnThisPHP").' '.$langs->transnoentitiesnoconv("TryAnotherConnectionMode");
-		return;
+		return '';
 	}
 
 	if ($usertotest) {
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 1305be68bc2..63cbeaad67b 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -985,6 +985,8 @@ class ExpenseReport extends CommonObject
 				return -1;
 			}
 		}
+
+		return 0;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1328,8 +1330,6 @@ class ExpenseReport extends CommonObject
 	public function set_save_from_refuse($fuser)
 	{
 		// phpcs:enable
-		global $conf, $langs;
-
 		// Sélection de la date de début de la NDF
 		$sql = 'SELECT date_debut';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
@@ -1357,6 +1357,8 @@ class ExpenseReport extends CommonObject
 		} else {
 			dol_syslog(get_class($this)."::set_save_from_refuse expensereport already with save status", LOG_WARNING);
 		}
+
+		return 0;
 	}
 
 	/**
@@ -1465,6 +1467,8 @@ class ExpenseReport extends CommonObject
 		} else {
 			dol_syslog(get_class($this)."::setDeny expensereport already with refuse status", LOG_WARNING);
 		}
+
+		return 0;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1531,6 +1535,8 @@ class ExpenseReport extends CommonObject
 		} else {
 			dol_syslog(get_class($this)."::set_unpaid expensereport already with unpaid status", LOG_WARNING);
 		}
+
+		return 0;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 1f191684d11..b072f4c756d 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -501,6 +501,8 @@ class Fichinter extends CommonObject
 				$this->db->free($resql);
 				return 1;
 			}
+
+			return 0;
 		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -515,8 +517,6 @@ class Fichinter extends CommonObject
 	 */
 	public function setDraft($user)
 	{
-		global $langs, $conf;
-
 		$error = 0;
 
 		// Protection
@@ -664,6 +664,8 @@ class Fichinter extends CommonObject
 				return -1;
 			}
 		}
+
+		return 0;
 	}
 
 	/**
@@ -904,8 +906,6 @@ class Fichinter extends CommonObject
 	 */
 	public function info($id)
 	{
-		global $conf;
-
 		$sql = "SELECT f.rowid,";
 		$sql .= " f.datec,";
 		$sql .= " f.tms as date_modification,";
@@ -1074,13 +1074,11 @@ class Fichinter extends CommonObject
 	 *
 	 *  @param      User	$user				Object user who define
 	 *  @param      integer	$date_delivery   	date of delivery
-	 *  @return     int							<0 if ko, >0 if ok
+	 *  @return     int							<0 if KO, >0 if OK
 	 */
 	public function set_date_delivery($user, $date_delivery)
 	{
 		// phpcs:enable
-		global $conf;
-
 		if ($user->rights->ficheinter->creer) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter ";
 			$sql .= " SET datei = '".$this->db->idate($date_delivery)."'";
@@ -1096,6 +1094,8 @@ class Fichinter extends CommonObject
 				return -1;
 			}
 		}
+
+		return 0;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1109,8 +1109,6 @@ class Fichinter extends CommonObject
 	public function set_description($user, $description)
 	{
 		// phpcs:enable
-		global $conf;
-
 		if ($user->rights->ficheinter->creer) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter ";
 			$sql .= " SET description = '".$this->db->escape($description)."',";
@@ -1126,6 +1124,8 @@ class Fichinter extends CommonObject
 				return -1;
 			}
 		}
+
+		return 0;
 	}
 
 
@@ -1135,13 +1135,11 @@ class Fichinter extends CommonObject
 	 *
 	 *	@param      User	$user			Object user who modify
 	 *	@param      int		$contractid		Description
-	 *	@return     int						<0 if ko, >0 if ok
+	 *	@return     int						<0 if KO, >0 if OK
 	 */
 	public function set_contrat($user, $contractid)
 	{
 		// phpcs:enable
-		global $conf;
-
 		if ($user->rights->ficheinter->creer) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter ";
 			$sql .= " SET fk_contrat = ".((int) $contractid);
@@ -1155,6 +1153,7 @@ class Fichinter extends CommonObject
 				return -1;
 			}
 		}
+
 		return -2;
 	}
 
@@ -1261,7 +1260,7 @@ class Fichinter extends CommonObject
 	{
 		dol_syslog(get_class($this)."::addline $fichinterid, $desc, $date_intervention, $duration");
 
-		if ($this->statut == 0) {
+		if ($this->statut == self::STATUS_DRAFT) {
 			$this->db->begin();
 
 			// Insertion ligne
@@ -1288,6 +1287,8 @@ class Fichinter extends CommonObject
 				return -1;
 			}
 		}
+
+		return 0;
 	}
 
 
diff --git a/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php b/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
index 31084cf7acc..b31a3ca08d5 100644
--- a/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
+++ b/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
@@ -56,8 +56,6 @@ class MyObjectTest extends PHPUnit\Framework\TestCase
 	/**
 	 * Constructor
 	 * We save global variables into local variables
-	 *
-	 * @return MyObjectTest
 	 */
 	public function __construct()
 	{
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 3bf780ba106..dbc9245fd71 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1271,7 +1271,7 @@ class Societe extends CommonObject
 		// Clean parameters
 		$this->id = $id;
 		$this->entity = ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
-		$this->name = $this->name ?trim($this->name) : trim($this->nom);
+		$this->name = $this->name ? trim($this->name) : trim($this->nom);
 		$this->nom = $this->name; // For backward compatibility
 		$this->name_alias = trim($this->name_alias);
 		$this->ref_ext		= trim($this->ref_ext);
@@ -2217,6 +2217,7 @@ class Societe extends CommonObject
 			}
 
 			$this->db->commit();
+
 			return 1;
 		}
 	}
@@ -2278,6 +2279,8 @@ class Societe extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
+
+		return -1;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -3091,6 +3094,8 @@ class Societe extends CommonObject
 		} else {
 			dol_print_error($this->db);
 		}
+
+		return '';
 	}
 
 
@@ -3473,9 +3478,9 @@ class Societe extends CommonObject
 			} else {
 				return -1;
 			}
-		} else {
-			return -1;
 		}
+
+		return -1;
 	}
 
 	/**
@@ -4819,6 +4824,8 @@ class Societe extends CommonObject
 		} elseif ($status == 3) {
 			return $langs->trans("ProspectCustomer");
 		}
+
+		return '';
 	}
 
 

From b3b0fe2444eb974281b50e774d7e9fdc936d59a8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Jan 2023 19:34:45 +0100
Subject: [PATCH 359/816] Clean code

---
 .../class/accountancyexport.class.php         |  2 +-
 htdocs/categories/class/categorie.class.php   | 29 ++-----------------
 htdocs/compta/facture/class/facture.class.php | 12 ++++----
 htdocs/compta/index.php                       | 20 ++++++++-----
 htdocs/compta/localtax/index.php              |  7 +++--
 htdocs/compta/tva/index.php                   |  5 +++-
 htdocs/core/class/evalmath.class.php          | 12 ++++----
 htdocs/core/class/html.form.class.php         | 10 ++++---
 htdocs/core/class/lessc.class.php             |  6 ++--
 htdocs/core/class/stats.class.php             |  6 ++--
 htdocs/core/lib/ftp.lib.php                   | 10 +++----
 htdocs/ecm/index.php                          |  2 +-
 htdocs/ecm/index_auto.php                     |  2 +-
 htdocs/ecm/index_medias.php                   |  2 +-
 htdocs/ftp/index.php                          |  1 +
 htdocs/index.php                              |  6 ++--
 htdocs/install/index.php                      |  2 +-
 htdocs/install/lib/repair.lib.php             |  6 ++--
 htdocs/main.inc.php                           |  4 +--
 htdocs/paybox/lib/paybox.lib.php              |  2 +-
 htdocs/public/recruitment/index.php           |  2 +-
 htdocs/takepos/ajax/ajax.php                  |  3 ++
 22 files changed, 72 insertions(+), 79 deletions(-)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index ad7bfc4edad..4c6e2d09838 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -338,7 +338,7 @@ class AccountancyExport
 			// PHP ZIP extension must be enabled
 			if (!extension_loaded('zip')) {
 				$langs->load('install');
-				$this->errors[] = $langs->trans('ErrorPHPDoesNotSupport', 'ZIP');;
+				$this->errors[] = $langs->trans('ErrorPHPDoesNotSupport', 'ZIP');
 				return -1;
 			}
 		} else {
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 4c2842b2dcf..4d6e3e1736f 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1189,8 +1189,6 @@ class Categorie extends CommonObject
 		dol_syslog(get_class($this)."::get_full_arbo dol_sort_array", LOG_DEBUG);
 		$this->cats = dol_sort_array($this->cats, 'fulllabel', 'asc', true, false);
 
-		//$this->debug_cats();
-
 		return $this->cats;
 	}
 
@@ -1201,7 +1199,7 @@ class Categorie extends CommonObject
 	 *
 	 * 	@param		int		$id_categ		id_categ entry to update
 	 * 	@param		int		$protection		Deep counter to avoid infinite loop
-	 *	@return		void
+	 *	@return		int						<0 if KO, >0 if OK
 	 *  @see get_full_arbo()
 	 */
 	private function buildPathFromId($id_categ, $protection = 1000)
@@ -1211,7 +1209,7 @@ class Categorie extends CommonObject
 		if (!empty($this->cats[$id_categ]['fullpath'])) {
 			// Already defined
 			dol_syslog(get_class($this)."::buildPathFromId fullpath and fulllabel already defined", LOG_WARNING);
-			return;
+			return -1;
 		}
 
 		// First build full array $motherof
@@ -1238,28 +1236,7 @@ class Categorie extends CommonObject
 		$nbunderscore = substr_count($this->cats[$id_categ]['fullpath'], '_');
 		$this->cats[$id_categ]['level'] = ($nbunderscore ? $nbunderscore : null);
 
-		return;
-	}
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *	Display content of $this->cats
-	 *
-	 *	@return	void
-	 */
-	public function debug_cats()
-	{
-		// phpcs:enable
-		// Display $this->cats
-		foreach ($this->cats as $key => $val) {
-			print 'id: '.$this->cats[$key]['id'];
-			print ' label: '.$this->cats[$key]['label'];
-			print ' mother: '.$this->cats[$key]['fk_parent'];
-			//print ' children: '.(is_array($this->cats[$key]['id_children'])?join(',',$this->cats[$key]['id_children']):'');
-			print ' fullpath: '.$this->cats[$key]['fullpath'];
-			print ' fulllabel: '.$this->cats[$key]['fulllabel'];
-			print "<br>\n";
-		}
+		return 1;
 	}
 
 
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 69b2ea1c293..0a9b0dcfe16 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4078,7 +4078,7 @@ class Facture extends CommonInvoice
 	 *
 	 * @param	int		$idline				id of line to check
 	 * @param	float	$situation_percent	progress percentage need to be test
-	 * @return false if KO, true if OK
+	 * @return 	bool						false if KO, true if OK
 	 */
 	public function checkProgressLine($idline, $situation_percent)
 	{
@@ -4097,7 +4097,7 @@ class Facture extends CommonInvoice
 		if ($obj === null) {
 			return true;
 		} else {
-			return $situation_percent < $obj->situation_percent;
+			return ($situation_percent < $obj->situation_percent);
 		}
 	}
 
@@ -4651,8 +4651,8 @@ class Facture extends CommonInvoice
 	 *	Invoices matching the following rules are returned:
 	 *	(validated + payment on process) or classified (payed completely or payed partiely) + not already replaced + not already a credit note
 	 *
-	 *	@param		int		$socid		Id thirdparty
-	 *	@return    	array				Array of invoices ($id => array('ref'=>,'paymentornot'=>,'status'=>,'paye'=>)
+	 *	@param		int			$socid		Id thirdparty
+	 *	@return    	array|int				Array of invoices ($id => array('ref'=>,'paymentornot'=>,'status'=>,'paye'=>)
 	 */
 	public function list_qualified_avoir_invoices($socid = 0)
 	{
@@ -4726,8 +4726,8 @@ class Facture extends CommonInvoice
 	/**
 	 *	Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
-	 *	@param  User		$user    	Object user
-	 *	@return WorkboardResponse|int 	<0 if KO, WorkboardResponse if OK
+	 *	@param  User					$user    	Object user
+	 *	@return WorkboardResponse|int 				<0 if KO, WorkboardResponse if OK
 	 */
 	public function load_board($user)
 	{
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index cfec4d87238..70ea12ba4cb 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -742,21 +742,25 @@ if (isModEnabled('facture') && isModEnabled('commande') && $user->hasRight("comm
 
 
 // TODO Mettre ici recup des actions en rapport avec la compta
-$resql = '';
-if ($resql) {
+$sql = '';
+if ($sql) {
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><thcolspan="2">'.$langs->trans("TasksToDo").'</th>';
 	print "</tr>\n";
 	$i = 0;
-	while ($i < $db->num_rows($resql)) {
-		$obj = $db->fetch_object($resql);
+	$resql = $db->query($sql);
+	if ($resql) {
+		$num_rows = $db->num_rows($resql);
+		while ($i < $num_rows) {
+			$obj = $db->fetch_object($resql);
 
-		print '<tr class="oddeven"><td>'.dol_print_date($db->jdate($obj->da), "day").'</td>';
-		print '<td><a href="action/card.php">'.$obj->label.'</a></td></tr>';
-		$i++;
+			print '<tr class="oddeven"><td>'.dol_print_date($db->jdate($obj->da), "day").'</td>';
+			print '<td><a href="action/card.php">'.$obj->label.'</a></td></tr>';
+			$i++;
+		}
+		$db->free($resql);
 	}
-	$db->free($resql);
 	print "</table></div><br>";
 }
 
diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php
index fb96e766945..f25b476fa94 100644
--- a/htdocs/compta/localtax/index.php
+++ b/htdocs/compta/localtax/index.php
@@ -22,7 +22,7 @@
 /**
  *      \file       htdocs/compta/localtax/index.php
  *      \ingroup    tax
- *      \brief      Index page of IRPF reports
+ *      \brief      Index page of localtax reports
  */
 
 require '../../main.inc.php';
@@ -259,6 +259,9 @@ llxHeader('', $name);
 //$textnextyear=" <a href=\"index.php?localTaxType=".$localTaxType."&year=" . ($year_current+1) . "\">".img_next()."</a>";
 //print load_fiche_titre($langs->transcountry($LT,$mysoc->country_code),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear", 'bill');
 
+$periodlink = '';
+$exportlink = '';
+
 report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink, array(), $calcmode);
 //report_header($name,'',$textprevyear.$langs->trans("Year")." ".$year_start.$textnextyear,'',$description,$builddate,$exportlink,array(),$calcmode);
 
@@ -271,7 +274,7 @@ print load_fiche_titre($langs->transcountry($LTSummary, $mysoc->country_code), '
 
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
-print '<td width="30%">'.$langs->trans("Year")." ".$y."</td>";
+print '<td>'.$langs->trans("Year")."</td>";
 if ($CalcLT == 0) {
 	print '<td class="right">'.$langs->transcountry($LTCustomer, $mysoc->country_code).'</td>';
 	print '<td class="right">'.$langs->transcountry($LTSupplier, $mysoc->country_code).'</td>';
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index 5c0d6930475..37e7f75b306 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -229,6 +229,9 @@ llxHeader('', $name);
 //$textnextyear=" <a href=\"index.php?year=" . ($year_current+1) . "\">".img_next($langs->trans("Next"), 'class="valignbottom"')."</a>";
 //print load_fiche_titre($langs->transcountry("VAT", $mysoc->country_code), $textprevyear." ".$langs->trans("Year")." ".$year_start." ".$textnextyear, 'bill');
 
+$periodlink = '';
+$exportlink = '';
+
 report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink, array(), $calcmode);
 //report_header($name,'',$textprevyear.$langs->trans("Year")." ".$year_start.$textnextyear,'',$description,$builddate,$exportlink,array(),$calcmode);
 
@@ -242,7 +245,7 @@ if ($refresh === true) {
 
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
-	print '<td width="30%">' . $langs->trans("Year") . " " . $y . '</td>';
+	print '<td width="30%">' . $langs->trans("Year") . '</td>';
 	print '<td class="right">' . $langs->trans("VATToPay") . '</td>';
 	print '<td class="right">' . $langs->trans("VATToCollect") . '</td>';
 	print '<td class="right">' . $langs->trans("Balance") . '</td>';
diff --git a/htdocs/core/class/evalmath.class.php b/htdocs/core/class/evalmath.class.php
index 9c01f133bf6..24be9731df9 100644
--- a/htdocs/core/class/evalmath.class.php
+++ b/htdocs/core/class/evalmath.class.php
@@ -481,7 +481,6 @@ class EvalMath
  */
 class EvalMathStack
 {
-
 	public $stack = array();
 
 	public $count = 0;
@@ -489,8 +488,8 @@ class EvalMathStack
 	/**
 	 * push
 	 *
-	 * @param string $val		Val
-	 * @return void
+	 * @param 	string 	$val		Val
+	 * @return 	void
 	 */
 	public function push($val)
 	{
@@ -515,14 +514,15 @@ class EvalMathStack
 	/**
 	 * last
 	 *
-	 * @param int $n	N
-	 * @return mixed 	Stack
+	 * @param 	int 	$n		N
+	 * @return 	mixed 			Stack
 	 */
 	public function last($n = 1)
 	{
 		if (isset($this->stack[$this->count - $n])) {
 			return $this->stack[$this->count - $n];
 		}
-		return;
+
+		return '';
 	}
 }
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index ad82ae86751..1c54df24e06 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6444,7 +6444,7 @@ class Form
 	 *  @param  int			$fullday        When a checkbox with this html name is on, hour and day are set with 00:00 or 23:59
 	 *  @param	string		$addplusone		Add a link "+1 hour". Value must be name of another select_date field.
 	 *  @param  datetime    $adddateof      Add a link "Date of invoice" using the following date.
-	 *  @return	string|void					Nothing or string if nooutput is 1
+	 *  @return	string						'' or HTML component string if nooutput is 1
 	 *  @deprecated
 	 *  @see    selectDate(), form_date(), select_month(), select_year(), select_dayofweek()
 	 */
@@ -6456,7 +6456,8 @@ class Form
 			return $retstring;
 		}
 		print $retstring;
-		return;
+
+		return '';
 	}
 
 	/**
@@ -6990,7 +6991,7 @@ class Form
 	 *						            	If 'textselect' input hour is in text and input min is a combo
 	 *  @param	integer		$minunderhours	If 1, show minutes selection under the hours
 	 * 	@param	int			$nooutput		Do not output html string but return it
-	 *  @return	string|void
+	 *  @return	string						HTML component
 	 */
 	public function select_duration($prefix, $iSecond = '', $disabled = 0, $typehour = 'select', $minunderhours = 0, $nooutput = 0)
 	{
@@ -7064,7 +7065,8 @@ class Form
 		}
 
 		print $retstring;
-		return;
+
+		return '';
 	}
 
 	/**
diff --git a/htdocs/core/class/lessc.class.php b/htdocs/core/class/lessc.class.php
index 1b764e20a35..0452cab45aa 100644
--- a/htdocs/core/class/lessc.class.php
+++ b/htdocs/core/class/lessc.class.php
@@ -1011,7 +1011,7 @@ class Lessc
 		if ($list[0] == "list" && isset($list[2][$idx - 1])) {
 			return $list[2][$idx - 1];
 		}
-		return null;
+		return '';
 	}
 
 	protected function lib_isnumber($value)
@@ -1306,7 +1306,7 @@ class Lessc
 		if (!is_null($color = $this->coerceColor($value))) {
 			return isset($color[4]) ? $color[4] : 1;
 		}
-		return null;
+		return '';
 	}
 
 	// set the alpha of the color
@@ -1959,7 +1959,7 @@ class Lessc
 			return $this->op_color_number($op, $rgt, $lft);
 		}
 
-		return null;
+		return array();
 	}
 
 	protected function op_color_number($op, $lft, $rgt)
diff --git a/htdocs/core/class/stats.class.php b/htdocs/core/class/stats.class.php
index 154b2b2158a..c8dbca747b9 100644
--- a/htdocs/core/class/stats.class.php
+++ b/htdocs/core/class/stats.class.php
@@ -55,7 +55,7 @@ abstract class Stats
 		global $conf, $user, $langs;
 
 		if ($startyear > $endyear) {
-			return -1;
+			return array();
 		}
 
 		$datay = array();
@@ -156,7 +156,7 @@ abstract class Stats
 		global $conf, $user, $langs;
 
 		if ($startyear > $endyear) {
-			return -1;
+			return array();
 		}
 
 		$datay = array();
@@ -251,7 +251,7 @@ abstract class Stats
 	public function getAverageByMonthWithPrevYear($endyear, $startyear)
 	{
 		if ($startyear > $endyear) {
-			return -1;
+			return array();
 		}
 
 		$datay = array();
diff --git a/htdocs/core/lib/ftp.lib.php b/htdocs/core/lib/ftp.lib.php
index e49972a4a97..1b7cfc7ca73 100644
--- a/htdocs/core/lib/ftp.lib.php
+++ b/htdocs/core/lib/ftp.lib.php
@@ -161,11 +161,10 @@ function dol_ftp_close($connect_id)
  * @param 		resource	$connect_id		Connection handler
  * @param 		string		$file			File
  * @param 		string		$newsection			$newsection
- * @return		result
+ * @return		bool
  */
 function dol_ftp_delete($connect_id, $file, $newsection)
 {
-
 	global $conf;
 
 	if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
@@ -197,7 +196,6 @@ function dol_ftp_delete($connect_id, $file, $newsection)
  */
 function dol_ftp_get($connect_id, $localfile, $file, $newsection)
 {
-
 	global $conf;
 
 	if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
@@ -223,7 +221,7 @@ function dol_ftp_get($connect_id, $localfile, $file, $newsection)
  * @param 		string		$file			File name
  * @param 		string		$localfile		The path to the local file
  * @param 		string		$newsection		$newsection
- * @return		boolean
+ * @return		bool
  */
 function dol_ftp_put($connect_id, $file, $localfile, $newsection)
 {
@@ -251,7 +249,7 @@ function dol_ftp_put($connect_id, $file, $localfile, $newsection)
  * @param 		resource	$connect_id		Connection handler
  * @param 		string		$file			File
  * @param 		string		$newsection			$newsection
- * @return		boolean
+ * @return		bool
  */
 function dol_ftp_rmdir($connect_id, $file, $newsection)
 {
@@ -280,7 +278,7 @@ function dol_ftp_rmdir($connect_id, $file, $newsection)
  * @param 		resource	$connect_id		Connection handler
  * @param 		string		$newdir			Dir create
  * @param 		string		$newsection		$newsection
- * @return		boolean|string
+ * @return		bool|string
  */
 function dol_ftp_mkdir($connect_id, $newdir, $newsection)
 {
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 9eb512bc96d..6edf59dcbed 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -322,7 +322,7 @@ $moreheadjs .= '</script>'."\n";
 
 llxHeader($moreheadcss.$moreheadjs, $langs->trans("ECMArea"), '', '', '', '', $morejs, '', 0, 0);
 
-$head = ecm_prepare_dasboard_head('');
+$head = ecm_prepare_dasboard_head(null);
 print dol_get_fiche_head($head, 'index', '', -1, '');
 
 
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 9d9d30e8188..3944e869da0 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -387,7 +387,7 @@ if (empty($conf->global->ECM_AUTO_TREE_HIDEN)) {
 	}
 }
 
-$head = ecm_prepare_dasboard_head('');
+$head = ecm_prepare_dasboard_head(null);
 print dol_get_fiche_head($head, 'index_auto', '', -1, '');
 
 
diff --git a/htdocs/ecm/index_medias.php b/htdocs/ecm/index_medias.php
index 2e1edcdc269..39118774430 100644
--- a/htdocs/ecm/index_medias.php
+++ b/htdocs/ecm/index_medias.php
@@ -295,7 +295,7 @@ $moreheadjs .= '</script>'."\n";
 
 llxHeader($moreheadcss.$moreheadjs, $langs->trans("ECMArea"), '', '', '', '', $morejs, '', 0, 0);
 
-$head = ecm_prepare_dasboard_head('');
+$head = ecm_prepare_dasboard_head(null);
 print dol_get_fiche_head($head, 'index_medias', '', -1, '');
 
 
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index 633cb6fa5ce..e6c1aac1372 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -154,6 +154,7 @@ if ($action == 'addfolder') {
 
 // Action ajout d'un rep
 if ($action == 'add' && $user->rights->ftp->setup) {
+	$ecmdir = new EcmDirectory($db);
 	$ecmdir->ref                = GETPOST("ref");
 	$ecmdir->label              = GETPOST("label");
 	$ecmdir->description        = GETPOST("desc");
diff --git a/htdocs/index.php b/htdocs/index.php
index 7cfd12d4bac..f1ce8248921 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -490,7 +490,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 		foreach ($dashboardgroup as $groupKey => $groupElement) {
 			$boards = array();
 
-			// Scan $groupElement and save the one with 'stats' that lust be used for Open object dashboard
+			// Scan $groupElement and save the one with 'stats' that must be used for the open objects dashboard
 			if (empty($conf->global->MAIN_DISABLE_NEW_OPENED_DASH_BOARD)) {
 				foreach ($groupElement['stats'] as $infoKey) {
 					if (!empty($valid_dashboardlines[$infoKey])) {
@@ -519,10 +519,10 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 				$openedDashBoard .= '		<span class="info-box-icon bg-infobox-'.$groupKeyLowerCase.'">'."\n";
 				$openedDashBoard .= '		<i class="fa fa-dol-'.$groupKeyLowerCase.'"></i>'."\n";
 
-				// Show the span for the total of record
+				// Show the span for the total of record. TODO This seems not used.
 				if (!empty($groupElement['globalStats'])) {
 					$globalStatInTopOpenedDashBoard[] = $globalStatsKey;
-					$openedDashBoard .= '<span class="info-box-icon-text" title="'.$groupElement['globalStats']['text'].'">'.$nbTotal.'</span>';
+					$openedDashBoard .= '<span class="info-box-icon-text" title="'.$groupElement['globalStats']['text'].'">'.$groupElement['globalStats']['nbTotal'].'</span>';
 				}
 
 				$openedDashBoard .= '</span>'."\n";
diff --git a/htdocs/install/index.php b/htdocs/install/index.php
index a7ce50c819f..6810e3c509f 100644
--- a/htdocs/install/index.php
+++ b/htdocs/install/index.php
@@ -44,7 +44,7 @@ $langs->load("admin");
  * View
  */
 
-$formadmin = new FormAdmin(''); // Note: $db does not exist yet but we don't need it, so we put ''.
+$formadmin = new FormAdmin(null); // Note: $db does not exist yet but we don't need it, so we put ''.
 
 pHeader("", "check"); // Next step = check
 
diff --git a/htdocs/install/lib/repair.lib.php b/htdocs/install/lib/repair.lib.php
index aea82107d29..c7c45dff053 100644
--- a/htdocs/install/lib/repair.lib.php
+++ b/htdocs/install/lib/repair.lib.php
@@ -125,7 +125,7 @@ function checkLinkedElements($sourcetype, $targettype)
 /**
  * Clean data into ecm_directories table
  *
- * @return	void
+ * @return	int			<0 if KO, >0 if OK
  */
 function clean_data_ecm_directories()
 {
@@ -145,12 +145,14 @@ function clean_data_ecm_directories()
 				$resqlupdate = $db->query($sqlupdate);
 				if (!$resqlupdate) {
 					dol_print_error($db, 'Failed to update');
+					return -1;
 				}
 			}
 		}
 	} else {
 		dol_print_error($db, 'Failed to run request');
+		return -1;
 	}
 
-	return;
+	return 1;
 }
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index d8eb602f624..17912f81101 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1413,7 +1413,7 @@ if (!function_exists("llxHeader")) {
 		}
 
 		if (empty($conf->dol_hide_leftmenu) && !GETPOST('dol_openinpopup', 'aZ09')) {
-			left_menu('', $help_url, '', '', 1, $title, 1); // $menumanager is retrieved with a global $menumanager inside this function
+			left_menu(array(), $help_url, '', '', 1, $title, 1); // $menumanager is retrieved with a global $menumanager inside this function
 		}
 
 		// main area
@@ -2885,7 +2885,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 		$selected = -1;
 		if (empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)) {
 			$usedbyinclude = 1;
-			$arrayresult = null;
+			$arrayresult = array();
 			include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php'; // This set $arrayresult
 
 			if ($conf->use_javascript_ajax && empty($conf->global->MAIN_USE_OLD_SEARCH_FORM)) {
diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php
index 7f41d45d374..567a4b91669 100644
--- a/htdocs/paybox/lib/paybox.lib.php
+++ b/htdocs/paybox/lib/paybox.lib.php
@@ -225,5 +225,5 @@ function print_paybox_redirect($PRICE, $CURRENCY, $EMAIL, $urlok, $urlko, $TAG)
 	print '</body></html>'."\n";
 	print "\n";
 
-	return;
+	return 1;
 }
diff --git a/htdocs/public/recruitment/index.php b/htdocs/public/recruitment/index.php
index 23a180b9a7b..8724e65ca4f 100644
--- a/htdocs/public/recruitment/index.php
+++ b/htdocs/public/recruitment/index.php
@@ -252,7 +252,7 @@ if (is_array($results)) {
 				}
 			}
 			print '<b class="wordbreak">';
-			print $tmpuser->getFullName(-1);
+			print $tmpuser->getFullName();
 			print ' &nbsp; '.dol_print_email($emailforcontact, 0, 0, 1, 0, 0, 'envelope');
 			print '</b>';
 			print '</b><br>';
diff --git a/htdocs/takepos/ajax/ajax.php b/htdocs/takepos/ajax/ajax.php
index db6b224466c..87357d10091 100644
--- a/htdocs/takepos/ajax/ajax.php
+++ b/htdocs/takepos/ajax/ajax.php
@@ -370,6 +370,9 @@ if ($action == 'getProducts') {
 	$place = GETPOST('place', 'alpha');
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
+
+	$object = new Facture($db);
+
 	$printer = new dolReceiptPrinter($db);
 	$printer->sendToPrinter($object, getDolGlobalString('TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$term), getDolGlobalString('TAKEPOS_PRINTER_TO_USE'.$term));
 }

From d3c35651906ba23ca9eaf5563149cc8ec37cfcf2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Jan 2023 20:53:09 +0100
Subject: [PATCH 360/816] css

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

diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index b0514c71ee6..6c961e85af9 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -1134,8 +1134,8 @@ if ($resql) {
 	}
 	// Conciliated
 	if (!empty($arrayfields['b.conciliated']['checked'])) {
-		print '<td class="liste_titre" align="center">';
-		print $form->selectyesno('search_conciliated', $search_conciliated, 1, false, 1, 1);
+		print '<td class="liste_titre center parentonrightofpage">';
+		print $form->selectyesno('search_conciliated', $search_conciliated, 1, false, 1, 1, 'search_status onrightofpage maxwidth75');
 		print '</td>';
 	}
 	// Bordereau

From 44423bea30c4f1340a34fa6a82be8a666bb5cb39 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Jan 2023 20:53:09 +0100
Subject: [PATCH 361/816] css

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

diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index b0514c71ee6..6c961e85af9 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -1134,8 +1134,8 @@ if ($resql) {
 	}
 	// Conciliated
 	if (!empty($arrayfields['b.conciliated']['checked'])) {
-		print '<td class="liste_titre" align="center">';
-		print $form->selectyesno('search_conciliated', $search_conciliated, 1, false, 1, 1);
+		print '<td class="liste_titre center parentonrightofpage">';
+		print $form->selectyesno('search_conciliated', $search_conciliated, 1, false, 1, 1, 'search_status onrightofpage maxwidth75');
 		print '</td>';
 	}
 	// Bordereau

From 8d922d89345c4f947e1b47e7d442ce07f8751c67 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Sat, 7 Jan 2023 00:24:57 +0100
Subject: [PATCH 362/816] New Accountancy - 2 line for 1 mvmt in create mode

---
 htdocs/accountancy/bookkeeping/card.php | 787 +++++++++++-------------
 1 file changed, 367 insertions(+), 420 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 4620bf37e4e..e1916310b34 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -4,6 +4,7 @@
  * 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>
+ * Copyright (C) 2022       Waël Almoman            <info@almoman.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -44,7 +45,7 @@ $cancel = GETPOST('cancel', 'aZ09');
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 $id = GETPOST('id', 'int'); // id of record
-$mode = GETPOST('mode', 'aZ09'); // '' or '_tmp'
+$mode = $mode = $action == 'create' ? "_tmp" : GETPOST('mode', 'aZ09'); // '' or '_tmp'
 $piece_num = GETPOST("piece_num", 'int'); // id of transaction (several lines share the same transaction id)
 
 $accountingaccount = new AccountingAccount($db);
@@ -54,10 +55,15 @@ $accountingaccount_number = GETPOST('accountingaccount_number', 'alphanohtml');
 $accountingaccount->fetch(null, $accountingaccount_number, true);
 $accountingaccount_label = $accountingaccount->label;
 
-$journal_code = GETPOST('code_journal', 'alpha');
+$journal_code = GETPOST('code_journal', 'alpha') ? GETPOST('code_journal', 'alpha') : "NULL";
 $accountingjournal->fetch(null, $journal_code);
 $journal_label = $accountingjournal->label;
 
+$next_num_mvt = (int) GETPOST('next_num_mvt', 'alpha');
+$doc_ref = (string) GETPOST('doc_ref', 'alpha');
+$doc_date = (string) GETPOST('doc_date', 'alpha');
+$doc_date = $doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
+
 $subledger_account = GETPOST('subledger_account', 'alphanohtml');
 if ($subledger_account == -1) {
 	$subledger_account = null;
@@ -72,6 +78,10 @@ $save = GETPOST('save', 'alpha');
 if (!empty($save)) {
 	$action = 'add';
 }
+$valid = GETPOST('validate', 'alpha');
+if (!empty($valid)) {
+	$action = 'valid';
+}
 $update = GETPOST('update', 'alpha');
 if (!empty($update)) {
 	$action = 'confirm_update';
@@ -156,64 +166,79 @@ if ($action == "confirm_update") {
 			}
 		}
 	}
-} elseif ($action == "add") {
+} elseif ($action == 'add' || $action == 'valid') {
 	$error = 0;
 
-	if ((floatval($debit) != 0.0) && (floatval($credit) != 0.0)) {
-		$error++;
-		setEventMessages($langs->trans('ErrorDebitCredit'), null, 'errors');
-		$action = '';
-	}
-	if (empty($accountingaccount_number) || $accountingaccount_number == '-1') {
-		$error++;
-		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("AccountAccountingShort")), null, 'errors');
-		$action = '';
+	if (array_sum($debit) != array_sum($credit)) {
+		$action = 'add';
 	}
 
-	if (!$error) {
-		$object = new BookKeeping($db);
+	foreach ($accountingaccount_number as $key => $value) {
+		$accountingaccount->fetch(null, $accountingaccount_number[$key], true);
+		$accountingaccount_label[$key] = $accountingaccount->label[$key];
 
-		$object->numero_compte = $accountingaccount_number;
-		$object->subledger_account = $subledger_account;
-		$object->subledger_label = $subledger_label;
-		$object->label_compte = $accountingaccount_label;
-		$object->label_operation = $label_operation;
-		$object->debit = $debit;
-		$object->credit = $credit;
-		$object->doc_date = (string) GETPOST('doc_date', 'alpha');
-		$object->doc_type = (string) GETPOST('doc_type', 'alpha');
-		$object->piece_num = $piece_num;
-		$object->doc_ref = (string) GETPOST('doc_ref', 'alpha');
-		$object->code_journal = $journal_code;
-		$object->journal_label = $journal_label;
-		$object->fk_doc = GETPOSTINT('fk_doc');
-		$object->fk_docdet = GETPOSTINT('fk_docdet');
-
-		if (floatval($debit) != 0.0) {
-			$object->montant = $debit; // deprecated
-			$object->amount = $debit;
-			$object->sens = 'D';
+		// if one added row is empty remove it before continue
+		if ($key < 1 && (empty($accountingaccount_number[$key]) || $accountingaccount_number[$key] == '-1') || (floatval($debit[$key]) == 0.0) && (floatval($credit[$key]) == 0.0)) {
+			continue;
 		}
 
-		if (floatval($credit) != 0.0) {
-			$object->montant = $credit; // deprecated
-			$object->amount = $credit;
-			$object->sens = 'C';
-		}
-
-		$result = $object->createStd($user, false, $mode);
-		if ($result < 0) {
-			setEventMessages($object->error, $object->errors, 'errors');
-		} else {
-			if ($mode != '_tmp') {
-				setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
-			}
-
-			$debit = 0;
-			$credit = 0;
-
+		if ((floatval($debit[$key]) != 0.0) && (floatval($credit[$key]) != 0.0)) {
+			$error++;
+			setEventMessages($langs->trans('ErrorDebitCredit'), null, 'errors');
 			$action = '';
 		}
+
+		if (empty($accountingaccount_number[$key]) || $accountingaccount_number[$key] == '-1') {
+			$error++;
+			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("AccountAccountingShort")), null, 'errors');
+			$action = '';
+		}
+
+		if (!$error) {
+			$object = new BookKeeping($db);
+			$object->numero_compte = $accountingaccount_number[$key];
+			$object->subledger_account = $subledger_account[$key];
+			$object->subledger_label = $subledger_label[$key];
+			$object->label_compte = $accountingaccount_label[$key];
+			$object->label_operation = $label_operation[$key];
+			$object->debit = price2num($debit[$key]);
+			$object->credit = price2num($credit[$key]);
+			$object->doc_date = $doc_date;
+			$object->doc_type = (string) GETPOST('doc_type', 'alpha');
+			$object->piece_num = $piece_num;
+			$object->doc_ref = $doc_ref;
+			$object->code_journal = $journal_code;
+			$object->journal_label = $journal_label;
+			$object->fk_doc = GETPOSTINT('fk_doc');
+			$object->fk_docdet = GETPOSTINT('fk_docdet');
+
+			if (floatval($debit[$key]) != 0.0) {
+				$object->montant = $object->debit; // deprecated
+				$object->amount = $object->debit;
+				$object->sens = 'D';
+			}
+
+			if (floatval($credit[$key]) != 0.0) {
+				$object->montant = $object->credit; // deprecated
+				$object->amount = $object->credit;
+				$object->sens = 'C';
+			}
+
+			$result = $object->createStd($user, false, $mode);
+			if ($result < 0) {
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
+	}
+	if (empty($error)) {
+		if ($mode != '_tmp') {
+			setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+		}
+		$debit = 0;
+		$credit = 0;
+
+		$action = $action == 'add' ? '' : $action ; // stay in valid mode when not adding line
 	}
 } elseif ($action == "confirm_delete") {
 	$object = new BookKeeping($db);
@@ -230,17 +255,28 @@ if ($action == "confirm_update") {
 		}
 	}
 	$action = '';
-} elseif ($action == "confirm_create") {
+} elseif ($action == 'create') {
 	$error = 0;
 
 	$object = new BookKeeping($db);
 
+	$next_num_mvt =  !empty($next_num_mvt) ? $next_num_mvt : $object->getNextNumMvt('_tmp');
+	$doc_ref = !empty($doc_ref) ? $doc_ref : $next_num_mvt;
+
+	if (empty($doc_date)) {
+		$tmp_date = dol_getdate(dol_now());
+		$_POST['doc_dateday'] =  $tmp_date['mday'];
+		$_POST['doc_datemonth'] = $tmp_date['mon'];
+		$_POST['doc_dateyear'] = $tmp_date['year'];
+		unset($tmp_date);
+	}
+
 	if (!$journal_code || $journal_code == '-1') {
 		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Journal")), null, 'errors');
 		$action = 'create';
 		$error++;
 	}
-	if (!GETPOST('doc_ref', 'alpha')) {
+	if (empty($doc_ref)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Piece")), null, 'errors');
 		$action = 'create';
 		$error++;
@@ -252,8 +288,8 @@ if ($action == "confirm_update") {
 		$object->credit = 0;
 		$object->doc_date = $date_start = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
 		$object->doc_type = GETPOST('doc_type', 'alpha');
-		$object->piece_num = GETPOST('next_num_mvt', 'alpha');
-		$object->doc_ref = GETPOST('doc_ref', 'alpha');
+		$object->piece_num = $next_num_mvt;
+		$object->doc_ref = $doc_ref;
 		$object->code_journal = $journal_code;
 		$object->journal_label = $journal_label;
 		$object->fk_doc = 0;
@@ -302,7 +338,7 @@ if ($action == 'setjournal') {
 }
 
 if ($action == 'setdocref') {
-	$refdoc = GETPOST('doc_ref', 'alpha');
+	$refdoc = $doc_ref;
 	$result = $object->updateByMvt($piece_num, 'doc_ref', $refdoc, $mode);
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
@@ -333,7 +369,7 @@ if ($action == 'valid') {
 $html = new Form($db);
 $formaccounting = new FormAccounting($db);
 
-$title = $langs->trans("CreateMvts");
+$title = $langs->trans($mode =="_tmp" ? "CreateMvts": "UpdateMvts");
 
 llxHeader('', $title);
 
@@ -343,28 +379,37 @@ if ($action == 'delete') {
 	print $formconfirm;
 }
 
-if ($action == 'create') {
-	print load_fiche_titre($title);
 
-	$object = new BookKeeping($db);
-	$next_num_mvt = $object->getNextNumMvt('_tmp');
+$object = new BookKeeping($db);
+$result = $object->fetchPerMvt($piece_num, $mode);
+if ($result < 0) {
+	setEventMessages($object->error, $object->errors, 'errors');
+}
 
-	if (empty($next_num_mvt)) {
-		dol_print_error('', 'Failed to get next piece number');
+if (!empty($object->piece_num)) {
+	$backlink = '<a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?restore_lastsearch_values=1">'.$langs->trans('BackToList').'</a>';
+
+	print load_fiche_titre($langs->trans($mode =="_tmp" ? "CreateMvts": "UpdateMvts"), $backlink);
+
+	print '<form action="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'" method="post">';	if ($optioncss != '') {
+		print '<input type="hidden" name="optioncss" value="'.$optioncss.'" />';
 	}
+	$head = array();
+	$h = 0;
+	$head[$h][0] = $_SERVER['PHP_SELF'].'?piece_num='.$object->piece_num.($mode ? '&mode='.$mode : '');
+	$head[$h][1] = $langs->trans("Transaction");
+	$head[$h][2] = 'transaction';
+	$h++;
 
-	print '<form action="'.$_SERVER["PHP_SELF"].'" name="create_mvt" method="POST">';
-	if ($optioncss != '') {
-		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-	}
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="action" value="confirm_create">'."\n";
-	print '<input type="hidden" name="next_num_mvt" value="'.$next_num_mvt.'">'."\n";
-	print '<input type="hidden" name="mode" value="_tmp">'."\n";
+	print dol_get_fiche_head($head, 'transaction', '', -1);
 
-	print dol_get_fiche_head();
+	//dol_banner_tab($object, '', $backlink);
 
-	print '<table class="border centpercent">';
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border tableforfield" width="100%">';
 
 	/*print '<tr>';
 	print '<td class="titlefieldcreate fieldrequired">' . $langs->trans("NumPiece") . '</td>';
@@ -374,7 +419,7 @@ if ($action == 'create') {
 	print '<tr>';
 	print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Docdate").'</td>';
 	print '<td>';
-	print $html->selectDate('', 'doc_date', '', '', '', "create_mvt", 1, 1);
+	print $html->selectDate($doc_date, 'doc_date', '', '', '', "create_mvt", 1, 1);
 	print '</td>';
 	print '</tr>';
 
@@ -385,262 +430,151 @@ if ($action == 'create') {
 
 	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans("Piece").'</td>';
-	print '<td><input type="text" class="minwidth200" name="doc_ref" value="'.GETPOST('doc_ref', 'alpha').'"></td>';
+	print '<td><input type="text" class="minwidth200" name="doc_ref" value="'.$doc_ref.'" /></td>';
 	print '</tr>';
 
 	/*
 	print '<tr>';
 	print '<td>' . $langs->trans("Doctype") . '</td>';
-	print '<td><input type="text" class="minwidth200 name="doc_type" value=""/></td>';
+	print '<td><input type="text" class="minwidth200 name="doc_type" value="" /></td>';
 	print '</tr>';
 	*/
 
 	print '</table>';
 
-	print dol_get_fiche_end();
+	print '</div>';
 
-	print $form->buttonsSaveCancel("Create");
+	print '<div class="fichehalfright">';
 
-	print '</form>';
-} else {
-	$object = new BookKeeping($db);
-	$result = $object->fetchPerMvt($piece_num, $mode);
-	if ($result < 0) {
-		setEventMessages($object->error, $object->errors, 'errors');
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border tableforfield centpercent">';
+
+	// Doc type
+	if (!empty($object->doc_type)) {
+		print '<tr>';
+		print '<td class="titlefield">'.$langs->trans("Doctype").'</td>';
+		print '<td>'.$object->doc_type.'</td>';
+		print '</tr>';
 	}
 
-	if (!empty($object->piece_num)) {
-		$backlink = '<a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?restore_lastsearch_values=1">'.$langs->trans('BackToList').'</a>';
+	// Date document creation
+	print '<tr>';
+	print '<td class="titlefield">'.$langs->trans("DateCreation").'</td>';
+	print '<td>';
+	print $object->date_creation ? dol_print_date($object->date_creation, 'day') : '&nbsp;';
+	print '</td>';
+	print '</tr>';
 
-		print load_fiche_titre($langs->trans("UpdateMvts"), $backlink);
-
-		$head = array();
-		$h = 0;
-		$head[$h][0] = $_SERVER['PHP_SELF'].'?piece_num='.$object->piece_num.($mode ? '&mode='.$mode : '');
-		$head[$h][1] = $langs->trans("Transaction");
-		$head[$h][2] = 'transaction';
-		$h++;
-
-		print dol_get_fiche_head($head, 'transaction', '', -1);
-
-		//dol_banner_tab($object, '', $backlink);
-
-		print '<div class="fichecenter">';
-		print '<div class="fichehalfleft">';
-
-		print '<div class="underbanner clearboth"></div>';
-		print '<table class="border tableforfield" width="100%">';
-
-		// Account movement
+	// Don't show in tmp mode, inevitably empty
+	if ($mode != "_tmp") {
+		// Date document export
 		print '<tr>';
-		print '<td class="titlefield">'.$langs->trans("NumMvts").'</td>';
-		print '<td>'.($mode == '_tmp' ? '<span class="opacitymedium" title="Id tmp '.$object->piece_num.'">'.$langs->trans("Draft").'</span>' : $object->piece_num).'</td>';
-		print '</tr>';
-
-		// Date
-		print '<tr><td>';
-		print '<table class="nobordernopadding centpercent"><tr><td>';
-		print $langs->trans('Docdate');
-		print '</td>';
-		if ($action != 'editdate') {
-			print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editdate&token='.newToken().'&piece_num='.urlencode($object->piece_num).'&mode='.urlencode($mode).'">'.img_edit($langs->transnoentitiesnoconv('SetDate'), 1).'</a></td>';
-		}
-		print '</tr></table>';
-		print '</td><td colspan="3">';
-		if ($action == 'editdate') {
-			print '<form name="setdate" action="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'" method="post">';
-			if ($optioncss != '') {
-				print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-			}
-			print '<input type="hidden" name="token" value="'.newToken().'">';
-			print '<input type="hidden" name="action" value="setdate">';
-			print '<input type="hidden" name="mode" value="'.$mode.'">';
-			print $form->selectDate($object->doc_date ? $object->doc_date : - 1, 'doc_date', '', '', '', "setdate");
-			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
-			print '</form>';
-		} else {
-			print $object->doc_date ? dol_print_date($object->doc_date, 'day') : '&nbsp;';
-		}
-		print '</td>';
-		print '</tr>';
-
-		// Journal
-		print '<tr><td>';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('Codejournal');
-		print '</td>';
-		if ($action != 'editjournal') {
-			print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editjournal&token='.newToken().'&piece_num='.urlencode($object->piece_num).'&mode='.urlencode($mode).'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
-		}
-		print '</tr></table>';
-		print '</td><td>';
-		if ($action == 'editjournal') {
-			print '<form name="setjournal" action="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'" method="post">';
-			if ($optioncss != '') {
-				print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-			}
-			print '<input type="hidden" name="token" value="'.newToken().'">';
-			print '<input type="hidden" name="action" value="setjournal">';
-			print '<input type="hidden" name="mode" value="'.$mode.'">';
-			print $formaccounting->select_journal($object->code_journal, 'code_journal', 0, 0, array(), 1, 1);
-			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
-			print '</form>';
-		} else {
-			print $object->code_journal;
-		}
-		print '</td>';
-		print '</tr>';
-
-		// Ref document
-		print '<tr><td>';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('Piece');
-		print '</td>';
-		if ($action != 'editdocref') {
-			print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editdocref&token='.newToken().'&piece_num='.urlencode($object->piece_num).'&mode='.urlencode($mode).'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
-		}
-		print '</tr></table>';
-		print '</td><td>';
-		if ($action == 'editdocref') {
-			print '<form name="setdocref" action="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'" method="post">';
-			if ($optioncss != '') {
-				print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-			}
-			print '<input type="hidden" name="token" value="'.newToken().'">';
-			print '<input type="hidden" name="action" value="setdocref">';
-			print '<input type="hidden" name="mode" value="'.$mode.'">';
-			print '<input type="text" size="20" name="doc_ref" value="'.dol_escape_htmltag($object->doc_ref).'">';
-			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
-			print '</form>';
-		} else {
-			print $object->doc_ref;
-		}
-		print '</td>';
-		print '</tr>';
-
-		print '</table>';
-
-		print '</div>';
-
-		print '<div class="fichehalfright">';
-
-		print '<div class="underbanner clearboth"></div>';
-		print '<table class="border tableforfield centpercent">';
-
-		// Doc type
-		if (!empty($object->doc_type)) {
-			print '<tr>';
-			print '<td class="titlefield">'.$langs->trans("Doctype").'</td>';
-			print '<td>'.$object->doc_type.'</td>';
-			print '</tr>';
-		}
-
-		// Date document creation
-		print '<tr>';
-		print '<td class="titlefield">'.$langs->trans("DateCreation").'</td>';
+		print '<td class="titlefield">'.$langs->trans("DateExport").'</td>';
 		print '<td>';
-		print $object->date_creation ? dol_print_date($object->date_creation, 'day') : '&nbsp;';
+		print $object->date_export ? dol_print_date($object->date_export, 'dayhour') : '&nbsp;';
 		print '</td>';
 		print '</tr>';
 
-		// Don't show in tmp mode, inevitably empty
-		if ($mode != "_tmp") {
-			// Date document export
-			print '<tr>';
-			print '<td class="titlefield">' . $langs->trans("DateExport") . '</td>';
-			print '<td>';
-			print $object->date_export ? dol_print_date($object->date_export, 'dayhour') : '&nbsp;';
-			print '</td>';
-			print '</tr>';
-
-			// Date document validation
-			print '<tr>';
-			print '<td class="titlefield">' . $langs->trans("DateValidation") . '</td>';
-			print '<td>';
-			print $object->date_validation ? dol_print_date($object->date_validation, 'dayhour') : '&nbsp;';
-			print '</td>';
-			print '</tr>';
-		}
-
-		// Validate
-		/*
+		// Date document validation
 		print '<tr>';
-		print '<td class="titlefield">' . $langs->trans("Status") . '</td>';
+		print '<td class="titlefield">'.$langs->trans("DateValidation").'</td>';
 		print '<td>';
-			if (empty($object->validated)) {
-				print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $line->id . '&action=enable&token='.newToken().'">';
-				print img_picto($langs->trans("Disabled"), 'switch_off');
-				print '</a>';
-			} else {
-				print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $line->id . '&action=disable&token='.newToken().'">';
-				print img_picto($langs->trans("Activated"), 'switch_on');
-				print '</a>';
-			}
-			print '</td>';
+		print $object->date_validation ? dol_print_date($object->date_validation, 'dayhour') : '&nbsp;';
+		print '</td>';
 		print '</tr>';
-		*/
+	}
+	// Validate
+	/*
+	print '<tr>';
+	print '<td class="titlefield">' . $langs->trans("Status") . '</td>';
+	print '<td>';
+	if (empty($object->validated)) {
+		print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $line->id . '&action=enable&token='.newToken().'">';
+		print img_picto($langs->trans("Disabled"), 'switch_off');
+		print '</a>';
+	} else {
+		print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $line->id . '&action=disable&token='.newToken().'">';
+		print img_picto($langs->trans("Activated"), 'switch_on');
+		print '</a>';
+	}
+	print '</td>';
+	print '</tr>';
+	*/
 
 		// check data
-		/*
-		print '<tr>';
-		print '<td class="titlefield">' . $langs->trans("Control") . '</td>';
-		if ($object->doc_type == 'customer_invoice')
-		{
-		 $sqlmid = 'SELECT rowid as ref';
-			$sqlmid .= " FROM ".MAIN_DB_PREFIX."facture as fac";
-			$sqlmid .= " WHERE fac.rowid=" . ((int) $object->fk_doc);
-			dol_syslog("accountancy/bookkeeping/card.php::sqlmid=" . $sqlmid, LOG_DEBUG);
-			$resultmid = $db->query($sqlmid);
-			if ($resultmid) {
-				$objmid = $db->fetch_object($resultmid);
-				$invoicestatic = new Facture($db);
-				$invoicestatic->fetch($objmid->ref);
-				$ref=$langs->trans("Invoice").' '.$invoicestatic->getNomUrl(1);
-			}
-			else dol_print_error($db);
-		}
-		print '<td>' . $ref .'</td>';
-		print '</tr>';
-		*/
-		print "</table>\n";
-
-		print '</div>';
-
-		print dol_get_fiche_end();
-
-		print '<div style="clear:both"></div>';
-
-		print '<br>';
-
-		$result = $object->fetchAllPerMvt($piece_num, $mode);	// This load $object->linesmvt
-
-		if ($result < 0) {
-			setEventMessages($object->error, $object->errors, 'errors');
+	/*
+	print '<tr>';
+	print '<td class="titlefield">' . $langs->trans("Control") . '</td>';
+	if ($object->doc_type == 'customer_invoice') {
+		$sqlmid = 'SELECT rowid as ref';
+		$sqlmid .= " FROM ".MAIN_DB_PREFIX."facture as fac";
+		$sqlmid .= " WHERE fac.rowid=" . ((int) $object->fk_doc);
+		dol_syslog("accountancy/bookkeeping/card.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+		$resultmid = $db->query($sqlmid);
+		if ($resultmid) {
+			$objmid = $db->fetch_object($resultmid);
+			$invoicestatic = new Facture($db);
+			$invoicestatic->fetch($objmid->ref);
+			$ref=$langs->trans("Invoice").' '.$invoicestatic->getNomUrl(1);
 		} else {
-			// List of movements
-			print load_fiche_titre($langs->trans("ListeMvts"), '', '');
+			dol_print_error($db);
+		}
+	}
+	print '<td>' . $ref .'</td>';
+	print '</tr>';
+	*/
+	print "</table>\n";
 
-			print '<form action="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'" method="post">';
-			if ($optioncss != '') {
-				print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print dol_get_fiche_end();
+
+	print '<div style="clear:both"></div>';
+
+	print '<br>';
+
+	$result = $object->fetchAllPerMvt($piece_num, $mode);	// This load $object->linesmvt
+	if ($result < 0) {
+		setEventMessages($object->error, $object->errors, 'errors');
+	} else {
+		// List of movements
+		print load_fiche_titre($langs->trans("ListeMvts"), '', '');
+
+		if ($optioncss != '') {
+			print '<input type="hidden" name="optioncss" value="'.$optioncss.'" />';
+		}
+
+		print '<input type="hidden" name="token" value="'.newToken().'" />';
+		print '<input type="hidden" name="doc_type" value="'.$object->doc_type.'" />'."\n";
+		print '<input type="hidden" name="fk_doc" value="'.$object->fk_doc.'" />'."\n";
+		print '<input type="hidden" name="fk_docdet" value="'.$object->fk_docdet.'" />'."\n";
+		print '<input type="hidden" name="mode" value="'.$mode.'" />'."\n";
+
+		if (count($object->linesmvt) > 0) {
+			print '<div class="div-table-responsive-no-min">';
+			print '<table class="noborder centpercent">';
+
+			$total_debit = 0;
+			$total_credit = 0;
+
+			// 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>';
 			}
-			print '<input type="hidden" name="token" value="'.newToken().'">';
-			print '<input type="hidden" name="doc_date" value="'.$object->doc_date.'">'."\n";
-			print '<input type="hidden" name="doc_type" value="'.$object->doc_type.'">'."\n";
-			print '<input type="hidden" name="doc_ref" value="'.$object->doc_ref.'">'."\n";
-			print '<input type="hidden" name="code_journal" value="'.$object->code_journal.'">'."\n";
-			print '<input type="hidden" name="fk_doc" value="'.$object->fk_doc.'">'."\n";
-			print '<input type="hidden" name="fk_docdet" value="'.$object->fk_docdet.'">'."\n";
-			print '<input type="hidden" name="mode" value="'.$mode.'">'."\n";
 
-			if (count($object->linesmvt) > 0) {
-				print '<div class="div-table-responsive-no-min">';
-				print '<table class="noborder centpercent">';
-
-				$total_debit = 0;
-				$total_credit = 0;
-
-				print '<tr class="liste_titre">';
+			print '<tr class="liste_titre">';
 
 				print_liste_field_titre("AccountAccountingShort");
 				print_liste_field_titre("SubledgerAccount");
@@ -655,24 +589,59 @@ if ($action == 'create') {
 
 				print "</tr>\n";
 
-				// Add an empty line if there is not yet
-				if (!empty($object->linesmvt[0])) {
-					$tmpline = $object->linesmvt[0];
-					if (!empty($tmpline->numero_compte)) {
-						$line = new BookKeepingLine();
-						$object->linesmvt[] = $line;
+			// In _tmp mode the first line is empty so we remove it
+			if ($mode == "_tmp") {
+				array_shift($object->linesmvt);
+			}
+
+			// Add an empty line at the end to be able to add transaction
+			$line = new BookKeepingLine();
+			$object->linesmvt[] = $line;
+
+			// Add a second line empty line if there is not yet
+			if (empty($object->linesmvt[1])) {
+				$line = new BookKeepingLine();
+				$object->linesmvt[] = $line;
+			}
+
+			$count_line = count($object->linesmvt);
+			$num_line = 0;
+			foreach ($object->linesmvt as $key => $line) {
+				$num_line++;
+				print '<tr class="oddeven" data-lineid="'.((int) $line->id).'">';
+				$total_debit += $line->debit;
+				$total_credit += $line->credit;
+
+				if ($action == 'update' && $line->id == $id) {
+					print '<!-- td columns in edit mode -->';
+					print '<td>';
+					print $formaccounting->select_account((GETPOSTISSET("accountingaccount_number") ? GETPOST("accountingaccount_number", "alpha") : $line->numero_compte), 'accountingaccount_number', 1, array(), 1, 1, '');
+					print '</td>';
+					print '<td>';
+					// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because:
+					// It does not use the setup of "key pressed" to select a thirdparty and this hang browser on large databases.
+					// Also, it is not possible to use a value that is not in the list.
+					// Also, the label is not automatically filled when a value is selected.
+					if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
+						print $formaccounting->select_auxaccount((GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account), 'subledger_account', 1, 'maxwidth250', '', 'subledger_label');
+					} else {
+						print '<input type="text" class="maxwidth150" name="subledger_account" value="'.(GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account).'" placeholder="'.dol_escape_htmltag($langs->trans("SubledgerAccount")).'" />';
 					}
-				}
-
-				foreach ($object->linesmvt as $line) {
-					print '<tr class="oddeven" data-lineid="'.((int) $line->id).'">';
-					$total_debit += $line->debit;
-					$total_credit += $line->credit;
-
-					if ($action == 'update' && $line->id == $id) {
-						print '<!-- td columns in edit mode -->';
+					// Add also input for subledger label
+					print '<br><input type="text" class="maxwidth150" name="subledger_label" value="'.(GETPOSTISSET("subledger_label") ? GETPOST("subledger_label", "alpha") : $line->subledger_label).'" placeholder="'.dol_escape_htmltag($langs->trans("SubledgerAccountLabel")).'" />';
+					print '</td>';
+					print '<td><input type="text" class="minwidth200" name="label_operation" value="'.(GETPOSTISSET("label_operation") ? GETPOST("label_operation", "alpha") : $line->label_operation).'" /></td>';
+					print '<td class="right"><input type="text" size="6" class="right" name="debit" value="'.(GETPOSTISSET("debit") ? GETPOST("debit", "alpha") : price($line->debit)).'" /></td>';
+					print '<td class="right"><input type="text" size="6" class="right" name="credit" value="'.(GETPOSTISSET("credit") ? GETPOST("credit", "alpha") : price($line->credit)).'" /></td>';
+					print '<td>';
+					print '<input type="hidden" name="id" value="'.$line->id.'" />'."\n";
+					print '<input type="submit" class="button" name="update" value="'.$langs->trans("Update").'" />';
+					print '</td>';
+				} elseif (empty($line->numero_compte) || (empty($line->debit) && empty($line->credit))) {
+					if ($action == "" || $action == 'add') {
+						print '<!-- td columns in add mode -->';
 						print '<td>';
-						print $formaccounting->select_account((GETPOSTISSET("accountingaccount_number") ? GETPOST("accountingaccount_number", "alpha") : $line->numero_compte), 'accountingaccount_number', 1, array(), 1, 1, 'minwidth200 maxwidth500');
+						print $formaccounting->select_account((is_array($accountingaccount_number) ? $accountingaccount_number[$key] : $accountingaccount_number ), 'accountingaccount_number['.$key.']', 1, array(), 1, 1, '');
 						print '</td>';
 						print '<td>';
 						// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because:
@@ -680,124 +649,102 @@ if ($action == 'create') {
 						// Also, it is not possible to use a value that is not in the list.
 						// Also, the label is not automatically filled when a value is selected.
 						if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
-							print $formaccounting->select_auxaccount((GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account), 'subledger_account', 1, 'maxwidth250', '', 'subledger_label');
+							print $formaccounting->select_auxaccount((is_array($subledger_account) ? $subledger_account[$key] : $subledger_account ), 'subledger_account['.$key.']', 1, 'maxwidth250', '', 'subledger_label');
 						} else {
-							print '<input type="text" class="maxwidth150" name="subledger_account" value="'.(GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account).'" placeholder="'.dol_escape_htmltag($langs->trans("SubledgerAccount")).'">';
+							print '<input type="text" class="maxwidth150" name="subledger_account['.$key.']" value="' . (is_array($subledger_account) ? $subledger_account[$key] : $subledger_account ) . '" placeholder="' . dol_escape_htmltag($langs->trans("SubledgerAccount")) . '" />';
 						}
-						// Add also input for subledger label
-						print '<br><input type="text" class="maxwidth150" name="subledger_label" value="'.(GETPOSTISSET("subledger_label") ? GETPOST("subledger_label", "alpha") : $line->subledger_label).'" placeholder="'.dol_escape_htmltag($langs->trans("SubledgerAccountLabel")).'">';
+						print '<br><input type="text" class="maxwidth150" name="subledger_label['.$key.']" value="' . (is_array($subledger_label) ? $subledger_label[$key] : $subledger_label ) . '" placeholder="' . dol_escape_htmltag($langs->trans("SubledgerAccountLabel")) . '" />';
 						print '</td>';
-						print '<td><input type="text" class="minwidth200" name="label_operation" value="'.(GETPOSTISSET("label_operation") ? GETPOST("label_operation", "alpha") : $line->label_operation).'"></td>';
-						print '<td class="right"><input type="text" size="6" class="right" name="debit" value="'.(GETPOSTISSET("debit") ? GETPOST("debit", "alpha") : price($line->debit)).'"></td>';
-						print '<td class="right"><input type="text" size="6" class="right" name="credit" value="'.(GETPOSTISSET("credit") ? GETPOST("credit", "alpha") : price($line->credit)).'"></td>';
-						print '<td>';
-						print '<input type="hidden" name="id" value="'.$line->id.'">'."\n";
-						print '<input type="submit" class="button" name="update" value="'.$langs->trans("Update").'">';
-						print '</td>';
-					} elseif (empty($line->numero_compte) || (empty($line->debit) && empty($line->credit))) {
-						if ($action == "" || $action == 'add') {
-							print '<!-- td columns in add mode -->';
-							print '<td>';
-							print $formaccounting->select_account('', 'accountingaccount_number', 1, array(), 1, 1, 'minwidth200 maxwidth500');
-							print '</td>';
-							print '<td>';
-							// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because:
-							// It does not use the setup of "key pressed" to select a thirdparty and this hang browser on large databases.
-							// Also, it is not possible to use a value that is not in the list.
-							// Also, the label is not automatically filled when a value is selected.
-							if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
-								print $formaccounting->select_auxaccount('', 'subledger_account', 1, 'maxwidth250', '', 'subledger_label');
-							} else {
-								print '<input type="text" class="maxwidth150" name="subledger_account" value="" placeholder="' . dol_escape_htmltag($langs->trans("SubledgerAccount")) . '">';
-							}
-							print '<br><input type="text" class="maxwidth150" name="subledger_label" value="" placeholder="' . dol_escape_htmltag($langs->trans("SubledgerAccountLabel")) . '">';
-							print '</td>';
-							print '<td><input type="text" class="minwidth200" name="label_operation" value="' . $label_operation . '"/></td>';
-							print '<td class="right"><input type="text" size="6" class="right" name="debit" value=""/></td>';
-							print '<td class="right"><input type="text" size="6" class="right" name="credit" value=""/></td>';
-							print '<td class="center"><input type="submit" class="button small" name="save" value="' . $langs->trans("Add") . '"></td>';
-						}
-					} else {
-						print '<!-- td columns in display mode -->';
-						$resultfetch = $accountingaccount->fetch(null, $line->numero_compte, true);
-						print '<td>';
-						if ($resultfetch > 0) {
-							print $accountingaccount->getNomUrl(0, 1, 1, '', 0);
+						print '<td><input type="text" class="minwidth200" name="label_operation['.$key.']" value="' . (is_array($label_operation) ? $label_operation[$key] : $label_operation ) . '"/></td>';
+						print '<td class="right"><input type="text" size="6" class="right" name="debit['.$key.']" value="' . (is_array($debit) ? $debit[$key] : $debit ) . '" /></td>';
+						print '<td class="right"><input type="text" size="6" class="right" name="credit['.$key.']" value="' . (is_array($credit) ? $credit[$key] : $credit ) . '" /></td>';
+						// Add button should not appear twice
+						if ($num_line === $count_line) {
+							print '<td><input type="submit" class="button small" name="save" value="' . $langs->trans("Add") . '" /></td>';
 						} else {
-							print $line->numero_compte.' <span class="warning">('.$langs->trans("AccountRemovedFromCurrentChartOfAccount").')</span>';
+							print '<td class="right"></td>';
 						}
-						print '</td>';
-						print '<td>'.length_accounta($line->subledger_account);
-						if ($line->subledger_label) {
-							print ' - <span class="opacitymedium">'.$line->subledger_label.'</span>';
-						}
-						print '</td>';
-						print '<td>'.$line->label_operation.'</td>';
-						print '<td class="right nowraponall amount">'.($line->debit != 0 ? price($line->debit) : '').'</td>';
-						print '<td class="right nowraponall amount">'.($line->credit != 0 ? price($line->credit) : '').'</td>';
-
-						print '<td class="center nowraponall">';
-						if (empty($line->date_export) && empty($line->date_validation)) {
-							print '<a class="editfielda reposition" href="' . $_SERVER["PHP_SELF"] . '?action=update&id=' . $line->id . '&piece_num=' . urlencode($line->piece_num) . '&mode=' . urlencode($mode) . '&token=' . urlencode(newToken()) . '">';
-							print img_edit('', 0, 'class="marginrightonly"');
-							print '</a> &nbsp;';
-						} else {
-							print '<a class="editfielda nohover cursornotallowed reposition disabled" href="#" title="'.dol_escape_htmltag($langs->trans("ForbiddenTransactionAlreadyExported")).'">';
-							print img_edit($langs->trans("ForbiddenTransactionAlreadyExported"), 0, 'class="marginrightonly"');
-							print '</a> &nbsp;';
-						}
-
-						if (empty($line->date_validation)) {
-							$actiontodelete = 'delete';
-							if ($mode == '_tmp' || $action != 'delmouv') {
-								$actiontodelete = 'confirm_delete';
-							}
-
-							print '<a href="' . $_SERVER["PHP_SELF"] . '?action=' . $actiontodelete . '&id=' . $line->id . '&piece_num=' . urlencode($line->piece_num) . '&mode=' . urlencode($mode) . '&token=' . urlencode(newToken()) . '">';
-							print img_delete();
-							print '</a>';
-						} else {
-							print '<a class="editfielda nohover cursornotallowed disabled" href="#" title="'.dol_escape_htmltag($langs->trans("ForbiddenTransactionAlreadyExported")).'">';
-							print img_delete($langs->trans("ForbiddenTransactionAlreadyValidated"));
-							print '</a>';
-						}
-
-						print '</td>';
 					}
-					print "</tr>\n";
-				}
-
-				$total_debit = price2num($total_debit, 'MT');
-				$total_credit = price2num($total_credit, 'MT');
-
-				if ($total_debit != $total_credit) {
-					setEventMessages(null, array($langs->trans('MvtNotCorrectlyBalanced', $total_debit, $total_credit)), 'warnings');
-				}
-
-				print '</table>';
-				print '</div>';
-
-				if ($mode == '_tmp' && $action == '') {
-					print '<br>';
-					print '<div class="center">';
-					if ($total_debit == $total_credit) {
-						print '<a class="button" href="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'&action=valid">'.$langs->trans("ValidTransaction").'</a>';
+				} else {
+					print '<!-- td columns in display mode -->';
+					$resultfetch = $accountingaccount->fetch(null, $line->numero_compte, true);
+					print '<td>';
+					if ($resultfetch > 0) {
+						print $accountingaccount->getNomUrl(0, 1, 1, '', 0);
 					} else {
-						print '<input type="submit" class="button" disabled="disabled" href="#" title="'.dol_escape_htmltag($langs->trans("MvtNotCorrectlyBalanced", $debit, $credit)).'" value="'.dol_escape_htmltag($langs->trans("ValidTransaction")).'">';
+						print $line->numero_compte.' <span class="warning">('.$langs->trans("AccountRemovedFromCurrentChartOfAccount").')</span>';
+					}
+					print '</td>';
+					print '<td>'.length_accounta($line->subledger_account);
+					if ($line->subledger_label) {
+						print ' - <span class="opacitymedium">'.$line->subledger_label.'</span>';
+					}
+					print '</td>';
+					print '<td>'.$line->label_operation.'</td>';
+					print '<td class="right nowraponall amount">'.($line->debit != 0 ? price($line->debit) : '').'</td>';
+					print '<td class="right nowraponall amount">'.($line->credit != 0 ? price($line->credit) : '').'</td>';
+
+					print '<td class="center nowraponall">';
+					if (empty($line->date_export) && empty($line->date_validation)) {
+						print '<a class="editfielda reposition" href="' . $_SERVER["PHP_SELF"] . '?action=update&id=' . $line->id . '&piece_num=' . urlencode($line->piece_num) . '&mode=' . urlencode($mode) . '&token=' . urlencode(newToken()) . '">';
+						print img_edit('', 0, 'class="marginrightonly"');
+						print '</a> &nbsp;';
+					} else {
+						print '<a class="editfielda nohover cursornotallowed reposition disabled" href="#" title="'.dol_escape_htmltag($langs->trans("ForbiddenTransactionAlreadyExported")).'">';
+						print img_edit($langs->trans("ForbiddenTransactionAlreadyExported"), 0, 'class="marginrightonly"');
+						print '</a> &nbsp;';
 					}
 
-					print ' &nbsp; ';
-					print '<a class="button button-cancel" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/list.php">'.$langs->trans("Cancel").'</a>';
+					if (empty($line->date_validation)) {
+						$actiontodelete = 'delete';
+						if ($mode == '_tmp' || $action != 'delmouv') {
+							$actiontodelete = 'confirm_delete';
+						}
 
-					print "</div>";
+						print '<a href="' . $_SERVER["PHP_SELF"] . '?action=' . $actiontodelete . '&id=' . $line->id . '&piece_num=' . urlencode($line->piece_num) . '&mode=' . urlencode($mode) . '&token=' . urlencode(newToken()) . '">';
+						print img_delete();
+						print '</a>';
+					} else {
+						print '<a class="editfielda nohover cursornotallowed disabled" href="#" title="'.dol_escape_htmltag($langs->trans("ForbiddenTransactionAlreadyExported")).'">';
+						print img_delete($langs->trans("ForbiddenTransactionAlreadyValidated"));
+						print '</a>';
+					}
+
+					print '</td>';
 				}
+				print "</tr>\n";
 			}
 
-			print '</form>';
+			$total_debit = price2num($total_debit, 'MT');
+			$total_credit = price2num($total_credit, 'MT');
+
+			if ($total_debit != $total_credit) {
+				setEventMessages(null, array($langs->trans('MvtNotCorrectlyBalanced', $total_debit, $total_credit)), 'warnings');
+			}
+
+			print '</table>';
+			print '</div>';
+
+			if ($mode == '_tmp' && $action == '') {
+				print '<br>';
+				print '<div class="center">';
+				if ($total_debit == $total_credit) {
+					print '<input type="submit" class="button" name="validate" value="' . $langs->trans("ValidTransaction") . '" />';
+				} else {
+					print '<input type="submit" class="button" disabled="disabled" href="#" title="'.dol_escape_htmltag($langs->trans("MvtNotCorrectlyBalanced", $debit, $credit)).'" value="'.dol_escape_htmltag($langs->trans("ValidTransaction")).'" />';
+				}
+
+				print ' &nbsp; ';
+				print '<a class="button button-cancel" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/list.php">'.$langs->trans("Cancel").'</a>';
+
+				print "</div>";
+			}
 		}
-	} else {
-		print load_fiche_titre($langs->trans("NoRecords"));
+
+		print '</form>';
 	}
+} else {
+	print load_fiche_titre($langs->trans("NoRecords"));
 }
 
 print dol_get_fiche_end();

From 35256d4ecb7213f09ec41ce5ab82fc0f1da652cf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Jan 2023 02:36:05 +0100
Subject: [PATCH 363/816] Fix css

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

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 4a148611a76..4f44ab20bad 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -634,7 +634,7 @@ table.tableforfield .buttonDelete:not(.bordertransp):not(.buttonpayment) {
 	-webkit-box-shadow: 0px 0px 5px 1px rgba(0, 0, 60, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
 	box-shadow: 0px 0px 5px 1px rgba(0, 0, 60, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
 }
-.button:hover, .buttonDelete:hover   {
+.button:hover:not(.nohover), .buttonDelete:hover:not(.nohover)   {
 	/* warning: having a larger shadow has side effect when button is completely on left of a table */
 	-webkit-box-shadow: 0px 0px 1px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
 	box-shadow: 0px 0px 1px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 6fd33800eb0..41c20074d6a 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -879,7 +879,7 @@ table.tableforfield .buttonDelete:not(.bordertransp):not(.buttonpayment) {
 	-webkit-box-shadow: 0px 0px 6px 1px rgba(0, 0, 60, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
 	box-shadow: 0px 0px 6px 1px rgba(0, 0, 60, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
 }
-.button:hover, .buttonDelete:hover   {
+.button:hover:not(.nohover), .buttonDelete:hover:not(.nohover)   {
 	-webkit-box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
 	box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
 }

From e228536329e7dcfaa7d19aee48d3b744d8c24220 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Jan 2023 03:11:33 +0100
Subject: [PATCH 364/816] Fix date now

---
 htdocs/public/recruitment/view.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/public/recruitment/view.php b/htdocs/public/recruitment/view.php
index 57cb82d9b08..0d856539902 100644
--- a/htdocs/public/recruitment/view.php
+++ b/htdocs/public/recruitment/view.php
@@ -159,6 +159,8 @@ include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
  * View
  */
 
+$now = dol_now();
+
 $head = '';
 if (!empty($conf->global->MAIN_RECRUITMENT_CSS_URL)) {
 	$head = '<link rel="stylesheet" type="text/css" href="'.$conf->global->MAIN_RECRUITMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";

From 880be173fa4289cf479fcce1caceb26898b33118 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Jan 2023 03:28:21 +0100
Subject: [PATCH 365/816] Fix typo

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

diff --git a/htdocs/public/recruitment/view.php b/htdocs/public/recruitment/view.php
index 0d856539902..de8297d3ef0 100644
--- a/htdocs/public/recruitment/view.php
+++ b/htdocs/public/recruitment/view.php
@@ -203,7 +203,7 @@ $paramlogo = 'ONLINE_RECRUITMENT_LOGO_'.$suffix;
 if (!empty($conf->global->$paramlogo)) {
 	$logosmall = $conf->global->$paramlogo;
 } elseif (!empty($conf->global->ONLINE_RECRUITMENT_LOGO)) {
-	$logosmall = $conf->global->ONLINE_RECRUITMENT_LOGO_;
+	$logosmall = $conf->global->ONLINE_RECRUITMENT_LOGO;
 }
 //print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
 // Define urllogo
@@ -236,7 +236,7 @@ if ($urllogo) {
 
 if (!empty($conf->global->RECRUITMENT_IMAGE_PUBLIC_INTERFACE)) {
 	print '<div class="backimagepublicrecruitment">';
-	print '<img id="idPROJECT_IMAGE_PUBLIC_SUGGEST_BOOTH" src="'.$conf->global->RECRUITMENT_IMAGE_PUBLIC_INTERFACE.'">';
+	print '<img id="idRECRUITMENT_IMAGE_PUBLIC_INTERFACE" src="'.$conf->global->RECRUITMENT_IMAGE_PUBLIC_INTERFACE.'">';
 	print '</div>';
 }
 

From 00740ca267563eee40691aa8ab94294b2f363ad6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Jan 2023 04:05:59 +0100
Subject: [PATCH 366/816] WIP Work on public virtual card

---
 htdocs/adherents/admin/website.php |   2 +-
 htdocs/core/class/vcard.class.php  |  87 +++++++
 htdocs/core/lib/functions.lib.php  |  47 ++--
 htdocs/core/lib/functions2.lib.php |   2 +-
 htdocs/langs/en_US/users.lang      |   3 +
 htdocs/public/users/view.php       | 381 +++++++++++++++++++++++++++++
 htdocs/theme/eldy/global.inc.php   |   4 +-
 htdocs/theme/md/style.css.php      |   3 +
 htdocs/user/card.php               |  10 +-
 htdocs/user/class/user.class.php   |  24 ++
 htdocs/user/info.php               |   2 +-
 htdocs/user/vcard.php              | 105 ++------
 htdocs/user/virtualcard.php        | 248 +++++++++++++++++++
 13 files changed, 810 insertions(+), 108 deletions(-)
 create mode 100644 htdocs/public/users/view.php
 create mode 100644 htdocs/user/virtualcard.php

diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index 08e9f617750..14379166247 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -178,7 +178,7 @@ if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 	//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;
+		$entity_qr = '?entity='.((int) $conf->entity);
 	} else {
 		$entity_qr = '';
 	}
diff --git a/htdocs/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php
index dbe505a894b..91e3a5565e1 100644
--- a/htdocs/core/class/vcard.class.php
+++ b/htdocs/core/class/vcard.class.php
@@ -1,4 +1,7 @@
 <?php
+use Splash\Tests\WsObjects\O00ObjectBaseTest;
+use JMS\Serializer\Exception\ObjectConstructionException;
+
 /* Copyright (C)           Kai Blankenhorn      <kaib@bitfolge.de>
  * Copyright (C) 2005-2017 Laurent Destailleur  <eldy@users.sourceforge.org>
  * Copyright (C) 2020		Tobias Sekan		<tobias.sekan@startmail.com>
@@ -367,6 +370,90 @@ class vCard
 		return $this->filename;
 	}
 
+	/**
+	 * Return a VCARD string
+	 *
+	 * @param	Object		$object		Object
+	 * @param	Societe		$company	Company
+	 * @param	Translate	$langs		Lang object
+	 * @return	string					String
+	 */
+	public function buildVCardString($object, $company, $langs)
+	{
+		$this->setProdId('Dolibarr '.DOL_VERSION);
+
+		$this->setUid('DOLIBARR-USERID-'.$object->id);
+		$this->setName($object->lastname, $object->firstname, "", $object->civility_code, "");
+		$this->setFormattedName($object->getFullName($langs, 1));
+
+		$this->setPhoneNumber($object->office_phone, "TYPE=WORK;VOICE");
+		$this->setPhoneNumber($object->personal_mobile, "TYPE=HOME;VOICE");
+		$this->setPhoneNumber($object->user_mobile, "TYPE=CELL;VOICE");
+		$this->setPhoneNumber($object->office_fax, "TYPE=WORK;FAX");
+
+		$country = $object->country_code ? $object->country : '';
+
+		$this->setAddress("", "", $object->address, $object->town, $object->state, $object->zip, $country, "TYPE=WORK;POSTAL");
+		$this->setLabel("", "", $object->address, $object->town, $object->state, $object->zip, $country, "TYPE=WORK");
+
+		$this->setEmail($object->email, "TYPE=WORK");
+		$this->setNote($object->note_public);
+		$this->setTitle($object->job);
+
+		if ($company->id > 0) {
+			$this->setURL($company->url, "TYPE=WORK");
+			if (!$object->office_phone) {
+				$this->setPhoneNumber($company->phone, "TYPE=WORK;VOICE");
+			}
+			if (!$object->office_fax) {
+				$this->setPhoneNumber($company->fax, "TYPE=WORK;FAX");
+			}
+			if (!$object->zip) {
+				$this->setAddress("", "", $company->address, $company->town, $company->state, $company->zip, $company->country, "TYPE=WORK;POSTAL");
+			}
+
+			// when company e-mail is empty, use only user e-mail
+			if (empty(trim($company->email))) {
+				// was set before, don't set twice
+			} elseif (empty(trim($object->email))) {
+				// when user e-mail is empty, use only company e-mail
+				$this->setEmail($company->email, "TYPE=WORK");
+			} else {
+				$tmpuser2 = explode("@", trim($object->email));
+				$tmpcompany = explode("@", trim($company->email));
+
+				if (strtolower(end($tmpuser2)) == strtolower(end($tmpcompany))) {
+					// when e-mail domain of user and company are the same, use user e-mail at first (and company e-mail at second)
+					$this->setEmail($object->email, "TYPE=WORK");
+
+					// support by Microsoft Outlook (2019 and possible earlier)
+					$this->setEmail($company->email, 'INTERNET');
+				} else {
+					// when e-mail of user and company complete different use company e-mail at first (and user e-mail at second)
+					$this->setEmail($company->email, "TYPE=WORK");
+
+					// support by Microsoft Outlook (2019 and possible earlier)
+					$this->setEmail($object->email, 'INTERNET');
+				}
+			}
+
+			// Si user lie a un tiers non de type "particulier"
+			if ($company->typent_code != 'TE_PRIVATE') {
+				$this->setOrg($company->name);
+			}
+		}
+
+		// Personal informations
+		$this->setPhoneNumber($object->personal_mobile, "TYPE=HOME;VOICE");
+		if ($object->birth) {
+			$this->setBirthday($object->birth);
+		}
+
+		// Return VCard string
+		return $this->getVCard();
+	}
+
+
 	/* Example from Microsoft Outlook 2019
 
 	BEGIN:VCARD
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 7ac6150c5ac..ac774209d30 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -101,31 +101,41 @@ function getDolGlobalInt($key, $default = 0)
 }
 
 /**
- * Return dolibarr user constant string value
+ * Return Dolibarr user constant string value
  *
  * @param string $key 		key to return value, return '' if not set
  * @param string $default 	value to return
+ * @param User   $tmpuser   To get another user than current user
  * @return string
  */
-function getDolUserString($key, $default = '')
+function getDolUserString($key, $default = '', $tmpuser = null)
 {
-	global $user;
+	if (empty($tmpuser)) {
+		global $user;
+		$tmpuser = $user;
+	}
+
 	// return $conf->global->$key ?? $default;
-	return (string) (empty($user->conf->$key) ? $default : $user->conf->$key);
+	return (string) (empty($tmpuser->conf->$key) ? $default : $$tmpuser->conf->$key);
 }
 
 /**
- * Return dolibarr user constant int value
+ * Return Dolibarr user constant int value
  *
  * @param string 	$key 			key to return value, return 0 if not set
  * @param int 		$default 		value to return
+ * @param User   	$tmpuser   		To get another user than current user
  * @return int
  */
-function getDolUserInt($key, $default = 0)
+function getDolUserInt($key, $default = 0, $tmpuser = null)
 {
-	global $user;
+	if (empty($tmpuser)) {
+		global $user;
+		$tmpuser = $user;
+	}
+
 	// return $conf->global->$key ?? $default;
-	return (int) (empty($user->conf->$key) ? $default : $user->conf->$key);
+	return (int) (empty($tmpuser->conf->$key) ? $default : $tmpuser->conf->$key);
 }
 
 /**
@@ -1717,7 +1727,7 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename =
  *
  *	@param	string	$name				A name for the html component
  *	@param	string	$label 	    		Label shown in Popup title top bar
- *	@param  string	$buttonstring  		button string
+ *	@param  string	$buttonstring  		button string (HTML text we can click on)
  *	@param  string	$url				Relative Url to open. For example '/project/card.php'
  *  @param	string	$disabled			Disabled text
  *  @param	string	$morecss			More CSS
@@ -1725,7 +1735,7 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename =
  *  									Value is 'keyforpopupid:Name_of_html_component_to_set_with id,Name_of_html_component_to_set_with_label'
  * 	@return	string						HTML component with button
  */
-function dolButtonToOpenUrlInDialogPopup($name, $label, $buttonstring, $url, $disabled = '', $morecss = 'button bordertransp', $backtopagejsfields = '')
+function dolButtonToOpenUrlInDialogPopup($name, $label, $buttonstring, $url, $disabled = '', $morecss = 'classlink button bordertransp', $backtopagejsfields = '')
 {
 	global $conf;
 
@@ -1753,7 +1763,7 @@ function dolButtonToOpenUrlInDialogPopup($name, $label, $buttonstring, $url, $di
 
 	//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("MediaFiles")).'" name="file_manager">';
 	$out .= '<!-- a link for button to open url into a dialog popup with backtopagejsfields = '.$backtopagejsfields.' -->';
-	$out .= '<a class="cursorpointer classlink button_'.$name.($morecss ? ' '.$morecss : '').'"'.$disabled.' title="'.dol_escape_htmltag($label).'"';
+	$out .= '<a class="cursorpointer button_'.$name.($morecss ? ' '.$morecss : '').'"'.$disabled.' title="'.dol_escape_htmltag($label).'"';
 	if (empty($conf->use_javascript_ajax)) {
 		$out .= ' href="'.DOL_URL_ROOT.$url.'" target="_blank"';
 	}
@@ -2239,6 +2249,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 		}
 	}
 
+	// Show barcode
 	if ($showbarcode) {
 		$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showbarcode($object, 100, 'photoref valignmiddle').'</div>';
 	}
@@ -2988,9 +2999,10 @@ function dol_print_size($size, $shortvalue = 0, $shortunit = 0)
  * @param	string		$target		Target for link
  * @param	int			$max		Max number of characters to show
  * @param	int			$withpicto	With picto
+ * @param	string		$morecss	More CSS
  * @return	string					HTML Link
  */
-function dol_print_url($url, $target = '_blank', $max = 32, $withpicto = 0)
+function dol_print_url($url, $target = '_blank', $max = 32, $withpicto = 0, $morecss = 'float')
 {
 	global $langs;
 
@@ -3013,7 +3025,12 @@ function dol_print_url($url, $target = '_blank', $max = 32, $withpicto = 0)
 	}
 	$link .= dol_trunc($url, $max);
 	$link .= '</a>';
-	return '<div class="nospan float" style="margin-right: 10px">'.($withpicto ?img_picto($langs->trans("Url"), 'globe').' ' : '').$link.'</div>';
+
+	if ($morecss == 'float') {
+		return '<div class="nospan'.($morecss ? ' '.$morecss : '').'" style="margin-right: 10px">'.($withpicto ?img_picto($langs->trans("Url"), 'globe').' ' : '').$link.'</div>';
+	} else {
+		return '<span class="nospan'.($morecss ? ' '.$morecss : '').'" style="margin-right: 10px">'.($withpicto ?img_picto($langs->trans("Url"), 'globe').' ' : '').$link.'</span>';
+	}
 }
 
 /**
@@ -4067,7 +4084,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'autofill', 'folder', 'folder-open', 'folder-plus',
 				'generate', 'globe', 'globe-americas', 'graph', 'grip', 'grip_title', 'group',
 				'help', 'holiday',
-				'images', 'incoterm', 'info', 'intervention', 'inventory', 'intracommreport', 'knowledgemanagement',
+				'id-card', 'images', 'incoterm', 'info', 'intervention', 'inventory', 'intracommreport', 'knowledgemanagement',
 				'label', 'language', 'line', 'link', 'list', 'list-alt', 'listlight', 'loan', 'lock', 'lot', 'long-arrow-alt-right',
 				'margin', 'map-marker-alt', 'member', 'meeting', 'money-bill-alt', 'movement', 'mrp', 'note', 'next',
 				'off', 'on', 'order',
@@ -4134,7 +4151,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'supplier'=>'building', 'technic'=>'cogs',
 				'timespent'=>'clock', 'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',
 				'title_agenda'=>'calendar-alt',
-				'uncheck'=>'times', 'uparrow'=>'share', 'url'=>'external-link-alt', 'vat'=>'money-check-alt', 'vcard'=>'address-card',
+				'uncheck'=>'times', 'uparrow'=>'share', 'url'=>'external-link-alt', 'vat'=>'money-check-alt', 'vcard'=>'arrow-alt-circle-down',
 				'jabber'=>'comment-o',
 				'website'=>'globe-americas', 'workstation'=>'pallet', 'webhook'=>'bullseye', 'world'=>'globe', 'private'=>'user-lock',
 				'conferenceorbooth'=>'chalkboard-teacher', 'eventorganization'=>'project-diagram'
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 692d01f9ef0..6b51cf76150 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1784,7 +1784,7 @@ function weight_convert($weight, &$from_unit, $to_unit)
  *	@param	DoliDB	$db         Handler database
  *	@param	Conf	$conf		Object conf
  *	@param	User	$user      	Object user
- *	@param	array	$tab        Array (key=>value) with all parameters to save
+ *	@param	array	$tab        Array (key=>value) with all parameters to save/update
  *	@return int         		<0 if KO, >0 if OK
  *
  *	@see		dolibarr_get_const(), dolibarr_set_const(), dolibarr_del_const()
diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index 757e9f1dedf..2f691153292 100644
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -129,3 +129,6 @@ IPLastLogin=IP last login
 IPPreviousLogin=IP previous login
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
\ No newline at end of file
diff --git a/htdocs/public/users/view.php b/htdocs/public/users/view.php
new file mode 100644
index 00000000000..2bc5e8e9245
--- /dev/null
+++ b/htdocs/public/users/view.php
@@ -0,0 +1,381 @@
+<?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/users/view.php
+ *       \ingroup    user
+ *       \brief      Public file to user profile
+ */
+
+if (!defined('NOLOGIN')) {
+	define("NOLOGIN", 1); // This means this output page does not require to be logged.
+}
+if (!defined('NOCSRFCHECK')) {
+	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+}
+if (!defined('NOIPCHECK')) {
+	define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+}
+if (!defined('NOBROWSERNOTIF')) {
+	define('NOBROWSERNOTIF', '1');
+}
+
+// Load Dolibarr environment
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/vcard.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("companies", "other", "recruitment"));
+
+// Get parameters
+$action   = GETPOST('action', 'aZ09');
+$cancel   = GETPOST('cancel', 'alpha');
+$backtopage = '';
+
+$id = GETPOST('id', 'int');
+$securekey = GETPOST('securekey', 'alpha');
+$suffix = GETPOST('suffix');
+
+$object = new User($db);
+$object->fetch($id, '', '', 1);
+
+// Define $urlwithroot
+//$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+//$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+$urlwithroot = DOL_MAIN_URL_ROOT; // This is to use same domain name than current. For Paypal payment, we can use internal URL like localhost.
+
+// Security check
+global $dolibarr_main_instance_unique_id;
+$encodedsecurekey = dol_hash($dolibarr_main_instance_unique_id.'uservirtualcard'.$object->id.'-'.$object->login, 'md5');
+if ($encodedsecurekey != $securekey) {
+	httponly_accessforbidden('User profile page not found or not allowed');
+}
+
+
+/*
+ * Actions
+ */
+
+if ($cancel) {
+	if (!empty($backtopage)) {
+		header("Location: ".$backtopage);
+		exit;
+	}
+	$action = 'view';
+}
+
+/*
+if ($action == "view" || $action == "presend" || $action == "dosubmit") {
+	$error = 0;
+	$display_ticket = false;
+	if (!strlen($ref)) {
+		$error++;
+		array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Ref")));
+		$action = '';
+	}
+	if (!strlen($email)) {
+		$error++;
+		array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Email")));
+		$action = '';
+	} else {
+		if (!isValidEmail($email)) {
+			$error++;
+			array_push($object->errors, $langs->trans("ErrorEmailInvalid"));
+			$action = '';
+		}
+	}
+
+	if (!$error) {
+		$ret = $object->fetch('', $ref);
+	}
+
+	if ($error || $errors) {
+		setEventMessages($object->error, $object->errors, 'errors');
+		if ($action == "dosubmit") {
+			$action = 'presend';
+		} else {
+			$action = '';
+		}
+	}
+}
+*/
+//var_dump($action);
+//$object->doActions($action);
+
+// Actions to send emails (for ticket, we need to manage the addfile and removefile only)
+/*$triggersendname = 'USER_SENTBYMAIL';
+$paramname = 'id';
+$autocopy = 'MAIN_MAIL_AUTOCOPY_USER_TO'; // used to know the automatic BCC to add
+$trackid = 'use'.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+*/
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$company = $mysoc;
+
+if ($action == 'vcard') {
+	// We create VCard
+	$v = new vCard();
+	$output = $v->buildVCardString($object, $company, $langs);
+
+	$filename = trim(urldecode($v->getFileName())); // "Nom prenom.vcf"
+	$filenameurlencoded = dol_sanitizeFileName(urlencode($filename));
+	//$filename = dol_sanitizeFileName($filename);
+
+	top_httphead('text/x-vcard; name="'.$filename.'"');
+
+	header("Content-Disposition: attachment; filename=\"".$filename."\"");
+	header("Content-Length: ".dol_strlen($output));
+	header("Connection: close");
+
+	print $output;
+
+	$db->close();
+
+	exit;
+}
+
+$head = '';
+if (!empty($conf->global->MAIN_USER_PROFILE_CSS_URL)) {
+	$head = '<link rel="stylesheet" type="text/css" href="'.$conf->global->MAIN_USER_PROFILE_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+}
+
+$conf->dol_hide_topmenu = 1;
+$conf->dol_hide_leftmenu = 1;
+
+if (!getDolUserInt('USER_ENABLE_PUBLIC', 0, $object)) {
+	$langs->load("errors");
+	print '<div class="error">'.$langs->trans('ErrorPublicInterfaceNotEnabled').'</div>';
+	$db->close();
+	exit();
+}
+
+$arrayofjs = array();
+$arrayofcss = array();
+
+$replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
+llxHeader($head, $langs->trans("UserProfile").' '.$object->getFullName($langs), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea, 1, 1);
+
+print '<span id="dolpaymentspan"></span>'."\n";
+print '<div class="center">'."\n";
+print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
+print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
+print '<input type="hidden" name="action" value="dosubmit">'."\n";
+print '<input type="hidden" name="securekey" value="'.$securekey.'">'."\n";
+print '<input type="hidden" name="entity" value="'.$entity.'" />';
+print "\n";
+print '<!-- Form to view job -->'."\n";
+
+$modulepart = 'user';
+$imagesize = 'small';
+$dir = $conf->user->dir_output;
+$email = $object->email;
+
+// Show logo (search order: logo defined by ONLINE_SIGN_LOGO_suffix, then ONLINE_SIGN_LOGO_, then small company logo, large company logo, theme logo, common logo)
+// Define logo and logosmall
+$logo = '';
+$logosmall = '';
+if (!empty($object->photo)) {
+	if (dolIsAllowedForPreview($object->photo)) {
+		$logosmall = get_exdir(0, 0, 0, 0, $object, 'user').'photos/'.getImageFileNameForSize($object->photo, '_small');
+		$logo = get_exdir(0, 0, 0, 0, $object, 'user').'photos/'.$object->photo;
+		//$originalfile = get_exdir(0, 0, 0, 0, $object, 'user').'photos/'.$object->photo;
+	}
+}
+//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
+// Define urllogo
+$urllogo = '';
+$urllogofull = '';
+if (!empty($logosmall) && is_readable($conf->user->dir_output.'/'.$logosmall)) {
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&amp;entity='.$conf->entity.'&amp;file='.urlencode($logosmall);
+	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart='.$modulepart.'&entity='.$conf->entity.'&file='.urlencode($logosmall);
+} elseif (!empty($logo) && is_readable($conf->user->dir_output.'/'.$logo)) {
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&amp;entity='.$conf->entity.'&amp;file='.urlencode($logo);
+	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart='.$modulepart.'&entity='.$conf->entity.'&file='.urlencode($logo);
+}
+
+// Output html code for logo
+print '<div class="backgreypublicpayment">';
+print '<div class="logopublicpayment">';
+
+// Show photo
+if ($urllogo) {
+	/*if (!empty($mysoc->url)) {
+		print '<a href="'.$mysoc->url.'" target="_blank" rel="noopener">';
+	}*/
+	print '<img id="dolpaymentlogo" src="'.$urllogofull.'">';
+	/*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>';
+}*/
+print '</div>';
+
+
+if (!empty($conf->global->USER_IMAGE_PUBLIC_INTERFACE)) {
+	print '<div class="backimagepublicrecruitment">';
+	print '<img id="idUSER_IMAGE_PUBLIC_SUGGEST_BOOTH" src="'.$conf->global->USER_IMAGE_PUBLIC_INTERFACE.'">';
+	print '</div>';
+}
+
+$urlforqrcode = $_SERVER["PHP_SELF"].'?action=vcard&id='.((int) $object->id).'&securekey='.urlencode($securekey);
+
+// Show barcode
+$showbarcode = GETPOST('nobarcode') ? 0 : 1;
+if ($showbarcode) {
+	print '<br>';
+	print '<div class="floatleft inline-block valignmiddle divphotoref">';
+	print 'QRCODE...<br>';
+	print $urlforqrcode;
+	print '</div>';
+	print '<br>';
+	print '<br>';
+}
+
+
+print '<div class="opacitymedium">'.$langs->trans("Me").'</div>'."\n";
+print '<table id="dolpaymenttable" summary="Job position offer" class="center">'."\n";
+
+// Output payment summary form
+print '<tr><td class="left">';
+
+print '<div class="nowidthimp" id="tablepublicpayment">';
+
+print '<br>';
+
+// Add contact info
+print '...';
+
+print '<br>';
+
+
+print '</div>'."\n";
+print "\n";
+
+print '</td></tr>'."\n";
+
+print '</table>'."\n";
+
+
+
+
+print '<div class="opacitymedium">'.$langs->trans("MyCompany").'</div>'."\n";
+print '<table id="dolpaymenttable" summary="Job position offer" class="center">'."\n";
+
+// Output payment summary form
+print '<tr><td class="left">';
+
+print '<div class="nowidthimp" id="tablepublicpayment">';
+
+// Add company info
+
+
+// Show logo (search order: logo defined by ONLINE_SIGN_LOGO_suffix, then ONLINE_SIGN_LOGO_, then small company logo, large company logo, theme logo, common logo)
+// Define logo and logosmall
+$logosmall = $mysoc->logo_small;
+$logo = $mysoc->logo;
+$paramlogo = 'ONLINE_USER_LOGO_'.$suffix;
+if (!empty($conf->global->$paramlogo)) {
+	$logosmall = $conf->global->$paramlogo;
+} elseif (!empty($conf->global->ONLINE_USER_LOGO)) {
+	$logosmall = $conf->global->ONLINE_USER_LOGO;
+}
+//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
+// Define urllogo
+$urllogo = '';
+$urllogofull = '';
+if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall)) {
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$logosmall);
+	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
+} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo)) {
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$logo);
+	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
+}
+// Output html code for logo
+if ($urllogo) {
+	print '<div class="logopublicpayment">';
+	if (!empty($mysoc->url)) {
+		print '<a href="'.$mysoc->url.'" target="_blank" rel="noopener">';
+	}
+	print '<img id="dolpaymentlogo" src="'.$urllogofull.'">';
+	if (!empty($mysoc->url)) {
+		print '</a>';
+	}
+	print '</div>';
+}
+
+
+if ($mysoc->email) {
+	print '<br>';
+	print img_picto('', 'email', 'class="pictofixedwidth"').dol_print_email($mysoc->email, 0, 0, 1);
+	print '<br>';
+}
+
+if ($mysoc->url) {
+	print '<br>';
+	print img_picto('', 'globe', 'class="pictofixedwidth"');
+	//print 'rr';
+	print dol_print_url($mysoc->url, '_blank', 0, 0, '');
+	print '<br>';
+}
+
+
+print '</div>'."\n";
+print "\n";
+
+print '</td></tr>'."\n";
+
+print '</table>'."\n";
+
+
+
+// Description
+$text = getDolUserString('USER_PUBLIC_MORE', '', $object);
+print $text;
+
+
+print '</form>'."\n";
+print '</div>'."\n";
+print '<br>';
+
+
+//htmlPrintOnlinePaymentFooter($mysoc, $langs);
+
+print '<div class="backgreypublicpayment">';
+print '<div class="center">';
+print '<a href="'.$urlforqrcode.'">';
+print img_picto($langs->trans("AddTocontacts"), 'add').' ';
+print $langs->trans("AddTocontacts");
+print '</a>';
+print '</div>';
+//print '<div>';
+//print '</div>';
+print '</div>';
+
+llxFooter('', 'public');
+
+$db->close();
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 4f44ab20bad..983e571e399 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -910,7 +910,9 @@ textarea.centpercent {
 .nomarginright {
 	margin-<?php print $right; ?>: unset;
 }
-
+.nowidthimp {
+	width: unset !important;
+}
 .cursordefault {
 	cursor: default;
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 41c20074d6a..89358053ef3 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1147,6 +1147,9 @@ textarea.centpercent {
 .nomarginright {
 	margin-<?php print $right; ?>: unset;
 }
+.nowidthimp {
+	width: unset !important;
+}
 
 .cursordefault {
 	cursor: default;
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index f26d61da521..8fceddf313b 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1432,10 +1432,18 @@ if ($action == 'create' || $action == 'adduserldap') {
 		if ($action != 'edit') {
 			print dol_get_fiche_head($head, 'user', $title, -1, 'user');
 
-			$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid">';
+			$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid" rel="noopener">';
 			$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 			$morehtmlref .= '</a>';
 
+			//$urltovirtualcard = $object->getOnlineVirtualCardUrl();
+			$urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id);
+
+			$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->trans("PublicVirtualCardUrl"), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
+			/*$morehtmlref .= '<a href="'.$urltovirtualcard.'" class="refid" target="_blank" rel="noopener">';
+			$morehtmlref .= img_picto($langs->trans("PublicVirtualCardUrl"), 'id-card', 'class="valignmiddle marginleftonly paddingrightonly"');
+			$morehtmlref .= '</a>';*/
+
 			dol_banner_tab($object, 'id', $linkback, $user->hasRight("user", "user", "read") || $user->admin, 'rowid', 'ref', $morehtmlref);
 
 			print '<div class="fichecenter">';
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index a4d4c7acfe6..9104dd5cfd4 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -3786,6 +3786,30 @@ class User extends CommonObject
 		}
 	}
 
+	/**
+	 * Return string with full Url to virtual card
+	 *
+	 * @return	string				      Url string
+	 */
+	public function getOnlineVirtualCardUrl()
+	{
+		global $dolibarr_main_instance_unique_id, $dolibarr_main_url_root;
+		global $conf;
+
+		$encodedsecurekey = dol_hash($dolibarr_main_instance_unique_id.'uservirtualcard'.$this->id.'-'.$this->login, 'md5');
+		if (isModEnabled('multicompany')) {
+			$entity_qr = '&entity='.((int) $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
+
+		return $urlwithroot.'/public/users/view.php?id='.$this->id.'&securekey='.$encodedsecurekey.$entity_qr;
+	}
+
 	/**
 	 *	Load all objects into $this->users
 	 *
diff --git a/htdocs/user/info.php b/htdocs/user/info.php
index dfb1fe23d0b..3f5d1aea604 100644
--- a/htdocs/user/info.php
+++ b/htdocs/user/info.php
@@ -51,7 +51,7 @@ $feature2 = (($socid && $user->rights->user->self->creer) ? '' : 'user');
 $result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
 
 // If user is not user that 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) && empty($user->rights->user->user->lire)) {
 	accessforbidden();
 }
 
diff --git a/htdocs/user/vcard.php b/htdocs/user/vcard.php
index 6e7035d99ec..576d2b90a5b 100644
--- a/htdocs/user/vcard.php
+++ b/htdocs/user/vcard.php
@@ -21,8 +21,8 @@
 
 /**
  *	    \file       htdocs/user/vcard.php
- *      \ingroup    societe
- *		\brief      Onglet vcard d'un user
+ *      \ingroup    user
+ *		\brief      Page to return a user vcard
  */
 
 // Load Dolibarr environment
@@ -31,9 +31,6 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/vcard.class.php';
 
-$user2 = new User($db);
-
-
 $id = GETPOST('id', 'int');
 
 // Security check
@@ -44,106 +41,38 @@ if ($user->socid > 0) {
 $feature2 = 'user';
 $result = restrictedArea($user, 'user', $id, 'user', $feature2);
 
-
-$result = $user2->fetch($id);
+$object = new User($db);
+$result = $object->fetch($id);
 if ($result <= 0) {
-	dol_print_error($user2->error);
+	dol_print_error($object->error);
 	exit;
 }
 
-$physicalperson = 1;
-
+// Data from linked company
 $company = new Societe($db);
-if ($user2->socid) {
-	$result = $company->fetch($user2->socid);
+if ($object->socid > 0) {
+	$result = $company->fetch($object->socid);
 }
 
+
+/*
+ * View
+ */
+
 // We create VCard
 $v = new vCard();
-$v->setProdId('Dolibarr '.DOL_VERSION);
-
-$v->setUid('DOLIBARR-USERID-'.$user2->id);
-$v->setName($user2->lastname, $user2->firstname, "", $user2->civility_code, "");
-$v->setFormattedName($user2->getFullName($langs, 1));
-
-$v->setPhoneNumber($user2->office_phone, "TYPE=WORK;VOICE");
-$v->setPhoneNumber($user2->personal_mobile, "TYPE=HOME;VOICE");
-$v->setPhoneNumber($user2->user_mobile, "TYPE=CELL;VOICE");
-$v->setPhoneNumber($user2->office_fax, "TYPE=WORK;FAX");
-
-$country = $user2->country_code ? $user2->country : '';
-
-$v->setAddress("", "", $user2->address, $user2->town, $user2->state, $user2->zip, $country, "TYPE=WORK;POSTAL");
-$v->setLabel("", "", $user2->address, $user2->town, $user2->state, $user2->zip, $country, "TYPE=WORK");
-
-$v->setEmail($user2->email, "TYPE=WORK");
-$v->setNote($user2->note_public);
-$v->setTitle($user2->job);
-
-// Data from linked company
-if ($company->id) {
-	$v->setURL($company->url, "TYPE=WORK");
-	if (!$user2->office_phone) {
-		$v->setPhoneNumber($company->phone, "TYPE=WORK;VOICE");
-	}
-	if (!$user2->office_fax) {
-		$v->setPhoneNumber($company->fax, "TYPE=WORK;FAX");
-	}
-	if (!$user2->zip) {
-		$v->setAddress("", "", $company->address, $company->town, $company->state, $company->zip, $company->country, "TYPE=WORK;POSTAL");
-	}
-
-	// when company e-mail is empty, use only user e-mail
-	if (empty(trim($company->email))) {
-		// was set before, don't set twice
-	} elseif (empty(trim($user2->email))) {
-		// when user e-mail is empty, use only company e-mail
-		$v->setEmail($company->email, "TYPE=WORK");
-	} else {
-		$tmpuser2 = explode("@", trim($user2->email));
-		$tmpcompany = explode("@", trim($company->email));
-
-		if (strtolower(end($tmpuser2)) == strtolower(end($tmpcompany))) {
-			// when e-mail domain of user and company are the same, use user e-mail at first (and company e-mail at second)
-			$v->setEmail($user2->email, "TYPE=WORK");
-
-			// support by Microsoft Outlook (2019 and possible earlier)
-			$v->setEmail($company->email, 'INTERNET');
-		} else {
-			// when e-mail of user and company complete different use company e-mail at first (and user e-mail at second)
-			$v->setEmail($company->email, "TYPE=WORK");
-
-			// support by Microsoft Outlook (2019 and possible earlier)
-			$v->setEmail($user2->email, 'INTERNET');
-		}
-	}
-
-	// Si user lie a un tiers non de type "particulier"
-	if ($company->typent_code != 'TE_PRIVATE') {
-		$v->setOrg($company->name);
-	}
-}
-
-// Personal informations
-$v->setPhoneNumber($user2->personal_mobile, "TYPE=HOME;VOICE");
-if ($user2->birth) {
-	$v->setBirthday($user2->birth);
-}
-
-$db->close();
-
-// Renvoi la VCard au navigateur
-
-$output = $v->getVCard();
+$output = $v->buildVCardString($object, $company, $langs);
 
 $filename = trim(urldecode($v->getFileName())); // "Nom prenom.vcf"
 $filenameurlencoded = dol_sanitizeFileName(urlencode($filename));
 //$filename = dol_sanitizeFileName($filename);
 
+top_httphead('text/x-vcard; name="'.$filename.'"');
 
 header("Content-Disposition: attachment; filename=\"".$filename."\"");
 header("Content-Length: ".dol_strlen($output));
 header("Connection: close");
-header("Content-Type: text/x-vcard; name=\"".$filename."\"");
 
 print $output;
+
+$db->close();
diff --git a/htdocs/user/virtualcard.php b/htdocs/user/virtualcard.php
new file mode 100644
index 00000000000..30dc32ad01c
--- /dev/null
+++ b/htdocs/user/virtualcard.php
@@ -0,0 +1,248 @@
+<?php
+/* Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2015 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/>.
+ */
+
+/**
+ *      \file       htdocs/user/virtualcard.php
+ *      \ingroup    core
+ *		\brief      Page to setup a virtual card
+ */
+
+// 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';
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+
+// Load translation files required by page
+$langs->load("users");
+
+// Security check
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+
+$object = new User($db);
+if ($id > 0 || !empty($ref)) {
+	$result = $object->fetch($id, $ref, '', 1);
+	$object->getrights();
+}
+
+// Security check
+$socid = 0;
+if ($user->socid > 0) {
+	$socid = $user->socid;
+}
+$feature2 = (($socid && $user->rights->user->self->creer) ? '' : 'user');
+
+$result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
+
+// If user is not the user that read and has no permission to read other users, we stop
+if (($object->id != $user->id) && empty($user->rights->user->user->lire)) {
+	accessforbidden();
+}
+
+/*
+ * Actions
+ */
+
+if ($action == 'update') {
+	$tmparray = array();
+	$tmparray['USER_PUBLIC_COMPANY_NAME'] = (GETPOST('USER_PUBLIC_COMPANY_NAME') ? 1 : 0);
+	$tmparray['USER_PUBLIC_JOBPOSITION'] = (GETPOST('USER_PUBLIC_JOBPOSITION') ? 1 : 0);
+	$tmparray['USER_PUBLIC_EMAIL'] = (GETPOST('USER_PUBLIC_EMAIL') ? 1 : 0);
+	$tmparray['USER_PUBLIC_PHONE'] = (GETPOST('USER_PUBLIC_PHONE') ? 1 : 0);
+	$tmparray['USER_PUBLIC_SOCIALNETWORKS'] = (GETPOST('USER_PUBLIC_SOCIALNETWORKS') ? 1 : 0);
+	$tmparray['USER_PUBLIC_MORE'] = (GETPOST('USER_PUBLIC_MORE') ? GETPOST('USER_PUBLIC_MORE') : '');
+
+	dol_set_user_param($db, $conf, $object, $tmparray);
+}
+
+if ($action == 'setUSER_ENABLE_PUBLIC') {
+	if (GETPOST('value')) {
+		$tmparray = array('USER_ENABLE_PUBLIC' => 1);
+	} else {
+		$tmparray = array('USER_ENABLE_PUBLIC' => 0);
+	}
+	dol_set_user_param($db, $conf, $object, $tmparray);
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$person_name = !empty($object->firstname) ? $object->lastname.", ".$object->firstname : $object->lastname;
+$title = $person_name." - ".$langs->trans('Info');
+$help_url = '';
+llxHeader('', $title, $help_url);
+
+$head = user_prepare_head($object);
+
+$title = $langs->trans("User");
+//print dol_get_fiche_head($head, 'info', $title, -1, 'user');
+
+
+$linkback = '';
+
+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>';
+}
+
+$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid">';
+$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);
+
+
+print '<div class="fichecenter">';
+
+print '<br>';
+
+/*
+ print '<span class="opacitymedium">'.$langs->trans("VCard").'</span><br>';
+
+print '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid" rel="noopener">';
+print img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
+print '</a>';
+
+
+print '<hr>';
+//print '<div class="underbanner clearboth"></div>';
+
+print '<br>';
+*/
+
+print '<span class="opacitymedium">'.$langs->trans("UserPublicPageDesc").'</span><br><br>';
+
+$param = '&id='.((int) $object->id);
+
+$enabledisablehtml = $langs->trans("EnablePublicVirtualCard").' ';
+if (!getDolUserInt('USER_ENABLE_PUBLIC', 0, $object)) {
+	// Button off, click to enable
+	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setUSER_ENABLE_PUBLIC&token='.newToken().'&value=1'.$param.'">';
+	$enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
+	$enabledisablehtml .= '</a>';
+} else {
+	// Button on, click to disable
+	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setUSER_ENABLE_PUBLIC&token='.newToken().'&value=0'.$param.'">';
+	$enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
+	$enabledisablehtml .= '</a>';
+}
+print $enabledisablehtml;
+print '<input type="hidden" id="USER_ENABLE_PUBLIC" name="USER_ENABLE_PUBLIC" value="'.(empty($conf->global->USER_ENABLE_PUBLIC) ? 0 : 1).'">';
+
+print '<br><br>';
+
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+print '<input type="hidden" name="action" value="update">';
+print '<input type="hidden" name="id" value="'.$object->id.'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+
+if (getDolUserInt('USER_ENABLE_PUBLIC', 0, $object)) {
+	print '<br>';
+	//print $langs->trans('FollowingLinksArePublic').'<br>';
+	print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans('PublicVirtualCardUrl').'</span><br>';
+
+	$fullexternaleurltovirtualcard = $object->getOnlineVirtualCardUrl();
+
+	print '<div class="urllink">';
+	print '<input type="text" id="publicurluser" class="quatrevingtpercentminusx" value="'.$fullexternaleurltovirtualcard.'">';
+	print '<a target="_blank" rel="noopener noreferrer" href="'.$fullexternaleurltovirtualcard.'">'.img_picto('', 'globe', 'class="paddingleft"').'</a>';
+	print '</div>';
+	print ajax_autoselect('publicurluser');
+
+	print '<br>';
+
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("Parameter").'</td>';
+	print '<td>'.$langs->trans("Value").'</td>';
+	print "</tr>\n";
+
+	// Company name
+	print '<tr class="oddeven" id="tramount"><td>';
+	print $langs->trans("Company");
+	print '</td><td>';
+	//print '<input type="text" class="maxwidth300" id="USER_PUBLIC_COMPANY_NAME" name="USER_PUBLIC_COMPANY_NAME" value="'.(getDolUserString('USER_PUBLIC_COMPANY_NAME', $mysoc->name, $object) ? getDolUserString('USER_PUBLIC_COMPANY_NAME', $mysoc->name, $object) : 0).'">';
+	print $form->selectyesno("USER_PUBLIC_COMPANY_NAME", (getDolUserInt('USER_PUBLIC_COMPANY_NAME', 0, $object) ? getDolUserInt('USER_PUBLIC_COMPANY_NAME', 0, $object) : 0), 1);
+	print "</td></tr>\n";
+
+	// Job position
+	print '<tr class="oddeven" id="tredit"><td>';
+	print $langs->trans("PostOrFunction");
+	print '</td><td>';
+	print $form->selectyesno("USER_PUBLIC_JOBPOSITION", (getDolUserInt('USER_PUBLIC_JOBPOSITION', 0, $object) ? getDolUserInt('USER_PUBLIC_JOBPOSITION', 0, $object) : 0), 1);
+	print "</td></tr>\n";
+
+	// Email
+	print '<tr class="oddeven" id="tredit"><td>';
+	print $langs->trans("Email");
+	print '</td><td>';
+	print $form->selectyesno("USER_PUBLIC_EMAIL", (getDolUserInt('USER_PUBLIC_EMAIL', 0, $object) ? getDolUserInt('USER_PUBLIC_EMAIL', 0, $object) : 0), 1);
+	print "</td></tr>\n";
+
+	// Phone
+	print '<tr class="oddeven" id="tredit"><td>';
+	print $langs->trans("Phone");
+	print '</td><td>';
+	print $form->selectyesno("USER_PUBLIC_PHONE", (getDolUserInt('USER_PUBLIC_PHONE', 0, $object) ? getDolUserInt('USER_PUBLIC_PHONE', 0, $object) : 0), 1);
+	print "</td></tr>\n";
+
+	// Social networks
+	print '<tr class="oddeven" id="tredit"><td>';
+	print $langs->trans("SocialNetworks");
+	print '</td><td>';
+	print $form->selectyesno("USER_PUBLIC_SOCIALNETWORKS", (getDolUserInt('USER_PUBLIC_SOCIALNETWORKS', 0, $object) ? getDolUserInt('USER_PUBLIC_SOCIALNETWORKS', 0, $object) : 0), 1);
+	print "</td></tr>\n";
+
+	// More
+	print '<tr class="oddeven" id="tredit"><td>';
+	print $langs->trans("More");
+	print '</td><td>';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	$doleditor = new DolEditor('USER_PUBLIC_MORE', getDolUserString('USER_PUBLIC_MORE', '', $object), '', 160, 'dolibarr_notes', '', false, false, isModEnabled('fckeditor'), ROWS_5, '90%');
+	$doleditor->Create();
+	print "</td></tr>\n";
+
+	print '</table>';
+	print '</div>';
+
+	print '<div class="center">';
+	print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
+	print '</div>';
+}
+
+
+print dol_get_fiche_end();
+
+print '</form>';
+
+
+print '</div>';
+
+
+print dol_get_fiche_end();
+
+// End of page
+llxFooter();
+$db->close();

From 2c9e4495dbd4afca5765e08d36a61fcbb8072ca7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Jan 2023 04:43:09 +0100
Subject: [PATCH 367/816] Fix url

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

diff --git a/htdocs/public/recruitment/view.php b/htdocs/public/recruitment/view.php
index de8297d3ef0..3626693ce89 100644
--- a/htdocs/public/recruitment/view.php
+++ b/htdocs/public/recruitment/view.php
@@ -223,7 +223,7 @@ if ($urllogo) {
 	if (!empty($mysoc->url)) {
 		print '<a href="'.$mysoc->url.'" target="_blank" rel="noopener">';
 	}
-	print '<img id="dolpaymentlogo" src="'.$urllogo.'">';
+	print '<img id="dolpaymentlogo" src="'.$urllogofull.'">';
 	if (!empty($mysoc->url)) {
 		print '</a>';
 	}

From 183552461c796b326264820aebc21ee6b3ced1e2 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 7 Jan 2023 08:20:48 +0100
Subject: [PATCH 368/816] NEW Accountancy - Add an option to disable
 autolettering when transferring to accounting

---
 htdocs/accountancy/admin/index.php            | 28 +++++++++++++++++++
 htdocs/accountancy/journal/bankjournal.php    |  2 +-
 .../accountancy/journal/purchasesjournal.php  |  2 +-
 htdocs/accountancy/journal/sellsjournal.php   |  2 +-
 htdocs/langs/en_US/accountancy.lang           |  1 +
 5 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 244b6f72330..5caa92ec9ee 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -261,6 +261,20 @@ if ($action == 'setenablelettering') {
 	}
 }
 
+if ($action == 'setenableautolettering') {
+	$setenableautolettering = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "ACCOUNTING_ENABLE_AUTOLETTERING", $setenableautolettering, 'yesno', 0, '', $conf->entity);
+	if (!($res > 0)) {
+		$error++;
+	}
+
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'mesgs');
+	}
+}
+
 
 /*
  * View
@@ -479,6 +493,7 @@ if (!empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS)) {
 print '</tr>';
 
 print '</table>';
+print '<br>';
 
 // Lettering params
 print '<table class="noborder centpercent">';
@@ -499,6 +514,19 @@ if (!empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) {
 }
 print '</tr>';
 
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("ACCOUNTING_ENABLE_AUTOLETTERING").'</td>';
+if (!empty($conf->global->ACCOUNTING_ENABLE_AUTOLETTERING)) {
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setenableautolettering&value=0">';
+	print img_picto($langs->trans("Activated"), 'switch_on');
+	print '</a></td>';
+} else {
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setenableautolettering&value=1">';
+	print img_picto($langs->trans("Disabled"), 'switch_off');
+	print '</a></td>';
+}
+print '</tr>';
+
 print '</table>';
 
 print '<div class="center"><input type="submit" class="button button-edit" name="button" value="'.$langs->trans('Modify').'"></div>';
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 4aba6bfeda4..699002395ab 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -793,7 +793,7 @@ if (!$error && $action == 'writebookkeeping') {
 								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 							}
 						} else {
-							if ($lettering && getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING')) {
+							if ($lettering && getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING') && getDolGlobalInt('ACCOUNTING_ENABLE_AUTOLETTERING')) {
 								require_once DOL_DOCUMENT_ROOT . '/accountancy/class/lettering.class.php';
 								$lettering_static = new Lettering($db);
 								$nb_lettering = $lettering_static->bookkeepingLetteringAll(array($bookkeeping->id));
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index a5b82e7b2d0..746383fef0b 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -376,7 +376,7 @@ if ($action == 'writebookkeeping') {
 						setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 					}
 				} else {
-					if (getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING')) {
+					if (getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING') && getDolGlobalInt('ACCOUNTING_ENABLE_AUTOLETTERING')) {
 						require_once DOL_DOCUMENT_ROOT . '/accountancy/class/lettering.class.php';
 						$lettering_static = new Lettering($db);
 						$nb_lettering = $lettering_static->bookkeepingLettering(array($bookkeeping->id));
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 0519762baef..f67fd76b3f1 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -390,7 +390,7 @@ if ($action == 'writebookkeeping') {
 						setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 					}
 				} else {
-					if (getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING')) {
+					if (getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING') && getDolGlobalInt('ACCOUNTING_ENABLE_AUTOLETTERING')) {
 						require_once DOL_DOCUMENT_ROOT . '/accountancy/class/lettering.class.php';
 						$lettering_static = new Lettering($db);
 						$nb_lettering = $lettering_static->bookkeepingLettering(array($bookkeeping->id));
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 9822a52e8f0..5a1e51a2269 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -339,6 +339,7 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file

From 192d641b26e997b8a540eb3cd455b5704186cb7d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Jan 2023 11:29:43 +0100
Subject: [PATCH 369/816] Update for doxygen generation from command line

---
 build/doxygen/dolibarr-doxygen-build.pl |   10 +-
 build/doxygen/dolibarr-doxygen.doxyfile |   98 +-
 build/doxygen/doxygen-awesome.css       | 2413 +++++++++++++++++++++++
 3 files changed, 2477 insertions(+), 44 deletions(-)
 create mode 100644 build/doxygen/doxygen-awesome.css

diff --git a/build/doxygen/dolibarr-doxygen-build.pl b/build/doxygen/dolibarr-doxygen-build.pl
index 75a5cceddbe..5a4849a3a5b 100755
--- a/build/doxygen/dolibarr-doxygen-build.pl
+++ b/build/doxygen/dolibarr-doxygen-build.pl
@@ -17,9 +17,9 @@ use Cwd;
 my $dir = getcwd;
 
 print "Current dir is: $dir\n";
-print "Running dir for doxygen must be: $DIR\n";
+#print "Running dir for doxygen must be: $DIR\n";
 
-if (! -s $CONFFILE)
+if (! -s "build/doxygen/$CONFFILE")
 {
     print "Error: current directory for building Dolibarr doxygen documentation is not correct.\n";
     print "\n";
@@ -30,7 +30,7 @@ if (! -s $CONFFILE)
     exit 1;   
 }
 
-$SOURCE="../..";
+$SOURCE=".";
 
 # Get version $MAJOR, $MINOR and $BUILD
 $result = open( IN, "< " . $SOURCE . "/htdocs/filefunc.inc.php" );
@@ -47,8 +47,8 @@ $version=$MAJOR.".".$MINOR.".".$BUILD;
 
 
 print "Running doxygen for version ".$version.", please wait...\n";
-print "cat $CONFFILE | sed -e 's/x\.y\.z/".$version."/' | doxygen $OPTIONS - 2>&1\n";
-$result=`cat $CONFFILE | sed -e 's/x\.y\.z/$version/' | doxygen $OPTIONS - 2>&1`;
+print "cat build/doxygen/$CONFFILE | sed -e 's/x\.y\.z/".$version."/' | doxygen $OPTIONS - 2>&1\n";
+$result=`cat build/doxygen/$CONFFILE | sed -e 's/x\.y\.z/$version/' | doxygen $OPTIONS - 2>&1`;
 
 print $result;
 
diff --git a/build/doxygen/dolibarr-doxygen.doxyfile b/build/doxygen/dolibarr-doxygen.doxyfile
index 31400661ecc..6f668ebad7e 100644
--- a/build/doxygen/dolibarr-doxygen.doxyfile
+++ b/build/doxygen/dolibarr-doxygen.doxyfile
@@ -1,14 +1,17 @@
-# Doxyfile 1.7.3
+# Doxyfile 1.8.16
 
 # This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
+# doxygen (www.doxygen.org) for a project.
 #
-# All text after a hash (#) is considered a comment and will be ignored
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
 # The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
 
 #---------------------------------------------------------------------------
 # Project related configuration options
@@ -38,7 +41,7 @@ PROJECT_NUMBER = x.y.z
 # If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY = ../../build
+OUTPUT_DIRECTORY = build
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
 # 4096 sub-directories (in 2 levels) under the output directory of each output
@@ -114,7 +117,7 @@ FULL_PATH_NAMES = YES
 # If left blank the directory from which doxygen is run is used as the
 # path to strip.
 
-STRIP_FROM_PATH = "../.."
+STRIP_FROM_PATH = "/home/dolibarr/doxygen.dolibarr.org/"
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
 # the path mentioned in the documentation of a class, which tells
@@ -287,7 +290,7 @@ TYPEDEF_HIDES_STRUCT = NO
 # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
 # corresponding to a cache size of 2^16 = 65536 symbols
 
-SYMBOL_CACHE_SIZE = 0
+#SYMBOL_CACHE_SIZE = 0
 
 #---------------------------------------------------------------------------
 # Build related configuration options
@@ -448,7 +451,7 @@ GENERATE_TODOLIST = NO
 # disable (NO) the test list. This list is created by putting \test
 # commands in the documentation.
 
-GENERATE_TESTLIST = YES
+GENERATE_TESTLIST = NO
 
 # The GENERATE_BUGLIST tag can be used to enable (YES) or
 # disable (NO) the bug list. This list is created by putting \bug
@@ -487,7 +490,7 @@ SHOW_USED_FILES = YES
 # then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
 # in the documentation. The default is NO.
 
-SHOW_DIRECTORIES = YES
+#SHOW_DIRECTORIES = YES
 
 # Set the SHOW_FILES tag to NO to disable the generation of the Files page.
 # This will remove the Files entry from the Quick Index and from the
@@ -571,7 +574,7 @@ WARN_FORMAT = "$file:$line: $text"
 # and error messages should be written. If left blank the output is written
 # to stderr.
 
-WARN_LOGFILE = doxygen_warnings.log
+WARN_LOGFILE = build/html/doxygen_warnings.log
 
 #---------------------------------------------------------------------------
 # configuration options related to the input files
@@ -582,7 +585,7 @@ WARN_LOGFILE = doxygen_warnings.log
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT = ../../htdocs ../../scripts
+INPUT = htdocs scripts
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -611,7 +614,7 @@ RECURSIVE = YES
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE = ../../build ../../dev ../../doc ../../document ../../documents ../../htdocs/conf/conf.php ../../htdocs/custom ../../htdocs/document ../../htdocs/documents ../../htdocs/includes
+EXCLUDE = build dev doc document documents htdocs/conf/conf.php htdocs/custom htdocs/document htdocs/documents htdocs/includes htdocs/install/doctemplates
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or
 # directories that are symbolic links (a Unix filesystem feature) are excluded
@@ -625,7 +628,7 @@ EXCLUDE_SYMLINKS = YES
 # against the file with absolute path, so to exclude all test directories
 # for example use the pattern */test/*
 
-EXCLUDE_PATTERNS = */CVS/* *google* *pibarcode*
+EXCLUDE_PATTERNS = */CVS/*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
@@ -639,27 +642,27 @@ EXCLUDE_SYMBOLS =
 # directories that contain example code fragments that are included (see
 # the \include command).
 
-EXAMPLE_PATH = ../../htdocs/modulebuilder/template 
+#EXAMPLE_PATH = htdocs/modulebuilder/template 
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
 # and *.h) to filter out the source-files in the directories. If left
 # blank all files are included.
 
-EXAMPLE_PATTERNS = *.php
+#EXAMPLE_PATTERNS = *.php
 
 # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
 # searched for input files to be used with the \include or \dontinclude
 # commands irrespective of the value of the RECURSIVE tag.
 # Possible values are YES and NO. If left blank NO is used.
 
-EXAMPLE_RECURSIVE = NO
+#EXAMPLE_RECURSIVE = NO
 
 # The IMAGE_PATH tag can be used to specify one or more files or
 # directories that contain image that are included in the documentation (see
 # the \image command).
 
-IMAGE_PATH = ../../doc/images
+IMAGE_PATH = doc/images
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
@@ -762,7 +765,7 @@ ALPHABETICAL_INDEX = YES
 # the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
 # in which this list will be split (can be a number in the range [1..20])
 
-COLS_IN_ALPHA_INDEX = 5
+#COLS_IN_ALPHA_INDEX = 5
 
 # In case all classes in a project start with a common prefix, all
 # classes will be put under the same header in the alphabetical index.
@@ -775,14 +778,16 @@ IGNORE_PREFIX =
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
 
 GENERATE_HTML = YES
 
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_OUTPUT = html
 
@@ -797,14 +802,14 @@ HTML_FILE_EXTENSION = .html
 # standard header.
 
 # Does not work with 1.7.3
-#HTML_HEADER = doxygen_header.html
+#HTML_HEADER = build/doxygen/doxygen_header.html
 
 # The HTML_FOOTER tag can be used to specify a personal HTML footer for
 # each generated HTML page. If it is left blank doxygen will generate a
 # standard footer.
 
 # Does not work with 1.7.3
-HTML_FOOTER = doxygen_footer.html
+HTML_FOOTER = build/doxygen/doxygen_footer.html
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading
 # style sheet that is used by each HTML page. It can be used to
@@ -850,7 +855,18 @@ HTML_TIMESTAMP = YES
 # files or namespaces will be aligned in HTML using tables. If set to
 # NO a bullet list will be used.
 
-HTML_ALIGN_MEMBERS = YES
+#HTML_ALIGN_MEMBERS = YES
+
+# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
+# documentation will contain a main index with vertical navigation menus that
+# are dynamically created via Javascript. If disabled, the navigation index will
+# consists of multiple levels of tabs that are statically embedded in every HTML
+# page. Disable this option to support browsers that do not have Javascript,
+# like the Qt help browser.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_MENUS     = NO
 
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 # documentation will contain sections that can be hidden and shown after the
@@ -858,7 +874,7 @@ HTML_ALIGN_MEMBERS = YES
 # JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
 # Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
 
-HTML_DYNAMIC_SECTIONS = YES
+HTML_DYNAMIC_SECTIONS = NO
 
 # If the GENERATE_DOCSET tag is set to YES, additional index files
 # will be generated that can be used as input for Apple's Xcode 3
@@ -1003,7 +1019,7 @@ QHG_LOCATION =
 # the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
 # the help appears.
 
-GENERATE_ECLIPSEHELP = YES
+GENERATE_ECLIPSEHELP = NO
 
 # A unique identifier for the eclipse help plugin. When installing the plugin
 # the directory name containing the HTML and XML files should also have
@@ -1035,7 +1051,7 @@ GENERATE_TREEVIEW = NO
 # By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
 # and Class Hierarchy pages using a tree view instead of an ordered list.
 
-USE_INLINE_TREES = NO
+#USE_INLINE_TREES = NO
 
 # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
 # used to set the initial width (in pixels) of the frame in which the tree
@@ -1072,7 +1088,7 @@ FORMULA_TRANSPARENT = YES
 # typically be disabled. For large projects the javascript based search engine
 # can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
 
-SEARCHENGINE = NO
+SEARCHENGINE = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
 # implemented using a PHP enabled web server instead of at the web client
@@ -1082,7 +1098,7 @@ SEARCHENGINE = NO
 # full text search. The disadvances is that it is more difficult to setup
 # and does not have live searching capabilities.
 
-SERVER_BASED_SEARCH = NO
+SERVER_BASED_SEARCH = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -1260,13 +1276,13 @@ XML_OUTPUT = xml
 # which can be used by a validating XML parser to check the
 # syntax of the XML files.
 
-XML_SCHEMA = 
+#XML_SCHEMA = 
 
 # The XML_DTD tag can be used to specify an XML DTD,
 # which can be used by a validating XML parser to check the
 # syntax of the XML files.
 
-XML_DTD = 
+#XML_DTD = 
 
 # If the XML_PROGRAMLISTING tag is set to YES Doxygen will
 # dump the program listings (including syntax highlighting
@@ -1431,7 +1447,7 @@ EXTERNAL_GROUPS = YES
 # The PERL_PATH should be the absolute path and name of the perl script
 # interpreter (i.e. the result of `which perl').
 
-PERL_PATH = /usr/bin/perl
+#PERL_PATH = /usr/bin/perl
 
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
@@ -1453,7 +1469,7 @@ CLASS_DIAGRAMS = NO
 # the mscgen tool resides. If left empty the tool is assumed to be found in the
 # default search path.
 
-MSCGEN_PATH = 
+#MSCGEN_PATH = 
 
 # If set to YES, the inheritance and collaboration graphs will hide
 # inheritance and usage relations if the target is undocumented
@@ -1485,7 +1501,7 @@ DOT_NUM_THREADS = 0
 # DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
 # containing the font.
 
-DOT_FONTNAME = FreeSans.ttf
+#DOT_FONTNAME = FreeSans.ttf
 
 # The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
 # The default size is 10pt.
@@ -1634,3 +1650,7 @@ GENERATE_LEGEND = YES
 # the various graphs.
 
 DOT_CLEANUP = YES
+
+
+FULL_SIDEBAR = NO
+HTML_EXTRA_STYLESHEET = build/doxygen/doxygen-awesome.css
diff --git a/build/doxygen/doxygen-awesome.css b/build/doxygen/doxygen-awesome.css
new file mode 100644
index 00000000000..0b1c8c20892
--- /dev/null
+++ b/build/doxygen/doxygen-awesome.css
@@ -0,0 +1,2413 @@
+/**
+
+Doxygen Awesome
+https://github.com/jothepro/doxygen-awesome-css
+
+MIT License
+
+Copyright (c) 2021 - 2022 jothepro
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+*/
+
+html {
+    /* primary theme color. This will affect the entire websites color scheme: links, arrows, labels, ... */
+    --primary-color: #1779c4;
+    --primary-dark-color: #335c80;
+    --primary-light-color: #70b1e9;
+
+    /* page base colors */
+    --page-background-color: #ffffff;
+    --page-foreground-color: #2f4153;
+    --page-secondary-foreground-color: #6f7e8e;
+
+    /* color for all separators on the website: hr, borders, ... */
+    --separator-color: #dedede;
+
+    /* border radius for all rounded components. Will affect many components, like dropdowns, memitems, codeblocks, ... */
+    --border-radius-large: 8px;
+    --border-radius-small: 4px;
+    --border-radius-medium: 6px;
+
+    /* default spacings. Most components reference these values for spacing, to provide uniform spacing on the page. */
+    --spacing-small: 5px;
+    --spacing-medium: 10px;
+    --spacing-large: 16px;
+
+    /* default box shadow used for raising an element above the normal content. Used in dropdowns, search result, ... */
+    --box-shadow: 0 2px 8px 0 rgba(0,0,0,.075);
+
+    --odd-color: rgba(0,0,0,.028);
+
+    /* font-families. will affect all text on the website
+     * font-family: the normal font for text, headlines, menus
+     * font-family-monospace: used for preformatted text in memtitle, code, fragments
+     */
+    --font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif;
+    --font-family-monospace: ui-monospace,SFMono-Regular,SF Mono,Menlo,Consolas,Liberation Mono,monospace;
+
+    /* font sizes */
+    --page-font-size: 15.6px;
+    --navigation-font-size: 14.4px;
+    --toc-font-size: 13.4px;
+    --code-font-size: 14px; /* affects code, fragment */
+    --title-font-size: 22px;
+
+    /* content text properties. These only affect the page content, not the navigation or any other ui elements */
+    --content-line-height: 27px;
+    /* The content is centered and constraint in it's width. To make the content fill the whole page, set the variable to auto.*/
+    --content-maxwidth: 1050px;
+    --table-line-height: 24px;
+    --toc-sticky-top: var(--spacing-medium);
+    --toc-width: 200px;
+    --toc-max-height: calc(100vh - 2 * var(--spacing-medium) - 85px);
+
+    /* colors for various content boxes: @warning, @note, @deprecated @bug */
+    --warning-color: #f8d1cc;
+    --warning-color-dark: #b61825;
+    --warning-color-darker: #75070f;
+    --note-color: #faf3d8;
+    --note-color-dark: #f3a600;
+    --note-color-darker: #5f4204;
+    --todo-color: #e4f3ff;
+    --todo-color-dark: #1879C4;
+    --todo-color-darker: #274a5c;
+    --deprecated-color: #ecf0f3;
+    --deprecated-color-dark: #5b6269;
+    --deprecated-color-darker: #43454a;
+    --bug-color: #e4dafd;
+    --bug-color-dark: #5b2bdd;
+    --bug-color-darker: #2a0d72;
+    --invariant-color: #d8f1e3;
+    --invariant-color-dark: #44b86f;
+    --invariant-color-darker: #265532;
+
+    /* blockquote colors */
+    --blockquote-background: #f8f9fa;
+    --blockquote-foreground: #636568;
+
+    /* table colors */
+    --tablehead-background: #f1f1f1;
+    --tablehead-foreground: var(--page-foreground-color);
+
+    /* menu-display: block | none
+     * Visibility of the top navigation on screens >= 768px. On smaller screen the menu is always visible.
+     * `GENERATE_TREEVIEW` MUST be enabled!
+     */
+    --menu-display: block;
+
+    --menu-focus-foreground: var(--page-background-color);
+    --menu-focus-background: var(--primary-color);
+    --menu-selected-background: rgba(0,0,0,.05);
+
+
+    --header-background: var(--page-background-color);
+    --header-foreground: var(--page-foreground-color);
+
+    /* searchbar colors */
+    --searchbar-background: var(--side-nav-background);
+    --searchbar-foreground: var(--page-foreground-color);
+
+    /* searchbar size
+     * (`searchbar-width` is only applied on screens >= 768px.
+     * on smaller screens the searchbar will always fill the entire screen width) */
+    --searchbar-height: 33px;
+    --searchbar-width: 210px;
+    --searchbar-border-radius: var(--searchbar-height);
+
+    /* code block colors */
+    --code-background: #f5f5f5;
+    --code-foreground: var(--page-foreground-color);
+
+    /* fragment colors */
+    --fragment-background: #F8F9FA;
+    --fragment-foreground: #37474F;
+    --fragment-keyword: #bb6bb2;
+    --fragment-keywordtype: #8258b3;
+    --fragment-keywordflow: #d67c3b;
+    --fragment-token: #438a59;
+    --fragment-comment: #969696;
+    --fragment-link: #5383d6;
+    --fragment-preprocessor: #46aaa5;
+    --fragment-linenumber-color: #797979;
+    --fragment-linenumber-background: #f4f4f5;
+    --fragment-linenumber-border: #e3e5e7;
+    --fragment-lineheight: 20px;
+
+    /* sidebar navigation (treeview) colors */
+    --side-nav-background: #fbfbfb;
+    --side-nav-foreground: var(--page-foreground-color);
+    --side-nav-arrow-opacity: 0;
+    --side-nav-arrow-hover-opacity: 0.9;
+
+    --toc-background: var(--side-nav-background);
+    --toc-foreground: var(--side-nav-foreground);
+
+    /* height of an item in any tree / collapsable table */
+    --tree-item-height: 30px;
+
+    --memname-font-size: var(--code-font-size);
+    --memtitle-font-size: 18px;
+
+    --webkit-scrollbar-size: 7px;
+    --webkit-scrollbar-padding: 4px;
+    --webkit-scrollbar-color: var(--separator-color);
+}
+
+@media screen and (max-width: 767px) {
+    html {
+        --page-font-size: 16px;
+        --navigation-font-size: 16px;
+        --toc-font-size: 15px;
+        --code-font-size: 15px; /* affects code, fragment */
+        --title-font-size: 22px;
+    }
+}
+
+@media (prefers-color-scheme: dark) {
+    html:not(.light-mode) {
+        color-scheme: dark;
+
+        --primary-color: #1982d2;
+        --primary-dark-color: #86a9c4;
+        --primary-light-color: #4779ac;
+
+        --box-shadow: 0 2px 8px 0 rgba(0,0,0,.35);
+
+        --odd-color: rgba(100,100,100,.06);
+
+        --menu-selected-background: rgba(0,0,0,.4);
+
+        --page-background-color: #1C1D1F;
+        --page-foreground-color: #d2dbde;
+        --page-secondary-foreground-color: #859399;
+        --separator-color: #38393b;
+        --side-nav-background: #252628;
+
+        --code-background: #2a2c2f;
+
+        --tablehead-background: #2a2c2f;
+    
+        --blockquote-background: #222325;
+        --blockquote-foreground: #7e8c92;
+
+        --warning-color: #2e1917;
+        --warning-color-dark: #ad2617;
+        --warning-color-darker: #f5b1aa;
+        --note-color: #3b2e04;
+        --note-color-dark: #f1b602;
+        --note-color-darker: #ceb670;
+        --todo-color: #163750;
+        --todo-color-dark: #1982D2;
+        --todo-color-darker: #dcf0fa;
+        --deprecated-color: #2e323b;
+        --deprecated-color-dark: #738396;
+        --deprecated-color-darker: #abb0bd;
+        --bug-color: #2a2536;
+        --bug-color-dark: #7661b3;
+        --bug-color-darker: #ae9ed6;
+        --invariant-color: #303a35;
+        --invariant-color-dark: #76ce96;
+        --invariant-color-darker: #cceed5;
+
+        --fragment-background: #282c34;
+        --fragment-foreground: #dbe4eb;
+        --fragment-keyword: #cc99cd;
+        --fragment-keywordtype: #ab99cd;
+        --fragment-keywordflow: #e08000;
+        --fragment-token: #7ec699;
+        --fragment-comment: #999999;
+        --fragment-link: #98c0e3;
+        --fragment-preprocessor: #65cabe;
+        --fragment-linenumber-color: #cccccc;
+        --fragment-linenumber-background: #35393c;
+        --fragment-linenumber-border: #1f1f1f;
+    }
+}
+
+/* dark mode variables are defined twice, to support both the dark-mode without and with doxygen-awesome-darkmode-toggle.js */
+html.dark-mode {
+    color-scheme: dark;
+
+    --primary-color: #1982d2;
+    --primary-dark-color: #86a9c4;
+    --primary-light-color: #4779ac;
+
+    --box-shadow: 0 2px 8px 0 rgba(0,0,0,.30);
+
+    --odd-color: rgba(100,100,100,.06);
+
+    --menu-selected-background: rgba(0,0,0,.4);
+
+    --page-background-color: #1C1D1F;
+    --page-foreground-color: #d2dbde;
+    --page-secondary-foreground-color: #859399;
+    --separator-color: #38393b;
+    --side-nav-background: #252628;
+
+    --code-background: #2a2c2f;
+
+    --tablehead-background: #2a2c2f;
+
+    --blockquote-background: #222325;
+    --blockquote-foreground: #7e8c92;
+
+    --warning-color: #2e1917;
+    --warning-color-dark: #ad2617;
+    --warning-color-darker: #f5b1aa;
+    --note-color: #3b2e04;
+    --note-color-dark: #f1b602;
+    --note-color-darker: #ceb670;
+    --todo-color: #163750;
+    --todo-color-dark: #1982D2;
+    --todo-color-darker: #dcf0fa;
+    --deprecated-color: #2e323b;
+    --deprecated-color-dark: #738396;
+    --deprecated-color-darker: #abb0bd;
+    --bug-color: #2a2536;
+    --bug-color-dark: #7661b3;
+    --bug-color-darker: #ae9ed6;
+    --invariant-color: #303a35;
+    --invariant-color-dark: #76ce96;
+    --invariant-color-darker: #cceed5;
+
+    --fragment-background: #282c34;
+    --fragment-foreground: #dbe4eb;
+    --fragment-keyword: #cc99cd;
+    --fragment-keywordtype: #ab99cd;
+    --fragment-keywordflow: #e08000;
+    --fragment-token: #7ec699;
+    --fragment-comment: #999999;
+    --fragment-link: #98c0e3;
+    --fragment-preprocessor: #65cabe;
+    --fragment-linenumber-color: #cccccc;
+    --fragment-linenumber-background: #35393c;
+    --fragment-linenumber-border: #1f1f1f;
+}
+
+body {
+    color: var(--page-foreground-color);
+    background-color: var(--page-background-color);
+    font-size: var(--page-font-size);
+}
+
+body, table, div, p, dl, #nav-tree .label, .title,
+.sm-dox a, .sm-dox a:hover, .sm-dox a:focus, #projectname,
+.SelectItem, #MSearchField, .navpath li.navelem a,
+.navpath li.navelem a:hover, p.reference, p.definition {
+    font-family: var(--font-family);
+}
+
+h1, h2, h3, h4, h5 {
+    margin-top: .9em;
+    font-weight: 600;
+    line-height: initial;
+}
+
+p, div, table, dl, p.reference, p.definition {
+    font-size: var(--page-font-size);
+}
+
+p.reference, p.definition {
+    color: var(--page-secondary-foreground-color);
+}
+
+a:link, a:visited, a:hover, a:focus, a:active {
+    color: var(--primary-color) !important;
+    font-weight: 500;
+}
+
+a.anchor {
+    scroll-margin-top: var(--spacing-large);
+    display: block;
+}
+
+/*
+ Title and top navigation
+ */
+
+#top {
+    background: var(--header-background);
+    border-bottom: 1px solid var(--separator-color);
+}
+
+@media screen and (min-width: 768px) {
+    #top {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: space-between;
+        align-items: center;
+    }
+}
+
+#main-nav {
+    flex-grow: 5;
+    padding: var(--spacing-small) var(--spacing-medium);
+}
+
+#titlearea {
+    width: auto;
+    padding: var(--spacing-medium) var(--spacing-large);
+    background: none;
+    color: var(--header-foreground);
+    border-bottom: none;
+}
+
+@media screen and (max-width: 767px) {
+    #titlearea {
+        padding-bottom: var(--spacing-small);
+    }
+}
+
+#titlearea table tbody tr {
+    height: auto !important;
+}
+
+#projectname {
+    font-size: var(--title-font-size);
+    font-weight: 600;
+}
+
+#projectnumber {
+    font-family: inherit;
+    font-size: 60%;
+}
+
+#projectbrief {
+    font-family: inherit;
+    font-size: 80%;
+}
+
+#projectlogo {
+    vertical-align: middle;
+}
+
+#projectlogo img {
+    max-height: calc(var(--title-font-size) * 2);
+    margin-right: var(--spacing-small);
+}
+
+.sm-dox, .tabs, .tabs2, .tabs3 {
+    background: none;
+    padding: 0;
+}
+
+.tabs, .tabs2, .tabs3 {
+    border-bottom: 1px solid var(--separator-color);
+    margin-bottom: -1px;
+}
+
+.main-menu-btn-icon, .main-menu-btn-icon:before, .main-menu-btn-icon:after {
+    background: var(--page-secondary-foreground-color);
+}
+
+@media screen and (max-width: 767px) {
+    .sm-dox a span.sub-arrow {
+        background: var(--code-background);
+    }
+
+    #main-menu a.has-submenu span.sub-arrow {
+        color: var(--page-secondary-foreground-color);
+        border-radius: var(--border-radius-medium);
+    }
+
+    #main-menu a.has-submenu:hover span.sub-arrow {
+        color: var(--page-foreground-color);
+    }
+}
+
+@media screen and (min-width: 768px) {
+    .sm-dox li, .tablist li {
+        display: var(--menu-display);
+    }
+
+    .sm-dox a span.sub-arrow {
+        border-color: var(--header-foreground) transparent transparent transparent;
+    }
+
+    .sm-dox a:hover span.sub-arrow {
+        border-color: var(--menu-focus-foreground) transparent transparent transparent;
+    }
+
+    .sm-dox ul a span.sub-arrow {
+        border-color: transparent transparent transparent var(--page-foreground-color);
+    }
+
+    .sm-dox ul a:hover span.sub-arrow {
+        border-color: transparent transparent transparent var(--menu-focus-foreground);
+    }
+}
+
+.sm-dox ul {
+    background: var(--page-background-color);
+    box-shadow: var(--box-shadow);
+    border: 1px solid var(--separator-color);
+    border-radius: var(--border-radius-medium) !important;
+    padding: var(--spacing-small);
+    animation: ease-out 150ms slideInMenu;
+}
+
+@keyframes slideInMenu {
+    from {
+        opacity: 0;
+        transform: translate(0px, -2px);
+    }
+
+    to {
+        opacity: 1;
+        transform: translate(0px, 0px);
+    }
+}
+
+.sm-dox ul a {
+    color: var(--page-foreground-color) !important;
+    background: var(--page-background-color);
+    font-size: var(--navigation-font-size);
+}
+
+.sm-dox>li>ul:after {
+    border-bottom-color: var(--page-background-color) !important;
+}
+
+.sm-dox>li>ul:before {
+    border-bottom-color: var(--separator-color) !important;
+}
+
+.sm-dox ul a:hover, .sm-dox ul a:active, .sm-dox ul a:focus {
+    font-size: var(--navigation-font-size) !important;
+    color: var(--menu-focus-foreground) !important;
+    text-shadow: none;
+    background-color: var(--menu-focus-background);
+    border-radius: var(--border-radius-small) !important;
+}
+
+.sm-dox a, .sm-dox a:focus, .tablist li, .tablist li a, .tablist li.current a {
+    text-shadow: none;
+    background: transparent;
+    background-image: none !important;
+    color: var(--header-foreground) !important;
+    font-weight: normal;
+    font-size: var(--navigation-font-size);
+    border-radius: var(--border-radius-small) !important;
+}
+
+.sm-dox a:focus {
+    outline: auto;
+}
+
+.sm-dox a:hover, .sm-dox a:active, .tablist li a:hover {
+    text-shadow: none;
+    font-weight: normal;
+    background: var(--menu-focus-background);
+    color: var(--menu-focus-foreground) !important;
+    border-radius: var(--border-radius-small) !important;
+    font-size: var(--navigation-font-size);
+}
+
+.tablist li.current {
+    border-radius: var(--border-radius-small);
+    background: var(--menu-selected-background);
+}
+
+.tablist li {
+    margin: var(--spacing-small) 0 var(--spacing-small) var(--spacing-small);
+}
+
+.tablist a {
+    padding: 0 var(--spacing-large);
+}
+
+
+/*
+ Search box
+ */
+
+#MSearchBox {
+    height: var(--searchbar-height);
+    background: var(--searchbar-background);
+    border-radius: var(--searchbar-border-radius);
+    border: 1px solid var(--separator-color);
+    overflow: hidden;
+    width: var(--searchbar-width);
+    position: relative;
+    box-shadow: none;
+    display: block;
+    margin-top: 0;
+}
+
+/* until Doxygen 1.9.4 */
+.left img#MSearchSelect {
+    left: 0;
+    user-select: none;
+    padding-left: 8px;
+}
+
+/* Doxygen 1.9.5 */
+.left span#MSearchSelect {
+    left: 0;
+    user-select: none;
+    margin-left: 8px;
+    padding: 0;
+}
+
+.left #MSearchSelect[src$=".png"] {
+    padding-left: 0
+}
+
+.SelectionMark {
+    user-select: none;
+}
+
+.tabs .left #MSearchSelect {
+    padding-left: 0;
+}
+
+.tabs #MSearchBox {
+    position: absolute;
+    right: var(--spacing-medium);
+}
+
+@media screen and (max-width: 767px) {
+    .tabs #MSearchBox {
+        position: relative;
+        right: 0;
+        margin-left: var(--spacing-medium);
+        margin-top: 0;
+    }
+}
+
+#MSearchSelectWindow, #MSearchResultsWindow {
+    z-index: 9999;
+}
+
+#MSearchBox.MSearchBoxActive {
+    border-color: var(--primary-color);
+    box-shadow: inset 0 0 0 1px var(--primary-color);
+}
+
+#main-menu > li:last-child {
+    margin-right: 0;
+}
+
+@media screen and (max-width: 767px) {
+    #main-menu > li:last-child {
+        height: 50px;
+    }
+}
+
+#MSearchField {
+    font-size: var(--navigation-font-size);
+    height: calc(var(--searchbar-height) - 2px);
+    background: transparent;
+    width: calc(var(--searchbar-width) - 64px);
+}
+
+.MSearchBoxActive #MSearchField {
+    color: var(--searchbar-foreground);
+}
+
+#MSearchSelect {
+    top: calc(calc(var(--searchbar-height) / 2) - 11px);
+}
+
+#MSearchBox span.left, #MSearchBox span.right {
+    background: none;
+    background-image: none;
+}
+
+#MSearchBox span.right {
+    padding-top: calc(calc(var(--searchbar-height) / 2) - 12px);
+    position: absolute;
+    right: var(--spacing-small);
+}
+
+.tabs #MSearchBox span.right {
+    top: calc(calc(var(--searchbar-height) / 2) - 12px);
+}
+
+@keyframes slideInSearchResults {
+    from {
+        opacity: 0;
+        transform: translate(0, 15px);
+    }
+
+    to {
+        opacity: 1;
+        transform: translate(0, 20px);
+    }
+}
+
+#MSearchResultsWindow {
+    left: auto !important;
+    right: var(--spacing-medium);
+    border-radius: var(--border-radius-large);
+    border: 1px solid var(--separator-color);
+    transform: translate(0, 20px);
+    box-shadow: var(--box-shadow);
+    animation: ease-out 280ms slideInSearchResults;
+    background: var(--page-background-color);
+}
+
+iframe#MSearchResults {
+    margin: 4px;
+}
+
+iframe {
+    color-scheme: normal;
+}
+
+@media (prefers-color-scheme: dark) {
+    html:not(.light-mode) iframe#MSearchResults {
+        filter: invert() hue-rotate(180deg);
+    }
+}
+
+html.dark-mode iframe#MSearchResults {
+    filter: invert() hue-rotate(180deg);
+}
+
+#MSearchResults .SRPage {
+    background-color: transparent;
+}
+
+#MSearchResults .SRPage .SREntry {
+    font-size: 10pt;
+    padding: var(--spacing-small) var(--spacing-medium);
+}
+
+#MSearchSelectWindow {
+    border: 1px solid var(--separator-color);
+    border-radius: var(--border-radius-medium);
+    box-shadow: var(--box-shadow);
+    background: var(--page-background-color);
+    padding-top: var(--spacing-small);
+    padding-bottom: var(--spacing-small);
+}
+
+#MSearchSelectWindow a.SelectItem {
+    font-size: var(--navigation-font-size);
+    line-height: var(--content-line-height);
+    margin: 0 var(--spacing-small);
+    border-radius: var(--border-radius-small);
+    color: var(--page-foreground-color) !important;
+    font-weight: normal;
+}
+
+#MSearchSelectWindow a.SelectItem:hover {
+    background: var(--menu-focus-background);
+    color: var(--menu-focus-foreground) !important;
+}
+
+@media screen and (max-width: 767px) {
+    #MSearchBox {
+        margin-top: var(--spacing-medium);
+        margin-bottom: var(--spacing-medium);
+        width: calc(100vw - 30px);
+    }
+
+    #main-menu > li:last-child {
+        float: none !important;
+    }
+
+    #MSearchField {
+        width: calc(100vw - 110px);
+    }
+
+    @keyframes slideInSearchResultsMobile {
+        from {
+            opacity: 0;
+            transform: translate(0, 15px);
+        }
+
+        to {
+            opacity: 1;
+            transform: translate(0, 20px);
+        }
+    }
+
+    #MSearchResultsWindow {
+        left: var(--spacing-medium) !important;
+        right: var(--spacing-medium);
+        overflow: auto;
+        transform: translate(0, 20px);
+        animation: ease-out 280ms slideInSearchResultsMobile;
+        width: auto !important;
+    }
+
+    /*
+     * Overwrites for fixing the searchbox on mobile in doxygen 1.9.2
+     */
+    label.main-menu-btn ~ #searchBoxPos1 {
+        top: 3px !important;
+        right: 6px !important;
+        left: 45px;
+        display: flex;
+    }
+
+    label.main-menu-btn ~ #searchBoxPos1 > #MSearchBox {
+        margin-top: 0;
+        margin-bottom: 0;
+        flex-grow: 2;
+        float: left;
+    }
+}
+
+/*
+ Tree view
+ */
+
+#side-nav {
+    padding: 0 !important;
+    background: var(--side-nav-background);
+}
+
+@media screen and (max-width: 767px) {
+    #side-nav {
+        display: none;
+    }
+
+    #doc-content {
+        margin-left: 0 !important;
+    }
+}
+
+#nav-tree {
+    background: transparent;
+}
+
+#nav-tree .label {
+    font-size: var(--navigation-font-size);
+}
+
+#nav-tree .item {
+    height: var(--tree-item-height);
+    line-height: var(--tree-item-height);
+}
+
+#nav-sync {
+    bottom: 12px;
+    right: 12px;
+    top: auto !important;
+    user-select: none;
+}
+
+#nav-tree .selected {
+    text-shadow: none;
+    background-image: none;
+    background-color: transparent;
+    position: relative;
+}
+
+#nav-tree .selected::after {
+    content: "";
+    position: absolute;
+    top: 1px;
+    bottom: 1px;
+    left: 0;
+    width: 4px;
+    border-radius: 0 var(--border-radius-small) var(--border-radius-small) 0;
+    background: var(--primary-color);
+}
+
+
+#nav-tree a {
+    color: var(--side-nav-foreground) !important;
+    font-weight: normal;
+}
+
+#nav-tree a:focus {
+    outline-style: auto;
+}
+
+#nav-tree .arrow {
+    opacity: var(--side-nav-arrow-opacity);
+}
+
+.arrow {
+    color: inherit;
+    cursor: pointer;
+    font-size: 45%;
+    vertical-align: middle;
+    margin-right: 2px;
+    font-family: serif;
+    height: auto;
+    text-align: right;
+}
+
+#nav-tree div.item:hover .arrow, #nav-tree a:focus .arrow {
+    opacity: var(--side-nav-arrow-hover-opacity);
+}
+
+#nav-tree .selected a {
+    color: var(--primary-color) !important;
+    font-weight: bolder;
+    font-weight: 600;
+}
+
+.ui-resizable-e {
+    background: var(--separator-color);
+    width: 1px;
+}
+
+/*
+ Contents
+ */
+
+div.header {
+    border-bottom: 1px solid var(--separator-color);
+    background-color: var(--page-background-color);
+    background-image: none;
+}
+
+@media screen and (min-width: 1000px) {
+    #doc-content > div > div.contents,
+    .PageDoc > div.contents {
+        display: flex;
+        flex-direction: row-reverse;
+        flex-wrap: nowrap;
+        align-items: flex-start;
+    }
+    
+    div.contents .textblock {
+        min-width: 200px;
+        flex-grow: 1;
+    }
+}
+
+div.contents, div.header .title, div.header .summary {
+    max-width: var(--content-maxwidth);
+}
+
+div.contents, div.header .title  {
+    line-height: initial;
+    margin: calc(var(--spacing-medium) + .2em) auto var(--spacing-medium) auto;
+}
+
+div.header .summary {
+    margin: var(--spacing-medium) auto 0 auto;
+}
+
+div.headertitle {
+    padding: 0;
+}
+
+div.header .title {
+    font-weight: 600;
+    font-size: 225%;
+    padding: var(--spacing-medium) var(--spacing-large);
+    word-break: break-word;
+}
+
+div.header .summary {
+    width: auto;
+    display: block;
+    float: none;
+    padding: 0 var(--spacing-large);
+}
+
+td.memSeparator {
+    border-color: var(--separator-color);
+}
+
+span.mlabel {
+    background: var(--primary-color);
+    border: none;
+    padding: 4px 9px;
+    border-radius: 12px;
+    margin-right: var(--spacing-medium);
+}
+
+span.mlabel:last-of-type {
+    margin-right: 2px;
+}
+
+div.contents {
+    padding: 0 var(--spacing-large);
+}
+
+div.contents p, div.contents li {
+    line-height: var(--content-line-height);
+}
+
+div.contents div.dyncontent {
+    margin: var(--spacing-medium) 0;
+}
+
+@media (prefers-color-scheme: dark) {
+    html:not(.light-mode) div.contents div.dyncontent img,
+    html:not(.light-mode) div.contents center img,
+    html:not(.light-mode) div.contents > table img,
+    html:not(.light-mode) div.contents div.dyncontent iframe,
+    html:not(.light-mode) div.contents center iframe,
+    html:not(.light-mode) div.contents table iframe {
+        filter: hue-rotate(180deg) invert();
+    }
+}
+
+html.dark-mode div.contents div.dyncontent img,
+html.dark-mode div.contents center img,
+html.dark-mode div.contents > table img,
+html.dark-mode div.contents div.dyncontent iframe,
+html.dark-mode div.contents center iframe,
+html.dark-mode div.contents table iframe {
+    filter: hue-rotate(180deg) invert();
+}
+
+h2.groupheader {
+    border-bottom: 0px;
+    color: var(--page-foreground-color);
+    box-shadow: 
+        100px 0 var(--page-background-color), 
+        -100px 0 var(--page-background-color),
+        100px 0.75px var(--separator-color),
+        -100px 0.75px var(--separator-color),
+        500px 0 var(--page-background-color), 
+        -500px 0 var(--page-background-color),
+        500px 0.75px var(--separator-color),
+        -500px 0.75px var(--separator-color),
+        900px 0 var(--page-background-color), 
+        -900px 0 var(--page-background-color),
+        900px 0.75px var(--separator-color),
+        -900px 0.75px var(--separator-color),
+        1400px 0 var(--page-background-color),
+        -1400px 0 var(--page-background-color), 
+        1400px 0.75px var(--separator-color),
+        -1400px 0.75px var(--separator-color),
+        1900px 0 var(--page-background-color),
+        -1900px 0 var(--page-background-color),
+        1900px 0.75px var(--separator-color),
+        -1900px 0.75px var(--separator-color);
+}
+
+blockquote {
+    margin: 0 var(--spacing-medium) 0 var(--spacing-medium);
+    padding: var(--spacing-small) var(--spacing-large);
+    background: var(--blockquote-background);
+    color: var(--blockquote-foreground);
+    border-left: 0;
+    overflow: visible;
+    border-radius: var(--border-radius-medium);
+    overflow: visible;
+    position: relative;
+}
+
+blockquote::before, blockquote::after {
+    font-weight: bold;
+    font-family: serif;
+    font-size: 360%;
+    opacity: .15;
+    position: absolute;
+}
+
+blockquote::before {
+    content: "“";
+    left: -10px;
+    top: 4px;
+}
+
+blockquote::after {
+    content: "”";
+    right: -8px;
+    bottom: -25px;
+}
+
+blockquote p {
+    margin: var(--spacing-small) 0 var(--spacing-medium) 0;
+}
+.paramname {
+    font-weight: 600;
+    color: var(--primary-dark-color);
+}
+
+.paramname > code {
+    border: 0;
+}
+
+table.params .paramname {
+    font-weight: 600;
+    font-family: var(--font-family-monospace);
+    font-size: var(--code-font-size);
+    padding-right: var(--spacing-small);
+    line-height: var(--table-line-height);
+}
+
+h1.glow, h2.glow, h3.glow, h4.glow, h5.glow, h6.glow {
+    text-shadow: 0 0 15px var(--primary-light-color);
+}
+
+.alphachar a {
+    color: var(--page-foreground-color);
+}
+
+/*
+ Table of Contents
+ */
+
+div.contents .toc {
+    max-height: var(--toc-max-height);
+    min-width: var(--toc-width);
+    border: 0;
+    border-left: 1px solid var(--separator-color);
+    border-radius: 0;
+    background-color: transparent;
+    box-shadow: none;
+    position: sticky;
+    top: var(--toc-sticky-top);
+    padding: 0 var(--spacing-large);
+    margin: var(--spacing-small) 0 var(--spacing-large) var(--spacing-large);
+}
+
+div.toc h3 {
+    color: var(--toc-foreground);
+    font-size: var(--navigation-font-size);
+    margin: var(--spacing-large) 0 var(--spacing-medium) 0;
+}
+
+div.toc li {
+    padding: 0;
+    background: none;
+    line-height: var(--toc-font-size);
+    margin: var(--toc-font-size) 0 0 0;
+}
+
+div.toc li::before {
+    display: none;
+}
+
+div.toc ul {
+    margin-top: 0
+}
+
+div.toc li a {
+    font-size: var(--toc-font-size);
+    color: var(--page-foreground-color) !important;
+    text-decoration: none;
+}
+
+div.toc li a:hover, div.toc li a.active {
+    color: var(--primary-color) !important;
+}
+
+div.toc li a.aboveActive {
+    color: var(--page-secondary-foreground-color) !important;
+}
+
+
+@media screen and (max-width: 999px) {
+    div.contents .toc {
+        max-height: 45vh;
+        float: none;
+        width: auto;
+        margin: 0 0 var(--spacing-medium) 0;
+        position: relative;
+        top: 0;
+        position: relative;
+        border: 1px solid var(--separator-color);
+        border-radius: var(--border-radius-medium);
+        background-color: var(--toc-background);
+        box-shadow: var(--box-shadow);
+    }
+
+    div.contents .toc.interactive {
+        max-height: calc(var(--navigation-font-size) + 2 * var(--spacing-large));
+        overflow: hidden;
+    }
+
+    div.contents .toc > h3 {
+        -webkit-tap-highlight-color: transparent;
+        cursor: pointer;
+        position: sticky;
+        top: 0;
+        background-color: var(--toc-background);
+        margin: 0;
+        padding: var(--spacing-large) 0;
+        display: block;
+    }
+
+    div.contents .toc.interactive > h3::before {
+        content: "";
+        width: 0; 
+        height: 0; 
+        border-left: 4px solid transparent;
+        border-right: 4px solid transparent;
+        border-top: 5px solid var(--primary-color);
+        display: inline-block;
+        margin-right: var(--spacing-small);
+        margin-bottom: calc(var(--navigation-font-size) / 4);
+        transform: rotate(-90deg);
+        transition: transform 0.25s ease-out;
+    }
+
+    div.contents .toc.interactive.open > h3::before {
+        transform: rotate(0deg);
+    }
+
+    div.contents .toc.interactive.open {
+        max-height: 45vh;
+        overflow: auto;
+        transition: max-height 0.2s ease-in-out;
+    }
+
+    div.contents .toc a, div.contents .toc a.active {
+        color: var(--primary-color) !important;
+    }
+
+    div.contents .toc a:hover {
+        text-decoration: underline;
+    }
+}
+
+/*
+ Code & Fragments
+ */
+
+code, div.fragment, pre.fragment {
+    border-radius: var(--border-radius-small);
+    border: 1px solid var(--separator-color);
+    overflow: hidden;
+}
+
+code {
+    display: inline;
+    background: var(--code-background);
+    color: var(--code-foreground);
+    padding: 2px 6px;
+}
+
+div.fragment, pre.fragment {
+    margin: var(--spacing-medium) 0;
+    padding: calc(var(--spacing-large) - (var(--spacing-large) / 6)) var(--spacing-large);
+    background: var(--fragment-background);
+    color: var(--fragment-foreground);
+    overflow-x: auto;
+}
+
+@media screen and (max-width: 767px) {
+    div.fragment, pre.fragment {
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
+        border-right: 0;
+    }
+
+    .contents > div.fragment,
+    .textblock > div.fragment,
+    .textblock > pre.fragment,
+    .contents > .doxygen-awesome-fragment-wrapper > div.fragment,
+    .textblock > .doxygen-awesome-fragment-wrapper > div.fragment,
+    .textblock > .doxygen-awesome-fragment-wrapper > pre.fragment {
+        margin: var(--spacing-medium) calc(0px - var(--spacing-large));
+        border-radius: 0;
+        border-left: 0;
+    }
+
+    .textblock li > .fragment,
+    .textblock li > .doxygen-awesome-fragment-wrapper > .fragment {
+        margin: var(--spacing-medium) calc(0px - var(--spacing-large));
+    }
+
+    .memdoc li > .fragment,
+    .memdoc li > .doxygen-awesome-fragment-wrapper > .fragment {
+        margin: var(--spacing-medium) calc(0px - var(--spacing-medium));
+    }
+
+    .textblock ul, .memdoc ul {
+        overflow: initial;
+    }
+
+    .memdoc > div.fragment,
+    .memdoc > pre.fragment,
+    dl dd > div.fragment,
+    dl dd pre.fragment,
+    .memdoc > .doxygen-awesome-fragment-wrapper > div.fragment,
+    .memdoc > .doxygen-awesome-fragment-wrapper > pre.fragment,
+    dl dd > .doxygen-awesome-fragment-wrapper > div.fragment,
+    dl dd .doxygen-awesome-fragment-wrapper > pre.fragment {
+        margin: var(--spacing-medium) calc(0px - var(--spacing-medium));
+        border-radius: 0;
+        border-left: 0;
+    }
+}
+
+code, code a, pre.fragment, div.fragment, div.fragment .line, div.fragment span, div.fragment .line a, div.fragment .line span {
+    font-family: var(--font-family-monospace);
+    font-size: var(--code-font-size) !important;
+}
+
+div.line:after {
+    margin-right: var(--spacing-medium);
+}
+
+div.fragment .line, pre.fragment {
+    white-space: pre;
+    word-wrap: initial;
+    line-height: var(--fragment-lineheight);
+}
+
+div.fragment span.keyword {
+    color: var(--fragment-keyword);
+}
+
+div.fragment span.keywordtype {
+    color: var(--fragment-keywordtype);
+}
+
+div.fragment span.keywordflow {
+    color: var(--fragment-keywordflow);
+}
+
+div.fragment span.stringliteral {
+    color: var(--fragment-token)
+}
+
+div.fragment span.comment {
+    color: var(--fragment-comment);
+}
+
+div.fragment a.code {
+    color: var(--fragment-link) !important;
+}
+
+div.fragment span.preprocessor {
+    color: var(--fragment-preprocessor);
+}
+
+div.fragment span.lineno {
+    display: inline-block;
+    width: 27px;
+    border-right: none;
+    background: var(--fragment-linenumber-background);
+    color: var(--fragment-linenumber-color);
+}
+
+div.fragment span.lineno a {
+    background: none;
+    color: var(--fragment-link) !important;
+}
+
+div.fragment .line:first-child .lineno {
+    box-shadow: -999999px 0px 0 999999px var(--fragment-linenumber-background), -999998px 0px 0 999999px var(--fragment-linenumber-border);
+}
+
+div.line {
+    border-radius: var(--border-radius-small);
+}
+
+div.line.glow {
+    background-color: var(--primary-light-color);
+    box-shadow: none;
+}
+
+/*
+ dl warning, attention, note, deprecated, bug, ...
+ */
+
+dl.bug dt a, dl.deprecated dt a, dl.todo dt a {
+    font-weight: bold !important;
+}
+
+dl.warning, dl.attention, dl.note, dl.deprecated, dl.bug, dl.invariant, dl.pre, dl.todo, dl.remark {
+    padding: var(--spacing-medium);
+    margin: var(--spacing-medium) 0;
+    color: var(--page-background-color);
+    overflow: hidden;
+    margin-left: 0;
+    border-radius: var(--border-radius-small);
+}
+
+dl.section dd {
+    margin-bottom: 2px;
+}
+
+dl.warning, dl.attention {
+    background: var(--warning-color);
+    border-left: 8px solid var(--warning-color-dark);
+    color: var(--warning-color-darker);
+}
+
+dl.warning dt, dl.attention dt {
+    color: var(--warning-color-dark);
+}
+
+dl.note, dl.remark {
+    background: var(--note-color);
+    border-left: 8px solid var(--note-color-dark);
+    color: var(--note-color-darker);
+}
+
+dl.note dt, dl.remark dt {
+    color: var(--note-color-dark);
+}
+
+dl.todo {
+    background: var(--todo-color);
+    border-left: 8px solid var(--todo-color-dark);
+    color: var(--todo-color-darker);
+}
+
+dl.todo dt {
+    color: var(--todo-color-dark);
+}
+
+dl.bug dt a {
+    color: var(--todo-color-dark) !important;
+}
+
+dl.bug {
+    background: var(--bug-color);
+    border-left: 8px solid var(--bug-color-dark);
+    color: var(--bug-color-darker);
+}
+
+dl.bug dt a {
+    color: var(--bug-color-dark) !important;
+}
+
+dl.deprecated {
+    background: var(--deprecated-color);
+    border-left: 8px solid var(--deprecated-color-dark);
+    color: var(--deprecated-color-darker);
+}
+
+dl.deprecated dt a {
+    color: var(--deprecated-color-dark) !important;
+}
+
+dl.section dd, dl.bug dd, dl.deprecated dd, dl.todo dd {
+    margin-inline-start: 0px;
+}
+
+dl.invariant, dl.pre {
+    background: var(--invariant-color);
+    border-left: 8px solid var(--invariant-color-dark);
+    color: var(--invariant-color-darker);
+}
+
+dl.invariant dt, dl.pre dt {
+    color: var(--invariant-color-dark);
+}
+
+/*
+ memitem
+ */
+
+div.memdoc, div.memproto, h2.memtitle {
+    box-shadow: none;
+    background-image: none;
+    border: none;
+}
+
+div.memdoc {
+    padding: 0 var(--spacing-medium);
+    background: var(--page-background-color);
+}
+
+h2.memtitle, div.memitem {
+    border: 1px solid var(--separator-color);
+    box-shadow: var(--box-shadow);
+}
+
+h2.memtitle {
+    box-shadow: 0px var(--spacing-medium) 0 -1px var(--fragment-background), var(--box-shadow);
+}
+
+div.memitem {
+    transition: none;
+}
+
+div.memproto, h2.memtitle {
+    background: var(--fragment-background);
+}
+
+h2.memtitle {
+    font-weight: 500;
+    font-size: var(--memtitle-font-size);
+    font-family: var(--font-family-monospace);
+    border-bottom: none;
+    border-top-left-radius: var(--border-radius-medium);
+    border-top-right-radius: var(--border-radius-medium);
+    word-break: break-all;
+    position: relative;
+}
+
+h2.memtitle:after {
+    content: "";
+    display: block;
+    background: var(--fragment-background);
+    height: var(--spacing-medium);
+    bottom: calc(0px - var(--spacing-medium));
+    left: 0;
+    right: -14px;
+    position: absolute;
+    border-top-right-radius: var(--border-radius-medium);
+}
+
+h2.memtitle > span.permalink {
+    font-size: inherit;
+}
+
+h2.memtitle > span.permalink > a {
+    text-decoration: none;
+    padding-left: 3px;
+    margin-right: -4px;
+    user-select: none;
+    display: inline-block;
+    margin-top: -6px;
+}
+
+h2.memtitle > span.permalink > a:hover {
+    color: var(--primary-dark-color) !important;
+}
+
+a:target + h2.memtitle, a:target + h2.memtitle + div.memitem {
+    border-color: var(--primary-light-color);
+}
+
+div.memitem {
+    border-top-right-radius: var(--border-radius-medium);
+    border-bottom-right-radius: var(--border-radius-medium);
+    border-bottom-left-radius: var(--border-radius-medium);
+    overflow: hidden;
+    display: block !important;
+}
+
+div.memdoc {
+    border-radius: 0;
+}
+
+div.memproto {
+    border-radius: 0 var(--border-radius-small) 0 0;
+    overflow: auto;
+    border-bottom: 1px solid var(--separator-color);
+    padding: var(--spacing-medium);
+    margin-bottom: -1px;
+}
+
+div.memtitle {
+    border-top-right-radius: var(--border-radius-medium);
+    border-top-left-radius: var(--border-radius-medium);
+}
+
+div.memproto table.memname {
+    font-family: var(--font-family-monospace);
+    color: var(--page-foreground-color);
+    font-size: var(--memname-font-size);
+    text-shadow: none;
+}
+
+div.memproto div.memtemplate {
+    font-family: var(--font-family-monospace);
+    color: var(--primary-dark-color);
+    font-size: var(--memname-font-size);
+    margin-left: 2px;
+    text-shadow: none;
+}
+
+table.mlabels, table.mlabels > tbody {
+    display: block;
+}
+
+td.mlabels-left {
+    width: auto;
+}
+
+td.mlabels-right {
+    margin-top: 3px;
+    position: sticky;
+    left: 0;
+}
+
+table.mlabels > tbody > tr:first-child {
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+}
+
+.memname, .memitem span.mlabels {
+    margin: 0
+}
+
+/*
+ reflist
+ */
+
+dl.reflist {
+    box-shadow: var(--box-shadow);
+    border-radius: var(--border-radius-medium);
+    border: 1px solid var(--separator-color);
+    overflow: hidden;
+    padding: 0;
+}
+
+
+dl.reflist dt, dl.reflist dd {
+    box-shadow: none;
+    text-shadow: none;
+    background-image: none;
+    border: none;
+    padding: 12px;
+}
+
+
+dl.reflist dt {
+    font-weight: 500;
+    border-radius: 0;
+    background: var(--code-background);
+    border-bottom: 1px solid var(--separator-color);
+    color: var(--page-foreground-color)
+}
+
+
+dl.reflist dd {
+    background: none;
+}
+
+/*
+ Table
+ */
+
+.contents table:not(.memberdecls):not(.mlabels):not(.fieldtable):not(.memname),
+.contents table:not(.memberdecls):not(.mlabels):not(.fieldtable):not(.memname) tbody {
+    display: inline-block;
+    max-width: 100%;
+}
+
+.contents > table:not(.memberdecls):not(.mlabels):not(.fieldtable):not(.memname):not(.classindex) {
+    margin-left: calc(0px - var(--spacing-large));
+    margin-right: calc(0px - var(--spacing-large));
+    max-width: calc(100% + 2 * var(--spacing-large));
+}
+
+table.fieldtable,
+table.markdownTable tbody,
+table.doxtable tbody {
+    border: none;
+    margin: var(--spacing-medium) 0;
+    box-shadow: 0 0 0 1px var(--separator-color);
+    border-radius: var(--border-radius-small);
+}
+
+table.doxtable caption {
+    display: block;
+}
+
+table.fieldtable {
+    border-collapse: collapse;
+    width: 100%;
+}
+
+th.markdownTableHeadLeft,
+th.markdownTableHeadRight,
+th.markdownTableHeadCenter,
+th.markdownTableHeadNone,
+table.doxtable th {
+    background: var(--tablehead-background);
+    color: var(--tablehead-foreground);
+    font-weight: 600;
+    font-size: var(--page-font-size);
+}
+
+th.markdownTableHeadLeft:first-child,
+th.markdownTableHeadRight:first-child,
+th.markdownTableHeadCenter:first-child,
+th.markdownTableHeadNone:first-child,
+table.doxtable tr th:first-child {
+    border-top-left-radius: var(--border-radius-small);
+}
+
+th.markdownTableHeadLeft:last-child,
+th.markdownTableHeadRight:last-child,
+th.markdownTableHeadCenter:last-child,
+th.markdownTableHeadNone:last-child,
+table.doxtable tr th:last-child {
+    border-top-right-radius: var(--border-radius-small);
+}
+
+table.markdownTable td,
+table.markdownTable th,
+table.fieldtable td,
+table.fieldtable th,
+table.doxtable td,
+table.doxtable th {
+    border: 1px solid var(--separator-color);
+    padding: var(--spacing-small) var(--spacing-medium);
+}
+
+table.markdownTable td:last-child,
+table.markdownTable th:last-child,
+table.fieldtable td:last-child,
+table.fieldtable th:last-child,
+table.doxtable td:last-child,
+table.doxtable th:last-child {
+    border-right: none;
+}
+
+table.markdownTable td:first-child,
+table.markdownTable th:first-child,
+table.fieldtable td:first-child,
+table.fieldtable th:first-child,
+table.doxtable td:first-child,
+table.doxtable th:first-child {
+    border-left: none;
+}
+
+table.markdownTable tr:first-child td,
+table.markdownTable tr:first-child th,
+table.fieldtable tr:first-child td,
+table.fieldtable tr:first-child th,
+table.doxtable tr:first-child td,
+table.doxtable tr:first-child th {
+    border-top: none;
+}
+
+table.markdownTable tr:last-child td,
+table.markdownTable tr:last-child th,
+table.fieldtable tr:last-child td,
+table.fieldtable tr:last-child th,
+table.doxtable tr:last-child td,
+table.doxtable tr:last-child th {
+    border-bottom: none;
+}
+
+table.markdownTable tr, table.doxtable tr {
+    border-bottom: 1px solid var(--separator-color);
+}
+
+table.markdownTable tr:last-child, table.doxtable tr:last-child {
+    border-bottom: none;
+}
+
+table.fieldtable th {
+    font-size: var(--page-font-size);
+    font-weight: 600;
+    background-image: none;
+    background-color: var(--tablehead-background);
+    color: var(--tablehead-foreground);
+}
+
+table.fieldtable td.fieldtype, .fieldtable td.fieldname, .fieldtable td.fielddoc, .fieldtable th {
+    border-bottom: 1px solid var(--separator-color);
+    border-right: 1px solid var(--separator-color);
+}
+
+table.fieldtable tr:last-child td:first-child {
+    border-bottom-left-radius: var(--border-radius-small);
+}
+
+table.fieldtable tr:last-child td:last-child {
+    border-bottom-right-radius: var(--border-radius-small);
+}
+
+.memberdecls td.glow, .fieldtable tr.glow {
+    background-color: var(--primary-light-color);
+    box-shadow: none;
+}
+
+table.memberdecls {
+    display: block;
+    -webkit-tap-highlight-color: transparent;
+}
+
+table.memberdecls tr[class^='memitem'] {
+    font-family: var(--font-family-monospace);
+    font-size: var(--code-font-size);
+}
+
+table.memberdecls tr[class^='memitem'] .memTemplParams {
+    font-family: var(--font-family-monospace);
+    font-size: var(--code-font-size);
+    color: var(--primary-dark-color);
+    white-space: normal;
+}
+
+table.memberdecls .memItemLeft,
+table.memberdecls .memItemRight,
+table.memberdecls .memTemplItemLeft,
+table.memberdecls .memTemplItemRight,
+table.memberdecls .memTemplParams {
+    transition: none;
+    padding-top: var(--spacing-small);
+    padding-bottom: var(--spacing-small);
+    border-top: 1px solid var(--separator-color);
+    border-bottom: 1px solid var(--separator-color);
+    background-color: var(--fragment-background);
+}
+
+table.memberdecls .memTemplItemLeft,
+table.memberdecls .memTemplItemRight {
+    padding-top: 2px;
+}
+
+table.memberdecls .memTemplParams {
+    border-bottom: 0;
+    border-left: 1px solid var(--separator-color);
+    border-right: 1px solid var(--separator-color);
+    border-radius: var(--border-radius-small) var(--border-radius-small) 0 0;
+    padding-bottom: var(--spacing-small);
+}
+
+table.memberdecls .memTemplItemLeft {
+    border-radius: 0 0 0 var(--border-radius-small);
+    border-left: 1px solid var(--separator-color);
+    border-top: 0;
+}
+
+table.memberdecls .memTemplItemRight {
+    border-radius: 0 0 var(--border-radius-small) 0;
+    border-right: 1px solid var(--separator-color);
+    padding-left: 0;
+    border-top: 0;
+}
+
+table.memberdecls .memItemLeft {
+    border-radius: var(--border-radius-small) 0 0 var(--border-radius-small);
+    border-left: 1px solid var(--separator-color);
+    padding-left: var(--spacing-medium);
+    padding-right: 0;
+}
+
+table.memberdecls .memItemRight  {
+    border-radius: 0 var(--border-radius-small) var(--border-radius-small) 0;
+    border-right: 1px solid var(--separator-color);
+    padding-right: var(--spacing-medium);
+    padding-left: 0;
+
+}
+
+table.memberdecls .mdescLeft, table.memberdecls .mdescRight {
+    background: none;
+    color: var(--page-foreground-color);
+    padding: var(--spacing-small) 0;
+}
+
+table.memberdecls .memItemLeft,
+table.memberdecls .memTemplItemLeft {
+    padding-right: var(--spacing-medium);
+}
+
+table.memberdecls .memSeparator {
+    background: var(--page-background-color);
+    height: var(--spacing-large);
+    border: 0;
+    transition: none;
+}
+
+table.memberdecls .groupheader {
+    margin-bottom: var(--spacing-large);
+}
+
+table.memberdecls .inherit_header td {
+    padding: 0 0 var(--spacing-medium) 0;
+    text-indent: -12px;
+    color: var(--page-secondary-foreground-color);
+}
+
+table.memberdecls img[src="closed.png"],
+table.memberdecls img[src="open.png"],
+div.dynheader img[src="open.png"],
+div.dynheader img[src="closed.png"] {
+    width: 0; 
+    height: 0; 
+    border-left: 4px solid transparent;
+    border-right: 4px solid transparent;
+    border-top: 5px solid var(--primary-color);
+    margin-top: 8px;
+    display: block;
+    float: left;
+    margin-left: -10px;
+    transition: transform 0.25s ease-out;
+}
+
+table.memberdecls img {
+    margin-right: 10px;
+}
+
+table.memberdecls img[src="closed.png"],
+div.dynheader img[src="closed.png"] {
+    transform: rotate(-90deg);
+    
+}
+
+.compoundTemplParams {
+    font-family: var(--font-family-monospace);
+    color: var(--primary-dark-color);
+    font-size: var(--code-font-size);
+}
+
+@media screen and (max-width: 767px) {
+
+    table.memberdecls .memItemLeft,
+    table.memberdecls .memItemRight,
+    table.memberdecls .mdescLeft,
+    table.memberdecls .mdescRight,
+    table.memberdecls .memTemplItemLeft,
+    table.memberdecls .memTemplItemRight,
+    table.memberdecls .memTemplParams {
+        display: block;
+        text-align: left;
+        padding-left: var(--spacing-large);
+        margin: 0 calc(0px - var(--spacing-large)) 0 calc(0px - var(--spacing-large));
+        border-right: none;
+        border-left: none;
+        border-radius: 0;
+        white-space: normal;
+    }
+
+    table.memberdecls .memItemLeft,
+    table.memberdecls .mdescLeft,
+    table.memberdecls .memTemplItemLeft {
+        border-bottom: 0;
+        padding-bottom: 0;
+    }
+
+    table.memberdecls .memTemplItemLeft {
+        padding-top: 0;
+    }
+
+    table.memberdecls .mdescLeft {
+        margin-bottom: calc(0px - var(--page-font-size));
+    }
+
+    table.memberdecls .memItemRight, 
+    table.memberdecls .mdescRight,
+    table.memberdecls .memTemplItemRight {
+        border-top: 0;
+        padding-top: 0;
+        padding-right: var(--spacing-large);
+        overflow-x: auto;
+    }
+
+    table.memberdecls tr[class^='memitem']:not(.inherit) {
+        display: block;
+        width: calc(100vw - 2 * var(--spacing-large));
+    }
+
+    table.memberdecls .mdescRight {
+        color: var(--page-foreground-color);
+    }
+
+    table.memberdecls tr.inherit {
+        visibility: hidden;
+    }
+
+    table.memberdecls tr[style="display: table-row;"] {
+        display: block !important;
+        visibility: visible;
+        width: calc(100vw - 2 * var(--spacing-large));
+        animation: fade .5s;
+    }
+
+    @keyframes fade {
+        0% {
+            opacity: 0;
+            max-height: 0;
+        }
+
+        100% {
+            opacity: 1;
+            max-height: 200px;
+        }
+    }
+}
+
+
+/*
+ Horizontal Rule
+ */
+
+hr {
+    margin-top: var(--spacing-large);
+    margin-bottom: var(--spacing-large);
+    height: 1px;
+    background-color: var(--separator-color);
+    border: 0;
+}
+
+.contents hr {
+    box-shadow: 100px 0 0 var(--separator-color),
+                -100px 0 0 var(--separator-color),
+                500px 0 0 var(--separator-color),
+                -500px 0 0 var(--separator-color),
+                1500px 0 0 var(--separator-color),
+                -1500px 0 0 var(--separator-color),
+                2000px 0 0 var(--separator-color),
+                -2000px 0 0 var(--separator-color);
+}
+
+.contents img, .contents .center, .contents center, .contents div.image object {
+    max-width: 100%;
+    overflow: auto;
+}
+
+@media screen and (max-width: 767px) {
+    .contents .dyncontent > .center, .contents > center {
+        margin-left: calc(0px - var(--spacing-large));
+        margin-right: calc(0px - var(--spacing-large));
+        max-width: calc(100% + 2 * var(--spacing-large));
+    }
+}
+
+/*
+ Directories
+ */
+div.directory {
+    border-top: 1px solid var(--separator-color);
+    border-bottom: 1px solid var(--separator-color);
+    width: auto;
+}
+
+table.directory {
+    font-family: var(--font-family);
+    font-size: var(--page-font-size);
+    font-weight: normal;
+    width: 100%;
+}
+
+table.directory td.entry, table.directory td.desc {
+    padding: calc(var(--spacing-small) / 2) var(--spacing-small);
+    line-height: var(--table-line-height);
+}
+
+table.directory tr.even td:last-child {
+    border-radius: 0 var(--border-radius-small) var(--border-radius-small) 0;
+}
+
+table.directory tr.even td:first-child {
+    border-radius: var(--border-radius-small) 0 0 var(--border-radius-small);
+}
+
+table.directory tr.even:last-child td:last-child {
+    border-radius: 0 var(--border-radius-small) 0 0;
+}
+
+table.directory tr.even:last-child td:first-child {
+    border-radius: var(--border-radius-small) 0 0 0;
+}
+
+table.directory td.desc {
+    min-width: 250px;
+}
+
+table.directory tr.even {
+    background-color: var(--odd-color);
+}
+
+table.directory tr.odd {
+    background-color: transparent;
+}
+
+.icona {
+    width: auto;
+    height: auto;
+    margin: 0 var(--spacing-small);
+}
+
+.icon {
+    background: var(--primary-color);
+    border-radius: var(--border-radius-small);
+    font-size: var(--page-font-size);
+    padding: calc(var(--page-font-size) / 5);
+    line-height: var(--page-font-size);
+    transform: scale(0.8);
+    height: auto;
+    width: var(--page-font-size);
+    user-select: none;
+}
+
+.iconfopen, .icondoc, .iconfclosed {
+    background-position: center;
+    margin-bottom: 0;
+    height: var(--table-line-height);
+}
+
+.icondoc {
+    filter: saturate(0.2);
+}
+
+@media screen and (max-width: 767px) {
+    div.directory {
+        margin-left: calc(0px - var(--spacing-large));
+        margin-right: calc(0px - var(--spacing-large));
+    }
+}
+
+@media (prefers-color-scheme: dark) {
+    html:not(.light-mode) .iconfopen, html:not(.light-mode) .iconfclosed {
+        filter: hue-rotate(180deg) invert();
+    }
+}
+
+html.dark-mode .iconfopen, html.dark-mode .iconfclosed {
+    filter: hue-rotate(180deg) invert();
+}
+
+/*
+ Class list
+ */
+
+.classindex dl.odd {
+    background: var(--odd-color);
+    border-radius: var(--border-radius-small);
+}
+
+.classindex dl.even {
+    background-color: transparent;
+}
+
+/* 
+ Class Index Doxygen 1.8 
+*/
+
+table.classindex {
+    margin-left: 0;
+    margin-right: 0;
+    width: 100%;
+}
+
+table.classindex table div.ah {
+    background-image: none;
+    background-color: initial;
+    border-color: var(--separator-color);
+    color: var(--page-foreground-color);
+    box-shadow: var(--box-shadow);
+    border-radius: var(--border-radius-large);
+    padding: var(--spacing-small);
+}
+
+div.qindex {
+    background-color: var(--odd-color);
+    border-radius: var(--border-radius-small);
+    border: 1px solid var(--separator-color);
+    padding: var(--spacing-small) 0;
+}
+
+/*
+  Footer and nav-path
+ */
+
+#nav-path {
+    width: 100%;
+}
+
+#nav-path ul {
+    background-image: none;
+    background: var(--page-background-color);
+    border: none;
+    border-top: 1px solid var(--separator-color);
+    border-bottom: 1px solid var(--separator-color);
+    border-bottom: 0;
+    box-shadow: 0 0.75px 0 var(--separator-color);
+    font-size: var(--navigation-font-size);
+}
+
+img.footer {
+    width: 60px;
+}
+
+.navpath li.footer {
+    color: var(--page-secondary-foreground-color);
+}
+
+address.footer {
+    color: var(--page-secondary-foreground-color);
+    margin-bottom: var(--spacing-large);
+}
+
+#nav-path li.navelem {
+    background-image: none;
+    display: flex;
+    align-items: center;
+}
+
+.navpath li.navelem a {
+    text-shadow: none;
+    display: inline-block;
+    color: var(--primary-color) !important;
+}
+
+.navpath li.navelem b {
+    color: var(--primary-dark-color);
+    font-weight: 500;
+}
+
+li.navelem {
+    padding: 0;
+    margin-left: -8px;
+}
+
+li.navelem:first-child {
+    margin-left: var(--spacing-large);
+}
+
+li.navelem:first-child:before {
+    display: none;
+}
+
+#nav-path li.navelem:after {
+    content: '';
+    border: 5px solid var(--page-background-color);
+    border-bottom-color: transparent;
+    border-right-color: transparent;
+    border-top-color: transparent;
+    transform: translateY(-1px) scaleY(4.2);
+    z-index: 10;
+    margin-left: 6px;
+}
+
+#nav-path li.navelem:before {
+    content: '';
+    border: 5px solid var(--separator-color);
+    border-bottom-color: transparent;
+    border-right-color: transparent;
+    border-top-color: transparent;
+    transform: translateY(-1px) scaleY(3.2);
+    margin-right: var(--spacing-small);
+}
+
+.navpath li.navelem a:hover {
+    color: var(--primary-color);
+}
+
+/*
+ Scrollbars for Webkit
+*/
+
+#nav-tree::-webkit-scrollbar,
+div.fragment::-webkit-scrollbar,
+pre.fragment::-webkit-scrollbar,
+div.memproto::-webkit-scrollbar,
+.contents center::-webkit-scrollbar,
+.contents .center::-webkit-scrollbar,
+.contents table:not(.memberdecls):not(.mlabels):not(.fieldtable):not(.memname) tbody::-webkit-scrollbar,
+div.contents .toc::-webkit-scrollbar {
+    background: transparent;
+    width: calc(var(--webkit-scrollbar-size) + var(--webkit-scrollbar-padding) + var(--webkit-scrollbar-padding));
+    height: calc(var(--webkit-scrollbar-size) + var(--webkit-scrollbar-padding) + var(--webkit-scrollbar-padding));
+}
+
+#nav-tree::-webkit-scrollbar-thumb,
+div.fragment::-webkit-scrollbar-thumb,
+pre.fragment::-webkit-scrollbar-thumb,
+div.memproto::-webkit-scrollbar-thumb,
+.contents center::-webkit-scrollbar-thumb,
+.contents .center::-webkit-scrollbar-thumb,
+.contents table:not(.memberdecls):not(.mlabels):not(.fieldtable):not(.memname) tbody::-webkit-scrollbar-thumb,
+div.contents .toc::-webkit-scrollbar-thumb {
+    background-color: transparent;
+    border: var(--webkit-scrollbar-padding) solid transparent;
+    border-radius: calc(var(--webkit-scrollbar-padding) + var(--webkit-scrollbar-padding));
+    background-clip: padding-box;  
+}
+
+#nav-tree:hover::-webkit-scrollbar-thumb,
+div.fragment:hover::-webkit-scrollbar-thumb,
+pre.fragment:hover::-webkit-scrollbar-thumb,
+div.memproto:hover::-webkit-scrollbar-thumb,
+.contents center:hover::-webkit-scrollbar-thumb,
+.contents .center:hover::-webkit-scrollbar-thumb,
+.contents table:not(.memberdecls):not(.mlabels):not(.fieldtable):not(.memname) tbody:hover::-webkit-scrollbar-thumb,
+div.contents .toc:hover::-webkit-scrollbar-thumb {
+    background-color: var(--webkit-scrollbar-color);
+}
+
+#nav-tree::-webkit-scrollbar-track,
+div.fragment::-webkit-scrollbar-track,
+pre.fragment::-webkit-scrollbar-track,
+div.memproto::-webkit-scrollbar-track,
+.contents center::-webkit-scrollbar-track,
+.contents .center::-webkit-scrollbar-track,
+.contents table:not(.memberdecls):not(.mlabels):not(.fieldtable):not(.memname) tbody::-webkit-scrollbar-track,
+div.contents .toc::-webkit-scrollbar-track {
+    background: transparent;
+}
+
+#nav-tree::-webkit-scrollbar-corner {
+    background-color: var(--side-nav-background);
+}
+
+#nav-tree,
+div.fragment,
+pre.fragment,
+div.memproto,
+.contents center,
+.contents .center,
+.contents table:not(.memberdecls):not(.mlabels):not(.fieldtable):not(.memname) tbody,
+div.contents .toc {
+    overflow-x: auto;
+    overflow-x: overlay;
+}
+
+#nav-tree {
+    overflow-x: auto;
+    overflow-y: auto;
+    overflow-y: overlay;
+}
+
+/*
+ Scrollbars for Firefox
+*/
+
+#nav-tree,
+div.fragment,
+pre.fragment,
+div.memproto,
+.contents center,
+.contents .center,
+.contents table:not(.memberdecls):not(.mlabels):not(.fieldtable):not(.memname) tbody,
+div.contents .toc {
+    scrollbar-width: thin;
+}
+
+/*
+  Optional Dark mode toggle button
+*/
+
+doxygen-awesome-dark-mode-toggle {
+    display: inline-block;
+    margin: 0 0 0 var(--spacing-small);
+    padding: 0;
+    width: var(--searchbar-height);
+    height: var(--searchbar-height);
+    background: none;
+    border: none;
+    border-radius: var(--searchbar-height);
+    vertical-align: middle;
+    text-align: center;
+    line-height: var(--searchbar-height);
+    font-size: 22px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    user-select: none;
+    cursor: pointer;
+}
+
+doxygen-awesome-dark-mode-toggle > svg {
+    transition: transform .1s ease-in-out;
+}
+
+doxygen-awesome-dark-mode-toggle:active > svg {
+    transform: scale(.5);
+}
+
+doxygen-awesome-dark-mode-toggle:hover {
+    background-color: rgba(0,0,0,.03);
+}
+
+html.dark-mode doxygen-awesome-dark-mode-toggle:hover {
+    background-color: rgba(0,0,0,.18);
+}
+
+/*
+ Optional fragment copy button
+*/
+.doxygen-awesome-fragment-wrapper {
+    position: relative;
+}
+
+doxygen-awesome-fragment-copy-button {
+    opacity: 0;
+    background: var(--fragment-background);
+    width: 28px;
+    height: 28px;
+    position: absolute;
+    right: calc(var(--spacing-large) - (var(--spacing-large) / 2.5));
+    top: calc(var(--spacing-large) - (var(--spacing-large) / 2.5));
+    border: 1px solid var(--fragment-foreground);
+    cursor: pointer;
+    border-radius: var(--border-radius-small);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.doxygen-awesome-fragment-wrapper:hover doxygen-awesome-fragment-copy-button, doxygen-awesome-fragment-copy-button.success {
+    opacity: .28;
+}
+
+doxygen-awesome-fragment-copy-button:hover, doxygen-awesome-fragment-copy-button.success {
+    opacity: 1 !important;
+}
+
+doxygen-awesome-fragment-copy-button:active:not([class~=success]) svg {
+    transform: scale(.91);
+}
+
+doxygen-awesome-fragment-copy-button svg {
+    fill: var(--fragment-foreground);
+    width: 18px;
+    height: 18px;
+}
+
+doxygen-awesome-fragment-copy-button.success svg {
+    fill: rgb(14, 168, 14);
+}
+
+doxygen-awesome-fragment-copy-button.success {
+    border-color: rgb(14, 168, 14);
+}
+
+@media screen and (max-width: 767px) {
+    .textblock > .doxygen-awesome-fragment-wrapper > doxygen-awesome-fragment-copy-button,
+    .textblock li > .doxygen-awesome-fragment-wrapper > doxygen-awesome-fragment-copy-button,
+    .memdoc li > .doxygen-awesome-fragment-wrapper > doxygen-awesome-fragment-copy-button,
+    .memdoc > .doxygen-awesome-fragment-wrapper > doxygen-awesome-fragment-copy-button,
+    dl dd > .doxygen-awesome-fragment-wrapper > doxygen-awesome-fragment-copy-button {
+        right: 0;
+    }
+}
+
+/*
+ Optional paragraph link button
+*/
+
+a.anchorlink {
+    font-size: 90%;
+    margin-left: var(--spacing-small);
+    color: var(--page-foreground-color) !important;
+    text-decoration: none;
+    opacity: .15;
+    display: none;
+    transition: opacity .1s ease-in-out, color .1s ease-in-out;
+}
+
+a.anchorlink svg {
+    fill: var(--page-foreground-color);
+}
+
+h3 a.anchorlink svg, h4 a.anchorlink svg {
+    margin-bottom: -3px;
+    margin-top: -4px;
+}
+
+a.anchorlink:hover {
+    opacity: .45;
+}
+
+h2:hover a.anchorlink, h1:hover a.anchorlink, h3:hover a.anchorlink, h4:hover a.anchorlink  {
+    display: inline-block;
+}
+
+
+#MSearchBox .left {
+	background: none !important;	
+}
+#MSearchBox .right {
+	background: none !important;	
+}

From a89995b63f7598820e47c781f17541ab193a14f7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Jan 2023 12:36:53 +0100
Subject: [PATCH 370/816] WIP Public virtual card

---
 htdocs/core/lib/functions.lib.php | 12 ++++++++----
 htdocs/langs/en_US/main.lang      |  3 ++-
 htdocs/main.inc.php               | 20 ++++++++++++++------
 htdocs/projet/card.php            |  2 +-
 htdocs/public/users/view.php      |  6 +++---
 htdocs/user/card.php              |  4 +---
 htdocs/user/virtualcard.php       |  1 +
 7 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ac774209d30..e32cbc3ca9d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1731,11 +1731,13 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename =
  *	@param  string	$url				Relative Url to open. For example '/project/card.php'
  *  @param	string	$disabled			Disabled text
  *  @param	string	$morecss			More CSS
+ *  @param	string	$jsonopen			Some JS code to execute on click/open of popup
  *  @param	string	$backtopagejsfields	The back to page must be managed using javascript instead of a redirect.
  *  									Value is 'keyforpopupid:Name_of_html_component_to_set_with id,Name_of_html_component_to_set_with_label'
+ *  @param	string	$accesskey			A key to use shortcut
  * 	@return	string						HTML component with button
  */
-function dolButtonToOpenUrlInDialogPopup($name, $label, $buttonstring, $url, $disabled = '', $morecss = 'classlink button bordertransp', $backtopagejsfields = '')
+function dolButtonToOpenUrlInDialogPopup($name, $label, $buttonstring, $url, $disabled = '', $morecss = 'classlink button bordertransp', $jsonopen = '', $backtopagejsfields = '', $accesskey = '')
 {
 	global $conf;
 
@@ -1763,9 +1765,11 @@ function dolButtonToOpenUrlInDialogPopup($name, $label, $buttonstring, $url, $di
 
 	//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("MediaFiles")).'" name="file_manager">';
 	$out .= '<!-- a link for button to open url into a dialog popup with backtopagejsfields = '.$backtopagejsfields.' -->';
-	$out .= '<a class="cursorpointer button_'.$name.($morecss ? ' '.$morecss : '').'"'.$disabled.' title="'.dol_escape_htmltag($label).'"';
+	$out .= '<a '.($accesskey ? ' accesskey="'.$accesskey.'"' : '').' class="cursorpointer button_'.$name.($morecss ? ' '.$morecss : '').'"'.$disabled.' title="'.dol_escape_htmltag($label).'"';
 	if (empty($conf->use_javascript_ajax)) {
 		$out .= ' href="'.DOL_URL_ROOT.$url.'" target="_blank"';
+	} elseif ($jsonopen) {
+		$out .= ' onclick="javascript:'.$jsonopen.'"';
 	}
 	$out .= '>'.$buttonstring.'</a>';
 
@@ -2324,7 +2328,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 
 	// Add alias for thirdparty
 	if (!empty($object->name_alias)) {
-		$morehtmlref .= '<div class="refidno opacitymedium">'.$object->name_alias.'</div>';
+		$morehtmlref .= '<div class="refidno opacitymedium">'.dol_escape_htmltag($object->name_alias).'</div>';
 	}
 
 	// Add label
@@ -2346,7 +2350,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 	if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && ($conf->global->MAIN_SHOW_TECHNICAL_ID == '1' || preg_match('/'.preg_quote($object->element, '/').'/i', $conf->global->MAIN_SHOW_TECHNICAL_ID)) && !empty($object->id)) {
 		$morehtmlref .= '<div style="clear: both;"></div>';
 		$morehtmlref .= '<div class="refidno opacitymedium">';
-		$morehtmlref .= $langs->trans("TechnicalID").': '.$object->id;
+		$morehtmlref .= $langs->trans("TechnicalID").': '.((int) $object->id);
 		$morehtmlref .= '</div>';
 	}
 
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index e747f004c87..daa01cfcfa4 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=No user group defined
 Password=Password
 PasswordRetype=Repeat your password
 NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
+YourUserFile=Your user file
 Name=Name
 NameSlashCompany=Name / Company
 Person=Person
@@ -1213,4 +1214,4 @@ InternalUser=Internal user
 ExternalUser=External user
 NoSpecificContactAddress=No specific contact or address
 NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
-
+AddToContacts=Add address to my contacts
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 17912f81101..a21082a8bc6 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2280,12 +2280,14 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 	if (empty($urllogout)) {
 		$urllogout = DOL_URL_ROOT.'/user/logout.php?token='.newToken();
 	}
-	$logoutLink = '<a accesskey="l" href="'.$urllogout.'" class="button-top-menu-dropdown" ><i class="fa fa-sign-out-alt"></i> '.$langs->trans("Logout").'</a>';
-	$profilLink = '<a accesskey="l" href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="button-top-menu-dropdown" ><i class="fa fa-user"></i>  '.$langs->trans("Card").'</a>';
 
+	// Defined the links for bottom of card
+	$profilLink = '<a accesskey="c" href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="button-top-menu-dropdown" title="'.dol_escape_htmltag($langs->trans("YourUserFile")).'"><i class="fa fa-user"></i>  '.$langs->trans("Card").'</a>';
+	$urltovirtualcard = '/user/virtualcard.php?id='.((int) $user->id);
+	$virtuelcardLink = dolButtonToOpenUrlInDialogPopup('publicvirtualcardmenu', $langs->trans("PublicVirtualCardUrl"), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', ''), $urltovirtualcard, '', 'button-top-menu-dropdown marginleftonly nohover', "closeTopMenuLoginDropdown()", '', 'v');
+	$logoutLink = '<a accesskey="l" href="'.$urllogout.'" class="button-top-menu-dropdown" title="'.dol_escape_htmltag($langs->trans("Logout")).'"><i class="fa fa-sign-out-alt"></i> '.$langs->trans("Logout").'</a>';
 
 	$profilName = $user->getFullName($langs).' ('.$user->login.')';
-
 	if (!empty($user->admin)) {
 		$profilName = '<i class="far fa-star classfortooltip" title="'.$langs->trans("Administrator").'" ></i> '.$profilName;
 	}
@@ -2341,6 +2343,9 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 	                <div class="pull-left">
 	                    '.$profilLink.'
 	                </div>
+	                <div class="pull-left">
+	                    '.$virtuelcardLink.'
+	                </div>
 	                <div class="pull-right">
 	                    '.$logoutLink.'
 	                </div>
@@ -2363,12 +2368,15 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 		$btnUser .= '
         <!-- Code to show/hide the user drop-down -->
         <script>
+		function closeTopMenuLoginDropdown() {
+			//console.log("close login dropdown");	// This is call at each click on page, so we disable the log
+			// Hide the menus.
+            jQuery("#topmenu-login-dropdown").removeClass("open");
+		}
         jQuery(document).ready(function() {
             jQuery(document).on("click", function(event) {
                 if (!$(event.target).closest("#topmenu-login-dropdown").length) {
-					//console.log("close login dropdown");
-					// Hide the menus.
-                    jQuery("#topmenu-login-dropdown").removeClass("open");
+					closeTopMenuLoginDropdown();
                 }
             });
 			';
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 96b4aa0b03b..3dc116d9931 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -699,7 +699,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 			// TODO @LDR Implement this
 			if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 				$tmpbacktopagejsfields = 'addthirdparty:socid,search_socid';
-				print dolButtonToOpenUrlInDialogPopup('addthirdparty', $langs->transnoentitiesnoconv('AddThirdParty'), $newbutton, $url, '', '', $tmpbacktopagejsfields);
+				print dolButtonToOpenUrlInDialogPopup('addthirdparty', $langs->transnoentitiesnoconv('AddThirdParty'), $newbutton, $url, '', '', '', $tmpbacktopagejsfields);
 			} else {
 				print ' <a href="'.DOL_URL_ROOT.$url.'">'.$newbutton.'</a>';
 			}
diff --git a/htdocs/public/users/view.php b/htdocs/public/users/view.php
index 2bc5e8e9245..03c3005b10e 100644
--- a/htdocs/public/users/view.php
+++ b/htdocs/public/users/view.php
@@ -257,7 +257,7 @@ if ($showbarcode) {
 }
 
 
-print '<div class="opacitymedium">'.$langs->trans("Me").'</div>'."\n";
+//print '<div class="opacitymedium">'.$langs->trans("Me").'</div>'."\n";
 print '<table id="dolpaymenttable" summary="Job position offer" class="center">'."\n";
 
 // Output payment summary form
@@ -368,8 +368,8 @@ print '<br>';
 print '<div class="backgreypublicpayment">';
 print '<div class="center">';
 print '<a href="'.$urlforqrcode.'">';
-print img_picto($langs->trans("AddTocontacts"), 'add').' ';
-print $langs->trans("AddTocontacts");
+print img_picto($langs->trans("AddToContacts"), 'add').' ';
+print $langs->trans("AddToContacts");
 print '</a>';
 print '</div>';
 //print '<div>';
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 8fceddf313b..05c831fcf04 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1433,12 +1433,10 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print dol_get_fiche_head($head, 'user', $title, -1, 'user');
 
 			$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid" rel="noopener">';
-			$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
+			$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard").' ('.$langs->trans("AddToContacts").')', 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 			$morehtmlref .= '</a>';
 
-			//$urltovirtualcard = $object->getOnlineVirtualCardUrl();
 			$urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id);
-
 			$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->trans("PublicVirtualCardUrl"), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
 			/*$morehtmlref .= '<a href="'.$urltovirtualcard.'" class="refid" target="_blank" rel="noopener">';
 			$morehtmlref .= img_picto($langs->trans("PublicVirtualCardUrl"), 'id-card', 'class="valignmiddle marginleftonly paddingrightonly"');
diff --git a/htdocs/user/virtualcard.php b/htdocs/user/virtualcard.php
index 30dc32ad01c..6ce00693eaa 100644
--- a/htdocs/user/virtualcard.php
+++ b/htdocs/user/virtualcard.php
@@ -133,6 +133,7 @@ print '<br>';
 print '<span class="opacitymedium">'.$langs->trans("UserPublicPageDesc").'</span><br><br>';
 
 $param = '&id='.((int) $object->id);
+$param .= '&dol_openinpopup=1';
 
 $enabledisablehtml = $langs->trans("EnablePublicVirtualCard").' ';
 if (!getDolUserInt('USER_ENABLE_PUBLIC', 0, $object)) {

From 81a8838070bab99e98d5f6433d5cfcbd15835acf Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 7 Jan 2023 14:06:20 +0100
Subject: [PATCH 371/816] Add a condition to show option

---
 htdocs/accountancy/admin/index.php | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 5caa92ec9ee..3a7be3e073e 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -514,18 +514,20 @@ if (!empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) {
 }
 print '</tr>';
 
-print '<tr class="oddeven">';
-print '<td>'.$langs->trans("ACCOUNTING_ENABLE_AUTOLETTERING").'</td>';
-if (!empty($conf->global->ACCOUNTING_ENABLE_AUTOLETTERING)) {
-	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setenableautolettering&value=0">';
-	print img_picto($langs->trans("Activated"), 'switch_on');
-	print '</a></td>';
-} else {
-	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setenableautolettering&value=1">';
-	print img_picto($langs->trans("Disabled"), 'switch_off');
-	print '</a></td>';
+if (!empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) {
+	print '<tr class="oddeven">';
+	print '<td>' . $langs->trans("ACCOUNTING_ENABLE_AUTOLETTERING") . '</td>';
+	if (!empty($conf->global->ACCOUNTING_ENABLE_AUTOLETTERING)) {
+		print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setenableautolettering&value=0">';
+		print img_picto($langs->trans("Activated"), 'switch_on');
+		print '</a></td>';
+	} else {
+		print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setenableautolettering&value=1">';
+		print img_picto($langs->trans("Disabled"), 'switch_off');
+		print '</a></td>';
+	}
+	print '</tr>';
 }
-print '</tr>';
 
 print '</table>';
 

From 75d979314565d5257d71ddeac8fd1d926d24644e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Jan 2023 12:36:53 +0100
Subject: [PATCH 372/816] Fix virtual card feature

---
 htdocs/core/lib/functions.lib.php |  25 +--
 htdocs/langs/en_US/main.lang      |   4 +-
 htdocs/main.inc.php               |  20 +-
 htdocs/projet/card.php            |   2 +-
 htdocs/public/users/view.php      | 303 ++++++++++++++++--------------
 htdocs/theme/eldy/global.inc.php  |  17 ++
 htdocs/theme/md/style.css.php     |  17 ++
 htdocs/user/card.php              |   4 +-
 htdocs/user/class/user.class.php  |   7 +-
 htdocs/user/virtualcard.php       |  54 +++---
 htdocs/viewimage.php              |  59 +++---
 11 files changed, 286 insertions(+), 226 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ac774209d30..c2276e8693e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1731,11 +1731,13 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename =
  *	@param  string	$url				Relative Url to open. For example '/project/card.php'
  *  @param	string	$disabled			Disabled text
  *  @param	string	$morecss			More CSS
+ *  @param	string	$jsonopen			Some JS code to execute on click/open of popup
  *  @param	string	$backtopagejsfields	The back to page must be managed using javascript instead of a redirect.
  *  									Value is 'keyforpopupid:Name_of_html_component_to_set_with id,Name_of_html_component_to_set_with_label'
+ *  @param	string	$accesskey			A key to use shortcut
  * 	@return	string						HTML component with button
  */
-function dolButtonToOpenUrlInDialogPopup($name, $label, $buttonstring, $url, $disabled = '', $morecss = 'classlink button bordertransp', $backtopagejsfields = '')
+function dolButtonToOpenUrlInDialogPopup($name, $label, $buttonstring, $url, $disabled = '', $morecss = 'classlink button bordertransp', $jsonopen = '', $backtopagejsfields = '', $accesskey = '')
 {
 	global $conf;
 
@@ -1763,9 +1765,11 @@ function dolButtonToOpenUrlInDialogPopup($name, $label, $buttonstring, $url, $di
 
 	//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("MediaFiles")).'" name="file_manager">';
 	$out .= '<!-- a link for button to open url into a dialog popup with backtopagejsfields = '.$backtopagejsfields.' -->';
-	$out .= '<a class="cursorpointer button_'.$name.($morecss ? ' '.$morecss : '').'"'.$disabled.' title="'.dol_escape_htmltag($label).'"';
+	$out .= '<a '.($accesskey ? ' accesskey="'.$accesskey.'"' : '').' class="cursorpointer button_'.$name.($morecss ? ' '.$morecss : '').'"'.$disabled.' title="'.dol_escape_htmltag($label).'"';
 	if (empty($conf->use_javascript_ajax)) {
 		$out .= ' href="'.DOL_URL_ROOT.$url.'" target="_blank"';
+	} elseif ($jsonopen) {
+		$out .= ' onclick="javascript:'.$jsonopen.'"';
 	}
 	$out .= '>'.$buttonstring.'</a>';
 
@@ -2324,7 +2328,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 
 	// Add alias for thirdparty
 	if (!empty($object->name_alias)) {
-		$morehtmlref .= '<div class="refidno opacitymedium">'.$object->name_alias.'</div>';
+		$morehtmlref .= '<div class="refidno opacitymedium">'.dol_escape_htmltag($object->name_alias).'</div>';
 	}
 
 	// Add label
@@ -2346,7 +2350,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 	if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && ($conf->global->MAIN_SHOW_TECHNICAL_ID == '1' || preg_match('/'.preg_quote($object->element, '/').'/i', $conf->global->MAIN_SHOW_TECHNICAL_ID)) && !empty($object->id)) {
 		$morehtmlref .= '<div style="clear: both;"></div>';
 		$morehtmlref .= '<div class="refidno opacitymedium">';
-		$morehtmlref .= $langs->trans("TechnicalID").': '.$object->id;
+		$morehtmlref .= $langs->trans("TechnicalID").': '.((int) $object->id);
 		$morehtmlref .= '</div>';
 	}
 
@@ -3166,11 +3170,10 @@ function dol_print_socialnetworks($value, $cid, $socid, $type, $dictsocialnetwor
 	if (!empty($type)) {
 		$htmllink = '<div class="divsocialnetwork inline-block valignmiddle">';
 		// Use dictionary definition for picto $dictsocialnetworks[$type]['icon']
-		$htmllink .= '<span class="fa paddingright '.($dictsocialnetworks[$type]['icon'] ? $dictsocialnetworks[$type]['icon'] : 'fa-link').'"></span>';
+		$htmllink .= '<span class="fa paddingright pictofixedwidth '.($dictsocialnetworks[$type]['icon'] ? $dictsocialnetworks[$type]['icon'] : 'fa-link').'"></span>';
 		if ($type == 'skype') {
 			$htmllink .= dol_escape_htmltag($value);
-			$htmllink .= '&nbsp;';
-			$htmllink .= '<a href="skype:';
+			$htmllink .= '&nbsp; <a href="skype:';
 			$htmllink .= dol_string_nospecial($value, '_', '', array('@'));
 			$htmllink .= '?call" alt="'.$langs->trans("Call").'&nbsp;'.$value.'" title="'.dol_escape_htmltag($langs->trans("Call").' '.$value).'">';
 			$htmllink .= '<img src="'.DOL_URL_ROOT.'/theme/common/skype_callbutton.png" border="0">';
@@ -3208,9 +3211,9 @@ function dol_print_socialnetworks($value, $cid, $socid, $type, $dictsocialnetwor
 				}
 				$link = str_replace('{socialid}', $value, $dictsocialnetworks[$type]['url']);
 				if (preg_match('/^https?:\/\//i', $link)) {
-					$htmllink .= '&nbsp;<a href="'.dol_sanitizeUrl($link, 0).'" target="_blank" rel="noopener noreferrer">'.dol_escape_htmltag($value).'</a>';
+					$htmllink .= '<a href="'.dol_sanitizeUrl($link, 0).'" target="_blank" rel="noopener noreferrer">'.dol_escape_htmltag($value).'</a>';
 				} else {
-					$htmllink .= '&nbsp;<a href="'.dol_sanitizeUrl($link, 1).'" target="_blank" rel="noopener noreferrer">'.dol_escape_htmltag($value).'</a>';
+					$htmllink .= '<a href="'.dol_sanitizeUrl($link, 1).'" target="_blank" rel="noopener noreferrer">'.dol_escape_htmltag($value).'</a>';
 				}
 			} else {
 				$htmllink .= dol_escape_htmltag($value);
@@ -3263,7 +3266,7 @@ function dol_print_profids($profID, $profIDtype, $countrycode = '', $addcpButton
  * 	@param  string  $countrycode    Country code to use for formatting
  * 	@param 	int		$cid 		    Id of contact if known
  * 	@param 	int		$socid          Id of third party if known
- * 	@param 	string	$addlink	    ''=no link to create action, 'AC_TEL'=add link to clicktodial (if module enabled) and add link to create event (if conf->global->AGENDA_ADDACTIONFORPHONE set)
+ * 	@param 	string	$addlink	    ''=no link to create action, 'AC_TEL'=add link to clicktodial (if module enabled) and add link to create event (if conf->global->AGENDA_ADDACTIONFORPHONE set), 'tel'=Force "tel:..." link
  * 	@param 	string	$separ 		    Separation between numbers for a better visibility example : xx.xx.xx.xx.xx
  *  @param	string  $withpicto      Show picto ('fax', 'phone', 'mobile')
  *  @param	string	$titlealt	    Text to show on alt
@@ -3471,7 +3474,7 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 		}
 	}
 	if (!empty($addlink)) {	// Link on phone number (+ link to add action if conf->global->AGENDA_ADDACTIONFORPHONE set)
-		if ($conf->browser->layout == 'phone' || (isModEnabled('clicktodial') && !empty($conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS))) {	// If phone or option for, we use link of phone
+		if ($addlink == 'tel' || $conf->browser->layout == 'phone' || (isModEnabled('clicktodial') && !empty($conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS))) {	// If phone or option for, we use link of phone
 			$newphoneform = $newphone;
 			$newphone = '<a href="tel:'.$phone.'"';
 			$newphone .= '>'.$newphoneform.'</a>';
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index e747f004c87..2473659a5c7 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=No user group defined
 Password=Password
 PasswordRetype=Repeat your password
 NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
+YourUserFile=Your user file
 Name=Name
 NameSlashCompany=Name / Company
 Person=Person
@@ -1213,4 +1214,5 @@ InternalUser=Internal user
 ExternalUser=External user
 NoSpecificContactAddress=No specific contact or address
 NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
-
+HideOnVCard=Hide %s
+AddToContacts=Add address to my contacts
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 17912f81101..a21082a8bc6 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2280,12 +2280,14 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 	if (empty($urllogout)) {
 		$urllogout = DOL_URL_ROOT.'/user/logout.php?token='.newToken();
 	}
-	$logoutLink = '<a accesskey="l" href="'.$urllogout.'" class="button-top-menu-dropdown" ><i class="fa fa-sign-out-alt"></i> '.$langs->trans("Logout").'</a>';
-	$profilLink = '<a accesskey="l" href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="button-top-menu-dropdown" ><i class="fa fa-user"></i>  '.$langs->trans("Card").'</a>';
 
+	// Defined the links for bottom of card
+	$profilLink = '<a accesskey="c" href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="button-top-menu-dropdown" title="'.dol_escape_htmltag($langs->trans("YourUserFile")).'"><i class="fa fa-user"></i>  '.$langs->trans("Card").'</a>';
+	$urltovirtualcard = '/user/virtualcard.php?id='.((int) $user->id);
+	$virtuelcardLink = dolButtonToOpenUrlInDialogPopup('publicvirtualcardmenu', $langs->trans("PublicVirtualCardUrl"), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', ''), $urltovirtualcard, '', 'button-top-menu-dropdown marginleftonly nohover', "closeTopMenuLoginDropdown()", '', 'v');
+	$logoutLink = '<a accesskey="l" href="'.$urllogout.'" class="button-top-menu-dropdown" title="'.dol_escape_htmltag($langs->trans("Logout")).'"><i class="fa fa-sign-out-alt"></i> '.$langs->trans("Logout").'</a>';
 
 	$profilName = $user->getFullName($langs).' ('.$user->login.')';
-
 	if (!empty($user->admin)) {
 		$profilName = '<i class="far fa-star classfortooltip" title="'.$langs->trans("Administrator").'" ></i> '.$profilName;
 	}
@@ -2341,6 +2343,9 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 	                <div class="pull-left">
 	                    '.$profilLink.'
 	                </div>
+	                <div class="pull-left">
+	                    '.$virtuelcardLink.'
+	                </div>
 	                <div class="pull-right">
 	                    '.$logoutLink.'
 	                </div>
@@ -2363,12 +2368,15 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 		$btnUser .= '
         <!-- Code to show/hide the user drop-down -->
         <script>
+		function closeTopMenuLoginDropdown() {
+			//console.log("close login dropdown");	// This is call at each click on page, so we disable the log
+			// Hide the menus.
+            jQuery("#topmenu-login-dropdown").removeClass("open");
+		}
         jQuery(document).ready(function() {
             jQuery(document).on("click", function(event) {
                 if (!$(event.target).closest("#topmenu-login-dropdown").length) {
-					//console.log("close login dropdown");
-					// Hide the menus.
-                    jQuery("#topmenu-login-dropdown").removeClass("open");
+					closeTopMenuLoginDropdown();
                 }
             });
 			';
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 96b4aa0b03b..3dc116d9931 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -699,7 +699,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 			// TODO @LDR Implement this
 			if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 				$tmpbacktopagejsfields = 'addthirdparty:socid,search_socid';
-				print dolButtonToOpenUrlInDialogPopup('addthirdparty', $langs->transnoentitiesnoconv('AddThirdParty'), $newbutton, $url, '', '', $tmpbacktopagejsfields);
+				print dolButtonToOpenUrlInDialogPopup('addthirdparty', $langs->transnoentitiesnoconv('AddThirdParty'), $newbutton, $url, '', '', '', $tmpbacktopagejsfields);
 			} else {
 				print ' <a href="'.DOL_URL_ROOT.$url.'">'.$newbutton.'</a>';
 			}
diff --git a/htdocs/public/users/view.php b/htdocs/public/users/view.php
index 2bc5e8e9245..7a843a0b597 100644
--- a/htdocs/public/users/view.php
+++ b/htdocs/public/users/view.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2020       Laurent Destailleur     <eldy@users.sourceforge.net>
+/* Copyright (C) 2020-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
@@ -45,6 +45,7 @@ $langs->loadLangs(array("companies", "other", "recruitment"));
 
 // Get parameters
 $action   = GETPOST('action', 'aZ09');
+$mode     = GETPOST('mode', 'aZ09');
 $cancel   = GETPOST('cancel', 'alpha');
 $backtopage = '';
 
@@ -64,7 +65,11 @@ $urlwithroot = DOL_MAIN_URL_ROOT; // This is to use same domain name than curren
 global $dolibarr_main_instance_unique_id;
 $encodedsecurekey = dol_hash($dolibarr_main_instance_unique_id.'uservirtualcard'.$object->id.'-'.$object->login, 'md5');
 if ($encodedsecurekey != $securekey) {
-	httponly_accessforbidden('User profile page not found or not allowed');
+	httponly_accessforbidden('Bad value for securitykey or public profile not enabled');
+}
+
+if (!getDolUserInt('USER_ENABLE_PUBLIC', 0, $object)) {
+	httponly_accessforbidden('Bad value for securitykey or public profile not enabled');
 }
 
 
@@ -80,52 +85,6 @@ if ($cancel) {
 	$action = 'view';
 }
 
-/*
-if ($action == "view" || $action == "presend" || $action == "dosubmit") {
-	$error = 0;
-	$display_ticket = false;
-	if (!strlen($ref)) {
-		$error++;
-		array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Ref")));
-		$action = '';
-	}
-	if (!strlen($email)) {
-		$error++;
-		array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Email")));
-		$action = '';
-	} else {
-		if (!isValidEmail($email)) {
-			$error++;
-			array_push($object->errors, $langs->trans("ErrorEmailInvalid"));
-			$action = '';
-		}
-	}
-
-	if (!$error) {
-		$ret = $object->fetch('', $ref);
-	}
-
-	if ($error || $errors) {
-		setEventMessages($object->error, $object->errors, 'errors');
-		if ($action == "dosubmit") {
-			$action = 'presend';
-		} else {
-			$action = '';
-		}
-	}
-}
-*/
-//var_dump($action);
-//$object->doActions($action);
-
-// Actions to send emails (for ticket, we need to manage the addfile and removefile only)
-/*$triggersendname = 'USER_SENTBYMAIL';
-$paramname = 'id';
-$autocopy = 'MAIN_MAIL_AUTOCOPY_USER_TO'; // used to know the automatic BCC to add
-$trackid = 'use'.$object->id;
-include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
-*/
-
 
 /*
  * View
@@ -134,7 +93,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 $form = new Form($db);
 $company = $mysoc;
 
-if ($action == 'vcard') {
+if ($mode == 'vcard') {
 	// We create VCard
 	$v = new vCard();
 	$output = $v->buildVCardString($object, $company, $langs);
@@ -219,16 +178,16 @@ if (!empty($logosmall) && is_readable($conf->user->dir_output.'/'.$logosmall)) {
 print '<div class="backgreypublicpayment">';
 print '<div class="logopublicpayment">';
 
-// Show photo
-if ($urllogo) {
-	/*if (!empty($mysoc->url)) {
-		print '<a href="'.$mysoc->url.'" target="_blank" rel="noopener">';
-	}*/
-	print '<img id="dolpaymentlogo" src="'.$urllogofull.'">';
-	/*if (!empty($mysoc->url)) {
-		print '</a>';
-	}*/
+// Name
+print '<div class="double colortext">'.$object->getFullName($langs).'</div>';
+// User position
+if ($object->job && !getDolUserInt('USER_PUBLIC_HIDE_JOBPOSITION', 0, $object)) {
+	print '<div class="">';
+	print dol_escape_htmltag($object->job);
+	print '</div>';
 }
+
+
 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>';
@@ -242,105 +201,73 @@ if (!empty($conf->global->USER_IMAGE_PUBLIC_INTERFACE)) {
 	print '</div>';
 }
 
-$urlforqrcode = $_SERVER["PHP_SELF"].'?action=vcard&id='.((int) $object->id).'&securekey='.urlencode($securekey);
+$urlforqrcode = $object->getOnlineVirtualCardUrl('vcard');
+
+$socialnetworksdict = getArrayOfSocialNetworks();
+
+
 
 // Show barcode
 $showbarcode = GETPOST('nobarcode') ? 0 : 1;
 if ($showbarcode) {
 	print '<br>';
 	print '<div class="floatleft inline-block valignmiddle divphotoref">';
-	print 'QRCODE...<br>';
-	print $urlforqrcode;
+	print '<img src="'.$dolibarr_main_url_root.'/viewimage.php?modulepart=barcode&entity='.((int) $conf->entity).'&generator=tcpdfbarcode&encoding=QRCODE&code='.urlencode($urlforqrcode).'">';
 	print '</div>';
 	print '<br>';
-	print '<br>';
 }
 
 
-print '<div class="opacitymedium">'.$langs->trans("Me").'</div>'."\n";
-print '<table id="dolpaymenttable" summary="Job position offer" class="center">'."\n";
-
-// Output payment summary form
-print '<tr><td class="left">';
-
-print '<div class="nowidthimp" id="tablepublicpayment">';
-
-print '<br>';
-
-// Add contact info
-print '...';
-
-print '<br>';
-
-
-print '</div>'."\n";
-print "\n";
-
-print '</td></tr>'."\n";
-
-print '</table>'."\n";
-
-
-
-
-print '<div class="opacitymedium">'.$langs->trans("MyCompany").'</div>'."\n";
-print '<table id="dolpaymenttable" summary="Job position offer" class="center">'."\n";
-
-// Output payment summary form
-print '<tr><td class="left">';
-
-print '<div class="nowidthimp" id="tablepublicpayment">';
-
-// Add company info
-
-
-// Show logo (search order: logo defined by ONLINE_SIGN_LOGO_suffix, then ONLINE_SIGN_LOGO_, then small company logo, large company logo, theme logo, common logo)
-// Define logo and logosmall
-$logosmall = $mysoc->logo_small;
-$logo = $mysoc->logo;
-$paramlogo = 'ONLINE_USER_LOGO_'.$suffix;
-if (!empty($conf->global->$paramlogo)) {
-	$logosmall = $conf->global->$paramlogo;
-} elseif (!empty($conf->global->ONLINE_USER_LOGO)) {
-	$logosmall = $conf->global->ONLINE_USER_LOGO;
-}
-//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
-// Define urllogo
-$urllogo = '';
-$urllogofull = '';
-if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall)) {
-	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$logosmall);
-	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
-} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo)) {
-	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$logo);
-	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
-}
-// Output html code for logo
+// Me
+// Show photo
 if ($urllogo) {
-	print '<div class="logopublicpayment">';
-	if (!empty($mysoc->url)) {
-		print '<a href="'.$mysoc->url.'" target="_blank" rel="noopener">';
-	}
-	print '<img id="dolpaymentlogo" src="'.$urllogofull.'">';
-	if (!empty($mysoc->url)) {
-		print '</a>';
-	}
+	print '<img class="userphotopublicvcard" id="dolpaymentlogo" src="'.$urllogofull.'">';
+}
+print '<table id="dolpaymenttable" summary="Job position offer" class="center">'."\n";
+
+// Output payment summary form
+print '<tr><td class="left">';
+
+print '<div class="nowidthimp" id="tablepublicpayment">';
+
+// User email
+if ($object->email && !getDolUserInt('USER_PUBLIC_HIDE_EMAIL', 0, $object)) {
+	print '<div class="flexitemsmall">';
+	print dol_print_email($object->email, 0, 0, 1, 0, 1, 1);
 	print '</div>';
 }
 
-
-if ($mysoc->email) {
-	print '<br>';
-	print img_picto('', 'email', 'class="pictofixedwidth"').dol_print_email($mysoc->email, 0, 0, 1);
-	print '<br>';
+// User url
+if ($object->url && !getDolUserInt('USER_PUBLIC_HIDE_URL', 0, $object)) {
+	print '<div class="flexitemsmall">';
+	print img_picto('', 'globe', 'class="pictofixedwidth"');
+	print dol_print_url($object->url, '_blank', 0, 0, '');
+	print '</div>';
 }
 
-if ($mysoc->url) {
-	print '<br>';
-	print img_picto('', 'globe', 'class="pictofixedwidth"');
-	//print 'rr';
-	print dol_print_url($mysoc->url, '_blank', 0, 0, '');
-	print '<br>';
+// User phone
+if ($object->office_phone && !getDolUserInt('USER_PUBLIC_HIDE_OFFICE_PHONE', 0, $object)) {
+	print '<div class="flexitemsmall">';
+	print img_picto('', 'phone', 'class="pictofixedwidth"');
+	print dol_print_phone($object->office_phone, $object->country_code, 0, $mysoc->id, 'tel', ' ', 0, '');
+	print '<div>';
+}
+if ($object->user_mobile && !getDolUserInt('USER_PUBLIC_HIDE_USER_MOBILE', 0, $object)) {
+	print '<div class="flexitemsmall">';
+	print img_picto('', 'phone', 'class="pictofixedwidth"');
+	print dol_print_phone($object->user_mobile, $object->country_code, 0, $mysoc->id, 'tel', ' ', 0, '');
+	print '<div>';
+}
+
+// Social networks
+if (!empty($object->socialnetworks) && is_array($object->socialnetworks) && count($object->socialnetworks) > 0) {
+	if (!getDolUserInt('USER_PUBLIC_HIDE_SOCIALNETWORKS', 0, $object)) {
+		foreach ($object->socialnetworks as $key => $value) {
+			if ($value) {
+				print '<div class="flexitemsmall">'.dol_print_socialnetworks($value, 0, $mysoc->id, $key, $socialnetworksdict).'</div>';
+			}
+		}
+	}
 }
 
 
@@ -353,6 +280,98 @@ print '</table>'."\n";
 
 
 
+if (!getDolUserInt('USER_PUBLIC_HIDE_COMPANY', 0, $object)) {
+	$companysection = '';
+
+	if ($mysoc->email) {
+		$companysection .= '<div class="flexitemsmall">';
+		$companysection .= img_picto('', 'email', 'class="pictofixedwidth"');
+		$companysection .= dol_print_email($mysoc->email, 0, 0, 1);
+		$companysection .= '<div>';
+	}
+
+	if ($mysoc->url) {
+		$companysection .= '<div class="flexitemsmall">';
+		$companysection .= img_picto('', 'globe', 'class="pictofixedwidth"');
+		$companysection .= dol_print_url($mysoc->url, '_blank', 0, 0, '');
+		$companysection .= '</div>';
+	}
+
+	if ($mysoc->phone) {
+		$companysection .= '<div class="flexitemsmall">';
+		$companysection .= img_picto('', 'phone', 'class="pictofixedwidth"');
+		$companysection .= dol_print_phone($mysoc->phone, $mysoc->country_code, 0, $mysoc->id, 'tel', ' ', 0, '');
+		$companysection .= '<div>';
+	}
+
+	// Social networks
+	if (!empty($mysoc->socialnetworks) && is_array($mysoc->socialnetworks) && count($mysoc->socialnetworks) > 0) {
+		foreach ($mysoc->socialnetworks as $key => $value) {
+			if ($value) {
+				$companysection .= '<div class="flexitemsmall">'.dol_print_socialnetworks($value, 0, $mysoc->id, $key, $socialnetworksdict).'</div>';
+			}
+		}
+	}
+
+	// Show logo (search order: logo defined by ONLINE_SIGN_LOGO_suffix, then ONLINE_SIGN_LOGO_, then small company logo, large company logo, theme logo, common logo)
+	// Define logo and logosmall
+	$logosmall = $mysoc->logo_squarred_small ? $mysoc->logo_squarred_small : $mysoc->logo_small;
+	$logo = $mysoc->logo_squarred ? $mysoc->logo_squarred : $mysoc->logo;
+	$paramlogo = 'ONLINE_USER_LOGO_'.$suffix;
+	if (!empty($conf->global->$paramlogo)) {
+		$logosmall = $conf->global->$paramlogo;
+	} elseif (!empty($conf->global->ONLINE_USER_LOGO)) {
+		$logosmall = $conf->global->ONLINE_USER_LOGO;
+	}
+	//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
+	// Define urllogo
+	$urllogo = '';
+	$urllogofull = '';
+	if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall)) {
+		$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$logosmall);
+		$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
+	} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo)) {
+		$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$logo);
+		$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
+	}
+	// Output html code for logo
+	if ($urllogo) {
+		print '<div class="logopublicpayment center">';
+		if (!empty($mysoc->url)) {
+			print '<a href="'.$mysoc->url.'" target="_blank" rel="noopener">';
+		}
+		print '<img class="userphotopublicvcard" id="dolpaymentlogo" src="'.$urllogofull.'">';
+		if (!empty($mysoc->url)) {
+			print '</a>';
+		}
+		print '</div>';
+	}
+	print '<table id="dolpaymenttable" summary="Job position offer" class="center">'."\n";
+
+	// Output payment summary form
+	print '<tr><td class="left">';
+
+	print '<div class="nowidthimp" id="tablepublicpayment">';
+
+	// Add company info
+	if ($mysoc->name) {
+		print '<div class="center bold">';
+		print $mysoc->name;
+		print '</div>';
+		print '<br>';
+	}
+
+	print $companysection;
+
+	print '</div>'."\n";
+	print "\n";
+
+	print '</td></tr>'."\n";
+
+	print '</table>'."\n";
+}
+
+
 // Description
 $text = getDolUserString('USER_PUBLIC_MORE', '', $object);
 print $text;
@@ -368,8 +387,8 @@ print '<br>';
 print '<div class="backgreypublicpayment">';
 print '<div class="center">';
 print '<a href="'.$urlforqrcode.'">';
-print img_picto($langs->trans("AddTocontacts"), 'add').' ';
-print $langs->trans("AddTocontacts");
+print img_picto($langs->trans("AddToContacts"), 'add').' ';
+print $langs->trans("AddToContacts");
 print '</a>';
 print '</div>';
 //print '<div>';
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 983e571e399..289f44333cc 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -3110,6 +3110,17 @@ img.userphotosmall {			/* size for user photo in lists */
 	vertical-align: middle;
 	background-color: #FFF;
 }
+img.userphotopublicvcard {
+	width: 60px;
+	height: 60px;
+	border-radius: 50%;
+	background-size: contain;
+	border: 1px solid;
+	border-color: rgba(128, 128, 128, 0.5);
+	position: relative;
+	top: 25px;
+	left: -110px;
+}
 img.userphoto[alt="Gravatar avatar"], img.photouserphoto.dropdown-user-image[alt="Gravatar avatar"] {
 	background: #fff;
 }
@@ -7814,6 +7825,12 @@ div.clipboardCPValue.hidewithsize {
 	.lilevel1 span.paddingright {
 		padding-right: 4px;
 	}
+
+	img.userphotopublicvcard {
+		left: unset;
+		top: unset;
+		margin-top: 30px;
+	}
 }
 
 @media only screen and (max-width: 320px)
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 89358053ef3..39f6858570a 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3232,6 +3232,17 @@ img.userphotosmall {			/* size for user photo in lists */
 img.userphoto[alt="Gravatar avatar"], img.photouserphoto.dropdown-user-image[alt="Gravatar avatar"] {
 	background: #fff;
 }
+img.userphotopublicvcard {
+	width: 60px;
+	height: 60px;
+	border-radius: 50%;
+	background-size: contain;
+	border: 1px solid;
+	border-color: rgba(128, 128, 128, 0.5);
+	position: relative;
+	top: 25px;
+	left: -110px;
+}
 form[name="addtime"] img.userphoto {
 	border: 1px solid #444;
 }
@@ -7639,6 +7650,12 @@ div.clipboardCPValue.hidewithsize {
 	.lilevel1 span.paddingright {
 		padding-right: 3px;
 	}
+	
+	img.userphotopublicvcard {
+		left: unset;
+		top: unset;
+		margin-top: 30px;
+	}
 }
 
 
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 8fceddf313b..05c831fcf04 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1433,12 +1433,10 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print dol_get_fiche_head($head, 'user', $title, -1, 'user');
 
 			$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid" rel="noopener">';
-			$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
+			$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard").' ('.$langs->trans("AddToContacts").')', 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 			$morehtmlref .= '</a>';
 
-			//$urltovirtualcard = $object->getOnlineVirtualCardUrl();
 			$urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id);
-
 			$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->trans("PublicVirtualCardUrl"), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
 			/*$morehtmlref .= '<a href="'.$urltovirtualcard.'" class="refid" target="_blank" rel="noopener">';
 			$morehtmlref .= img_picto($langs->trans("PublicVirtualCardUrl"), 'id-card', 'class="valignmiddle marginleftonly paddingrightonly"');
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 9104dd5cfd4..74093af63c6 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -3789,9 +3789,10 @@ class User extends CommonObject
 	/**
 	 * Return string with full Url to virtual card
 	 *
-	 * @return	string				      Url string
+	 * @param	string		$mode		Mode for link
+	 * @return	string				    Url string link
 	 */
-	public function getOnlineVirtualCardUrl()
+	public function getOnlineVirtualCardUrl($mode = '')
 	{
 		global $dolibarr_main_instance_unique_id, $dolibarr_main_url_root;
 		global $conf;
@@ -3807,7 +3808,7 @@ class User extends CommonObject
 		$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
 
-		return $urlwithroot.'/public/users/view.php?id='.$this->id.'&securekey='.$encodedsecurekey.$entity_qr;
+		return $urlwithroot.'/public/users/view.php?id='.$this->id.'&securekey='.$encodedsecurekey.$entity_qr.($mode ? '&mode='.urlencode($mode) : '');
 	}
 
 	/**
diff --git a/htdocs/user/virtualcard.php b/htdocs/user/virtualcard.php
index 30dc32ad01c..69ecb2a9503 100644
--- a/htdocs/user/virtualcard.php
+++ b/htdocs/user/virtualcard.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 
 // Load translation files required by page
-$langs->load("users");
+$langs->loadLangs(array("users", "companies"));
 
 // Security check
 $id = GETPOST('id', 'int');
@@ -62,11 +62,12 @@ if (($object->id != $user->id) && empty($user->rights->user->user->lire)) {
 
 if ($action == 'update') {
 	$tmparray = array();
-	$tmparray['USER_PUBLIC_COMPANY_NAME'] = (GETPOST('USER_PUBLIC_COMPANY_NAME') ? 1 : 0);
-	$tmparray['USER_PUBLIC_JOBPOSITION'] = (GETPOST('USER_PUBLIC_JOBPOSITION') ? 1 : 0);
-	$tmparray['USER_PUBLIC_EMAIL'] = (GETPOST('USER_PUBLIC_EMAIL') ? 1 : 0);
-	$tmparray['USER_PUBLIC_PHONE'] = (GETPOST('USER_PUBLIC_PHONE') ? 1 : 0);
-	$tmparray['USER_PUBLIC_SOCIALNETWORKS'] = (GETPOST('USER_PUBLIC_SOCIALNETWORKS') ? 1 : 0);
+	$tmparray['USER_PUBLIC_HIDE_JOBPOSITION'] = (GETPOST('USER_PUBLIC_HIDE_JOBPOSITION') ? 1 : 0);
+	$tmparray['USER_PUBLIC_HIDE_EMAIL'] = (GETPOST('USER_PUBLIC_HIDE_EMAIL') ? 1 : 0);
+	$tmparray['USER_PUBLIC_HIDE_OFFICE_PHONE'] = (GETPOST('USER_PUBLIC_HIDE_OFFICE_PHONE') ? 1 : 0);
+	$tmparray['USER_PUBLIC_HIDE_USER_MOBILE'] = (GETPOST('USER_PUBLIC_HIDE_USER_MOBILE') ? 1 : 0);
+	$tmparray['USER_PUBLIC_HIDE_SOCIALNETWORKS'] = (GETPOST('USER_PUBLIC_HIDE_SOCIALNETWORKS') ? 1 : 0);
+	$tmparray['USER_PUBLIC_HIDE_COMPANY'] = (GETPOST('USER_PUBLIC_HIDE_COMPANY') ? 1 : 0);
 	$tmparray['USER_PUBLIC_MORE'] = (GETPOST('USER_PUBLIC_MORE') ? GETPOST('USER_PUBLIC_MORE') : '');
 
 	dol_set_user_param($db, $conf, $object, $tmparray);
@@ -133,6 +134,7 @@ print '<br>';
 print '<span class="opacitymedium">'.$langs->trans("UserPublicPageDesc").'</span><br><br>';
 
 $param = '&id='.((int) $object->id);
+$param .= '&dol_openinpopup=1';
 
 $enabledisablehtml = $langs->trans("EnablePublicVirtualCard").' ';
 if (!getDolUserInt('USER_ENABLE_PUBLIC', 0, $object)) {
@@ -179,40 +181,46 @@ if (getDolUserInt('USER_ENABLE_PUBLIC', 0, $object)) {
 	print '<td>'.$langs->trans("Value").'</td>';
 	print "</tr>\n";
 
-	// Company name
-	print '<tr class="oddeven" id="tramount"><td>';
-	print $langs->trans("Company");
-	print '</td><td>';
-	//print '<input type="text" class="maxwidth300" id="USER_PUBLIC_COMPANY_NAME" name="USER_PUBLIC_COMPANY_NAME" value="'.(getDolUserString('USER_PUBLIC_COMPANY_NAME', $mysoc->name, $object) ? getDolUserString('USER_PUBLIC_COMPANY_NAME', $mysoc->name, $object) : 0).'">';
-	print $form->selectyesno("USER_PUBLIC_COMPANY_NAME", (getDolUserInt('USER_PUBLIC_COMPANY_NAME', 0, $object) ? getDolUserInt('USER_PUBLIC_COMPANY_NAME', 0, $object) : 0), 1);
-	print "</td></tr>\n";
-
 	// Job position
 	print '<tr class="oddeven" id="tredit"><td>';
-	print $langs->trans("PostOrFunction");
+	print $langs->trans("HideOnVCard", $langs->transnoentitiesnoconv("PostOrFunction"));
 	print '</td><td>';
-	print $form->selectyesno("USER_PUBLIC_JOBPOSITION", (getDolUserInt('USER_PUBLIC_JOBPOSITION', 0, $object) ? getDolUserInt('USER_PUBLIC_JOBPOSITION', 0, $object) : 0), 1);
+	print $form->selectyesno("USER_PUBLIC_HIDE_JOBPOSITION", (getDolUserInt('USER_PUBLIC_HIDE_JOBPOSITION', 0, $object) ? getDolUserInt('USER_PUBLIC_HIDE_JOBPOSITION', 0, $object) : 0), 1);
 	print "</td></tr>\n";
 
 	// Email
 	print '<tr class="oddeven" id="tredit"><td>';
-	print $langs->trans("Email");
+	print $langs->trans("HideOnVCard", $langs->transnoentitiesnoconv("Email"));
 	print '</td><td>';
-	print $form->selectyesno("USER_PUBLIC_EMAIL", (getDolUserInt('USER_PUBLIC_EMAIL', 0, $object) ? getDolUserInt('USER_PUBLIC_EMAIL', 0, $object) : 0), 1);
+	print $form->selectyesno("USER_PUBLIC_HIDE_EMAIL", (getDolUserInt('USER_PUBLIC_HIDE_EMAIL', 0, $object) ? getDolUserInt('USER_PUBLIC_HIDE_EMAIL', 0, $object) : 0), 1);
 	print "</td></tr>\n";
 
-	// Phone
+	// Office phone
 	print '<tr class="oddeven" id="tredit"><td>';
-	print $langs->trans("Phone");
+	print $langs->trans("HideOnVCard", $langs->transnoentitiesnoconv("OfficePhone"));
 	print '</td><td>';
-	print $form->selectyesno("USER_PUBLIC_PHONE", (getDolUserInt('USER_PUBLIC_PHONE', 0, $object) ? getDolUserInt('USER_PUBLIC_PHONE', 0, $object) : 0), 1);
+	print $form->selectyesno("USER_PUBLIC_HIDE_OFFICE_PHONE", (getDolUserInt('USER_PUBLIC_HIDE_OFFICE_PHONE', 0, $object) ? getDolUserInt('USER_PUBLIC_HIDE_OFFICE_PHONE', 0, $object) : 0), 1);
+	print "</td></tr>\n";
+
+	// Office phone
+	print '<tr class="oddeven" id="tredit"><td>';
+	print $langs->trans("HideOnVCard", $langs->transnoentitiesnoconv("UserMobile"));
+	print '</td><td>';
+	print $form->selectyesno("USER_PUBLIC_HIDE_USER_MOBILE", (getDolUserInt('USER_PUBLIC_HIDE_USER_MOBILE', 0, $object) ? getDolUserInt('USER_PUBLIC_HIDE_USER_MOBILE', 0, $object) : 0), 1);
 	print "</td></tr>\n";
 
 	// Social networks
 	print '<tr class="oddeven" id="tredit"><td>';
-	print $langs->trans("SocialNetworks");
+	print $langs->trans("HideOnVCard", $langs->transnoentitiesnoconv("SocialNetworks"));
 	print '</td><td>';
-	print $form->selectyesno("USER_PUBLIC_SOCIALNETWORKS", (getDolUserInt('USER_PUBLIC_SOCIALNETWORKS', 0, $object) ? getDolUserInt('USER_PUBLIC_SOCIALNETWORKS', 0, $object) : 0), 1);
+	print $form->selectyesno("USER_PUBLIC_HIDE_SOCIALNETWORKS", (getDolUserInt('USER_PUBLIC_HIDE_SOCIALNETWORKS', 0, $object) ? getDolUserInt('USER_PUBLIC_HIDE_SOCIALNETWORKS', 0, $object) : 0), 1);
+	print "</td></tr>\n";
+
+	// Company name
+	print '<tr class="oddeven" id="tramount"><td>';
+	print $langs->trans("HideOnVCard", $langs->transnoentitiesnoconv("CompanySection"));
+	print '</td><td>';
+	print $form->selectyesno("USER_PUBLIC_HIDE_COMPANY", (getDolUserInt('USER_PUBLIC_HIDE_COMPANY', 0, $object) ? getDolUserInt('USER_PUBLIC_HIDE_COMPANY', 0, $object) : 0), 1);
 	print "</td></tr>\n";
 
 	// More
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index d676f8a6ee9..ed5afe72f21 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -52,44 +52,31 @@ if (!defined('NOREQUIREAJAX')) {
 
 // Some value of modulepart can be used to get resources that are public so no login are required.
 // Note that only directory logo is free to access without login.
-if (isset($_GET["modulepart"]) && $_GET["modulepart"] == 'mycompany' && preg_match('/^\/?logos\//', $_GET['file'])) {
-	if (!defined("NOLOGIN")) {
-		define("NOLOGIN", 1);
+$needlogin = 1;
+if (isset($_GET["modulepart"])) {
+	// For logo of company
+	if ($_GET["modulepart"] == 'mycompany' && preg_match('/^\/?logos\//', $_GET['file'])) {
+		$needlogin = 0;
 	}
-	if (!defined("NOCSRFCHECK")) {
-		define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+	// For barcode live generation
+	if ($_GET["modulepart"] == 'barcode') {
+		$needlogin = 0;
 	}
-	if (!defined("NOIPCHECK")) {
-		define("NOIPCHECK", 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+	// Some value of modulepart can be used to get resources that are public so no login are required.
+	if ($_GET["modulepart"] == 'medias') {
+		$needlogin = 0;
+	}
+	// Used by TakePOS Auto Order
+	if ($_GET["modulepart"] == 'product' && isset($_GET["publictakepos"])) {
+		$needlogin = 0;
 	}
 }
 // For direct external download link, we don't need to load/check we are into a login session
-if (isset($_GET["hashp"]) && !defined("NOLOGIN")) {
-	if (!defined("NOLOGIN")) {
-		define("NOLOGIN", 1);
-	}
-	if (!defined("NOCSRFCHECK")) {
-		define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
-	}
-	if (!defined("NOIPCHECK")) {
-		define("NOIPCHECK", 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip
-	}
+if (isset($_GET["hashp"])) {
+	$needlogin = 0;
 }
-// Some value of modulepart can be used to get resources that are public so no login are required.
-if (isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias') {
-	if (!defined("NOLOGIN")) {
-		define("NOLOGIN", 1);
-	}
-	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
-	}
-}
-
-// Used by TakePOS Auto Order
-if (isset($_GET["modulepart"]) && $_GET["modulepart"] == 'product' && isset($_GET["publictakepos"])) {
+// If nologin required
+if (!$needlogin) {
 	if (!defined("NOLOGIN")) {
 		define("NOLOGIN", 1);
 	}
@@ -130,11 +117,11 @@ require 'main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 $action = GETPOST('action', 'aZ09');
-$original_file = GETPOST('file', 'alphanohtml'); // Do not use urldecode here ($_GET are already decoded by PHP).
-$hashp = GETPOST('hashp', 'aZ09');
-$modulepart = GETPOST('modulepart', 'alpha');
+$original_file = GETPOST('file', 'alphanohtml'); 	// Do not use urldecode here ($_GET are already decoded by PHP).
+$hashp = GETPOST('hashp', 'aZ09', 1);				// Must be read only by GET
+$modulepart = GETPOST('modulepart', 'alpha', 1);	// Must be read only by GET
 $urlsource = GETPOST('urlsource', 'alpha');
-$entity = GETPOST('entity', 'int') ?GETPOST('entity', 'int') : $conf->entity;
+$entity = (GETPOST('entity', 'int') ? GETPOST('entity', 'int') : $conf->entity);
 
 // Security check
 if (empty($modulepart) && empty($hashp)) {

From 9741d2d72334f597dc19247f5f4a30d82a6897d9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Jan 2023 17:00:39 +0100
Subject: [PATCH 373/816] Debug virtual card

---
 htdocs/core/lib/files.lib.php | 33 ++++++++++++---
 htdocs/public/users/view.php  | 76 ++++++++++++++++++++++-------------
 htdocs/user/card.php          |  3 --
 htdocs/user/virtualcard.php   | 25 ++++++++++--
 htdocs/viewimage.php          |  4 +-
 5 files changed, 99 insertions(+), 42 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 47b3955e617..ad7d7cecfa5 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2527,14 +2527,37 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$accessallowed = 1;
 		$original_file = $conf->mycompany->dir_output.'/'.$original_file;
 	} elseif ($modulepart == 'userphoto' && !empty($conf->user->dir_output)) {
-		// Wrapping for users photos
+		// Wrapping for users photos (user photos are allowed to any connected users)
 		$accessallowed = 0;
 		if (preg_match('/^\d+\/photos\//', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->user->dir_output.'/'.$original_file;
+	} elseif ($modulepart == 'userphotopublic' && !empty($conf->user->dir_output)) {
+		// Wrapping for users photos that were set to public by their owner (public user photos can be read with the public link and securekey)
+		$accessok = false;
+		$reg = array();
+		if (preg_match('/^(\d+)\/photos\//', $original_file, $reg)) {
+			if ($reg[0]) {
+				$tmpobject = new User($db);
+				$tmpobject->fetch($reg[0], '', '', 1);
+				if (getDolUserInt('USER_ENABLE_PUBLIC', 0, $tmpobject)) {
+					$securekey = GETPOST('securekey', 'alpha', 1);
+					// Security check
+					global $dolibarr_main_instance_unique_id;
+					$encodedsecurekey = dol_hash($dolibarr_main_instance_unique_id.'uservirtualcard'.$tmpobject->id.'-'.$tmpobject->login, 'md5');
+					if ($encodedsecurekey == $securekey) {
+						$accessok = true;
+					}
+				}
+			}
+		}
+		if ($accessok) {
+			$accessallowed = 1;
+		}
+		$original_file = $conf->user->dir_output.'/'.$original_file;
 	} elseif (($modulepart == 'companylogo') && !empty($conf->mycompany->dir_output)) {
-		// Wrapping for users logos
+		// Wrapping for company logos (company logos are allowed to anyboby, they are public)
 		$accessallowed = 1;
 		$original_file = $conf->mycompany->dir_output.'/logos/'.$original_file;
 	} elseif ($modulepart == 'memberphoto' && !empty($conf->adherent->dir_output)) {
@@ -2545,7 +2568,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->adherent->dir_output.'/'.$original_file;
 	} elseif ($modulepart == 'apercufacture' && !empty($conf->facture->multidir_output[$entity])) {
-		// Wrapping pour les apercu factures
+		// Wrapping for invoices (user need permission to read invoices)
 		if ($fuser->rights->facture->{$lire}) {
 			$accessallowed = 1;
 		}
@@ -2698,11 +2721,11 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->agenda->dir_output.'/'.$original_file;
 	} elseif ($modulepart == 'category' && !empty($conf->categorie->multidir_output[$entity])) {
-		// Wrapping for categories
+		// Wrapping for categories (categories are allowed if user has permission to read categories or to work on TakePos)
 		if (empty($entity) || empty($conf->categorie->multidir_output[$entity])) {
 			return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
 		}
-		if ($fuser->rights->categorie->{$lire} || $fuser->rights->takepos->run) {
+		if ($fuser->hasRight("categorie", $lire) || $fuser->hasRight("takepos", "run")) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->categorie->multidir_output[$entity].'/'.$original_file;
diff --git a/htdocs/public/users/view.php b/htdocs/public/users/view.php
index 7a843a0b597..511e7b93604 100644
--- a/htdocs/public/users/view.php
+++ b/htdocs/public/users/view.php
@@ -146,7 +146,7 @@ print '<input type="hidden" name="entity" value="'.$entity.'" />';
 print "\n";
 print '<!-- Form to view job -->'."\n";
 
-$modulepart = 'user';
+$modulepart = 'userphotopublic';
 $imagesize = 'small';
 $dir = $conf->user->dir_output;
 $email = $object->email;
@@ -167,11 +167,11 @@ if (!empty($object->photo)) {
 $urllogo = '';
 $urllogofull = '';
 if (!empty($logosmall) && is_readable($conf->user->dir_output.'/'.$logosmall)) {
-	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&amp;entity='.$conf->entity.'&amp;file='.urlencode($logosmall);
-	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart='.$modulepart.'&entity='.$conf->entity.'&file='.urlencode($logosmall);
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&amp;entity='.$conf->entity.'&amp;securekey='.urlencode($securekey).'&amp;file='.urlencode($logosmall);
+	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart='.$modulepart.'&entity='.$conf->entity.'&amp;securekey='.urlencode($securekey).'&file='.urlencode($logosmall);
 } elseif (!empty($logo) && is_readable($conf->user->dir_output.'/'.$logo)) {
-	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&amp;entity='.$conf->entity.'&amp;file='.urlencode($logo);
-	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart='.$modulepart.'&entity='.$conf->entity.'&file='.urlencode($logo);
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&amp;entity='.$conf->entity.'&amp;securekey='.urlencode($securekey).'&amp;file='.urlencode($logo);
+	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart='.$modulepart.'&entity='.$conf->entity.'&amp;securekey='.urlencode($securekey).'&file='.urlencode($logo);
 }
 
 // Output html code for logo
@@ -223,40 +223,43 @@ if ($showbarcode) {
 if ($urllogo) {
 	print '<img class="userphotopublicvcard" id="dolpaymentlogo" src="'.$urllogofull.'">';
 }
-print '<table id="dolpaymenttable" summary="Job position offer" class="center">'."\n";
 
-// Output payment summary form
-print '<tr><td class="left">';
 
-print '<div class="nowidthimp" id="tablepublicpayment">';
+$usersection = '';
 
 // User email
 if ($object->email && !getDolUserInt('USER_PUBLIC_HIDE_EMAIL', 0, $object)) {
-	print '<div class="flexitemsmall">';
-	print dol_print_email($object->email, 0, 0, 1, 0, 1, 1);
-	print '</div>';
+	$usersection .= '<div class="flexitemsmall">';
+	$usersection .= dol_print_email($object->email, 0, 0, 1, 0, 1, 1);
+	$usersection .= '</div>';
 }
 
 // User url
 if ($object->url && !getDolUserInt('USER_PUBLIC_HIDE_URL', 0, $object)) {
-	print '<div class="flexitemsmall">';
-	print img_picto('', 'globe', 'class="pictofixedwidth"');
-	print dol_print_url($object->url, '_blank', 0, 0, '');
-	print '</div>';
+	$usersection .= '<div class="flexitemsmall">';
+	$usersection .= img_picto('', 'globe', 'class="pictofixedwidth"');
+	$usersection .= dol_print_url($object->url, '_blank', 0, 0, '');
+	$usersection .= '</div>';
 }
 
 // User phone
 if ($object->office_phone && !getDolUserInt('USER_PUBLIC_HIDE_OFFICE_PHONE', 0, $object)) {
-	print '<div class="flexitemsmall">';
-	print img_picto('', 'phone', 'class="pictofixedwidth"');
-	print dol_print_phone($object->office_phone, $object->country_code, 0, $mysoc->id, 'tel', ' ', 0, '');
-	print '<div>';
+	$usersection .= '<div class="flexitemsmall">';
+	$usersection .= img_picto('', 'phone', 'class="pictofixedwidth"');
+	$usersection .= dol_print_phone($object->office_phone, $object->country_code, 0, $mysoc->id, 'tel', ' ', 0, '');
+	$usersection .= '<div>';
+}
+if ($object->office_fax && !getDolUserInt('USER_PUBLIC_HIDE_OFFICE_FAX', 0, $object)) {
+	$usersection .= '<div class="flexitemsmall">';
+	$usersection .= img_picto('', 'phoning_fax', 'class="pictofixedwidth"');
+	$usersection .= dol_print_phone($object->office_fax, $object->country_code, 0, $mysoc->id, 'fax', ' ', 0, '');
+	$usersection .= '<div>';
 }
 if ($object->user_mobile && !getDolUserInt('USER_PUBLIC_HIDE_USER_MOBILE', 0, $object)) {
-	print '<div class="flexitemsmall">';
-	print img_picto('', 'phone', 'class="pictofixedwidth"');
-	print dol_print_phone($object->user_mobile, $object->country_code, 0, $mysoc->id, 'tel', ' ', 0, '');
-	print '<div>';
+	$usersection .= '<div class="flexitemsmall">';
+	$usersection .= img_picto('', 'phone', 'class="pictofixedwidth"');
+	$usersection .= dol_print_phone($object->user_mobile, $object->country_code, 0, $mysoc->id, 'tel', ' ', 0, '');
+	$usersection .= '<div>';
 }
 
 // Social networks
@@ -264,20 +267,29 @@ if (!empty($object->socialnetworks) && is_array($object->socialnetworks) && coun
 	if (!getDolUserInt('USER_PUBLIC_HIDE_SOCIALNETWORKS', 0, $object)) {
 		foreach ($object->socialnetworks as $key => $value) {
 			if ($value) {
-				print '<div class="flexitemsmall">'.dol_print_socialnetworks($value, 0, $mysoc->id, $key, $socialnetworksdict).'</div>';
+				$usersection .= '<div class="flexitemsmall">'.dol_print_socialnetworks($value, 0, $mysoc->id, $key, $socialnetworksdict).'</div>';
 			}
 		}
 	}
 }
 
+if ($usersection) {
+	print '<table id="dolpaymenttable" summary="Job position offer" class="center">'."\n";
 
-print '</div>'."\n";
-print "\n";
+	// Output payment summary form
+	print '<tr><td class="left">';
 
-print '</td></tr>'."\n";
+	print '<div class="nowidthimp" id="tablepublicpayment">';
 
-print '</table>'."\n";
+	print $usersection;
 
+	print '</div>'."\n";
+	print "\n";
+
+	print '</td></tr>'."\n";
+
+	print '</table>'."\n";
+}
 
 
 if (!getDolUserInt('USER_PUBLIC_HIDE_COMPANY', 0, $object)) {
@@ -303,6 +315,12 @@ if (!getDolUserInt('USER_PUBLIC_HIDE_COMPANY', 0, $object)) {
 		$companysection .= dol_print_phone($mysoc->phone, $mysoc->country_code, 0, $mysoc->id, 'tel', ' ', 0, '');
 		$companysection .= '<div>';
 	}
+	if ($mysoc->fax) {
+		$companysection .= '<div class="flexitemsmall">';
+		$companysection .= img_picto('', 'phoning_fax', 'class="pictofixedwidth"');
+		$companysection .= dol_print_phone($mysoc->fax, $mysoc->country_code, 0, $mysoc->id, 'fax', ' ', 0, '');
+		$companysection .= '<div>';
+	}
 
 	// Social networks
 	if (!empty($mysoc->socialnetworks) && is_array($mysoc->socialnetworks) && count($mysoc->socialnetworks) > 0) {
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 05c831fcf04..d535492406a 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1438,9 +1438,6 @@ if ($action == 'create' || $action == 'adduserldap') {
 
 			$urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id);
 			$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->trans("PublicVirtualCardUrl"), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
-			/*$morehtmlref .= '<a href="'.$urltovirtualcard.'" class="refid" target="_blank" rel="noopener">';
-			$morehtmlref .= img_picto($langs->trans("PublicVirtualCardUrl"), 'id-card', 'class="valignmiddle marginleftonly paddingrightonly"');
-			$morehtmlref .= '</a>';*/
 
 			dol_banner_tab($object, 'id', $linkback, $user->hasRight("user", "user", "read") || $user->admin, 'rowid', 'ref', $morehtmlref);
 
diff --git a/htdocs/user/virtualcard.php b/htdocs/user/virtualcard.php
index 69ecb2a9503..59d30e4e575 100644
--- a/htdocs/user/virtualcard.php
+++ b/htdocs/user/virtualcard.php
@@ -35,6 +35,7 @@ $langs->loadLangs(array("users", "companies"));
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
+$dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09');
 
 $object = new User($db);
 if ($id > 0 || !empty($ref)) {
@@ -62,9 +63,11 @@ if (($object->id != $user->id) && empty($user->rights->user->user->lire)) {
 
 if ($action == 'update') {
 	$tmparray = array();
+	$tmparray['USER_PUBLIC_HIDE_PHOTO'] = (GETPOST('USER_PUBLIC_HIDE_PHOTO') ? 1 : 0);
 	$tmparray['USER_PUBLIC_HIDE_JOBPOSITION'] = (GETPOST('USER_PUBLIC_HIDE_JOBPOSITION') ? 1 : 0);
 	$tmparray['USER_PUBLIC_HIDE_EMAIL'] = (GETPOST('USER_PUBLIC_HIDE_EMAIL') ? 1 : 0);
 	$tmparray['USER_PUBLIC_HIDE_OFFICE_PHONE'] = (GETPOST('USER_PUBLIC_HIDE_OFFICE_PHONE') ? 1 : 0);
+	$tmparray['USER_PUBLIC_HIDE_OFFICE_FAX'] = (GETPOST('USER_PUBLIC_HIDE_OFFICE_FAX') ? 1 : 0);
 	$tmparray['USER_PUBLIC_HIDE_USER_MOBILE'] = (GETPOST('USER_PUBLIC_HIDE_USER_MOBILE') ? 1 : 0);
 	$tmparray['USER_PUBLIC_HIDE_SOCIALNETWORKS'] = (GETPOST('USER_PUBLIC_HIDE_SOCIALNETWORKS') ? 1 : 0);
 	$tmparray['USER_PUBLIC_HIDE_COMPANY'] = (GETPOST('USER_PUBLIC_HIDE_COMPANY') ? 1 : 0);
@@ -177,10 +180,17 @@ if (getDolUserInt('USER_ENABLE_PUBLIC', 0, $object)) {
 	print '<table class="noborder centpercent">';
 
 	print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans("Parameter").'</td>';
+	print '<td>'.$langs->trans("Options").'</td>';
 	print '<td>'.$langs->trans("Value").'</td>';
 	print "</tr>\n";
 
+	// User photo
+	print '<tr class="oddeven" id="tredit"><td>';
+	print $langs->trans("HideOnVCard", $langs->transnoentitiesnoconv("Photo"));
+	print '</td><td>';
+	print $form->selectyesno("USER_PUBLIC_HIDE_PHOTO", (getDolUserInt('USER_PUBLIC_HIDE_PHOTO', 0, $object) ? getDolUserInt('USER_PUBLIC_HIDE_PHOTO', 0, $object) : 0), 1);
+	print "</td></tr>\n";
+
 	// Job position
 	print '<tr class="oddeven" id="tredit"><td>';
 	print $langs->trans("HideOnVCard", $langs->transnoentitiesnoconv("PostOrFunction"));
@@ -202,7 +212,14 @@ if (getDolUserInt('USER_ENABLE_PUBLIC', 0, $object)) {
 	print $form->selectyesno("USER_PUBLIC_HIDE_OFFICE_PHONE", (getDolUserInt('USER_PUBLIC_HIDE_OFFICE_PHONE', 0, $object) ? getDolUserInt('USER_PUBLIC_HIDE_OFFICE_PHONE', 0, $object) : 0), 1);
 	print "</td></tr>\n";
 
-	// Office phone
+	// Office fax
+	print '<tr class="oddeven" id="tredit"><td>';
+	print $langs->trans("HideOnVCard", $langs->transnoentitiesnoconv("OfficeFax"));
+	print '</td><td>';
+	print $form->selectyesno("USER_PUBLIC_HIDE_OFFICE_FAX", (getDolUserInt('USER_PUBLIC_HIDE_OFFICE_FAX', 0, $object) ? getDolUserInt('USER_PUBLIC_HIDE_OFFICE_FAX', 0, $object) : 0), 1);
+	print "</td></tr>\n";
+
+	// User mobile
 	print '<tr class="oddeven" id="tredit"><td>';
 	print $langs->trans("HideOnVCard", $langs->transnoentitiesnoconv("UserMobile"));
 	print '</td><td>';
@@ -225,7 +242,7 @@ if (getDolUserInt('USER_ENABLE_PUBLIC', 0, $object)) {
 
 	// More
 	print '<tr class="oddeven" id="tredit"><td>';
-	print $langs->trans("More");
+	print $langs->trans("Text");
 	print '</td><td>';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 	$doleditor = new DolEditor('USER_PUBLIC_MORE', getDolUserString('USER_PUBLIC_MORE', '', $object), '', 160, 'dolibarr_notes', '', false, false, isModEnabled('fckeditor'), ROWS_5, '90%');
@@ -236,7 +253,7 @@ if (getDolUserInt('USER_ENABLE_PUBLIC', 0, $object)) {
 	print '</div>';
 
 	print '<div class="center">';
-	print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
+	print $form->buttonsSaveCancel("Save", "Cancel", array(), 0, '', $dol_openinpopup);
 	print '</div>';
 }
 
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index ed5afe72f21..2c2c93acbca 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -66,6 +66,9 @@ if (isset($_GET["modulepart"])) {
 	if ($_GET["modulepart"] == 'medias') {
 		$needlogin = 0;
 	}
+	if ($_GET["modulepart"] == 'userphotopublic') {
+		$needlogin = 0;
+	}
 	// Used by TakePOS Auto Order
 	if ($_GET["modulepart"] == 'product' && isset($_GET["publictakepos"])) {
 		$needlogin = 0;
@@ -135,7 +138,6 @@ if ($modulepart == 'fckeditor') {
 }
 
 
-
 /*
  * Actions
  */

From def29ac9f901162a204f4e2b5d70377103185bd6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Jan 2023 17:26:57 +0100
Subject: [PATCH 374/816] Fix style

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

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index e1916310b34..42ac08383ea 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -576,18 +576,18 @@ if (!empty($object->piece_num)) {
 
 			print '<tr class="liste_titre">';
 
-				print_liste_field_titre("AccountAccountingShort");
-				print_liste_field_titre("SubledgerAccount");
-				print_liste_field_titre("LabelOperation");
-				print_liste_field_titre("AccountingDebit", "", "", "", "", 'class="right"');
-				print_liste_field_titre("AccountingCredit", "", "", "", "", 'class="right"');
-				if (empty($object->date_validation)) {
-					print_liste_field_titre("Action", "", "", "", "", 'width="60"', "", "", 'center ');
-				} else {
-					print_liste_field_titre("");
-				}
+			print_liste_field_titre("AccountAccountingShort");
+			print_liste_field_titre("SubledgerAccount");
+			print_liste_field_titre("LabelOperation");
+			print_liste_field_titre("AccountingDebit", "", "", "", "", 'class="right"');
+			print_liste_field_titre("AccountingCredit", "", "", "", "", 'class="right"');
+			if (empty($object->date_validation)) {
+				print_liste_field_titre("Action", "", "", "", "", 'width="60"', "", "", 'center ');
+			} else {
+				print_liste_field_titre("");
+			}
 
-				print "</tr>\n";
+			print "</tr>\n";
 
 			// In _tmp mode the first line is empty so we remove it
 			if ($mode == "_tmp") {

From 59dd3be2bb6c2ebab7e0733da2547d213aacae87 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Jan 2023 17:47:58 +0100
Subject: [PATCH 375/816] Fix title

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index a21082a8bc6..301162c1429 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2284,7 +2284,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 	// Defined the links for bottom of card
 	$profilLink = '<a accesskey="c" href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="button-top-menu-dropdown" title="'.dol_escape_htmltag($langs->trans("YourUserFile")).'"><i class="fa fa-user"></i>  '.$langs->trans("Card").'</a>';
 	$urltovirtualcard = '/user/virtualcard.php?id='.((int) $user->id);
-	$virtuelcardLink = dolButtonToOpenUrlInDialogPopup('publicvirtualcardmenu', $langs->trans("PublicVirtualCardUrl"), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', ''), $urltovirtualcard, '', 'button-top-menu-dropdown marginleftonly nohover', "closeTopMenuLoginDropdown()", '', 'v');
+	$virtuelcardLink = dolButtonToOpenUrlInDialogPopup('publicvirtualcardmenu', $langs->trans("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', ''), $urltovirtualcard, '', 'button-top-menu-dropdown marginleftonly nohover', "closeTopMenuLoginDropdown()", '', 'v');
 	$logoutLink = '<a accesskey="l" href="'.$urllogout.'" class="button-top-menu-dropdown" title="'.dol_escape_htmltag($langs->trans("Logout")).'"><i class="fa fa-sign-out-alt"></i> '.$langs->trans("Logout").'</a>';
 
 	$profilName = $user->getFullName($langs).' ('.$user->login.')';
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index d535492406a..e7d001b1041 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1437,7 +1437,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			$morehtmlref .= '</a>';
 
 			$urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id);
-			$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->trans("PublicVirtualCardUrl"), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
+			$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->trans("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
 
 			dol_banner_tab($object, 'id', $linkback, $user->hasRight("user", "user", "read") || $user->admin, 'rowid', 'ref', $morehtmlref);
 

From 47d448325122bcb71f2341efef8a1c75adb97bd6 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sat, 7 Jan 2023 18:42:15 +0100
Subject: [PATCH 376/816] Update payout.php

---
 htdocs/stripe/payout.php | 76 ++++------------------------------------
 1 file changed, 7 insertions(+), 69 deletions(-)

diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php
index 1965c8ab73d..c1c7a8febeb 100644
--- a/htdocs/stripe/payout.php
+++ b/htdocs/stripe/payout.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2018-2019  Thibault FOUCART        <support@ptibogxiv.net>
+/* Copyright (C) 2018-2023  Thibault FOUCART        <support@ptibogxiv.net>
  * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -65,8 +65,6 @@ $result = restrictedArea($user, 'banque');
  */
 
 $form = new Form($db);
-$societestatic = new Societe($db);
-$memberstatic = new Adherent($db);
 $acc = new Account($db);
 $stripe = new Stripe($db);
 
@@ -129,47 +127,13 @@ if (!$rowid) {
 		}
 
 		foreach ($payout->data as $payout) {
-			//$charge = $payout;
-			//var_dump($payout);
-
-			// The metadata FULLTAG is defined by the online payment page
-			/*$FULLTAG=$charge->metadata->FULLTAG;
-
-			// Save into $tmparray all metadata
-			$tmparray = dolExplodeIntoArray($FULLTAG,'.','=');
-			// Load origin object according to metadata
-			if (!empty($tmparray['CUS']))
-			{
-				$societestatic->fetch($tmparray['CUS']);
-			}
-			else
-			{
-				$societestatic->id = 0;
-			}
-			if (!empty($tmparray['MEM']))
-			{
-				$memberstatic->fetch($tmparray['MEM']);
-			}
-			else
-			{
-				$memberstatic->id = 0;
-			}*/
-
-			$societestatic->fetch($charge->metadata->idcustomer);
-			$societestatic->id = $charge->metadata->idcustomer;
-			$societestatic->lastname = $obj->lastname;
-			$societestatic->firstname = $obj->firstname;
-			$societestatic->admin = $obj->admin;
-			$societestatic->login = $obj->login;
-			$societestatic->email = $obj->email;
-			$societestatic->socid = $obj->fk_soc;
 
 			print '<tr class="oddeven">';
 
 			// Ref
 			if (!empty($stripeacc)) {
 				$connect = $stripeacc.'/';
-			}
+			} else $connect = null;
 
 			$url = 'https://dashboard.stripe.com/'.$connect.'test/payouts/'.$payout->id;
 			if ($servicestatus) {
@@ -178,32 +142,6 @@ if (!$rowid) {
 
 			print "<td><a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'globe')." ".$payout->id."</a></td>\n";
 
-
-			// Stripe customer
-			//print "<td>".$charge->customer."</td>\n";
-			// Link
-			/*print "<td>";
-			if ($societestatic->id > 0)
-			{
-				print $societestatic->getNomUrl(1);
-			}
-			if ($memberstatic->id > 0)
-			{
-				print $memberstatic->getNomUrl(1);
-			}
-			print "</td>\n";*/
-			// Origine
-			//print "<td>";
-			////if ($charge->metadata->dol_type=="order"){
-			//	$object = new Commande($db);
-			//	$object->fetch($charge->metadata->dol_id);
-			//	print "<a href='".DOL_URL_ROOT."/commande/card.php?id=".$charge->metadata->dol_id."'>".img_picto('', 'object_order')." ".$object->ref."</a>";
-			//} elseif ($charge->metadata->dol_type=="invoice"){
-			//	$object = new Facture($db);
-			//	$object->fetch($charge->metadata->dol_id);
-			//	print "<a href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->dol_id."'>".img_picto('', 'object_invoice')." ".$object->ref."</a>";
-			//}
-			//print "</td>\n";
 			// Date payment
 			print '<td class="center">'.dol_print_date($payout->created, 'dayhour')."</td>\n";
 			// Date payment
@@ -215,15 +153,15 @@ if (!$rowid) {
 			// Status
 			print "<td class='right'>";
 			if ($payout->status == 'paid') {
-				print img_picto($langs->trans("".$payout->status.""), 'statut4');
+				print img_picto($langs->trans($payout->status), 'statut4');
 			} elseif ($payout->status == 'pending') {
-				print img_picto($langs->trans("".$payout->status.""), 'statut7');
+				print img_picto($langs->trans($payout->status), 'statut7');
 			} elseif ($payout->status == 'in_transit') {
-				print img_picto($langs->trans("".$payout->status.""), 'statut7');
+				print img_picto($langs->trans($payout->status), 'statut7');
 			} elseif ($payout->status == 'failed') {
-				print img_picto($langs->trans("".$payout->status.""), 'statut7');
+				print img_picto($langs->trans($payout->status), 'statut7');
 			} elseif ($payout->status == 'canceled') {
-				print img_picto($langs->trans("".$payout->status.""), 'statut8');
+				print img_picto($langs->trans($payout->status), 'statut8');
 			}
 			print '</td>';
 			print "</tr>\n";

From 98aa68de8d68c782abaa009e6588fcb36b73e102 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Jan 2023 18:35:26 +0100
Subject: [PATCH 377/816] Move to format vcard v4

---
 htdocs/core/class/vcard.class.php | 73 ++++++++++++++++---------------
 htdocs/main.inc.php               |  2 +-
 2 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/htdocs/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php
index 91e3a5565e1..53f5b4496b9 100644
--- a/htdocs/core/class/vcard.class.php
+++ b/htdocs/core/class/vcard.class.php
@@ -1,7 +1,4 @@
 <?php
-use Splash\Tests\WsObjects\O00ObjectBaseTest;
-use JMS\Serializer\Exception\ObjectConstructionException;
-
 /* Copyright (C)           Kai Blankenhorn      <kaib@bitfolge.de>
  * Copyright (C) 2005-2017 Laurent Destailleur  <eldy@users.sourceforge.org>
  * Copyright (C) 2020		Tobias Sekan		<tobias.sekan@startmail.com>
@@ -103,14 +100,14 @@ class vCard
 	/**
 	 * @var string encoding
 	 */
-	public $encoding = "ISO-8859-1;ENCODING=QUOTED-PRINTABLE";
+	public $encoding = "ENCODING=QUOTED-PRINTABLE";
 
 
 	/**
 	 *  mise en forme du numero de telephone
 	 *
 	 *  @param	int		$number		numero de telephone
-	 *  @param	string	$type		Type
+	 *  @param	string	$type		Type ('cell')
 	 *  @return	void
 	 */
 	public function setPhoneNumber($number, $type = "")
@@ -120,22 +117,22 @@ class vCard
 		if ($type != "") {
 			$key .= ";".$type;
 		}
-		$key .= ";CHARSET=".$this->encoding;
-		$this->properties[$key] = encode($number);
+		$key .= ";".$this->encoding;
+		$this->properties[$key] = 'VALUE=uri:tel:'.encode($number);
 	}
 
 	/**
 	 *	mise en forme de la photo
 	 *  warning NON TESTE !
 	 *
-	 *  @param  string  $type			Type
+	 *  @param  string  $type			Type 'image/gif'
 	 *  @param  string  $photo			Photo
 	 *  @return	void
 	 */
 	public function setPhoto($type, $photo)
 	{
 		// $type = "GIF" | "JPEG"
-		$this->properties["PHOTO;TYPE=$type;ENCODING=BASE64"] = base64_encode($photo);
+		$this->properties["PHOTO;MEDIATYPE=$type;ENCODING=BASE64"] = base64_encode($photo);
 	}
 
 	/**
@@ -146,7 +143,7 @@ class vCard
 	 */
 	public function setFormattedName($name)
 	{
-		$this->properties["FN;CHARSET=".$this->encoding] = encode($name);
+		$this->properties["FN;".$this->encoding] = encode($name);
 	}
 
 	/**
@@ -161,7 +158,7 @@ class vCard
 	 */
 	public function setName($family = "", $first = "", $additional = "", $prefix = "", $suffix = "")
 	{
-		$this->properties["N;CHARSET=".$this->encoding] = encode($family).";".encode($first).";".encode($additional).";".encode($prefix).";".encode($suffix);
+		$this->properties["N;".$this->encoding] = encode($family).";".encode($first).";".encode($additional).";".encode($prefix).";".encode($suffix);
 		$this->filename = "$first%20$family.vcf";
 		if (empty($this->properties["FN"])) {
 			$this->setFormattedName(trim("$prefix $first $additional $family $suffix"));
@@ -191,19 +188,23 @@ class vCard
 	 *	@param	string	$zip			Zip
 	 *	@param	string	$country		Country
 	 *	@param	string	$type			Type
+	 *  @param	string	$label			Label
 	 *	@return	void
 	 */
-	public function setAddress($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "HOME;POSTAL")
+	public function setAddress($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "HOME", $label = '')
 	{
 		// $type may be DOM | INTL | POSTAL | PARCEL | HOME | WORK or any combination of these: e.g. "WORK;PARCEL;POSTAL"
 		$key = "ADR";
 		if ($type != "") {
 			$key .= ";".$type;
 		}
-		$key .= ";CHARSET=".$this->encoding;
+		if ($label != "") {
+			$key .= ';LABEL="'.encode($label).'"';
+		}
+		$key .= ";".$this->encoding;
 		$this->properties[$key] = ";".encode($extended).";".encode($street).";".encode($city).";".encode($region).";".encode($zip).";".encode($country);
 
-		//if ($this->properties["LABEL;".$type.";CHARSET=".$this->encoding] == '') {
+		//if ($this->properties["LABEL;".$type.";".$this->encoding] == '') {
 			//$this->setLabel($postoffice, $extended, $street, $city, $region, $zip, $country, $type);
 		//}
 	}
@@ -221,7 +222,7 @@ class vCard
 	 *  @param	string	$type			Type
 	 *  @return	void
 	 */
-	public function setLabel($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "HOME;POSTAL")
+	public function setLabel($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "HOME")
 	{
 		$label = "";
 		if ($postoffice != "") {
@@ -246,7 +247,7 @@ class vCard
 			$country .= "$country\r\n";
 		}
 
-		$this->properties["LABEL;$type;CHARSET=".$this->encoding] = encode($label);
+		$this->properties["LABEL;$type;".$this->encoding] = encode($label);
 	}
 
 	/**
@@ -256,7 +257,7 @@ class vCard
 	 *	@param	string	$type			(optional) The type of the e-mail (typical "PREF;INTERNET" or "INTERNET")
 	 *	@return	void
 	 */
-	public function setEmail($address, $type = "TYPE=INTERNET;PREF")
+	public function setEmail($address, $type = "")
 	{
 		$key = "EMAIL";
 		if ($type != "") {
@@ -273,7 +274,7 @@ class vCard
 	 */
 	public function setNote($note)
 	{
-		$this->properties["NOTE;CHARSET=".$this->encoding] = encode($note);
+		$this->properties["NOTE;".$this->encoding] = encode($note);
 	}
 
 	/**
@@ -284,7 +285,7 @@ class vCard
 	 */
 	public function setTitle($title)
 	{
-		$this->properties["TITLE;CHARSET=".$this->encoding] = encode($title);
+		$this->properties["TITLE;".$this->encoding] = encode($title);
 	}
 
 
@@ -296,7 +297,7 @@ class vCard
 	 */
 	public function setOrg($org)
 	{
-		$this->properties["ORG;CHARSET=".$this->encoding] = encode($org);
+		$this->properties["ORG;".$this->encoding] = encode($org);
 	}
 
 
@@ -308,7 +309,7 @@ class vCard
 	 */
 	public function setProdId($prodid)
 	{
-		$this->properties["PRODID;CHARSET=".$this->encoding] = encode($prodid);
+		$this->properties["PRODID;".$this->encoding] = encode($prodid);
 	}
 
 
@@ -320,7 +321,7 @@ class vCard
 	 */
 	public function setUID($uid)
 	{
-		$this->properties["UID;CHARSET=".$this->encoding] = encode($uid);
+		$this->properties["UID;".$this->encoding] = encode($uid);
 	}
 
 
@@ -349,13 +350,13 @@ class vCard
 	public function getVCard()
 	{
 		$text = "BEGIN:VCARD\r\n";
-		$text .= "VERSION:3.0\r\n";
+		$text .= "VERSION:4.0\r\n";		// With V4, all encoding are UTF-8
 		//$text.= "VERSION:2.1\r\n";
 		foreach ($this->properties as $key => $value) {
 			$text .= "$key:$value\r\n";
 		}
 		$text .= "REV:".date("Y-m-d")."T".date("H:i:s")."Z\r\n";
-		$text .= "MAILER: Dolibarr\r\n";
+		//$text .= "MAILER: Dolibarr\r\n";
 		$text .= "END:VCARD\r\n";
 		return $text;
 	}
@@ -386,15 +387,15 @@ class vCard
 		$this->setName($object->lastname, $object->firstname, "", $object->civility_code, "");
 		$this->setFormattedName($object->getFullName($langs, 1));
 
-		$this->setPhoneNumber($object->office_phone, "TYPE=WORK;VOICE");
-		$this->setPhoneNumber($object->personal_mobile, "TYPE=HOME;VOICE");
-		$this->setPhoneNumber($object->user_mobile, "TYPE=CELL;VOICE");
-		$this->setPhoneNumber($object->office_fax, "TYPE=WORK;FAX");
+		$this->setPhoneNumber($object->office_phone, "TYPE=WORK,VOICE");
+		$this->setPhoneNumber($object->personal_mobile, "TYPE=HOME,VOICE");
+		$this->setPhoneNumber($object->user_mobile, "TYPE=CELL,VOICE");
+		$this->setPhoneNumber($object->office_fax, "TYPE=WORK,FAX");
 
 		$country = $object->country_code ? $object->country : '';
 
-		$this->setAddress("", "", $object->address, $object->town, $object->state, $object->zip, $country, "TYPE=WORK;POSTAL");
-		$this->setLabel("", "", $object->address, $object->town, $object->state, $object->zip, $country, "TYPE=WORK");
+		$this->setAddress("", "", $object->address, $object->town, $object->state, $object->zip, $country, "TYPE=WORK");
+		//$this->setLabel("", "", $object->address, $object->town, $object->state, $object->zip, $country, "TYPE=WORK");
 
 		$this->setEmail($object->email, "TYPE=WORK");
 		$this->setNote($object->note_public);
@@ -403,13 +404,13 @@ class vCard
 		if ($company->id > 0) {
 			$this->setURL($company->url, "TYPE=WORK");
 			if (!$object->office_phone) {
-				$this->setPhoneNumber($company->phone, "TYPE=WORK;VOICE");
+				$this->setPhoneNumber($company->phone, "TYPE=WORK,VOICE");
 			}
 			if (!$object->office_fax) {
-				$this->setPhoneNumber($company->fax, "TYPE=WORK;FAX");
+				$this->setPhoneNumber($company->fax, "TYPE=WORK,FAX");
 			}
 			if (!$object->zip) {
-				$this->setAddress("", "", $company->address, $company->town, $company->state, $company->zip, $company->country, "TYPE=WORK;POSTAL");
+				$this->setAddress("", "", $company->address, $company->town, $company->state, $company->zip, $company->country, "TYPE=WORK");
 			}
 
 			// when company e-mail is empty, use only user e-mail
@@ -427,13 +428,13 @@ class vCard
 					$this->setEmail($object->email, "TYPE=WORK");
 
 					// support by Microsoft Outlook (2019 and possible earlier)
-					$this->setEmail($company->email, 'INTERNET');
+					$this->setEmail($company->email, '');
 				} else {
 					// when e-mail of user and company complete different use company e-mail at first (and user e-mail at second)
 					$this->setEmail($company->email, "TYPE=WORK");
 
 					// support by Microsoft Outlook (2019 and possible earlier)
-					$this->setEmail($object->email, 'INTERNET');
+					$this->setEmail($object->email, '');
 				}
 			}
 
@@ -444,7 +445,7 @@ class vCard
 		}
 
 		// Personal informations
-		$this->setPhoneNumber($object->personal_mobile, "TYPE=HOME;VOICE");
+		$this->setPhoneNumber($object->personal_mobile, "TYPE=HOME,VOICE");
 		if ($object->birth) {
 			$this->setBirthday($object->birth);
 		}
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 301162c1429..b2c76218a5d 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2284,7 +2284,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 	// Defined the links for bottom of card
 	$profilLink = '<a accesskey="c" href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="button-top-menu-dropdown" title="'.dol_escape_htmltag($langs->trans("YourUserFile")).'"><i class="fa fa-user"></i>  '.$langs->trans("Card").'</a>';
 	$urltovirtualcard = '/user/virtualcard.php?id='.((int) $user->id);
-	$virtuelcardLink = dolButtonToOpenUrlInDialogPopup('publicvirtualcardmenu', $langs->trans("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', ''), $urltovirtualcard, '', 'button-top-menu-dropdown marginleftonly nohover', "closeTopMenuLoginDropdown()", '', 'v');
+	$virtuelcardLink = dolButtonToOpenUrlInDialogPopup('publicvirtualcardmenu', $langs->trans("PublicVirtualCardUrl").(is_object($user) ? ' - '.$user->getFullName($langs) : ''), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', ''), $urltovirtualcard, '', 'button-top-menu-dropdown marginleftonly nohover', "closeTopMenuLoginDropdown()", '', 'v');
 	$logoutLink = '<a accesskey="l" href="'.$urllogout.'" class="button-top-menu-dropdown" title="'.dol_escape_htmltag($langs->trans("Logout")).'"><i class="fa fa-sign-out-alt"></i> '.$langs->trans("Logout").'</a>';
 
 	$profilName = $user->getFullName($langs).' ('.$user->login.')';

From 7138a06b2b78ac02a994e3500a53a589584f9cad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Jan 2023 19:11:38 +0100
Subject: [PATCH 378/816] Fix better ID

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

diff --git a/htdocs/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php
index 53f5b4496b9..eb6c0eab743 100644
--- a/htdocs/core/class/vcard.class.php
+++ b/htdocs/core/class/vcard.class.php
@@ -381,9 +381,11 @@ class vCard
 	 */
 	public function buildVCardString($object, $company, $langs)
 	{
+		global $dolibarr_main_instance_unique_id;
+
 		$this->setProdId('Dolibarr '.DOL_VERSION);
 
-		$this->setUid('DOLIBARR-USERID-'.$object->id);
+		$this->setUid('DOLIBARR-USERID-'.dol_trunc(md5('vcard'.$dolibarr_main_instance_unique_id), 8, 'right', 'UTF-8', 1).'-'.$object->id);
 		$this->setName($object->lastname, $object->firstname, "", $object->civility_code, "");
 		$this->setFormattedName($object->getFullName($langs, 1));
 

From 3e12a8ab2178506f8906e3039e327b93676b8a45 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Jan 2023 19:13:59 +0100
Subject: [PATCH 379/816] Debug vcard v4

---
 htdocs/core/class/vcard.class.php | 11 ++++++++---
 htdocs/public/users/view.php      |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php
index eb6c0eab743..8a62c0aea5e 100644
--- a/htdocs/core/class/vcard.class.php
+++ b/htdocs/core/class/vcard.class.php
@@ -353,7 +353,7 @@ class vCard
 		$text .= "VERSION:4.0\r\n";		// With V4, all encoding are UTF-8
 		//$text.= "VERSION:2.1\r\n";
 		foreach ($this->properties as $key => $value) {
-			$text .= "$key:$value\r\n";
+			$text .= $key.":".$value."\r\n";
 		}
 		$text .= "REV:".date("Y-m-d")."T".date("H:i:s")."Z\r\n";
 		//$text .= "MAILER: Dolibarr\r\n";
@@ -374,7 +374,7 @@ class vCard
 	/**
 	 * Return a VCARD string
 	 *
-	 * @param	Object		$object		Object
+	 * @param	Object		$object		Object (User, Contact)
 	 * @param	Societe		$company	Company
 	 * @param	Translate	$langs		Lang object
 	 * @return	string					String
@@ -403,8 +403,13 @@ class vCard
 		$this->setNote($object->note_public);
 		$this->setTitle($object->job);
 
-		if ($company->id > 0) {
+		// For user, type=home
+		// For contact, this is not defined
+		$this->setURL($object->url, "TYPE=HOME");
+
+		if (is_object($company)) {
 			$this->setURL($company->url, "TYPE=WORK");
+
 			if (!$object->office_phone) {
 				$this->setPhoneNumber($company->phone, "TYPE=WORK,VOICE");
 			}
diff --git a/htdocs/public/users/view.php b/htdocs/public/users/view.php
index 511e7b93604..ba1a6dd0908 100644
--- a/htdocs/public/users/view.php
+++ b/htdocs/public/users/view.php
@@ -96,6 +96,7 @@ $company = $mysoc;
 if ($mode == 'vcard') {
 	// We create VCard
 	$v = new vCard();
+
 	$output = $v->buildVCardString($object, $company, $langs);
 
 	$filename = trim(urldecode($v->getFileName())); // "Nom prenom.vcf"

From bea075b3bb5be52e00d4a31b41bc0b141622af49 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sat, 7 Jan 2023 21:37:51 +0100
Subject: [PATCH 380/816] Fix php 8 error

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

diff --git a/htdocs/core/modules/mailings/eventorganization.modules.php b/htdocs/core/modules/mailings/eventorganization.modules.php
index 84c27c5f673..0d0ffb63c3a 100644
--- a/htdocs/core/modules/mailings/eventorganization.modules.php
+++ b/htdocs/core/modules/mailings/eventorganization.modules.php
@@ -188,7 +188,7 @@ class mailing_eventorganization extends MailingTargets
 
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 		$formproject = new FormProjets($this->db);
-		$s .= $formproject->select_projects(-1, 0, "filter_eventorganization", 0, 0, 1, 1, 0, 0, 0, '', 1, 0, '', '', 'usage_organize_event=1');
+		$s = $formproject->select_projects(-1, 0, "filter_eventorganization", 0, 0, 1, 1, 0, 0, 0, '', 1, 0, '', '', 'usage_organize_event=1');
 
 		return $s;
 	}

From ca9276b5ebea7ecf831db502a82e900e1545e174 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sat, 7 Jan 2023 22:03:18 +0100
Subject: [PATCH 381/816] Fix php 8 error

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

diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index 735bef1e688..6916a2dfe5d 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -33,6 +33,7 @@ $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $optioncss = GETPOST('optioncss', 'alpha');
+$massaction = GETPOST('massaction', 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	$page = 0;

From a2c564d5b537bbafcdfc6d5d3e66f9f0f2150577 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sun, 8 Jan 2023 13:12:56 +0100
Subject: [PATCH 382/816] Fix php 8 error

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

diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index 3ce0b173fd3..1cb4946715a 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -490,10 +490,10 @@ print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
-$newcardbutton .= '';
-$newcardbutton = dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton = dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/bom/bom_card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $user->rights->bom->write);
+$newcardbutton = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/bom/bom_card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $user->rights->bom->write);
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 

From d5091d7b90d89c23184f544a3a103d07f5a0e37f Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sun, 8 Jan 2023 13:48:49 +0100
Subject: [PATCH 383/816] Fix php 8 error

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

diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index 4517bee15c6..d3aa8cc2211 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -80,7 +80,7 @@ if ($id > 0 || !empty($ref)) {
 	// Define variables to know what current user can do on properties of user linked to edited member
 	if ($object->user_id) {
 		// $User is the user who edits, $object->user_id is the id of the related user in the edited member
-		$caneditfielduser = ((($user->id == $object->user_id) && $$user->hasRight('user', 'self', 'creer'))
+		$caneditfielduser = ((($user->id == $object->user_id) && $user->hasRight('user', 'self', 'creer'))
 			|| (($user->id != $object->user_id) && $user->hasRight('user', 'user', 'creer')));
 		$caneditpassworduser = ((($user->id == $object->user_id) && $user->hasRight('user', 'self', 'password'))
 			|| (($user->id != $object->user_id) && $user->hasRight('user', 'user', 'password')));

From 805bf6442858f563887444874432ab51d52c24c4 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sun, 8 Jan 2023 15:00:58 +0100
Subject: [PATCH 384/816] Fix php 8 error

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

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 79104817e77..144506ab7b6 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -1039,6 +1039,7 @@ if ($source == 'order') {
 		$amount = price2num($amount);
 	}
 
+	$tag = '';
 	if (GETPOST('fulltag', 'alpha')) {
 		$fulltag = GETPOST('fulltag', 'alpha');
 	} else {

From 590334300d37a2aa9e0076f6b0427473ff2d876e Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sun, 8 Jan 2023 15:27:11 +0100
Subject: [PATCH 385/816] Fix php 8 error

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

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index bb9d2376a47..8b5dcd251d2 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -95,6 +95,7 @@ $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 $backtopagejsfields = GETPOST('backtopagejsfields', 'alpha');
 $confirm 	= GETPOST('confirm', 'alpha');
 
+$dol_openinpopup = '';
 if (!empty($backtopagejsfields)) {
 	$tmpbacktopagejsfields = explode(':', $backtopagejsfields);
 	$dol_openinpopup = $tmpbacktopagejsfields[0];

From 828da5f83cd297437a60b0d3f88d29c5c87d2214 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sun, 8 Jan 2023 15:33:12 +0100
Subject: [PATCH 386/816] Fix php 8 errors

---
 htdocs/margin/agentMargins.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index f89cc60736d..e68576edd81 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -49,6 +49,11 @@ $pagenext = $page + 1;
 if (!$sortorder) {
 	$sortorder = "ASC";
 }
+if ($user->rights->margins->read->all) {
+	$agentid = GETPOST('agentid', 'int');
+} else {
+	$agentid = $user->id;
+}
 if (!$sortfield) {
 	if ($agentid > 0) {
 		$sortfield = "s.nom";
@@ -74,11 +79,6 @@ if (!empty($enddatemonth)) {
 }
 
 // Security check
-if ($user->rights->margins->read->all) {
-	$agentid = GETPOST('agentid', 'int');
-} else {
-	$agentid = $user->id;
-}
 $result = restrictedArea($user, 'margins');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -317,7 +317,8 @@ if ($result) {
 			$sortfield = 'name';
 		}
 		$group_list = dol_sort_array($group_list, $sortfield, $sortorder);
-
+		$cumul_achat = 0;
+		$cumul_vente = 0;
 		foreach ($group_list as $group_id => $group_array) {
 			$pa = $group_array['buying_price'];
 			$pv = $group_array['selling_price'];

From f649fcf8cfdbd00097583b3679e2029922f41057 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sun, 8 Jan 2023 15:48:23 +0100
Subject: [PATCH 387/816] Fix php 8 errors

---
 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 84b051d24f3..2393524e572 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -40,7 +40,7 @@ if ($action == 'presend') {
 	$titreform = 'SendMail';
 
 	$object->fetch_projet();
-
+	if (!isset($file)) $file = null;
 	$ref = dol_sanitizeFileName($object->ref);
 	if (!in_array($object->element, array('user', 'member'))) {
 		//$fileparams['fullname'] can be filled from the card
@@ -57,7 +57,7 @@ if ($action == 'presend') {
 			}
 		}
 
-		$file = $fileparams['fullname'];
+		$file = isset($fileparams['fullname'])?$fileparams['fullname']:null;
 	}
 
 	// Define output language

From 88c3f33e1811408afb6bab925d5e8daa58ff8056 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sun, 8 Jan 2023 15:52:20 +0100
Subject: [PATCH 388/816] Fix php 8 error

---
 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 ae4afc695e6..ef954794964 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2422,7 +2422,7 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles =
 function dol_most_recent_file($dir, $regexfilter = '', $excludefilter = array('(\.meta|_preview.*\.png)$', '^\.'), $nohook = false, $mode = '')
 {
 	$tmparray = dol_dir_list($dir, 'files', 0, $regexfilter, $excludefilter, 'date', SORT_DESC, $mode, $nohook);
-	return $tmparray[0];
+	return isset($tmparray[0])?$tmparray[0]:null;
 }
 
 /**

From f08407e59736a5a51a9a860cb057790c75681b4c Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sun, 8 Jan 2023 17:07:59 +0100
Subject: [PATCH 389/816] Fix php 8 errors

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

diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 459c892a1d9..ec22c82543f 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -52,7 +52,7 @@ $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
-
+$socid = GETPOST('socid', 'int');
 $amount = price2num(GETPOST('amount', 'alphanohtml'), 'MT');
 $donation_date = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
 $projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
@@ -63,6 +63,13 @@ if ($id > 0 || $ref) {
 	$object->fetch($id, $ref);
 }
 
+if (!empty($socid) && $socid > 0) {
+	$soc = new Societe($db);
+	if ($socid > 0) {
+		$soc->fetch($socid);
+	}
+}
+
 $extrafields = new ExtraFields($db);
 
 // fetch optionals attributes and labels

From 6962d4aaa3cb515837693cb2a3c3255b2b3b56c8 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sun, 8 Jan 2023 17:10:30 +0100
Subject: [PATCH 390/816] Update list.php

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

diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index ac704571daa..c2f89ebc759 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -59,6 +59,7 @@ $search_status = (GETPOST("search_status", 'intcomma') != '') ? GETPOST("search_
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_company = GETPOST('search_company', 'alpha');
+$search_thirdparty = GETPOST('search_thirdparty', 'alpha');
 $search_name = GETPOST('search_name', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
@@ -71,6 +72,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_all = "";
 	$search_ref = "";
 	$search_company = "";
+	$search_thirdparty  = "";
 	$search_name = "";
 	$search_amount = "";
 	$search_status = '';

From f130237e255278ea9f44522da614603bd24ded6f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 8 Jan 2023 19:20:35 +0100
Subject: [PATCH 391/816] Fix Clean code

---
 htdocs/core/search.php     |   5 +-
 htdocs/user/group/list.php | 128 +++++++++++++++++++++++++++++++++----
 htdocs/user/list.php       |   2 +-
 3 files changed, 118 insertions(+), 17 deletions(-)

diff --git a/htdocs/core/search.php b/htdocs/core/search.php
index 321fc94a925..333cb218e58 100644
--- a/htdocs/core/search.php
+++ b/htdocs/core/search.php
@@ -50,6 +50,7 @@ if (!defined('NOREQUIREMENU')) {
 
 require_once '../main.inc.php';
 
+
 /*
  * Actions
  */
@@ -128,11 +129,11 @@ if (GETPOST('search_task') != '') {
 }
 
 if (GETPOST('search_user') != '') {
-	header("Location: ".DOL_URL_ROOT.'/user/list.php?mode=search&sall='.urlencode(GETPOST('search_user')));
+	header("Location: ".DOL_URL_ROOT.'/user/list.php?search_all='.urlencode(GETPOST('search_user')));
 	exit;
 }
 if (GETPOST('search_group') != '') {
-	header("Location: ".DOL_URL_ROOT.'/user/group/list.php?mode=search&sall='.urlencode(GETPOST('search_group')));
+	header("Location: ".DOL_URL_ROOT.'/user/group/list.php?search_all='.urlencode(GETPOST('search_group')));
 	exit;
 }
 
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index 9f7505c3de1..7e707b6b4fc 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -43,7 +43,7 @@ $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ09'); // Option for the css output (always '' except when 'print')
 $mode       = GETPOST('mode', 'aZ');
 
-$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_group = GETPOST('search_group');
 
 // Load variable for pagination
@@ -152,12 +152,15 @@ if (empty($reshook)) {
  * View
  */
 
-$help_url="";
+$form = new Form($db);
+
+$help_url = '';
 $title = $langs->trans("UserGroups");
 $morejs = array();
 $morecss = array();
 
-
+// Build and execute select
+// --------------------------------------------------------------------
 $sql = "SELECT g.rowid, g.nom as name, g.note, g.entity, g.datec, g.tms as datem, COUNT(DISTINCT ugu.fk_user) as nb, COUNT(DISTINCT ugr.fk_id) as nbpermissions";
 $sql .= " FROM ".MAIN_DB_PREFIX."usergroup as g";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_usergroup = g.rowid";
@@ -230,6 +233,27 @@ foreach ($search as $key => $val) {
 if ($optioncss != '') {
 	$param .= '&optioncss='.urlencode($optioncss);
 }
+// Add $param from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+// Add $param from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
+$param .= $hookmanager->resPrint;
+
+// List of mass actions available
+$arrayofmassactions = array(
+	//'validate'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate"),
+	//'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
+	//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
+	//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
+);
+if (!empty($permissiontodelete)) {
+	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
+}
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+	$arrayofmassactions = array();
+}
+$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
 if ($optioncss != '') {
@@ -262,21 +286,43 @@ if ($search_all) {
 		$setupstring .= $key."=".$val.";";
 	}
 	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
-	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
 $moreforfilter = '';
 
-//$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-//$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+if (empty($reshook)) {
+	$moreforfilter .= $hookmanager->resPrint;
+} else {
+	$moreforfilter = $hookmanager->resPrint;
+}
+
+if (!empty($moreforfilter)) {
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print $moreforfilter;
+	print '</div>';
+}
+
+$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+$arrayfields = array();
+$selectedfields = '';
+if (!empty($arrayfields)) {
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+	$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
+}
 
 print '<div class="div-table-responsive">';
-print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 // Fields title search
 // --------------------------------------------------------------------
 // ...
 
+$totalarray = array();
+$totalarray['nbfield'] = 0;
+
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
@@ -298,12 +344,26 @@ print_liste_field_titre("DateCreationShort", $_SERVER["PHP_SELF"], "g.datec", $p
 $totalarray['nbfield']++;
 print_liste_field_titre("DateLastModification", $_SERVER["PHP_SELF"], "g.tms", $param, "", '', $sortfield, $sortorder, 'center ');
 $totalarray['nbfield']++;
-print_liste_field_titre("", $_SERVER["PHP_SELF"]);
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+// Hook fields
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+/*if (!empty($arrayfields['anotherfield']['checked'])) {
+ print '<th class="liste_titre right">'.$langs->trans("AnotherField").'</th>';
+ $totalarray['nbfield']++;
+ }*/
+// Action column
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
 $totalarray['nbfield']++;	// For the column action
-print "</tr>\n";
-
+print '</tr>'."\n";
 
 
+// Loop on record
+// --------------------------------------------------------------------
 $i = 0;
 $savnbfield = $totalarray['nbfield'];
 $totalarray = array();
@@ -357,17 +417,41 @@ while ($i < $imaxinloop) {
 			print img_picto($langs->trans("GlobalGroup"), 'redstar');
 		}
 		print "</td>";
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 		//multicompany
 		if (isModEnabled('multicompany') && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1) {
 			$mc->getInfo($obj->entity);
 			print '<td class="center">'.dol_escape_htmltag($mc->label).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		print '<td class="center">'.$obj->nb.'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 		print '<td class="center">';
 		print '<a href="'.DOL_URL_ROOT.'/user/group/perms.php?id='.$obj->rowid.'">'.$obj->nbpermissions.'</a>';
 		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 		print '<td class="center nowrap">'.dol_print_date($db->jdate($obj->datec), "dayhour").'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 		print '<td class="center nowrap">'.dol_print_date($db->jdate($obj->datem), "dayhour").'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+		// Extra fields
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+		// Fields from hook
+		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
 		// Action column
 		if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
 			print '<td class="nowrap center">';
@@ -384,17 +468,33 @@ while ($i < $imaxinloop) {
 			$totalarray['nbfield']++;
 		}
 
-		print "</tr>\n";
+		print '</tr>'."\n";
 	}
 	$i++;
 }
-print "</table>";
 
-print '</div>';
-print "</form>\n";
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+// If no record found
+if ($num == 0) {
+	/*$colspan = 1;
+	foreach ($arrayfields as $key => $val) {
+		if (!empty($val['checked'])) {
+			$colspan++;
+		}
+	}*/
+	$colspan = $savnbfield;
+	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
+}
 
 $db->free($resql);
 
+print '</table>'."\n";
+print '</div>'."\n";
+
+print '</form>'."\n";
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index d3139b438e2..3cac5d06c56 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -542,7 +542,7 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&amp;limit='.urlencode($limit);
 }
 if ($sall != '') {
-	$param .= '&amp;sall='.urlencode($sall);
+	$param .= '&amp;search_all='.urlencode($sall);
 }
 if ($search_user != '') {
 	$param .= "&amp;search_user=".urlencode($search_user);

From 027ff49100d9e4776bc72845f8df913cc62f41f6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 8 Jan 2023 19:28:38 +0100
Subject: [PATCH 392/816] Try to fix warnings

---
 .../core/class/commondocgenerator.class.php   | 38 +++++++++----------
 htdocs/core/lib/geturl.lib.php                |  4 +-
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index e142e5c8d61..abf30f2f3ee 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1108,10 +1108,10 @@ abstract class CommonDocGenerator
 	}
 
 	/**
-	 *   	get column position rank from column key
+	 *  get column position rank from column key
 	 *
-	 *   	@param	string		$colKey    		the column key
-	 *      @return	int         rank on success and -1 on error
+	 *  @param	string		$colKey    		the column key
+	 *  @return	int         rank on success and -1 on error
 	 */
 	public function getColumnRank($colKey)
 	{
@@ -1124,11 +1124,11 @@ abstract class CommonDocGenerator
 	/**
 	 *  get column position rank from column key
 	 *
-	 *  @param	string		$newColKey    	the new column key
-	 *  @param	array		$defArray    	a single column definition array
-	 *  @param	string		$targetCol    	target column used to place the new column beside
-	 *  @param	bool		$insertAfterTarget    	insert before or after target column ?
-	 *  @return	int         new rank on success and -1 on error
+	 *  @param	string		$newColKey    		the new column key
+	 *  @param	array		$defArray    		a single column definition array
+	 *  @param	string		$targetCol    		target column used to place the new column beside
+	 *  @param	bool		$insertAfterTarget  insert before or after target column ?
+	 *  @return	int         					new rank on success and -1 on error
 	 */
 	public function insertNewColumnDef($newColKey, $defArray, $targetCol = false, $insertAfterTarget = false)
 	{
@@ -1169,11 +1169,11 @@ abstract class CommonDocGenerator
 	/**
 	 *  print standard column content
 	 *
-	 *  @param	TCPDF		    $pdf    	pdf object
-	 *  @param	float		$curY    	curent Y position
-	 *  @param	string		$colKey    	the column key
-	 *  @param	string		$columnText   column text
-	 *  @return	void
+	 *  @param	TCPDF		$pdf    		pdf object
+	 *  @param	float		$curY    		curent Y position
+	 *  @param	string		$colKey    		the column key
+	 *  @param	string		$columnText   	column text
+	 *  @return	int							<0 if KO, >= if OK
 	 */
 	public function printStdColumnContent($pdf, &$curY, $colKey, $columnText = '')
 	{
@@ -1191,7 +1191,7 @@ abstract class CommonDocGenerator
 		}
 		if (!$reshook) {
 			if (empty($columnText)) {
-				return;
+				return 0;
 			}
 			$pdf->SetXY($this->getColumnContentXStart($colKey), $curY); // Set curent position
 			$colDef = $this->cols[$colKey];
@@ -1205,7 +1205,7 @@ abstract class CommonDocGenerator
 			$pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);
 		}
 
-		return;
+		return 0;
 	}
 
 
@@ -1592,16 +1592,16 @@ abstract class CommonDocGenerator
 	 *  @param	object			$object    		common object det
 	 *  @param	Translate		$outputlangs    langs
 	 *  @param	int			   $hidedetails		Do not show line details
-	 *  @return	void
+	 *  @return	int								<0 if KO, >=0 if OK
 	 */
 	public function defineColumnExtrafield($object, $outputlangs, $hidedetails = 0)
 	{
 		if (!empty($hidedetails)) {
-			return;
+			return 0;
 		}
 
 		if (empty($object->table_element)) {
-			return;
+			return 0;
 		}
 
 		// Load extrafiels if not allready does
@@ -1672,6 +1672,6 @@ abstract class CommonDocGenerator
 			}
 		}
 
-		return;
+		return 1;
 	}
 }
diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index 3d1f7157e83..4434855da2d 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -266,9 +266,9 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 			$maxRedirection--;
 			// TODO Use $info['local_ip'] and $info['primary_ip'] ?
 			continue;
-		} else {
-			$http_code = 0;
 		}
+
+		$http_code = 0;
 	} while ($http_code);
 
 	$request = curl_getinfo($ch, CURLINFO_HEADER_OUT); // Reading of request must be done after sending request

From 18c959e578242a1e836cbcd544f6584f7daf221d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 8 Jan 2023 19:31:43 +0100
Subject: [PATCH 393/816] Url can wrok without parameters

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

diff --git a/htdocs/user/virtualcard.php b/htdocs/user/virtualcard.php
index 59d30e4e575..a8546a44735 100644
--- a/htdocs/user/virtualcard.php
+++ b/htdocs/user/virtualcard.php
@@ -37,6 +37,10 @@ $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09');
 
+if (empty($id) && empty($ref)) {
+	$id = $user->id;
+}
+
 $object = new User($db);
 if ($id > 0 || !empty($ref)) {
 	$result = $object->fetch($id, $ref, '', 1);

From 2ed7cda6e7fcfdf2247207f35afbdd20fcbaedd8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 8 Jan 2023 19:33:33 +0100
Subject: [PATCH 394/816] Fix phpunit

---
 htdocs/stripe/payout.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php
index c1c7a8febeb..36c798c8571 100644
--- a/htdocs/stripe/payout.php
+++ b/htdocs/stripe/payout.php
@@ -127,7 +127,6 @@ if (!$rowid) {
 		}
 
 		foreach ($payout->data as $payout) {
-
 			print '<tr class="oddeven">';
 
 			// Ref

From ce1e6dd9bd7aee503aca1cf46b3e842b562101f3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 8 Jan 2023 19:34:32 +0100
Subject: [PATCH 395/816] Fix php tag

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

diff --git a/htdocs/takepos/css/pos.css.php b/htdocs/takepos/css/pos.css.php
index 921ec1bea40..5a773fc3347 100644
--- a/htdocs/takepos/css/pos.css.php
+++ b/htdocs/takepos/css/pos.css.php
@@ -342,9 +342,9 @@ div.paymentbordline
 		?>
 		overflow-x: hidden;
 		overfloy-y: scroll;
-	<?
+		<?php
 	} else {
-	?>
+		?>
 		overflow: visible;
 		<?php
 	}

From 23013282ffddccea472bae55ba8741fcf328b1d3 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sun, 8 Jan 2023 21:30:12 +0100
Subject: [PATCH 396/816] Fix php 8 error

if empty value, there is an error when doc is generated
---
 htdocs/core/class/commondocgenerator.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 82012400f68..e1780985c7c 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1288,7 +1288,8 @@ abstract class CommonDocGenerator
 		}
 		$extrafields = $this->extrafieldsCache;
 
-		$extrafieldOutputContent = $extrafields->showOutputField($extrafieldKey, $object->array_options[$extrafieldOptionsKey], '', $object->table_element);
+		$extrafieldOutputContent = '';
+		if (isset($object->array_options[$extrafieldOptionsKey])) $extrafieldOutputContent = $extrafields->showOutputField($extrafieldKey, $object->array_options[$extrafieldOptionsKey], '', $object->table_element);
 
 		// TODO : allow showOutputField to be pdf public friendly, ex: in a link to object, clean getNomUrl to remove link and images... like a getName methode ...
 		if ($extrafields->attributes[$object->table_element]['type'][$extrafieldKey] == 'link') {

From f8aa861a7785e76bb43298358910a321815eb232 Mon Sep 17 00:00:00 2001
From: Christian Humpel <christian.humpel@gmail.com>
Date: Sun, 8 Jan 2023 21:43:12 +0100
Subject: [PATCH 397/816] Fix: REST MO API - It's able to have a wrong value on
 the 'ref' Field

---
 htdocs/mrp/class/api_mos.class.php | 28 ++++++++++++++++++++++++++++
 htdocs/mrp/class/mo.class.php      |  1 +
 2 files changed, 29 insertions(+)

diff --git a/htdocs/mrp/class/api_mos.class.php b/htdocs/mrp/class/api_mos.class.php
index 48396025957..794ab3d5378 100644
--- a/htdocs/mrp/class/api_mos.class.php
+++ b/htdocs/mrp/class/api_mos.class.php
@@ -203,6 +203,9 @@ class Mos extends DolibarrApi
 		foreach ($request_data as $field => $value) {
 			$this->mo->$field = $value;
 		}
+
+		$this->checkRefNumbering();
+
 		if (!$this->mo->create(DolibarrApiAccess::$user)) {
 			throw new RestException(500, "Error creating MO", array_merge(array($this->mo->error), $this->mo->errors));
 		}
@@ -239,6 +242,8 @@ class Mos extends DolibarrApi
 			$this->mo->$field = $value;
 		}
 
+		$this->checkRefNumbering();
+
 		if ($this->mo->update(DolibarrApiAccess::$user) > 0) {
 			return $this->get($id);
 		} else {
@@ -723,4 +728,27 @@ class Mos extends DolibarrApi
 		}
 		return $myobject;
 	}
+
+	/**
+	 * Validate the ref field and get the next Number if it's necessary.
+	 *
+	 * @return void
+	 */
+	private function checkRefNumbering(): void
+	{
+		$ref = substr($this->mo->ref, 1, 4);
+		if ($this->mo->status > 0 && $ref == 'PROV') {
+			throw new RestException(400, "Wrong naming scheme '(PROV%)' is only allowed on 'DRAFT' status. For automatic increment use 'auto' on the 'ref' field.");
+		}
+
+		if (strtolower($this->mo->ref) == 'auto') {
+			if (empty($this->mo->id) && $this->mo->status == 0) {
+				$this->mo->ref = ''; // 'ref' will auto incremented with '(PROV' + newID + ')'
+			} else {
+				$this->mo->fetch_product();
+				$numref = $this->mo->getNextNumRef($this->mo->product);
+				$this->mo->ref = $numref;
+			}
+		}
+	}
 }
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index c977a14d9ca..223605bffe3 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -277,6 +277,7 @@ class Mo extends CommonObject
 
 		if ($this->fk_bom > 0) {
 			// If there is a nown BOM, we force the type of MO to the type of BOM
+			include_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
 			$tmpbom = new BOM($this->db);
 			$tmpbom->fetch($this->fk_bom);
 

From fc0ef489e62d4a7a091bfaad55559440dbfacc6a Mon Sep 17 00:00:00 2001
From: Christian Humpel <christian.humpel@gmail.com>
Date: Mon, 9 Jan 2023 00:49:24 +0100
Subject: [PATCH 398/816] Fix #23108: - Set NULL on fk_warehouse if
 stockmovement is empty. - Fix deletion on lines without stockmovement -> set
 the correct rowid of the line. - Fix stock qty and warnings correct.

---
 htdocs/mrp/mo_production.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 28d0f004784..1efdad2f43f 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2019-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2019-2020 	Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2023 		Christian Humpel  <christian.humpel@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
@@ -239,7 +240,7 @@ if (empty($reshook)) {
 							$moline->batch = GETPOST('batch-'.$line->id.'-'.$i);
 							$moline->role = 'consumed';
 							$moline->fk_mrp_production = $line->id;
-							$moline->fk_stock_movement = $idstockmove;
+							$moline->fk_stock_movement = $idstockmove == 0 ? null : $idstockmove;
 							$moline->fk_user_creat = $user->id;
 
 							$resultmoline = $moline->create($user);
@@ -924,10 +925,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					// Stock
 					if (isModEnabled('stock')) {
 						print '<td class="nowraponall right">';
-						if ($tmpproduct->stock_reel < ($line->qty - $alreadyconsumed)) {
-							print img_warning($langs->trans('StockTooLow')).' ';
+						if (empty($conf->global->STOCK_SUPPORTS_SERVICES) && $tmpproduct->type != PRODUCT::TYPE_SERVICE) {
+							if (!$line->disable_stock_change && $tmpproduct->stock_reel < ($line->qty - $alreadyconsumed)) {
+								print img_warning($langs->trans('StockTooLow')) . ' ';
+							}
+							print price2num($tmpproduct->stock_reel, 'MS'); // Available
 						}
-						print price2num($tmpproduct->stock_reel, 'MS'); // Available
 						print '</td>';
 					}
 					// Lot
@@ -1001,7 +1004,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 						// Action delete line
 						if ($permissiontodelete) {
-							$href = $_SERVER["PHP_SELF"].'?id='.((int) $object->id).'&action=deleteline&token='.newToken().'&lineid='.((int) $line->id).'&fk_movement='.((int) $line2['fk_stock_movement']);
+							$href = $_SERVER["PHP_SELF"].'?id='.((int) $object->id).'&action=deleteline&token='.newToken().'&lineid='.((int) $line2['rowid']).'&fk_movement='.((int) $line2['fk_stock_movement']);
 							print '<td class="center">';
 							print '<a class="reposition" href="'.$href.'">';
 							print img_picto($langs->trans('TooltipDeleteAndRevertStockMovement'), 'delete');

From 144b6cd29e1ad0e503517c28e2a7d73aa7134e2e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 9 Jan 2023 01:28:16 +0100
Subject: [PATCH 399/816] Merge branch 'develop' of
 git@github.com:Dolibarr/dolibarr.git into develop

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

diff --git a/htdocs/user/virtualcard.php b/htdocs/user/virtualcard.php
index a8546a44735..8d023c2c9a9 100644
--- a/htdocs/user/virtualcard.php
+++ b/htdocs/user/virtualcard.php
@@ -257,7 +257,7 @@ if (getDolUserInt('USER_ENABLE_PUBLIC', 0, $object)) {
 	print '</div>';
 
 	print '<div class="center">';
-	print $form->buttonsSaveCancel("Save", "Cancel", array(), 0, '', $dol_openinpopup);
+	print $form->buttonsSaveCancel("Save", ($dol_openinpopup ? "Cancel" : ""), array(), 0, '', $dol_openinpopup);
 	print '</div>';
 }
 

From 5152a7720885f636060843bd915f50ba92e404b0 Mon Sep 17 00:00:00 2001
From: Christian Humpel <christian.humpel@gmail.com>
Date: Mon, 9 Jan 2023 00:49:24 +0100
Subject: [PATCH 400/816] Fix #23108: - Set NULL on fk_warehouse if
 stockmovement is empty. - Fix deletion on lines without stockmovement -> set
 the correct rowid of the line. - Fix stock qty and warnings correct.

---
 htdocs/mrp/mo_production.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 1f61bf37935..c23f51c58cb 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2019-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2019-2020 	Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2023 		Christian Humpel  <christian.humpel@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
@@ -239,7 +240,7 @@ if (empty($reshook)) {
 							$moline->batch = GETPOST('batch-'.$line->id.'-'.$i);
 							$moline->role = 'consumed';
 							$moline->fk_mrp_production = $line->id;
-							$moline->fk_stock_movement = $idstockmove;
+							$moline->fk_stock_movement = $idstockmove == 0 ? null : $idstockmove;
 							$moline->fk_user_creat = $user->id;
 
 							$resultmoline = $moline->create($user);
@@ -924,10 +925,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					// Stock
 					if (isModEnabled('stock')) {
 						print '<td class="nowraponall right">';
-						if ($tmpproduct->stock_reel < ($line->qty - $alreadyconsumed)) {
-							print img_warning($langs->trans('StockTooLow')).' ';
+						if (empty($conf->global->STOCK_SUPPORTS_SERVICES) && $tmpproduct->type != PRODUCT::TYPE_SERVICE) {
+							if (!$line->disable_stock_change && $tmpproduct->stock_reel < ($line->qty - $alreadyconsumed)) {
+								print img_warning($langs->trans('StockTooLow')) . ' ';
+							}
+							print price2num($tmpproduct->stock_reel, 'MS'); // Available
 						}
-						print price2num($tmpproduct->stock_reel, 'MS'); // Available
 						print '</td>';
 					}
 					// Lot
@@ -1001,7 +1004,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 						// Action delete line
 						if ($permissiontodelete) {
-							$href = $_SERVER["PHP_SELF"].'?id='.((int) $object->id).'&action=deleteline&token='.newToken().'&lineid='.((int) $line->id).'&fk_movement='.((int) $line2['fk_stock_movement']);
+							$href = $_SERVER["PHP_SELF"].'?id='.((int) $object->id).'&action=deleteline&token='.newToken().'&lineid='.((int) $line2['rowid']).'&fk_movement='.((int) $line2['fk_stock_movement']);
 							print '<td class="center">';
 							print '<a class="reposition" href="'.$href.'">';
 							print img_picto($langs->trans('TooltipDeleteAndRevertStockMovement'), 'delete');

From 32610ec3cacc0929c000667f88fb97653ada2f36 Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Mon, 19 Dec 2022 14:27:22 +0100
Subject: [PATCH 401/816] NEW category of operation for crabe PDF model

---
 .../modules/facture/doc/pdf_crabe.modules.php | 57 +++++++++++++++++++
 .../facture/doc/pdf_sponge.modules.php        | 56 +++++++++++++++++-
 2 files changed, 111 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 ee4cc9b5d0d..30a61fbb1d3 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -132,6 +132,11 @@ class pdf_crabe extends ModelePDFFactures
 	 */
 	public $posxprogress;
 
+	/**
+	 * @var int Category of operation
+	 */
+	public $categoryOfOperation = -1; // unknown by default
+
 
 	/**
 	 *	Constructor
@@ -402,11 +407,37 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// Set $this->atleastonediscount if you have at least one discount
+				// and determine category of operation
+				$categoryOfOperation = 0;
+				$nbProduct = 0;
+				$nbService = 0;
 				for ($i = 0; $i < $nblines; $i++) {
 					if ($object->lines[$i]->remise_percent) {
 						$this->atleastonediscount++;
 					}
+
+					// determine category of operation
+					if ($categoryOfOperation < 2) {
+						$lineProductType = $object->lines[$i]->product_type;
+						if ($lineProductType == Product::TYPE_PRODUCT) {
+							$nbProduct++;
+						} elseif ($lineProductType == Product::TYPE_SERVICE) {
+							$nbService++;
+						}
+						if ($nbProduct > 0 && $nbService > 0) {
+							// mixed products and services
+							$categoryOfOperation = 2;
+						}
+					}
 				}
+				// determine category of operation
+				if ($categoryOfOperation <= 0) {
+					// only services
+					if ($nbProduct == 0 && $nbService > 0) {
+						$categoryOfOperation = 1;
+					}
+				}
+				$this->categoryOfOperation = $categoryOfOperation;
 				if (empty($this->atleastonediscount)) {    // retrieve space not used by discount
 					$delta = ($this->posxprogress - $this->posxdiscount);
 					$this->posxpicture += $delta;
@@ -1128,6 +1159,10 @@ class pdf_crabe extends ModelePDFFactures
 		}
 
 		$posxval = 52;
+		$posxend = 110;	// End of x for text on left side
+		if ($this->page_largeur < 210) { // To work with US executive format
+			$posxend -= 10;
+		}
 
 		// Show payments conditions
 		if ($object->type != 2 && ($object->cond_reglement_code || $object->cond_reglement)) {
@@ -1145,6 +1180,21 @@ class pdf_crabe extends ModelePDFFactures
 			$posy = $pdf->GetY() + 3;	// We need spaces for 2 lines payment conditions
 		}
 
+		// Show category of operations
+		if (getDolGlobalInt('INVOICE_CATEGORY_OF_OPERATION') == 2 && $this->categoryOfOperation >= 0) {
+			$pdf->SetFont('', 'B', $default_font_size - 2);
+			$pdf->SetXY($this->marge_gauche, $posy);
+			$categoryOfOperationTitle = $outputlangs->transnoentities("MentionCategoryOfOperations").' : ';
+			$pdf->MultiCell($posxval - $this->marge_gauche, 4, $categoryOfOperationTitle, 0, 'L');
+
+			$pdf->SetFont('', '', $default_font_size - 2);
+			$pdf->SetXY($posxval, $posy);
+			$categoryOfOperationLabel = $outputlangs->transnoentities("MentionCategoryOfOperations" . $this->categoryOfOperation);
+			$pdf->MultiCell($posxend - $posxval, 4, $categoryOfOperationLabel, 0, 'L');
+
+			$posy = $pdf->GetY() + 3; // for 2 lines
+		}
+
 		if ($object->type != 2) {
 			// Check a payment mode is defined
 			if (empty($object->mode_reglement_code)
@@ -1659,6 +1709,13 @@ class pdf_crabe extends ModelePDFFactures
 		$pdf->SetFont('', '', $default_font_size - 2);
 
 		if (empty($hidetop)) {
+			// Show category of operations
+			if (getDolGlobalInt('INVOICE_CATEGORY_OF_OPERATION') == 1 && $this->categoryOfOperation >= 0) {
+				$categoryOfOperations = $outputlangs->transnoentities("MentionCategoryOfOperations") . ' : ' . $outputlangs->transnoentities("MentionCategoryOfOperations" . $this->categoryOfOperation);
+				$pdf->SetXY($this->marge_gauche, $tab_top - 4);
+				$pdf->MultiCell(($pdf->GetStringWidth($categoryOfOperations)) + 4, 2, $categoryOfOperations);
+			}
+
 			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 1bea6b0db67..5edfc3f6157 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -159,6 +159,11 @@ class pdf_sponge extends ModelePDFFactures
 	 */
 	public $cols;
 
+	/**
+	 * @var int Category of operation
+	 */
+	public $categoryOfOperation = -1; // unknown by default
+
 
 	/**
 	 *	Constructor
@@ -429,12 +434,37 @@ class pdf_sponge extends ModelePDFFactures
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// Set $this->atleastonediscount if you have at least one discount
+				// and determine category of operation
+				$categoryOfOperation = 0;
+				$nbProduct = 0;
+				$nbService = 0;
 				for ($i = 0; $i < $nblines; $i++) {
 					if ($object->lines[$i]->remise_percent) {
 						$this->atleastonediscount++;
 					}
-				}
 
+					// determine category of operation
+					if ($categoryOfOperation < 2) {
+						$lineProductType = $object->lines[$i]->product_type;
+						if ($lineProductType == Product::TYPE_PRODUCT) {
+							$nbProduct++;
+						} elseif ($lineProductType == Product::TYPE_SERVICE) {
+							$nbService++;
+						}
+						if ($nbProduct > 0 && $nbService > 0) {
+							// mixed products and services
+							$categoryOfOperation = 2;
+						}
+					}
+				}
+				// determine category of operation
+				if ($categoryOfOperation <= 0) {
+					// only services
+					if ($nbProduct == 0 && $nbService > 0) {
+						$categoryOfOperation = 1;
+					}
+				}
+				$this->categoryOfOperation = $categoryOfOperation;
 
 				// Situation invoice handling
 				if ($object->situation_cycle_ref) {
@@ -1241,6 +1271,21 @@ class pdf_sponge extends ModelePDFFactures
 			$posy = $pdf->GetY() + 3; // We need spaces for 2 lines payment conditions
 		}
 
+		// Show category of operations
+		if (getDolGlobalInt('INVOICE_CATEGORY_OF_OPERATION') == 2 && $this->categoryOfOperation >= 0) {
+			$pdf->SetFont('', 'B', $default_font_size - 2);
+			$pdf->SetXY($this->marge_gauche, $posy);
+			$categoryOfOperationTitle = $outputlangs->transnoentities("MentionCategoryOfOperations").' : ';
+			$pdf->MultiCell($posxval - $this->marge_gauche, 4, $categoryOfOperationTitle, 0, 'L');
+
+			$pdf->SetFont('', '', $default_font_size - 2);
+			$pdf->SetXY($posxval, $posy);
+			$categoryOfOperationLabel = $outputlangs->transnoentities("MentionCategoryOfOperations" . $this->categoryOfOperation);
+			$pdf->MultiCell($posxend - $posxval, 4, $categoryOfOperationLabel, 0, 'L');
+
+			$posy = $pdf->GetY() + 3; // for 2 lines
+		}
+
 		if ($object->type != 2) {
 			// Check a payment mode is defined
 			if (empty($object->mode_reglement_code)
@@ -1967,6 +2012,13 @@ class pdf_sponge extends ModelePDFFactures
 		$pdf->SetFont('', '', $default_font_size - 2);
 
 		if (empty($hidetop)) {
+			// Show category of operations
+			if (getDolGlobalInt('INVOICE_CATEGORY_OF_OPERATION') == 1 && $this->categoryOfOperation >= 0) {
+				$categoryOfOperations = $outputlangs->transnoentities("MentionCategoryOfOperations") . ' : ' . $outputlangs->transnoentities("MentionCategoryOfOperations" . $this->categoryOfOperation);
+				$pdf->SetXY($this->marge_gauche, $tab_top - 4);
+				$pdf->MultiCell(($pdf->GetStringWidth($categoryOfOperations)) + 4, 2, $categoryOfOperations);
+			}
+
 			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
 			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
 				$titre .= ' - '.$outputlangsbis->transnoentities("AmountInCurrency", $outputlangsbis->transnoentitiesnoconv("Currency".$currency));
@@ -2337,7 +2389,7 @@ class pdf_sponge extends ModelePDFFactures
 					$carac_client_shipping = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, $object->contact, $usecontact, 'target', $object);
 				} else {
 					$carac_client_name_shipping=pdfBuildThirdpartyName($object->thirdparty, $outputlangs);
-					$carac_client_shipping=pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'target', $object);;
+					$carac_client_shipping=pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'target', $object);
 				}
 				if (!empty($carac_client_shipping) && (isset($object->contact->socid) && $object->contact->socid != $object->socid)) {
 					$posy += $hautcadre;

From 21c665d53605653336b1b5a06fb1e92e191407b6 Mon Sep 17 00:00:00 2001
From: Adnan RIHAN <adnan@rihan.fr>
Date: Mon, 9 Jan 2023 01:47:38 +0100
Subject: [PATCH 402/816] Fix EAN13 prefix available for internal use

[GS1](https://www.gs1.org/prefixes) only allows prefixes 040-049 for internal use
within a company, while the often mistakenly 020-029 prefixes are restricted.
---
 .../iso-normes/qr-bar-codes/barcode_EAN13.txt | 235 ++++++++++--------
 htdocs/admin/barcode.php                      |   4 +-
 .../barcode/mod_barcode_product_standard.php  |   2 +-
 .../mod_barcode_thirdparty_standard.php       |   2 +-
 4 files changed, 138 insertions(+), 105 deletions(-)

diff --git a/dev/resources/iso-normes/qr-bar-codes/barcode_EAN13.txt b/dev/resources/iso-normes/qr-bar-codes/barcode_EAN13.txt
index e8000035788..549c6e29a1d 100644
--- a/dev/resources/iso-normes/qr-bar-codes/barcode_EAN13.txt
+++ b/dev/resources/iso-normes/qr-bar-codes/barcode_EAN13.txt
@@ -10,8 +10,7 @@ Signification des chiffres.
 - 1 chiffre pour la somme de controle
 
 Cette regle subit de nombreuses entorses pour ameliorer l'usage des chiffres disponibles.
-Voici la liste des codes pays ou systeme :
-
+Voici la liste des codes pays ou systeme, les préfixes qui ne sont pas explicitement mentionnés sont réservés par GS1 :
 
 
 EN
@@ -25,105 +24,139 @@ Meaning of the numbers:
 
 This rule has been twisted many times to improve the use of the available numbers.
 
-Here is the list of country codes or system:
+Here is the list of country codes or system, prefixes not explicitly listed are reserved by GS1:
 
 
-List
-====
+List (https://www.gs1.org/prefixes)
+===================================
 
-00 - 13  UCC  (U.S.A / États-Unis & Canada)
-20 - 29  Flag for internal numbering / Codification interne en magasin
-30 - 37  GENCOD-EAN  France
-380      BCCI  (Bulgaria)
-383      SANA  (Slovenia)
-385      CRO-EAN  (Croatia)
-387      EAN-BIH  (Bosnia-Herzegovina)
-400-440  CCG  (DE/Germany/Allemagne)
-45 + 49  Distribution Code Center - DCC  (Japan)
-460-469  UNISCAN - EAN Russia  (Federation de Russie)
-471      CAN  Taiwan
-474      EAN  Estonia
-475      EAN  Latvia
-476      EAN  Azerbaijan
-477      EAN  Lithuania
-478      EAN  Uzbekistan
-479      EAN  Sri Lanka
-480      PANC Philippines
-481      EAN  Belarus
-482      EAN  Ukraine
-484      EAN  Moldova 
-485      EAN  Armenia
-486      EAN  Georgia
-487      EAN  Kazakhstan
-489      HKANA Hong Kong
-50       E Centre UK - United Kingdom 
-520      HELLCAN-EAN HELLAS - Greece
-528      EAN  Lebanon
-529      EAN  Cyprus
-531      EAN-MAC (FYR Macedonia)
-535      EAN  Malta
-539      EAN  Ireland
-54       ICODIF/EAN  Belgium & Luxembourg
-560      CODIPOR (Portugal)
-569      EAN  Iceland/Islande
-57       EAN  Denmark
-590      EAN  Poland
-594      EAN  Romania
-599      H.A.P.M.H. (Hungary)
-600-601  EAN  South Africa
-609      EAN  Mauritius Island
-611      EAN  Morocco
-613      EAN  Algeria
-619      Tunicode (Tunisia)
-621      EAN  Syria
-622      EAN  Egypt
-625      EAN  Jordan/Jordanie
-626      EAN  Iran
-628      EAN  Saudi Arabia
-64       EAN  Finland
-690-693  ANCC - Article Numbering Centre of China
-70  EAN Norge (Norvege)
-729 Israeli Bar Code Association - EAN Israel
-73  EAN Suede
-740 EAN Guatemala
-741 EAN El Salvador
-742 ICCC (Honduras)
-743 EAN Nicaragua
-744 EAN Costa Rica Panama
-746 746 EAN Republique Dominicaine
-750 AMECE (Mexique)
-759 EAN Venezuela
-76  EAN (Schweiz, Suisse, Svizzera)
-770 IAC (Colombie)
-773 EAN Uruguay
-775 APC - EAN Peru (Perou)
-777 EAN Bolivie
-779 CODIGO - EAN Argentine
-780 EAN Chili
-784 EAN Paraguay
-786 ECOP (Equateur)
-789 EAN Bresil
-80 - 83 INDICOD (Italy)
-84  AECOC (Espagne)
-850 Camera de Comercio de la Republica de Cuba (Cuba)
-858 EAN Slovaquie
-859 EAN Republique Tcheque
-860 EAN YU (Yougoslavie)
-867 EAN DPR Korea (Coree du Nord)
-869 Union of Chambers of Commerce of Turkey (Turquie)
-87  EAN Nederland (Hollande)
-880 EAN Korea (Coree du Sud)
-885 EAN Thailande
-888 SANC (Singapour)
-890 EAN Inde
-893 EAN Vietnam
-899 EAN Indonesie
-90 - 91 EAN Autriche
-93  EAN Australie
-94  EAN Nouvelle Zelande
-955 Malaysian Article Numbering Council (MANC) - Malaisie
-977 Publications sirielles (ISSN)
-978 - 979 Livres (ISBN)
-980 Refus de remboursement
-981 - 982 Coupons (monnaie courante)
-99  Coupons
+0000000      Flag for internal numbering / Codification interne en magasin
+00001–01999  GS1 US (U.S.A / États-Unis & Canada)
+020-029      Restricted / Restreint
+030-039      GS1 US (U.S.A / États-Unis & Canada)
+040-049      Flag for internal numbering / Codification interne en magasin
+050-059      GS1 US (U.S.A / États-Unis & Canada)
+060-139      GS1 US (U.S.A / États-Unis & Canada)
+300-379      GS1 France
+380          GS1 Bulgaria
+383          GS1 Slovenija
+385          GS1 Croatia
+387          GS1 BIH (Bosnia-Herzegovina)
+389          GS1 Montenegro
+400-440      GS1 Germany
+450-459      GS1 Japan
+460-469      GS1 Russia
+470          GS1 Kyrgyzstan
+471          GS1 Chinese Taipei
+474          GS1 Estonia
+475          GS1 Latvia
+476          GS1 Azerbaijan
+477          GS1 Lithuania
+478          GS1 Uzbekistan
+479          GS1 Sri Lanka
+480          GS1 Philippines
+481          GS1 Belarus
+482          GS1 Ukraine
+483          GS1 Turkmenistan
+484          GS1 Moldova
+485          GS1 Armenia
+486          GS1 Georgia
+487          GS1 Kazakstan
+488          GS1 Tajikistan
+489          GS1 Hong Kong, China
+490-499      GS1 Japan
+500-509      GS1 UK
+520-521      GS1 Association Greece
+528          GS1 Lebanon
+529          GS1 Cyprus
+530          GS1 Albania
+531          GS1 Macedonia
+535          GS1 Malta
+539          GS1 Ireland
+540-549      GS1 Belgium & Luxembourg
+560          GS1 Portugal
+569          GS1 Iceland
+570-579      GS1 Denmark
+590          GS1 Poland
+594          GS1 Romania
+599          GS1 Hungary
+600-601      GS1 South Africa
+603          GS1 Ghana
+604          GS1 Senegal
+607          GS1 Oman
+608          GS1 Bahrain
+609          GS1 Mauritius
+611          GS1 Morocco
+613          GS1 Algeria
+615          GS1 Nigeria
+616          GS1 Kenya
+617          GS1 Cameroon
+618          GS1 Côte d'Ivoire
+619          GS1 Tunisia
+620          GS1 Tanzania
+621          GS1 Syria
+622          GS1 Egypt
+624          GS1 Libya
+625          GS1 Jordan
+626          GS1 Iran
+627          GS1 Kuwait
+628          GS1 Saudi Arabia
+629          GS1 Emirates
+630          GS1 Qatar
+631          GS1 Namibia
+640-649      GS1 Finland
+690-699      GS1 China
+700-709      GS1 Norway
+729          GS1 Israel
+730-739      GS1 Sweden
+740          GS1 Guatemala
+741          GS1 El Salvador
+742          GS1 Honduras
+743          GS1 Nicaragua
+744          GS1 Costa Rica
+745          GS1 Panama
+746          GS1 Republica Dominicana
+750          GS1 Mexico
+754-755      GS1 Canada
+759          GS1 Venezuela
+760-769      GS1 Schweiz, Suisse, Svizzera
+770-771      GS1 Colombia
+773          GS1 Uruguay
+775          GS1 Peru
+777          GS1 Bolivia
+778-779      GS1 Argentina
+780          GS1 Chile
+784          GS1 Paraguay
+786          GS1 Ecuador
+789-790      GS1 Brasil
+800-839      GS1 Italy
+840-849      GS1 Spain
+850          GS1 Cuba
+858          GS1 Slovakia
+859          GS1 Czech
+860          GS1 Serbia
+865          GS1 Mongolia
+867          GS1 North Korea
+868-869      GS1 Türkiye
+870-879      GS1 Netherlands
+880          GS1 South Korea
+883          GS1 Myanmar
+884          GS1 Cambodia
+885          GS1 Thailand
+888          GS1 Singapore
+890          GS1 India
+893          GS1 Vietnam
+896          GS1 Pakistan
+899          GS1 Indonesia
+900-919      GS1 Austria
+930-939      GS1 Australia
+940-949      GS1 New Zealand
+950          GS1 Global Office
+955          GS1 Malaysia
+958          GS1 Macao, China
+960-969      Global Office - GTIN-8
+977          Serial publications / Publications en série (ISSN)
+978-979      Bookland / Livres (ISBN)
+980          Refund receipts / Remboursements
+981-983      GS1 Coupons
+99           GS1 Coupons
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index 96dd7affdba..176816c0f88 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -52,7 +52,7 @@ if ($action == 'setbarcodeproducton') {
 	$barcodenumberingmodule = GETPOST('value', 'alpha');
 	$res = dolibarr_set_const($db, "BARCODE_PRODUCT_ADDON_NUM", $barcodenumberingmodule, 'chaine', 0, '', $conf->entity);
 	if ($barcodenumberingmodule == 'mod_barcode_product_standard' && empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)) {
-		$res = dolibarr_set_const($db, "BARCODE_STANDARD_PRODUCT_MASK", '020{000000000}', 'chaine', 0, '', $conf->entity);
+		$res = dolibarr_set_const($db, "BARCODE_STANDARD_PRODUCT_MASK", '04{0000000000}', 'chaine', 0, '', $conf->entity);
 	}
 } elseif ($action == 'setbarcodeproductoff') {
 	$res = dolibarr_del_const($db, "BARCODE_PRODUCT_ADDON_NUM", $conf->entity);
@@ -62,7 +62,7 @@ if ($action == 'setbarcodethirdpartyon') {
 	$barcodenumberingmodule = GETPOST('value', 'alpha');
 	$res = dolibarr_set_const($db, "BARCODE_THIRDPARTY_ADDON_NUM", $barcodenumberingmodule, 'chaine', 0, '', $conf->entity);
 	if ($barcodenumberingmodule == 'mod_barcode_thirdparty_standard' && empty($conf->global->BARCODE_STANDARD_THIRDPARTY_MASK)) {
-		$res = dolibarr_set_const($db, "BARCODE_STANDARD_THIRDPARTY_MASK", '020{000000000}', 'chaine', 0, '', $conf->entity);
+		$res = dolibarr_set_const($db, "BARCODE_STANDARD_THIRDPARTY_MASK", '04{0000000000}', 'chaine', 0, '', $conf->entity);
 	}
 } elseif ($action == 'setbarcodethirdpartyoff') {
 	$res = dolibarr_del_const($db, "BARCODE_THIRDPARTY_ADDON_NUM", $conf->entity);
diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index f4bf05afb3b..b1775a1e95f 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -100,7 +100,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("BarCode"), $langs->transnoentities("BarCode"));
 		$tooltip .= $langs->trans("GenericMaskCodes3EAN");
 		$tooltip .= '<strong>'.$langs->trans("Example").':</strong><br>';
-		$tooltip .= '020{000000000}? (for internal use)<br>';
+		$tooltip .= '04{0000000000}? (for internal use)<br>';
 		$tooltip .= '9771234{00000}? (example of ISSN code with prefix 1234)<br>';
 		$tooltip .= '9791234{00000}? (example of ISMN code with prefix 1234)<br>';
 		//$tooltip.=$langs->trans("GenericMaskCodes5");
diff --git a/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php b/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
index e25cd1dd115..6eae8da2c1f 100644
--- a/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
@@ -101,7 +101,7 @@ class mod_barcode_thirdparty_standard extends ModeleNumRefBarCode
 		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("BarCode"), $langs->transnoentities("BarCode"));
 		$tooltip .= $langs->trans("GenericMaskCodes3EAN");
 		$tooltip .= '<strong>'.$langs->trans("Example").':</strong><br>';
-		$tooltip .= '020{000000000}? (for internal use)<br>';
+		$tooltip .= '04{0000000000}? (for internal use)<br>';
 		$tooltip .= '9771234{00000}? (example of ISSN code with prefix 1234)<br>';
 		$tooltip .= '9791234{00000}? (example of ISMN code with prefix 1234)<br>';
 		//$tooltip.=$langs->trans("GenericMaskCodes5");

From 64a59b3a4b9ec48b5e0bbb294c046833baee48c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 9 Jan 2023 11:56:43 +0100
Subject: [PATCH 403/816] fix warnings

---
 htdocs/core/modules/DolibarrModules.class.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index afc19a12e92..24fa4437a36 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -219,6 +219,19 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	 */
 	public $descriptionlong;
 
+	/**
+	 * dictionaries
+	 *
+	 * @var array
+	 */
+	public $dictionaries;
+
+	/**
+	 * tabs
+	 *
+	 * @var array
+	 */
+	public $tabs;
 
 	// For exports
 

From baeff3710cc26c30f7f2dd9ecb1032fab5e3f341 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 9 Jan 2023 12:09:16 +0100
Subject: [PATCH 404/816] Update DolibarrModules.class.php

---
 htdocs/core/modules/DolibarrModules.class.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 24fa4437a36..d6baed78c46 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2014       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2018       Josep Lluís Amador      <joseplluis@lliuretic.cat>
- * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-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
@@ -180,6 +180,11 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	 */
 	public $error;
 
+	/**
+	 * @var string[] Array of Errors messages
+	 */
+	public $errors;
+
 	/**
 	 * @var string Module version
 	 * @see http://semver.org
@@ -220,16 +225,12 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	public $descriptionlong;
 
 	/**
-	 * dictionaries
-	 *
-	 * @var array
+	 * @var array dictionaries description
 	 */
 	public $dictionaries;
 
 	/**
-	 * tabs
-	 *
-	 * @var array
+	 * @var array tabs description
 	 */
 	public $tabs;
 

From 38a82649cb35167cacd0e14ca5fd38e41d7bf7c0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 9 Jan 2023 12:30:56 +0100
Subject: [PATCH 405/816] Clean code

---
 htdocs/core/class/doleditor.class.php      | 6 +-----
 htdocs/core/lib/doleditor.lib.php          | 7 +------
 htdocs/core/modules/modExport.class.php    | 1 +
 htdocs/core/modules/modFckeditor.class.php | 2 +-
 htdocs/core/modules/modImport.class.php    | 2 +-
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index fc86d661296..f53498fafe8 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -157,11 +157,7 @@ class DolEditor
 					define('REQUIRE_CKEDITOR', '1');
 				}
 
-				if (!empty($conf->global->FCKEDITOR_SKIN)) {
-					$skin = $conf->global->FCKEDITOR_SKIN;
-				} else {
-					$skin = 'moono-lisa'; // default with ckeditor 4.6 : moono-lisa
-				}
+				$skin = getDolGlobalString('FCKEDITOR_SKIN', 'moono-lisa');		// default with ckeditor 4.6 : moono-lisa
 
 				$pluginstodisable = 'elementspath,save,flash,div,specialchar,anchor';
 				if (!empty($conf->dol_optimize_smallscreen)) {
diff --git a/htdocs/core/lib/doleditor.lib.php b/htdocs/core/lib/doleditor.lib.php
index fecf10f48fe..c2e1955d8de 100644
--- a/htdocs/core/lib/doleditor.lib.php
+++ b/htdocs/core/lib/doleditor.lib.php
@@ -49,12 +49,7 @@ function show_skin($fuser, $edit = 0)
 	$dirskins = array_unique($dirskins);
 	// Now dir_themes=array('/themes') or dir_themes=array('/theme','/mymodule/theme')
 
-	$selected_theme = '';
-	if (empty($conf->global->FCKEDITOR_SKIN)) {
-		$selected_theme = 'moono-lisa';
-	} else {
-		$selected_theme = $conf->global->FCKEDITOR_SKIN;
-	}
+	$selected_theme = getDolGlobalString('FCKEDITOR_SKIN', 'moono-lisa');
 
 	$colspan = 2;
 
diff --git a/htdocs/core/modules/modExport.class.php b/htdocs/core/modules/modExport.class.php
index 357e280f9f6..df996a312bf 100644
--- a/htdocs/core/modules/modExport.class.php
+++ b/htdocs/core/modules/modExport.class.php
@@ -64,6 +64,7 @@ class modExport extends DolibarrModules
 		$this->requiredby = array();
 		$this->phpmin = array(7, 0);
 		$this->phpmax = array();
+		$this->enabled_bydefault = true; // Will be enabled during install
 
 		// Constants
 		$this->const = array();
diff --git a/htdocs/core/modules/modFckeditor.class.php b/htdocs/core/modules/modFckeditor.class.php
index fa3a66c37cc..9dd3fce7fcd 100644
--- a/htdocs/core/modules/modFckeditor.class.php
+++ b/htdocs/core/modules/modFckeditor.class.php
@@ -66,6 +66,7 @@ class modFckeditor extends DolibarrModules
 		$this->disabled = in_array(constant('JS_CKEDITOR'), array('disabled', 'disabled/'));
 		$this->depends = array();
 		$this->requiredby = array('modWebsites');
+		$this->enabled_bydefault = true; // Will be enabled during install
 
 		// Constants
 		$this->const = array();
@@ -74,7 +75,6 @@ class modFckeditor extends DolibarrModules
 		$this->const[3] = array("FCKEDITOR_ENABLE_USERSIGN", "yesno", "1", "WYSIWIG for user signature");
 		$this->const[4] = array("FCKEDITOR_ENABLE_MAILING", "yesno", "1", "WYSIWIG for mass emailings");
 		$this->const[5] = array("FCKEDITOR_ENABLE_MAIL", "yesno", "1", "WYSIWIG for products details lines for all entities");
-		$this->const[6] = array("FCKEDITOR_SKIN", "string", "moono-lisa", "Skin by default for fckeditor");
 
 		// Boxes
 		$this->boxes = array();
diff --git a/htdocs/core/modules/modImport.class.php b/htdocs/core/modules/modImport.class.php
index ad0f33c8da2..63f0ca5189f 100644
--- a/htdocs/core/modules/modImport.class.php
+++ b/htdocs/core/modules/modImport.class.php
@@ -67,7 +67,7 @@ class modImport extends DolibarrModules
 		$this->phpmin = array(7, 0); // Minimum version of PHP required by module - Need auto_detect_line_endings php option to solve MAC pbs.
 		$this->phpmax = array();
 		$this->need_dolibarr_version = array(2, 7, -1); // Minimum version of Dolibarr required by module
-		$this->need_javascript_ajax = 1;
+		$this->enabled_bydefault = true; // Will be enabled during install
 
 		// Constants
 		$this->const = array();

From de681fee0752135ed63069afb7ba9de15e3cb5b4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 9 Jan 2023 13:07:55 +0100
Subject: [PATCH 406/816] Comment in english

---
 htdocs/core/lib/functions.lib.php | 32 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c2276e8693e..d0a5ff664ae 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6454,12 +6454,12 @@ function get_product_localtax_for_country($idprod, $local, $thirdpartytouse)
 
 /**
  *	Function that return vat rate of a product line (according to seller, buyer and product vat rate)
- *   VATRULE 1: Si vendeur non assujeti a TVA, TVA par defaut=0. Fin de regle.
- *	 VATRULE 2: Si le (pays vendeur = pays acheteur) alors TVA par defaut=TVA du produit vendu. Fin de regle.
- *	 VATRULE 3: Si (vendeur et acheteur dans Communaute europeenne) et (bien vendu = moyen de transports neuf comme auto, bateau, avion) alors TVA par defaut=0 (La TVA doit etre paye par acheteur au centre d'impots de son pays et non au vendeur). Fin de regle.
- *	 VATRULE 4: Si (vendeur et acheteur dans Communaute europeenne) et (acheteur = particulier) alors TVA par defaut=TVA du produit vendu. Fin de regle
- *	 VATRULE 5: Si (vendeur et acheteur dans Communaute europeenne) et (acheteur = entreprise) alors TVA par defaut=0. Fin de regle
- *	 VATRULE 6: Sinon TVA proposee par defaut=0. Fin de regle.
+ *   VATRULE 1: If seller does not use VAT, default VAT is 0. End of rule.
+ *	 VATRULE 2: If the (seller country = buyer country) then the default VAT = VAT of the product sold. End of rule.
+ *	 VATRULE 3: If (seller and buyer in the European Community) and (property sold = new means of transport such as car, boat, plane) then VAT by default = 0 (VAT must be paid by the buyer to the tax center of his country and not to the seller). End of rule.
+ *	 VATRULE 4: If (seller and buyer in the European Community) and (buyer = individual) then VAT by default = VAT of the product sold. End of rule
+ *	 VATRULE 5: If (seller and buyer in European Community) and (buyer = company) then VAT by default=0. End of rule
+ *	 VATRULE 6: Otherwise the VAT proposed by default=0. End of rule.
  *
  *	@param	Societe		$thirdparty_seller    	Objet societe vendeuse
  *	@param  Societe		$thirdparty_buyer   	Objet societe acheteuse
@@ -6504,26 +6504,24 @@ function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer,
 		}
 	}
 
-	// If seller does not use VAT
+	// If seller does not use VAT, default VAT is 0. End of rule.
 	if (!$seller_use_vat) {
 		//print 'VATRULE 1';
 		return 0;
 	}
 
-	// Le test ci-dessus ne devrait pas etre necessaire. Me signaler l'exemple du cas juridique concerne si le test suivant n'est pas suffisant.
-
-	// Si le (pays vendeur = pays acheteur) alors la TVA par defaut=TVA du produit vendu. Fin de regle.
+	// If the (seller country = buyer country) then the default VAT = VAT of the product sold. End of rule.
 	if (($seller_country_code == $buyer_country_code)
 	|| (in_array($seller_country_code, array('FR', 'MC')) && in_array($buyer_country_code, array('FR', 'MC')))) { // Warning ->country_code not always defined
 		//print 'VATRULE 2';
 		return get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice);
 	}
 
-	// Si (vendeur et acheteur dans Communaute europeenne) et (bien vendu = moyen de transports neuf comme auto, bateau, avion) alors TVA par defaut=0 (La TVA doit etre paye par l'acheteur au centre d'impots de son pays et non au vendeur). Fin de regle.
+	// If (seller and buyer in the European Community) and (property sold = new means of transport such as car, boat, plane) then VAT by default = 0 (VAT must be paid by the buyer to the tax center of his country and not to the seller). End of rule.
 	// 'VATRULE 3' - Not supported
 
-	// Si (vendeur et acheteur dans Communaute europeenne) et (acheteur = entreprise) alors TVA par defaut=0. Fin de regle
-	// Si (vendeur et acheteur dans Communaute europeenne) et (acheteur = particulier) alors TVA par defaut=TVA du produit vendu. Fin de regle
+	// If (seller and buyer in the European Community) and (buyer = individual) then VAT by default = VAT of the product sold. End of rule
+	// If (seller and buyer in European Community) and (buyer = company) then VAT by default=0. End of rule
 	if (($seller_in_cee && $buyer_in_cee)) {
 		$isacompany = $thirdparty_buyer->isACompany();
 		if ($isacompany && !empty($conf->global->MAIN_USE_VAT_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID_ARE_INDIVIDUAL)) {
@@ -6542,7 +6540,7 @@ function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer,
 		}
 	}
 
-	// Si (vendeur dans Communaute europeene et acheteur hors Communaute europeenne et acheteur particulier) alors TVA par defaut=TVA du produit vendu. Fin de regle
+	// If (seller in the European Community and buyer outside the European Community and private buyer) then VAT by default = VAT of the product sold. End of rule
 	// I don't see any use case that need this rule.
 	if (!empty($conf->global->MAIN_USE_VAT_OF_PRODUCT_FOR_INDIVIDUAL_CUSTOMER_OUT_OF_EEC) && empty($buyer_in_cee)) {
 		$isacompany = $thirdparty_buyer->isACompany();
@@ -6552,15 +6550,15 @@ function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer,
 		}
 	}
 
-	// Sinon la TVA proposee par defaut=0. Fin de regle.
-	// Rem: Cela signifie qu'au moins un des 2 est hors Communaute europeenne et que le pays differe
+	// Otherwise the VAT proposed by default=0. End of rule.
+	// Rem: This means that at least one of the 2 is outside the European Community and the country differs
 	//print 'VATRULE 6';
 	return 0;
 }
 
 
 /**
- *	Fonction qui renvoie si tva doit etre tva percue recuperable
+ *	Function that returns whether VAT must be recoverable collected VAT (e.g.: VAT NPR in France)
  *
  *	@param	Societe		$thirdparty_seller    	Thirdparty seller
  *	@param  Societe		$thirdparty_buyer   	Thirdparty buyer

From 7ca337cf8bfa59a36a438f598c52492a7a566c62 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 9 Jan 2023 13:40:02 +0100
Subject: [PATCH 407/816] Add option MAIN_SALETAX_AUTOSWITCH_I_CS_FOR_INDIA for
 India

---
 htdocs/core/lib/functions.lib.php               | 17 ++++++++++++++++-
 .../install/mysql/migration/17.0.0-18.0.0.sql   |  2 ++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index d0a5ff664ae..f4f8ff5c172 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6514,7 +6514,22 @@ function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer,
 	if (($seller_country_code == $buyer_country_code)
 	|| (in_array($seller_country_code, array('FR', 'MC')) && in_array($buyer_country_code, array('FR', 'MC')))) { // Warning ->country_code not always defined
 		//print 'VATRULE 2';
-		return get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice);
+		$tmpvat = get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice);
+
+		if ($seller_country_code == 'IN' && getDolGlobalString('MAIN_SALETAX_AUTOSWITCH_I_CS_FOR_INDIA')) {
+			// Special case for india. TODO Convert tmpvat according to tmpvat, seller sate and buyer state
+			//print 'VATRULE 2b';
+			$reg = array();
+			if (preg_match('/^C+S-(\d+)$/', $tmpvat, $reg) && $thirdparty_seller->state_id != $thirdparty_buyer->state_id) {
+				// we must revert the C+S into I
+				$tmpvat = "I-".$reg[1];
+			} elseif (preg_match('/^I-(\d+)$/', $tmpvat, $reg) && $thirdparty_seller->state_id == $thirdparty_buyer->state_id) {
+				// we must revert the I into C+S
+				$tmpvat = "C+S-".$reg[1];
+			}
+		}
+
+		return $tmpvat;
 	}
 
 	// If (seller and buyer in the European Community) and (property sold = new means of transport such as car, boat, plane) then VAT by default = 0 (VAT must be paid by the buyer to the tax center of his country and not to the seller). End of rule.
diff --git a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
index 1adc89643d8..84022422fba 100644
--- a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
+++ b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
@@ -53,4 +53,6 @@ ALTER TABLE llx_facture ADD COLUMN prorata_discount	real DEFAULT NULL;
 
 ALTER TABLE llx_payment_salary MODIFY COLUMN datep datetime;
 
+INSERT INTO llx_c_tva(rowid,fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (1179, 117, 'I-28'  , 28,   0, '0',   0, '0', 0, 'IGST',      1);
+INSERT INTO llx_c_tva(rowid,fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (1176, 117, 'C+S-18',  0,   9, '1',   9, '1', 0, 'CGST+SGST - Same state sales', 1);
 

From 2f3d87f27ab8dbdab1de7676d96a286e3ee9d74c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 9 Jan 2023 13:44:29 +0100
Subject: [PATCH 408/816] Add option MAIN_SALETAX_AUTOSWITCH_I_CS_FOR_INDIA for
 India

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f4f8ff5c172..30d2d2327d8 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6517,15 +6517,15 @@ function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer,
 		$tmpvat = get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice);
 
 		if ($seller_country_code == 'IN' && getDolGlobalString('MAIN_SALETAX_AUTOSWITCH_I_CS_FOR_INDIA')) {
-			// Special case for india. TODO Convert tmpvat according to tmpvat, seller sate and buyer state
+			// Special case for india.
 			//print 'VATRULE 2b';
 			$reg = array();
-			if (preg_match('/^C+S-(\d+)$/', $tmpvat, $reg) && $thirdparty_seller->state_id != $thirdparty_buyer->state_id) {
+			if (preg_match('/C+S-(\d+)/', $tmpvat, $reg) && $thirdparty_seller->state_id != $thirdparty_buyer->state_id) {
 				// we must revert the C+S into I
-				$tmpvat = "I-".$reg[1];
-			} elseif (preg_match('/^I-(\d+)$/', $tmpvat, $reg) && $thirdparty_seller->state_id == $thirdparty_buyer->state_id) {
+				$tmpvat = str_replace("C+S", "I", $tmpvat);
+			} elseif (preg_match('/I-(\d+)/', $tmpvat, $reg) && $thirdparty_seller->state_id == $thirdparty_buyer->state_id) {
 				// we must revert the I into C+S
-				$tmpvat = "C+S-".$reg[1];
+				$tmpvat = str_replace("I", "C+S", $tmpvat);
 			}
 		}
 

From 4c9d6b5e51092aaed715c062e1b93f4987782d61 Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Mon, 9 Jan 2023 13:57:20 +0100
Subject: [PATCH 409/816] FIX hide details option in supplier order PDF model

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

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 736e23519bc..892e93018bd 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -567,7 +567,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 					// Total HT line
 					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN)) {
-						$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs);
+						$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
 						$pdf->SetXY($this->postotalht, $curY);
 						$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
 					}

From 4e0ea65c43d4b687f2b3ccee1b3b9beb35400a08 Mon Sep 17 00:00:00 2001
From: hystepik <lucas.marcouiller@gmail.com>
Date: Mon, 9 Jan 2023 15:37:10 +0100
Subject: [PATCH 410/816] Fix #23466 : fix public payement pages ko and ok

---
 htdocs/public/payment/paymentko.php | 2 +-
 htdocs/public/payment/paymentok.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index 606bed0c490..0359b116078 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -169,7 +169,7 @@ if (!empty($_SESSION['ipaddress'])) {      // To avoid to make action twice
 		$companylangs->setDefaultLang($mysoc->default_lang);
 		$companylangs->loadLangs(array('main', 'members', 'bills', 'paypal', 'paybox'));
 
-		$from = $conf->global->MAILING_EMAIL_FROM;
+		$from = !empty($conf->global->MAILING_EMAIL_FROM) ? $conf->global->MAILING_EMAIL_FROM : getDolGlobalString("MAIN_MAIL_EMAIL_FROM");
 		$sendto = $sendemail;
 
 		// Define link to login card
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 57e23350a2c..c2223ea7708 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -1287,7 +1287,7 @@ if ($ispaymentok) {
 							$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
 
 							$sendto = $attendeetovalidate->email;
-							$from = $conf->global->MAILING_EMAIL_FROM;
+							$from = !empty($conf->global->MAILING_EMAIL_FROM) ? $conf->global->MAILING_EMAIL_FROM : getDolGlobalString("MAIN_MAIL_EMAIL_FROM");
 							$urlback = $_SERVER["REQUEST_URI"];
 
 							$ishtml = dol_textishtml($texttosend); // May contain urls
@@ -1579,7 +1579,7 @@ if ($ispaymentok) {
 		$companylangs->loadLangs(array('main', 'members', 'bills', 'paypal', 'paybox'));
 
 		$sendto = $sendemail;
-		$from = $conf->global->MAILING_EMAIL_FROM;
+		$from = !empty($conf->global->MAILING_EMAIL_FROM) ? $conf->global->MAILING_EMAIL_FROM : getDolGlobalString("MAIN_MAIL_EMAIL_FROM");
 		// 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
@@ -1720,7 +1720,7 @@ if ($ispaymentok) {
 		$companylangs->loadLangs(array('main', 'members', 'bills', 'paypal', 'paybox'));
 
 		$sendto = $sendemail;
-		$from = $conf->global->MAILING_EMAIL_FROM;
+		$from = !empty($conf->global->MAILING_EMAIL_FROM) ? $conf->global->MAILING_EMAIL_FROM : getDolGlobalString("MAIN_MAIL_EMAIL_FROM");
 		// Define $urlwithroot
 		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
 		$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file

From 6c373c9381357bdafcc08997bcdf8ca5db9872d0 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 9 Jan 2023 15:50:55 +0100
Subject: [PATCH 411/816] fix: reminder type label

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

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 0b169d846e9..545088e47e9 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -2213,7 +2213,7 @@ if ($id > 0) {
 				$tmpuserstatic = new User($db);
 
 				foreach ($object->reminders as $actioncommreminderid => $actioncommreminder) {
-					print $TRemindTypes[$actioncommreminder->typeremind];
+					print $TRemindTypes[$actioncommreminder->typeremind]['label'];
 					if ($actioncommreminder->fk_user > 0) {
 						$tmpuserstatic->fetch($actioncommreminder->fk_user);
 						print ' ('.$tmpuserstatic->getNomUrl(0, '', 0, 0, 16).')';

From 2c971555f5d148bd63075355f8634d6f723d9179 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Mon, 9 Jan 2023 15:52:33 +0100
Subject: [PATCH 412/816] KanbanView for list of mrp

---
 htdocs/mrp/class/mo.class.php |  32 ++++++
 htdocs/mrp/mo_list.php        | 178 ++++++++++++++++++++--------------
 2 files changed, 135 insertions(+), 75 deletions(-)

diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 8624713c689..fd4ba8db4b9 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -1553,6 +1553,38 @@ class Mo extends CommonObject
 			return $MoParent;
 		}
 	}
+
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $langs;
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		//$return .= '<i class="fa fa-dol-action"></i>'; // Can be image
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>';
+		if (property_exists($this, 'fk_bom')) {
+			$return .= '<br><span class="info-box-label opacitymedium">'.$this->fk_bom.'</span>';
+		}
+		if (property_exists($this, 'qty')) {
+			$return .= '<br><span class="info-box-label">'.$langs->trans('Quantity').' : '.$this->qty.'</span>';
+		}
+		if (method_exists($this, 'getLibStatut')) {
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
 
 /**
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index 1a00a2dc052..99e91fec184 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -46,6 +46,7 @@ $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'molist'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$mode = GETPOST('mode', 'alpha');
 
 $id = GETPOST('id', 'int');
 
@@ -370,6 +371,9 @@ llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', '');
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
+if (!empty($mode)) {
+	$param .= '&mode='.urlencode($mode);
+}
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 	$param .= '&contextpage='.urlencode($contextpage);
 }
@@ -423,8 +427,12 @@ print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
 
-$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/mrp/mo_card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
+$newcardbutton = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/mrp/mo_card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -583,6 +591,7 @@ if (isset($extrafields->attributes[$object->table_element]['computed']) && is_ar
 
 // Loop on record
 // --------------------------------------------------------------------
+$bom = new Bom($db);
 $i = 0;
 $totalarray = array();
 $totalarray['nbfield'] = 0;
@@ -595,94 +604,113 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
 
-	// Show here line of result
-	print '<tr class="oddeven">';
-	// Action column
-	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print '<td class="nowrap center">';
-		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($object->id, $arrayofselected)) {
-				$selected = 1;
-			}
-			print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
-		}
-		print '</td>';
-	}
-	foreach ($object->fields as $key => $val) {
-		$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
-		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'center';
-		} elseif ($key == 'status') {
-			$cssforfield .= ($cssforfield ? ' ' : '').'center';
-		} elseif ($key == 'fk_parent_line') {
-			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	//mode Kanban
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr><td colspan="12">';
+			print '<div class="box-flex-container">';
 		}
+		$object->id = $obj->type_id;
+		$bom->id = $obj->fk_bom;
+		$objectBom = $bom->fetch($obj->fk_bom);
+		//var_dump($bom);exit;
+		$object->fk_bom = $bom->getNomUrl();
 
-		if (in_array($val['type'], array('timestamp'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-		} elseif ($key == 'ref') {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		// Output Kanban
+		print $object->getKanbanView('');
+		if ($i == (min($num, $limit) - 1)) {
+			print '</div>';
+			print '</td></tr>';
 		}
-
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'right';
-		}
-
-		if (!empty($arrayfields['t.'.$key]['checked'])) {
-			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
-			if ($key == 'status') {
-				print $object->getLibStatut(5);
-			} elseif ($key == 'fk_parent_line') {
-				$moparent = $object->getMoParent();
-				if (is_object($moparent)) print $moparent->getNomUrl(1);
-			} elseif ($key == 'rowid') {
-				print $object->showOutputField($val, $key, $object->id, '');
-			} else {
-				print $object->showOutputField($val, $key, $object->$key, '');
+	} else {
+		// Show here line of result
+		print '<tr class="oddeven">';
+		// Action column
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($object->id, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
 			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
+		}
+		foreach ($object->fields as $key => $val) {
+			$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
+			if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'center';
+			} elseif ($key == 'status') {
+				$cssforfield .= ($cssforfield ? ' ' : '').'center';
+			} elseif ($key == 'fk_parent_line') {
+				$cssforfield .= ($cssforfield ? ' ' : '').'center';
 			}
-			if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
+
+			if (in_array($val['type'], array('timestamp'))) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+			} elseif ($key == 'ref') {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+			}
+
+			if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'right';
+			}
+
+			if (!empty($arrayfields['t.'.$key]['checked'])) {
+				print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
+				if ($key == 'status') {
+					print $object->getLibStatut(5);
+				} elseif ($key == 'fk_parent_line') {
+					$moparent = $object->getMoParent();
+					if (is_object($moparent)) print $moparent->getNomUrl(1);
+				} elseif ($key == 'rowid') {
+					print $object->showOutputField($val, $key, $object->id, '');
+				} else {
+					print $object->showOutputField($val, $key, $object->$key, '');
+				}
+				print '</td>';
 				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+					$totalarray['nbfield']++;
 				}
-				if (!isset($totalarray['val'])) {
-					$totalarray['val'] = array();
+				if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
+					if (!$i) {
+						$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+					}
+					if (!isset($totalarray['val'])) {
+						$totalarray['val'] = array();
+					}
+					if (!isset($totalarray['val']['t.'.$key])) {
+						$totalarray['val']['t.'.$key] = 0;
+					}
+					$totalarray['val']['t.'.$key] += $object->$key;
 				}
-				if (!isset($totalarray['val']['t.'.$key])) {
-					$totalarray['val']['t.'.$key] = 0;
-				}
-				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
-	}
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	// Action column
-	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print '<td class="nowrap center">';
-		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($object->id, $arrayofselected)) {
-				$selected = 1;
+		// Extra fields
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+		// Fields from hook
+		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		// Action column
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($object->id, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
-			print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+			print '</td>';
+		}
+		if (!$i) {
+			$totalarray['nbfield']++;
 		}
-		print '</td>';
-	}
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
-
-	print '</tr>'."\n";
 
+		print '</tr>'."\n";
+	}
 	$i++;
 }
 

From ccf231bc44b010eab67a6d9c27bf232bd0dcec38 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 9 Jan 2023 16:01:20 +0100
Subject: [PATCH 413/816] Fix sql error

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

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 7fca848356e..bc867516d22 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -4597,6 +4597,9 @@ class OrderLine extends CommonOrderLine
 		if (empty($this->remise_percent)) {
 			$this->remise_percent = 0;
 		}
+		if (empty($this->remise)) {
+			$this->remise = 0;
+		}
 		if (empty($this->info_bits)) {
 			$this->info_bits = 0;
 		}

From 1c997eaabda71a91bf349aee3a9ccb296671506c Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Mon, 9 Jan 2023 16:56:55 +0100
Subject: [PATCH 414/816] KanbanView for list of taskActivity

---
 htdocs/projet/class/task.class.php | 35 ++++++++++++++++++++++++++++++
 htdocs/projet/tasks/list.php       | 13 ++++++++++-
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 91333c153f8..0383fc7c27b 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -2327,4 +2327,39 @@ class Task extends CommonObjectLine
 
 		return ($datetouse > 0 && ($datetouse < ($now - $conf->project->task->warning_delay)));
 	}
+
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $langs, $conf;
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		//$return .= '<i class="fa fa-dol-action"></i>'; // Can be image
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
+		if (property_exists($this, 'fk_project') ) {
+			$return .= '<br><span class="info-box-status ">'.$this->fk_project.'</span>';
+		}
+		if (property_exists($this, 'budget_amount')) {
+			$return .= '<br><span class="info-box-label amount">'.$langs->trans("Budget").' : '.price($this->budget_amount, 0, $langs, 1, 0, 0, $conf->currency).'</span>';
+		}
+		if (property_exists($this, 'fk_statut')) {
+			$return .= '<br><span class="info-box-status ">'.$this->fk_statut.'</span>';
+		}
+		if (property_exists($this, 'duration_effective')) {
+			$return .= '<div class="info-box-label opacitymedium">'.getTaskProgressView($this, false, false).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 72c5eb25874..bc4c8770f0f 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -580,6 +580,9 @@ llxHeader('', $title, $help_url);
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
+if (!empty($mode)) {
+	$param .= '&mode='.urlencode($mode);
+}
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 	$param .= '&contextpage='.urlencode($contextpage);
 }
@@ -697,7 +700,11 @@ if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'pr
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-$newcardbutton = dolGetButtonTitle($langs->trans('NewTask'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/tasks.php?action=create', '', $user->rights->projet->creer);
+$newcardbutton = '';
+
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('NewTask'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/tasks.php?action=create', '', $user->rights->projet->creer);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
 if ($optioncss != '') {
@@ -712,6 +719,8 @@ if (!empty($type)) {
 	print '<input type="hidden" name="type" value="'.$type.'">';
 }
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
+
 
 // Show description of content
 $texthelp = '';
@@ -1121,6 +1130,8 @@ while ($i < $imaxinloop) {
 			print '<div class="box-flex-container">';
 		}
 		// Output Kanban
+		$object->fk_statut = $projectstatic->getLibStatut(1);
+		$object->fk_project = $projectstatic->getNomUrl(1, 'task');
 		print $object->getKanbanView('');
 		if ($i == ($imaxinloop - 1)) {
 			print '</div>';

From a2848b48812d59596768fdc5ffad1b3122837252 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Mon, 9 Jan 2023 17:52:01 +0100
Subject: [PATCH 415/816] kanbanView for Intervention List

---
 htdocs/fichinter/class/fichinter.class.php |  32 ++
 htdocs/fichinter/list.php                  | 375 +++++++++++----------
 2 files changed, 231 insertions(+), 176 deletions(-)

diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 25fc0996ca0..eaafe202407 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -1453,6 +1453,38 @@ class Fichinter extends CommonObject
 			return -1;
 		}
 	}
+
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $langs;
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		//$return .= '<i class="fa fa-dol-action"></i>'; // Can be image
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>';
+		if (property_exists($this, 'socid')) {
+			$return .= '<br><span class="info-box-label">'.$this->socid.'</span>';
+		}
+		if (property_exists($this, 'duration')) {
+			$return .= '<br><span class="info-box-label ">'.$langs->trans("Duration").' : '.convertSecondToTime($this->duration, 'allhourmin').'</span>';
+		}
+		if (method_exists($this, 'getLibStatut')) {
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
 
 /**
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index d43b4166f1d..1892cf8c79f 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -57,6 +57,7 @@ $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'interventionlist';
+$mode = GETPOST('mode', 'alpha');
 
 $search_ref = GETPOST('search_ref') ?GETPOST('search_ref', 'alpha') : GETPOST('search_inter', 'alpha');
 $search_ref_client = GETPOST('search_ref_client', 'alpha');
@@ -460,7 +461,10 @@ $url = DOL_URL_ROOT.'/fichinter/card.php?action=create';
 if (!empty($socid)) {
 	$url .= '&socid='.$socid;
 }
-$newcardbutton = dolGetButtonTitle($langs->trans('NewIntervention'), '', 'fa fa-plus-circle', $url, '', $user->rights->ficheinter->creer);
+$newcardbutton = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('NewIntervention'), '', 'fa fa-plus-circle', $url, '', $user->rights->ficheinter->creer);
 
 print_barre_liste($title, $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -695,200 +699,219 @@ while ($i < $imaxinloop) {
 	$companystatic->email = $obj->email;
 	$companystatic->status = $obj->thirdpartystatus;
 
-	print '<tr class="oddeven">';
-	// Action column
-	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print '<td class="nowrap center">';
-		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($obj->rowid, $arrayofselected)) {
-				$selected = 1;
-			}
-			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+	//mode kanban
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr><td colspan="12">';
+			print '<div class="box-flex-container">';
 		}
-		print '</td>';
-	}
-	if (!empty($arrayfields['f.ref']['checked'])) {
-		print "<td>";
 
-		print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-		// Picto + Ref
-		print '<td class="nobordernopadding nowraponall">';
-		print $objectstatic->getNomUrl(1);
-		print '</td>';
-		// Warning
-		$warnornote = '';
-		//if ($obj->fk_statut == 1 && $db->jdate($obj->dfv) < ($now - $conf->fichinter->warning_delay)) $warnornote.=img_warning($langs->trans("Late"));
-		if (!empty($obj->note_private)) {
-			$warnornote .= ($warnornote ? ' ' : '');
-			$warnornote .= '<span class="note">';
-			$warnornote .= '<a href="note.php?id='.$obj->rowid.'">'.img_picto($langs->trans("ViewPrivateNote"), 'object_generic').'</a>';
-			$warnornote .= '</span>';
+		// Output Kanban
+		$objectstatic->duration = $obj->duree;
+		$objectstatic->socid = $companystatic->getNomUrl(1, '', 44);
+
+
+		print $objectstatic->getKanbanView('');
+		if ($i == (min($num, $limit) - 1)) {
+			print '</div>';
+			print '</td></tr>';
 		}
-		if ($warnornote) {
-			print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
-			print $warnornote;
+	} else {
+		print '<tr class="oddeven">';
+		// Action column
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($obj->rowid, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
 			print '</td>';
 		}
+		if (!empty($arrayfields['f.ref']['checked'])) {
+			print "<td>";
 
-		// Other picto tool
-		print '<td width="16" class="right nobordernopadding hideonsmartphone">';
-		$filename = dol_sanitizeFileName($obj->ref);
-		$filedir = $conf->ficheinter->dir_output.'/'.dol_sanitizeFileName($obj->ref);
-		$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
-		print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-		print '</td></tr></table>';
+			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+			// Picto + Ref
+			print '<td class="nobordernopadding nowraponall">';
+			print $objectstatic->getNomUrl(1);
+			print '</td>';
+			// Warning
+			$warnornote = '';
+			//if ($obj->fk_statut == 1 && $db->jdate($obj->dfv) < ($now - $conf->fichinter->warning_delay)) $warnornote.=img_warning($langs->trans("Late"));
+			if (!empty($obj->note_private)) {
+				$warnornote .= ($warnornote ? ' ' : '');
+				$warnornote .= '<span class="note">';
+				$warnornote .= '<a href="note.php?id='.$obj->rowid.'">'.img_picto($langs->trans("ViewPrivateNote"), 'object_generic').'</a>';
+				$warnornote .= '</span>';
+			}
+			if ($warnornote) {
+				print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
+				print $warnornote;
+				print '</td>';
+			}
 
-		print "</td>\n";
-		if (!$i) {
-			$totalarray['nbfield']++;
+			// Other picto tool
+			print '<td width="16" class="right nobordernopadding hideonsmartphone">';
+			$filename = dol_sanitizeFileName($obj->ref);
+			$filedir = $conf->ficheinter->dir_output.'/'.dol_sanitizeFileName($obj->ref);
+			$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
+			print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
+			print '</td></tr></table>';
+
+			print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
-	}
-	if (!empty($arrayfields['f.ref_client']['checked'])) {
-		// Customer ref
-		print '<td class="nowrap tdoverflowmax200">';
-		print dol_escape_htmltag($obj->ref_client);
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
+		if (!empty($arrayfields['f.ref_client']['checked'])) {
+			// Customer ref
+			print '<td class="nowrap tdoverflowmax200">';
+			print dol_escape_htmltag($obj->ref_client);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
-	}
-	if (!empty($arrayfields['s.nom']['checked'])) {
-		print '<td>';
-		print $companystatic->getNomUrl(1, '', 44);
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
+		if (!empty($arrayfields['s.nom']['checked'])) {
+			print '<td>';
+			print $companystatic->getNomUrl(1, '', 44);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
-	}
-	if (!empty($arrayfields['pr.ref']['checked'])) {
-		print '<td>';
-		$projetstatic->id = $obj->projet_id;
-		$projetstatic->ref = $obj->projet_ref;
-		$projetstatic->title = $obj->projet_title;
-		if ($projetstatic->id > 0) {
-			print $projetstatic->getNomUrl(1, '');
+		if (!empty($arrayfields['pr.ref']['checked'])) {
+			print '<td>';
+			$projetstatic->id = $obj->projet_id;
+			$projetstatic->ref = $obj->projet_ref;
+			$projetstatic->title = $obj->projet_title;
+			if ($projetstatic->id > 0) {
+				print $projetstatic->getNomUrl(1, '');
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
+		if (!empty($arrayfields['c.ref']['checked'])) {
+			print '<td>';
+			$contratstatic->id = $obj->contrat_id;
+			$contratstatic->ref = $obj->contrat_ref;
+			$contratstatic->ref_customer = $obj->contrat_ref_customer;
+			$contratstatic->ref_supplier = $obj->contrat_ref_supplier;
+			if ($contratstatic->id > 0) {
+				print $contratstatic->getNomUrl(1, '');
+				print '</td>';
+			}
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
-	}
-	if (!empty($arrayfields['c.ref']['checked'])) {
-		print '<td>';
-		$contratstatic->id = $obj->contrat_id;
-		$contratstatic->ref = $obj->contrat_ref;
-		$contratstatic->ref_customer = $obj->contrat_ref_customer;
-		$contratstatic->ref_supplier = $obj->contrat_ref_supplier;
-		if ($contratstatic->id > 0) {
-			print $contratstatic->getNomUrl(1, '');
+		if (!empty($arrayfields['f.description']['checked'])) {
+			print '<td>'.dol_trunc(dolGetFirstLineOfText(dol_string_nohtmltag($obj->description, 1)), 48).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Extra fields
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+		// Fields from hook
+		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		// Date creation
+		if (!empty($arrayfields['f.datec']['checked'])) {
+			print '<td class="center">';
+			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Date modification
+		if (!empty($arrayfields['f.tms']['checked'])) {
+			print '<td class="center">';
+			print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Note public
+		if (!empty($arrayfields['f.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['f.note_private']['checked'])) {
+			print '<td class="center">';
+			print dol_string_nohtmltag($obj->note_private);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Status
+		if (!empty($arrayfields['f.fk_statut']['checked'])) {
+			print '<td class="right">'.$objectstatic->getLibStatut(5).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Fields of detail of line
+		if (!empty($arrayfields['fd.description']['checked'])) {
+			print '<td>'.dol_trunc(dolGetFirstLineOfText(dol_string_nohtmltag($obj->descriptiondetail, 1)), 48).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		if (!empty($arrayfields['fd.date']['checked'])) {
+			print '<td class="center">'.dol_print_date($db->jdate($obj->dp), 'dayhour')."</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		if (!empty($arrayfields['fd.duree']['checked'])) {
+			print '<td class="right">'.convertSecondToTime($obj->duree, 'allhourmin').'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['type'][$totalarray['nbfield']] = 'duration';
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'fd.duree';
+			}
+			$totalarray['val']['fd.duree'] += $obj->duree;
+		}
+		// Action column
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($obj->rowid, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
 			print '</td>';
 		}
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
-	}
-	if (!empty($arrayfields['f.description']['checked'])) {
-		print '<td>'.dol_trunc(dolGetFirstLineOfText(dol_string_nohtmltag($obj->description, 1)), 48).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
 
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	// Date creation
-	if (!empty($arrayfields['f.datec']['checked'])) {
-		print '<td class="center">';
-		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Date modification
-	if (!empty($arrayfields['f.tms']['checked'])) {
-		print '<td class="center">';
-		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Note public
-	if (!empty($arrayfields['f.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['f.note_private']['checked'])) {
-		print '<td class="center">';
-		print dol_string_nohtmltag($obj->note_private);
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Status
-	if (!empty($arrayfields['f.fk_statut']['checked'])) {
-		print '<td class="right">'.$objectstatic->getLibStatut(5).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Fields of detail of line
-	if (!empty($arrayfields['fd.description']['checked'])) {
-		print '<td>'.dol_trunc(dolGetFirstLineOfText(dol_string_nohtmltag($obj->descriptiondetail, 1)), 48).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	if (!empty($arrayfields['fd.date']['checked'])) {
-		print '<td class="center">'.dol_print_date($db->jdate($obj->dp), 'dayhour')."</td>\n";
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	if (!empty($arrayfields['fd.duree']['checked'])) {
-		print '<td class="right">'.convertSecondToTime($obj->duree, 'allhourmin').'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-		if (!$i) {
-			$totalarray['type'][$totalarray['nbfield']] = 'duration';
-		}
-		if (!$i) {
-			$totalarray['pos'][$totalarray['nbfield']] = 'fd.duree';
-		}
-		$totalarray['val']['fd.duree'] += $obj->duree;
-	}
-	// Action column
-	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print '<td class="nowrap center">';
-		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($obj->rowid, $arrayofselected)) {
-				$selected = 1;
-			}
-			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
-		}
-		print '</td>';
-	}
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
+		print '</tr>'."\n";
 
-	print '</tr>'."\n";
-
-	$total += $obj->duree;
+		$total += $obj->duree;
+	}
 	$i++;
 }
 

From ee331b709e619e5527db9b29ea11785d0509279e Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Mon, 9 Jan 2023 18:23:33 +0100
Subject: [PATCH 416/816] kanbanMode for list of contracts

---
 htdocs/contrat/class/contrat.class.php |  32 ++
 htdocs/contrat/list.php                | 421 +++++++++++++------------
 2 files changed, 254 insertions(+), 199 deletions(-)

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 1846d911cef..eb86f6e071b 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2789,6 +2789,38 @@ class Contrat extends CommonObject
 
 		return ($error ? 1: 0);
 	}
+
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $langs;
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		//$return .= '<i class="fa fa-dol-action"></i>'; // Can be image
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>';
+		if (property_exists($this, 'societe')) {
+			$return .= '<br><span class="info-box-label ">'.$this->societe.'</span>';
+		}
+		if (property_exists($this, 'date_contrat')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("DateContract").' : </span><span class="info-box-label">'.dol_print_date($this->date_contrat).'</span>';
+		}
+		if (method_exists($this, 'getLibStatut')) {
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
 
 
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 4b49840f681..7ea26bf6f1b 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -51,6 +51,7 @@ $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'contractlist'; // To manage different context of search
+$mode = GETPOST('mode', 'alpha');
 
 $search_name = GETPOST('search_name', 'alpha');
 $search_email = GETPOST('search_email', 'alpha');
@@ -510,6 +511,9 @@ if ($socid > 0) {
 }
 
 $param = '';
+if (!empty($mode)) {
+	$param .= '&mode='.urlencode($mode);
+}
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 	$param .= '&contextpage='.urlencode($contextpage);
 }
@@ -606,7 +610,10 @@ $url = DOL_URL_ROOT.'/contrat/card.php?action=create';
 if (!empty($socid)) {
 	$url .= '&socid='.((int) $socid);
 }
-$newcardbutton = dolGetButtonTitle($langs->trans('NewContractSubscription'), '', 'fa fa-plus-circle', $url, '', $user->rights->contrat->creer);
+$newcardbutton = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('NewContractSubscription'), '', 'fa fa-plus-circle', $url, '', $user->rights->contrat->creer);
 
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 if ($optioncss != '') {
@@ -618,6 +625,7 @@ print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 print_barre_liste($langs->trans("Contracts"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'contract', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -909,212 +917,227 @@ while ($i < min($num, $limit)) {
 		$socstatic->country_code = $cacheCountryIDCode[$obj->country_id]['code'];
 		$socstatic->country = $cacheCountryIDCode[$obj->country_id]['label'];
 	}
-
-
-	print '<tr class="oddeven">';
-	// Action column
-	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print '<td class="nowrap center">';
-		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($obj->rowid, $arrayofselected)) {
-				$selected = 1;
-			}
-			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
-		}
-		print '</td>';
-	}
-	// Ref
-	if (!empty($arrayfields['c.ref']['checked'])) {
-		print '<td class="nowraponall">';
-		print $contracttmp->getNomUrl(1);
-		if ($obj->nb_late) {
-			print img_warning($langs->trans("Late"));
-		}
-		if (!empty($obj->note_private) || !empty($obj->note_public)) {
-			print ' <span class="note">';
-			print '<a href="'.DOL_URL_ROOT.'/contrat/note.php?id='.$obj->rowid.'&save_lastsearch_values=1">'.img_picto($langs->trans("ViewPrivateNote"), 'note').'</a>';
-			print '</span>';
+	//mode kanban
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr><td colspan="12">';
+			print '<div class="box-flex-container">';
 		}
 
-		$filename = dol_sanitizeFileName($obj->ref);
-		$filedir = $conf->contrat->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);
-		$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
-		print $formfile->getDocumentsLink($contracttmp->element, $filename, $filedir);
-		print '</td>';
-
-		print '</td>';
-	}
-
-	// Ref thirdparty
-	if (!empty($arrayfields['c.ref_customer']['checked'])) {
-		print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag(dol_string_nohtmltag($contracttmp->getFormatedCustomerRef($obj->ref_customer))).'">'.$contracttmp->getFormatedCustomerRef($obj->ref_customer).'</td>';
-	}
-	if (!empty($arrayfields['c.ref_supplier']['checked'])) {
-		print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->ref_supplier).'">'.dol_escape_htmltag($obj->ref_supplier).'</td>';
-	}
-	if (!empty($arrayfields['s.nom']['checked'])) {
-		print '<td class="tdoverflowmax150">';
-		if ($obj->socid > 0) {
-			// TODO Use a cache for this string
-			print $socstatic->getNomUrl(1, '');
+		// Output Kanban
+		$contracttmp->societe = $socstatic->getNomUrl();
+		$contracttmp->date_contrat = $obj->date_contrat;
+		print $contracttmp->getKanbanView('');
+		if ($i == (min($num, $limit) - 1)) {
+			print '</div>';
+			print '</td></tr>';
 		}
-		print '</td>';
-	}
-	// Email
-	if (!empty($arrayfields['s.email']['checked'])) {
-		print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->email).'">'.dol_print_email($obj->email, 0, $obj->socid, 0, 0, 1, 1).'</td>';
-	}
-	// Town
-	if (!empty($arrayfields['s.town']['checked'])) {
-		print '<td class="nocellnopadd">';
-		print $obj->town;
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Zip
-	if (!empty($arrayfields['s.zip']['checked'])) {
-		print '<td class="nocellnopadd">';
-		print $obj->zip;
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// State
-	if (!empty($arrayfields['state.nom']['checked'])) {
-		print "<td>".$obj->state_name."</td>\n";
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Country
-	if (!empty($arrayfields['country.code_iso']['checked'])) {
-		print '<td class="center tdoverflowmax100" title="'.dol_escape_htmltag($socstatic->country).'">';
-		print dol_escape_htmltag($socstatic->country);
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Type ent
-	if (!empty($arrayfields['typent.code']['checked'])) {
-		print '<td class="center">';
-		if (count($typenArray) == 0) {
-			$typenArray = $formcompany->typent_array(1);
-		}
-		print $typenArray[$obj->typent_code];
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	if (!empty($arrayfields['sale_representative']['checked'])) {
-		// Sales representatives
-		print '<td>';
-		if ($obj->socid > 0) {
-			$listsalesrepresentatives = $socstatic->getSalesRepresentatives($user);
-			if ($listsalesrepresentatives < 0) {
-				dol_print_error($db);
-			}
-			$nbofsalesrepresentative = count($listsalesrepresentatives);
-			if ($nbofsalesrepresentative > 6) {
-				// We print only number
-				print $nbofsalesrepresentative;
-			} elseif ($nbofsalesrepresentative > 0) {
-				$userstatic = new User($db);
-				$j = 0;
-				foreach ($listsalesrepresentatives as $val) {
-					$userstatic->id = $val['id'];
-					$userstatic->lastname = $val['lastname'];
-					$userstatic->firstname = $val['firstname'];
-					$userstatic->email = $val['email'];
-					$userstatic->statut = $val['statut'];
-					$userstatic->entity = $val['entity'];
-					$userstatic->photo = $val['photo'];
-					$userstatic->login = $val['login'];
-					$userstatic->phone = $val['phone'];
-					$userstatic->job = $val['job'];
-					$userstatic->gender = $val['gender'];
-
-					//print '<div class="float">':
-					print ($nbofsalesrepresentative < 2) ? $userstatic->getNomUrl(-1, '', 0, 0, 12) : $userstatic->getNomUrl(-2);
-					$j++;
-					if ($j < $nbofsalesrepresentative) {
-						print ' ';
-					}
-					//print '</div>';
+	} else {
+		print '<tr class="oddeven">';
+		// Action column
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($obj->rowid, $arrayofselected)) {
+					$selected = 1;
 				}
+				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
-			//else print $langs->trans("NoSalesRepresentativeAffected");
-		} else {
-			print '&nbsp;';
+			print '</td>';
 		}
-		print '</td>';
-	}
-	// Date
-	if (!empty($arrayfields['c.date_contrat']['checked'])) {
-		print '<td class="center">'.dol_print_date($db->jdate($obj->date_contrat), 'day', 'tzserver').'</td>';
-	}
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	// Date creation
-	if (!empty($arrayfields['c.datec']['checked'])) {
-		print '<td class="center nowrap">';
-		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Date modification
-	if (!empty($arrayfields['c.tms']['checked'])) {
-		print '<td class="center nowrap">';
-		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Date lower end date
-	if (!empty($arrayfields['lower_planned_end_date']['checked'])) {
-		print '<td class="center nowrapforall">';
-		print dol_print_date($db->jdate($obj->lower_planned_end_date), 'day', 'tzuser');
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Status
-	if (!empty($arrayfields['status']['checked'])) {
-		print '<td class="center">'.($obj->nb_initial > 0 ? $obj->nb_initial : '').'</td>';
-		print '<td class="center">'.($obj->nb_running > 0 ? $obj->nb_running : '').'</td>';
-		print '<td class="center">'.($obj->nb_expired > 0 ? $obj->nb_expired : '').'</td>';
-		print '<td class="center">'.($obj->nb_closed > 0 ? $obj->nb_closed : '').'</td>';
-	}
-	// Action column
-	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print '<td class="nowrap center">';
-		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($obj->rowid, $arrayofselected)) {
-				$selected = 1;
+		// Ref
+		if (!empty($arrayfields['c.ref']['checked'])) {
+			print '<td class="nowraponall">';
+			print $contracttmp->getNomUrl(1);
+			if ($obj->nb_late) {
+				print img_warning($langs->trans("Late"));
+			}
+			if (!empty($obj->note_private) || !empty($obj->note_public)) {
+				print ' <span class="note">';
+				print '<a href="'.DOL_URL_ROOT.'/contrat/note.php?id='.$obj->rowid.'&save_lastsearch_values=1">'.img_picto($langs->trans("ViewPrivateNote"), 'note').'</a>';
+				print '</span>';
 			}
-			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
-		}
-		print '</td>';
-	}
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
 
-	print "</tr>\n";
+			$filename = dol_sanitizeFileName($obj->ref);
+			$filedir = $conf->contrat->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);
+			$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
+			print $formfile->getDocumentsLink($contracttmp->element, $filename, $filedir);
+			print '</td>';
+
+			print '</td>';
+		}
+
+		// Ref thirdparty
+		if (!empty($arrayfields['c.ref_customer']['checked'])) {
+			print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag(dol_string_nohtmltag($contracttmp->getFormatedCustomerRef($obj->ref_customer))).'">'.$contracttmp->getFormatedCustomerRef($obj->ref_customer).'</td>';
+		}
+		if (!empty($arrayfields['c.ref_supplier']['checked'])) {
+			print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->ref_supplier).'">'.dol_escape_htmltag($obj->ref_supplier).'</td>';
+		}
+		if (!empty($arrayfields['s.nom']['checked'])) {
+			print '<td class="tdoverflowmax150">';
+			if ($obj->socid > 0) {
+				// TODO Use a cache for this string
+				print $socstatic->getNomUrl(1, '');
+			}
+			print '</td>';
+		}
+		// Email
+		if (!empty($arrayfields['s.email']['checked'])) {
+			print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->email).'">'.dol_print_email($obj->email, 0, $obj->socid, 0, 0, 1, 1).'</td>';
+		}
+		// Town
+		if (!empty($arrayfields['s.town']['checked'])) {
+			print '<td class="nocellnopadd">';
+			print $obj->town;
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Zip
+		if (!empty($arrayfields['s.zip']['checked'])) {
+			print '<td class="nocellnopadd">';
+			print $obj->zip;
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// State
+		if (!empty($arrayfields['state.nom']['checked'])) {
+			print "<td>".$obj->state_name."</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Country
+		if (!empty($arrayfields['country.code_iso']['checked'])) {
+			print '<td class="center tdoverflowmax100" title="'.dol_escape_htmltag($socstatic->country).'">';
+			print dol_escape_htmltag($socstatic->country);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Type ent
+		if (!empty($arrayfields['typent.code']['checked'])) {
+			print '<td class="center">';
+			if (count($typenArray) == 0) {
+				$typenArray = $formcompany->typent_array(1);
+			}
+			print $typenArray[$obj->typent_code];
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		if (!empty($arrayfields['sale_representative']['checked'])) {
+			// Sales representatives
+			print '<td>';
+			if ($obj->socid > 0) {
+				$listsalesrepresentatives = $socstatic->getSalesRepresentatives($user);
+				if ($listsalesrepresentatives < 0) {
+					dol_print_error($db);
+				}
+				$nbofsalesrepresentative = count($listsalesrepresentatives);
+				if ($nbofsalesrepresentative > 6) {
+					// We print only number
+					print $nbofsalesrepresentative;
+				} elseif ($nbofsalesrepresentative > 0) {
+					$userstatic = new User($db);
+					$j = 0;
+					foreach ($listsalesrepresentatives as $val) {
+						$userstatic->id = $val['id'];
+						$userstatic->lastname = $val['lastname'];
+						$userstatic->firstname = $val['firstname'];
+						$userstatic->email = $val['email'];
+						$userstatic->statut = $val['statut'];
+						$userstatic->entity = $val['entity'];
+						$userstatic->photo = $val['photo'];
+						$userstatic->login = $val['login'];
+						$userstatic->phone = $val['phone'];
+						$userstatic->job = $val['job'];
+						$userstatic->gender = $val['gender'];
+
+						//print '<div class="float">':
+						print ($nbofsalesrepresentative < 2) ? $userstatic->getNomUrl(-1, '', 0, 0, 12) : $userstatic->getNomUrl(-2);
+						$j++;
+						if ($j < $nbofsalesrepresentative) {
+							print ' ';
+						}
+						//print '</div>';
+					}
+				}
+				//else print $langs->trans("NoSalesRepresentativeAffected");
+			} else {
+				print '&nbsp;';
+			}
+			print '</td>';
+		}
+		// Date
+		if (!empty($arrayfields['c.date_contrat']['checked'])) {
+			print '<td class="center">'.dol_print_date($db->jdate($obj->date_contrat), 'day', 'tzserver').'</td>';
+		}
+		// Extra fields
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+		// Fields from hook
+		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		// Date creation
+		if (!empty($arrayfields['c.datec']['checked'])) {
+			print '<td class="center nowrap">';
+			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Date modification
+		if (!empty($arrayfields['c.tms']['checked'])) {
+			print '<td class="center nowrap">';
+			print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Date lower end date
+		if (!empty($arrayfields['lower_planned_end_date']['checked'])) {
+			print '<td class="center nowrapforall">';
+			print dol_print_date($db->jdate($obj->lower_planned_end_date), 'day', 'tzuser');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Status
+		if (!empty($arrayfields['status']['checked'])) {
+			print '<td class="center">'.($obj->nb_initial > 0 ? $obj->nb_initial : '').'</td>';
+			print '<td class="center">'.($obj->nb_running > 0 ? $obj->nb_running : '').'</td>';
+			print '<td class="center">'.($obj->nb_expired > 0 ? $obj->nb_expired : '').'</td>';
+			print '<td class="center">'.($obj->nb_closed > 0 ? $obj->nb_closed : '').'</td>';
+		}
+		// Action column
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($obj->rowid, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+		}
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+
+		print "</tr>\n";
+	}
 	$i++;
 }
 

From e110e7ed743c5d1ef15935d255efb644dfe9b415 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 9 Jan 2023 19:46:16 +0100
Subject: [PATCH 417/816] Fix vat rate for luxembourg

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

diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index 6c96cb46605..72cff6afde7 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -194,7 +194,7 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (14
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1402, 140, '14','0','VAT rate - intermediary',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1403, 140,  '8','0','VAT rate - reduced', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1404, 140,  '3','0','VAT rate - super-reduced', 1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1405, 140, '17','0','VAT rate - standard',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1405, 140, '16','0','VAT rate - standard',1);
 
 -- MALI (id country=147)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1471, 147,  '0','0','VAT rate 0', 1);

From cce5741acac669c0462bc797c8b9231ecc99347f Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 10 Jan 2023 05:45:47 +0100
Subject: [PATCH 418/816] NEW Accountancy - Add sub-account balance - FPC22

---
 htdocs/accountancy/bookkeeping/balance.php    | 313 ++++++++++++------
 .../accountancy/class/bookkeeping.class.php   |  23 +-
 htdocs/langs/en_US/accountancy.lang           |   1 +
 3 files changed, 235 insertions(+), 102 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 01d89f1168d..0d26213e52f 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2016       Olivier Geffroy         <jeff@jeffinfo.com>
  * Copyright (C) 2016       Florian Henry           <florian.henry@open-concept.pro>
- * Copyright (C) 2016-2022  Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2016-2023  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -42,22 +42,13 @@ $langs->loadLangs(array("accountancy", "compta"));
 
 $action = GETPOST('action', 'aZ09');
 $optioncss = GETPOST('optioncss', 'alpha');
-$contextpage = GETPOST('contextpage', 'aZ09');
-
-// Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'aZ09comma');
-$sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
-	$page = 0;
-}     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
-$offset = $limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-//if (! $sortfield) $sortfield="p.date_fin";
-//if (! $sortorder) $sortorder="DESC";
-
+$type = GETPOST('type', 'alpha');
+if ($type == 'sub') {
+	$context_default = 'balancesubaccountlist';
+} else {
+	$context_default = 'balancelist';
+}
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : $context_default;
 $show_subgroup = GETPOST('show_subgroup', 'alpha');
 $search_date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
 $search_date_end = dol_mktime(23, 59, 59, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
@@ -70,10 +61,29 @@ $search_accountancy_code_end = GETPOST('search_accountancy_code_end', 'alpha');
 if ($search_accountancy_code_end == - 1) {
 	$search_accountancy_code_end = '';
 }
+$search_not_reconciled = GETPOST('search_not_reconciled', 'alpha');
+
+// Load variable for pagination
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if ($sortorder == "") {
+	$sortorder = "ASC";
+}
+if ($sortfield == "") {
+	$sortfield = "t.numero_compte";
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new BookKeeping($db);
-$hookmanager->initHooks(array('balancelist'));  // Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array($contextpage));  // Note that conf->hooks_modules contains array
 
 $formaccounting = new FormAccounting($db);
 $formother = new FormOther($db);
@@ -84,6 +94,7 @@ if (empty($search_date_start) && !GETPOSTISSET('formfilteraction')) {
 	$sql .= " WHERE date_start < '".$db->idate(dol_now())."' AND date_end > '".$db->idate(dol_now())."'";
 	$sql .= $db->plimit(1);
 	$res = $db->query($sql);
+
 	if ($res->num_rows > 0) {
 		$fiscalYear = $db->fetch_object($res);
 		$search_date_start = strtotime($fiscalYear->date_start);
@@ -104,45 +115,6 @@ if (empty($search_date_start) && !GETPOSTISSET('formfilteraction')) {
 		$search_date_end = dol_get_last_day($year_end, $month_end);
 	}
 }
-if ($sortorder == "") {
-	$sortorder = "ASC";
-}
-if ($sortfield == "") {
-	$sortfield = "t.numero_compte";
-}
-
-
-$param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
-	$param .= '&contextpage='.urlencode($contextpage);
-}
-if ($limit > 0 && $limit != $conf->liste_limit) {
-	$param .= '&limit='.urlencode($limit);
-}
-
-$filter = array();
-if (!empty($search_date_start)) {
-	$filter['t.doc_date>='] = $search_date_start;
-	$param .= '&date_startmonth='.GETPOST('date_startmonth', 'int').'&date_startday='.GETPOST('date_startday', 'int').'&date_startyear='.GETPOST('date_startyear', 'int');
-}
-if (!empty($search_date_end)) {
-	$filter['t.doc_date<='] = $search_date_end;
-	$param .= '&date_endmonth='.GETPOST('date_endmonth', 'int').'&date_endday='.GETPOST('date_endday', 'int').'&date_endyear='.GETPOST('date_endyear', 'int');
-}
-if (!empty($search_accountancy_code_start)) {
-	$filter['t.numero_compte>='] = $search_accountancy_code_start;
-	$param .= '&search_accountancy_code_start='.urlencode($search_accountancy_code_start);
-}
-if (!empty($search_accountancy_code_end)) {
-	$filter['t.numero_compte<='] = $search_accountancy_code_end;
-	$param .= '&search_accountancy_code_end='.urlencode($search_accountancy_code_end);
-}
-if (!empty($search_ledger_code)) {
-	$filter['t.code_journal'] = $search_ledger_code;
-	foreach ($search_ledger_code as $code) {
-		$param .= '&search_ledger_code[]='.urlencode($code);
-	}
-}
 
 if (!isModEnabled('accounting')) {
 	accessforbidden();
@@ -154,14 +126,13 @@ if (!$user->hasRight('accounting', 'mouvements', 'lire')) {
 	accessforbidden();
 }
 
-
-
 /*
  * Action
  */
 
-$parameters = array();
-$arrayfields = array();
+$param = '';
+
+$parameters = array('socid'=>$socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -172,16 +143,67 @@ if (empty($reshook)) {
 		$show_subgroup = '';
 		$search_date_start = '';
 		$search_date_end = '';
+		$search_date_startyear = '';
+		$search_date_startmonth = '';
+		$search_date_startday = '';
+		$search_date_endyear = '';
+		$search_date_endmonth = '';
+		$search_date_endday = '';
 		$search_accountancy_code_start = '';
 		$search_accountancy_code_end = '';
+		$search_not_reconciled = '';
 		$search_ledger_code = array();
 		$filter = array();
 	}
-}
 
-/*
- * View
- */
+	// Must be after the remove filter action, before the export.
+	$filter = array();
+
+	if (!empty($search_date_start)) {
+		$filter['t.doc_date>='] = $search_date_start;
+		$param .= '&amp;date_startmonth=' . GETPOST('date_startmonth', 'int') . '&amp;date_startday=' . GETPOST('date_startday', 'int') . '&amp;date_startyear=' . GETPOST('date_startyear', 'int');
+	}
+	if (!empty($search_date_end)) {
+		$filter['t.doc_date<='] = $search_date_end;
+		$param .= '&amp;date_endmonth=' . GETPOST('date_endmonth', 'int') . '&amp;date_endday=' . GETPOST('date_endday', 'int') . '&amp;date_endyear=' . GETPOST('date_endyear', 'int');
+	}
+	if (!empty($search_doc_date)) {
+		$filter['t.doc_date'] = $search_doc_date;
+		$param .= '&doc_datemonth=' . GETPOST('doc_datemonth', 'int') . '&doc_dateday=' . GETPOST('doc_dateday', 'int') . '&doc_dateyear=' . GETPOST('doc_dateyear', 'int');
+	}
+	if (!empty($search_accountancy_code_start)) {
+		if ($type == 'sub') {
+			$filter['t.subledger_account>='] = $search_accountancy_code_start;
+		} else {
+			$filter['t.numero_compte>='] = $search_accountancy_code_start;
+		}
+		$param .= '&amp;search_accountancy_code_start=' . urlencode($search_accountancy_code_start);
+	}
+	if (!empty($search_accountancy_code_end)) {
+		if ($type == 'sub') {
+			$filter['t.subledger_account<='] = $search_accountancy_code_end;
+		} else {
+			$filter['t.numero_compte<='] = $search_accountancy_code_end;
+		}
+		$param .= '&amp;search_accountancy_code_end=' . urlencode($search_accountancy_code_end);
+	}
+	if (!empty($search_ledger_code)) {
+		$filter['t.code_journal'] = $search_ledger_code;
+		foreach ($search_ledger_code as $code) {
+			$param .= '&search_ledger_code[]=' . urlencode($code);
+		}
+	}
+	if (!empty($search_not_reconciled)) {
+		$filter['t.reconciled_option'] = $search_not_reconciled;
+		$param .= '&search_not_reconciled='.urlencode($search_not_reconciled);
+	}
+
+	// param with type of list
+	$url_param = substr($param, 1); // remove first "&"
+	if (!empty($type)) {
+		$param = '&type=' . $type . $param;
+	}
+}
 
 if ($action == 'export_csv') {
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
@@ -190,14 +212,23 @@ if ($action == 'export_csv') {
 	$type_export = 'balance';
 	include DOL_DOCUMENT_ROOT.'/accountancy/tpl/export_journal.tpl.php';
 
-	$result = $object->fetchAllBalance($sortorder, $sortfield, $limit, 0, $filter);
+	if ($type == 'sub') {
+		$result = $object->fetchAllBalance($sortorder, $sortfield, $limit, 0, $filter, 'AND', 1);
+	} else {
+		$result = $object->fetchAllBalance($sortorder, $sortfield, $limit, 0, $filter);
+	}
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 
 	foreach ($object->lines as $line) {
-		print '"'.length_accountg($line->numero_compte).'"'.$sep;
-		print '"'.$object->get_compte_desc($line->numero_compte).'"'.$sep;
+		if ($type == 'sub') {
+			print '"' . length_accounta($line->subledger_account) . '"' . $sep;
+			print '"' . $line->subledger_label . '"' . $sep;
+		} else {
+			print '"' . length_accountg($line->numero_compte) . '"' . $sep;
+			print '"' . $object->get_compte_desc($line->numero_compte) . '"' . $sep;
+		}
 		print '"'.price($line->debit).'"'.$sep;
 		print '"'.price($line->credit).'"'.$sep;
 		print '"'.price($line->debit - $line->credit).'"'.$sep;
@@ -207,8 +238,15 @@ if ($action == 'export_csv') {
 	exit;
 }
 
+/*
+ * View
+ */
 
-$title_page = $langs->trans("AccountBalance");
+if ($type == 'sub') {
+	$title_page = $langs->trans("AccountBalanceSubAccount");
+} else {
+	$title_page = $langs->trans("AccountBalance");
+}
 
 llxHeader('', $title_page);
 
@@ -217,39 +255,52 @@ if ($action != 'export_csv') {
 	// List
 	$nbtotalofrecords = '';
 	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-		$nbtotalofrecords = $object->fetchAllBalance($sortorder, $sortfield, 0, 0, $filter);
+		if ($type == 'sub') {
+			$nbtotalofrecords = $object->fetchAllBalance($sortorder, $sortfield, 0, 0, $filter, 'AND', 1);
+		} else {
+			$nbtotalofrecords = $object->fetchAllBalance($sortorder, $sortfield, 0, 0, $filter);
+		}
+
 		if ($nbtotalofrecords < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 
-	$result = $object->fetchAllBalance($sortorder, $sortfield, $limit, $offset, $filter);
+	if ($type == 'sub') {
+		$result = $object->fetchAllBalance($sortorder, $sortfield, $limit, $offset, $filter, 'AND', 1);
+	} else {
+		$result = $object->fetchAllBalance($sortorder, $sortfield, $limit, $offset, $filter);
+	}
+
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" id="action" value="list">';
 	if ($optioncss != '') {
 		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	}
-	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-	print '<input type="hidden" name="action" id="action" value="list">';
+	print '<input type="hidden" name="type" value="'.$type.'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
 
 
 	$parameters = array();
-	$reshook = $hookmanager->executeHooks('addMoreActionsButtonsList', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+
 	if ($reshook < 0) {
 		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 	}
 
-	$button = empty($hookmanager->resPrint) ? '' : $hookmanager->resPrint;
+	$newcardbutton = empty($hookmanager->resPrint) ? '' : $hookmanager->resPrint;
 
 	if (empty($reshook)) {
-		$button .= '<input type="button" id="exportcsvbutton" name="exportcsvbutton" class="butAction" value="'.$langs->trans("Export").' ('.$conf->global->ACCOUNTING_EXPORT_FORMAT.')" />';
+		$newcardbutton = '<input type="button" id="exportcsvbutton" name="exportcsvbutton" class="butAction" value="'.$langs->trans("Export").' ('.$conf->global->ACCOUNTING_EXPORT_FORMAT.')" />';
 
 		print '<script type="text/javascript">
 		jQuery(document).ready(function() {
@@ -262,9 +313,24 @@ if ($action != 'export_csv') {
 			});
 		});
 		</script>';
+
+		if ($type == 'sub') {
+			$newcardbutton .= dolGetButtonTitle($langs->trans('AccountBalance')." - ".$langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/balance.php?' . $url_param, '', 1, array('morecss' => 'marginleftonly'));
+			$newcardbutton .= dolGetButtonTitle($langs->trans('AccountBalance')." - ".$langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/balance.php?type=sub&' . $url_param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
+		} else {
+			$newcardbutton .= dolGetButtonTitle($langs->trans('AccountBalance')." - ".$langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/balance.php?' . $url_param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
+			$newcardbutton .= dolGetButtonTitle($langs->trans('AccountBalance')." - ".$langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/balance.php?type=sub&' . $url_param, '', 1, array('morecss' => 'marginleftonly'));
+		}
+		$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?action=create');
+	}
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+		$param .= '&contextpage='.urlencode($contextpage);
+	}
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit='.urlencode($limit);
 	}
 
-	print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $button, $result, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
+	print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $result, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 	$selectedfields = '';
 
@@ -275,18 +341,38 @@ if ($action != 'export_csv') {
 	$moreforfilter .= $form->selectDate($search_date_start ? $search_date_start : -1, 'date_start', 0, 0, 1, '', 1, 0);
 	$moreforfilter .= $langs->trans('DateEnd').': ';
 	$moreforfilter .= $form->selectDate($search_date_end ? $search_date_end : -1, 'date_end', 0, 0, 1, '', 1, 0);
-
-	$moreforfilter .= ' - ';
-	$moreforfilter .= '<label for="show_subgroup">'.$langs->trans('ShowSubtotalByGroup').'</label>: ';
-	$moreforfilter .= '<input type="checkbox" name="show_subgroup" id="show_subgroup" value="show_subgroup"'.($show_subgroup == 'show_subgroup' ? ' checked' : '').'>';
-
 	$moreforfilter .= '</div>';
 
 	$moreforfilter .= '<div class="divsearchfield">';
+	$moreforfilter .= '<label for="show_subgroup">'.$langs->trans('ShowSubtotalByGroup').'</label>: ';
+	$moreforfilter .= '<input type="checkbox" name="show_subgroup" id="show_subgroup" value="show_subgroup"'.($show_subgroup == 'show_subgroup' ? ' checked' : '').'>';
+	$moreforfilter .= '</div>';
 
-	$moreforfilter .= $langs->trans("Journal");
+	$moreforfilter .= '<div class="divsearchfield">';
+	$moreforfilter .= $langs->trans("Journals").': ';
 	$moreforfilter .= $formaccounting->multi_select_journal($search_ledger_code, 'search_ledger_code', 0, 1, 1, 1);
+	$moreforfilter .= '</div>';
 
+	$moreforfilter .= '</br>';
+	$moreforfilter .= '<div class="divsearchfield">';
+	// Accountancy account
+	$moreforfilter .= $langs->trans('AccountAccounting').': ';
+	if ($type == 'sub') {
+		$moreforfilter .= $formaccounting->select_auxaccount($search_accountancy_code_start, 'search_accountancy_code_start', $langs->trans('From'), 'maxwidth200');
+	} else {
+		$moreforfilter .= $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', $langs->trans('From'), array(), 1, 1, 'maxwidth200', 'accounts');
+	}
+	$moreforfilter .= ' ';
+	if ($type == 'sub') {
+		$moreforfilter .= $formaccounting->select_auxaccount($search_accountancy_code_end, 'search_accountancy_code_end', $langs->trans('to'), 'maxwidth200');
+	} else {
+		$moreforfilter .= $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', $langs->trans('to'), array(), 1, 1, 'maxwidth200', 'accounts');
+	}
+	$moreforfilter .= '</div>';
+
+	$moreforfilter .= '<div class="divsearchfield">';
+	$moreforfilter .= '<label for="notreconciled">'.$langs->trans('NotReconciled').'</label>: ';
+	$moreforfilter .= '<input type="checkbox" name="search_not_reconciled" id="notreconciled" value="notreconciled"'.($search_not_reconciled == 'notreconciled' ? ' checked' : '').'>';
 	$moreforfilter .= '</div>';
 
 	if (!empty($moreforfilter)) {
@@ -305,9 +391,6 @@ if ($action != 'export_csv') {
 
 	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre" colspan="'.$colspan.'">';
-	print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', $langs->trans('From'), array(), 1, 1, '', 'accounts');
-	print ' ';
-	print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', $langs->trans('to'), array(), 1, 1, '', 'accounts');
 	print '</td>';
 
 	// Fields from hook
@@ -324,6 +407,10 @@ if ($action != 'export_csv') {
 
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("AccountAccounting", $_SERVER['PHP_SELF'], "t.numero_compte", "", $param, "", $sortfield, $sortorder);
+	// TODO : Retrieve the type of third party: Customer / Supplier / Employee
+	//if ($type == 'sub') {
+	//	print_liste_field_titre("Type", $_SERVER['PHP_SELF'], "t.type", "", $param, "", $sortfield, $sortorder);
+	//}
 	if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
 		print_liste_field_titre("OpeningBalance", $_SERVER['PHP_SELF'], "", $param, "", 'class="right"', $sortfield, $sortorder);
 	}
@@ -359,7 +446,7 @@ if ($action != 'export_csv') {
 		$sql .= " GROUP BY t.numero_compte";
 
 		$resql = $db->query($sql);
-		$nrows = $db->num_rows($resql);
+		$nrows = $resql->num_rows;
 		$opening_balances = array();
 		for ($i = 0; $i < $nrows; $i++) {
 			$arr = $resql->fetch_array();
@@ -372,11 +459,13 @@ if ($action != 'export_csv') {
 		$accountingaccountstatic->id = 0;
 		$accountingaccountstatic->account_number = '';
 
-		$accountingaccountstatic->fetch(null, $line->numero_compte, true);
-		if (!empty($accountingaccountstatic->account_number)) {
-			$accounting_account = $accountingaccountstatic->getNomUrl(0, 1, 0, '', 0, -1, 0, 'accountcard');
-		} else {
-			$accounting_account = length_accountg($line->numero_compte);
+		if ($type != 'sub') {
+			$accountingaccountstatic->fetch(null, $line->numero_compte, true);
+			if (!empty($accountingaccountstatic->account_number)) {
+				$accounting_account = $accountingaccountstatic->getNomUrl(0, 1, 0, '', 0, -1, 0, 'ledger');
+			} else {
+				$accounting_account = length_accountg($line->numero_compte);
+			}
 		}
 
 		$link = '';
@@ -427,7 +516,7 @@ if ($action != 'export_csv') {
 
 				// Show first line of a break
 				print '<tr class="trforbreak">';
-				print '<td colspan="'.($colspan+1).'" class="tdforbreak">'.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').'</td>';
+				print '<td colspan="'.($colspan+1).'" style="font-weight:bold; border-bottom: 1pt solid black;">'.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').'</td>';
 				print '</tr>';
 
 				$displayed_account = $root_account_number;
@@ -438,19 +527,43 @@ if ($action != 'export_csv') {
 		}
 
 		print '<tr class="oddeven">';
-		print '<td>'.$accounting_account.'</td>';
+		// Accounting account
+		if ($type == 'sub') {
+			print '<td>'.$line->subledger_account.' <span class="opacitymedium">('.$line->subledger_label.')</span></td>';
+		} else {
+			print '<td>'.$accounting_account.'</td>';
+		}
+
+		// Type
+		// TODO Retrieve the type of third party: Customer / Supplier / Employee
+		//if ($type == 'sub') {
+		//	print '<td></td>';
+		//}
+
 		if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
 			print '<td class="right nowraponall amount">'.price(price2num($opening_balance, 'MT')).'</td>';
 		}
 
 		$urlzoom = '';
-		if ($line->numero_compte) {
-			$urlzoom = DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?search_accountancy_code_start='.urlencode($line->numero_compte).'&search_accountancy_code_end='.urlencode($line->numero_compte);
-			if (GETPOSTISSET('date_startmonth')) {
-				$urlzoom .= '&search_date_startmonth='.GETPOST('date_startmonth', 'int').'&search_date_startday='.GETPOST('date_startday', 'int').'&search_date_startyear='.GETPOST('date_startyear', 'int');
+		if ($type == 'sub') {
+			if ($line->subledger_account) {
+				$urlzoom = DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?type=sub&search_accountancy_code_start=' . urlencode($line->subledger_account) . '&search_accountancy_code_end=' . urlencode($line->subledger_account);
+				if (GETPOSTISSET('date_startmonth')) {
+					$urlzoom .= '&search_date_startmonth=' . GETPOST('date_startmonth', 'int') . '&search_date_startday=' . GETPOST('date_startday', 'int') . '&search_date_startyear=' . GETPOST('date_startyear', 'int');
+				}
+				if (GETPOSTISSET('date_endmonth')) {
+					$urlzoom .= '&search_date_endmonth=' . GETPOST('date_endmonth', 'int') . '&search_date_endday=' . GETPOST('date_endday', 'int') . '&search_date_endyear=' . GETPOST('date_endyear', 'int');
+				}
 			}
-			if (GETPOSTISSET('date_endmonth')) {
-				$urlzoom .= '&search_date_endmonth='.GETPOST('date_endmonth', 'int').'&search_date_endday='.GETPOST('date_endday', 'int').'&search_date_endyear='.GETPOST('date_endyear', 'int');
+		} else {
+			if ($line->numero_compte) {
+				$urlzoom = DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?search_accountancy_code_start=' . urlencode($line->numero_compte) . '&search_accountancy_code_end=' . urlencode($line->numero_compte);
+				if (GETPOSTISSET('date_startmonth')) {
+					$urlzoom .= '&search_date_startmonth=' . GETPOST('date_startmonth', 'int') . '&search_date_startday=' . GETPOST('date_startday', 'int') . '&search_date_startyear=' . GETPOST('date_startyear', 'int');
+				}
+				if (GETPOSTISSET('date_endmonth')) {
+					$urlzoom .= '&search_date_endmonth=' . GETPOST('date_endmonth', 'int') . '&search_date_endday=' . GETPOST('date_endday', 'int') . '&search_date_endyear=' . GETPOST('date_endyear', 'int');
+				}
 			}
 		}
 		// Debit
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 95ba38d20bb..803e2feb619 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1139,9 +1139,10 @@ class BookKeeping extends CommonObject
 	 * @param 	int 	$offset 		offset limit
 	 * @param 	array 	$filter 		filter array
 	 * @param 	string 	$filtermode 	filter mode (AND or OR)
+	 * @param 	int 	$option 		option (0: general account or 1: subaccount)
 	 * @return 	int 					<0 if KO, >0 if OK
 	 */
-	public function fetchAllBalance($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAllBalance($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND', $option = 0)
 	{
 		global $conf;
 
@@ -1151,6 +1152,9 @@ class BookKeeping extends CommonObject
 
 		$sql = 'SELECT';
 		$sql .= " t.numero_compte,";
+		$sql .= " t.label_compte,";
+		$sql .= " t.subledger_account,";
+		$sql .= " t.subledger_label,";
 		$sql .= " SUM(t.debit) as debit,";
 		$sql .= " SUM(t.credit) as credit";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
@@ -1176,6 +1180,8 @@ class BookKeeping extends CommonObject
 					} else {
 						$sqlwhere[] = natural_search("t.code_journal", $value, 3, 1);
 					}
+				} elseif ($key == 't.reconciled_option') {
+					$sqlwhere[] = 't.lettering_code IS NULL';
 				} else {
 					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
 				}
@@ -1186,7 +1192,17 @@ class BookKeeping extends CommonObject
 			$sql .= " AND ".implode(" ".$filtermode." ", $sqlwhere);
 		}
 
-		$sql .= ' GROUP BY t.numero_compte';
+		if (!empty($option)) {
+			$sql .= ' AND t.subledger_account IS NOT NULL';
+			$sql .= ' AND t.subledger_account != ""';
+			$sql .= ' GROUP BY t.subledger_account';
+			$sortfield = 't.subledger_account'.($sortfield ? ','.$sortfield : '');
+			$sortorder = 'ASC'.($sortfield ? ','.$sortfield : '');
+		} else {
+			$sql .= ' GROUP BY t.numero_compte';
+			$sortfield = 't.numero_compte'.($sortfield ? ','.$sortfield : '');
+			$sortorder = 'ASC'.($sortorder ? ','.$sortorder : '');
+		}
 
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
@@ -1204,6 +1220,9 @@ class BookKeeping extends CommonObject
 				$line = new BookKeepingLine();
 
 				$line->numero_compte = $obj->numero_compte;
+				$line->label_compte = $obj->label_compte;
+				$line->subledger_account = $obj->subledger_account;
+				$line->subledger_label = $obj->subledger_label;
 				$line->debit = $obj->debit;
 				$line->credit = $obj->credit;
 
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index e988764d8ba..19abe47fd0b 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -126,6 +126,7 @@ WriteBookKeeping=Record transactions in accounting
 Bookkeeping=Ledger
 BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
 TotalExpenseReport=Total expense report

From a85e1c46946325bfbd57a564cb75a463515fa081 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 10 Jan 2023 08:49:09 +0100
Subject: [PATCH 419/816] Remove link

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

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 0d26213e52f..1b3973ae0cd 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -462,7 +462,7 @@ if ($action != 'export_csv') {
 		if ($type != 'sub') {
 			$accountingaccountstatic->fetch(null, $line->numero_compte, true);
 			if (!empty($accountingaccountstatic->account_number)) {
-				$accounting_account = $accountingaccountstatic->getNomUrl(0, 1, 0, '', 0, -1, 0, 'ledger');
+				$accounting_account = $accountingaccountstatic->getNomUrl(0, 1, 1);
 			} else {
 				$accounting_account = length_accountg($line->numero_compte);
 			}

From 1c3d4f9301b29a107fae617fd279a711fbb4cfad Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 10 Jan 2023 09:09:39 +0100
Subject: [PATCH 420/816] Add warning

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

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 1b3973ae0cd..fd8cd8ad688 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -334,6 +334,11 @@ if ($action != 'export_csv') {
 
 	$selectedfields = '';
 
+	// Warning to explain why list of record is not consistent with the other list view (missing a lot of lines)
+	if ($type == 'sub') {
+		print info_admin($langs->trans("WarningRecordWithoutSubledgerAreExcluded"));
+	}
+
 	$moreforfilter = '';
 
 	$moreforfilter .= '<div class="divsearchfield">';

From 81d2c7fa0ee8d1775c2f84960b313b8f343d31fa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Jan 2023 10:21:36 +0100
Subject: [PATCH 421/816] NEW Can bin accounting line for a given month

---
 htdocs/accountancy/customer/index.php      | 15 ++++++++++++---
 htdocs/accountancy/expensereport/index.php | 22 +++++++++++++++++++---
 htdocs/accountancy/supplier/index.php      | 22 +++++++++++++++++++---
 htdocs/langs/en_US/accountancy.lang        |  1 +
 4 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 393629ae505..46e6832dba2 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -300,7 +300,10 @@ if ($action == 'validatehistory') {
 		$db->rollback();
 	} else {
 		$db->commit();
-		setEventMessages($langs->trans('AutomaticBindingDone', 	$nbbinddone, $notpossible), null, 'mesgs');
+		setEventMessages($langs->trans('AutomaticBindingDone', 	$nbbinddone, $notpossible), null, ($notpossible ? 'warnings' : 'mesgs'));
+		if ($notpossible) {
+			setEventMessages($langs->trans('DoManualBindingForFailedRecord', $notpossible), null, 'warnings');
+		}
 	}
 }
 
@@ -324,7 +327,7 @@ print '</span><br>';
 
 $y = $year_current;
 
-$buttonbind = '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=validatehistory&token='.newToken().'">'.$langs->trans("ValidateHistory").'</a>';
+$buttonbind = '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=validatehistory&token='.newToken().'">'.img_picto($langs->trans("ValidateHistory"), 'link', 'class="pictofixedwidth fa-color-unset"').$langs->trans("ValidateHistory").'</a>';
 
 print_barre_liste(img_picto('', 'unlink', 'class="paddingright fa-color-unset"').$langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', '', '', '', -1, '', '', 0, $buttonbind, '', 0, 1, 1);
 //print load_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, '');
@@ -420,6 +423,12 @@ if ($resql) {
 
 			print '<td class="right nowraponall amount">';
 			print price($row[$i]);
+			// Add link to make binding
+			if (!empty(price2num($row[$i]))) {
+				print '<a href="'.$_SERVER['PHP_SELF'].'?action=validatehistory&validatemonth='.((int) $cursormonth).'&validateyear='.((int) $cursoryear).'&token='.newToken().'">';
+				print img_picto($langs->trans("ValidateHistory").' ('.$langs->trans('Month'.str_pad($cursormonth, 2, '0', STR_PAD_LEFT)).' '.$cursoryear.')', 'link', 'class="marginleft2"');
+				print '</a>';
+			}
 			print '</td>';
 		}
 		print '<td class="right nowraponall amount"><b>'.price($row[14]).'</b></td>';
@@ -558,7 +567,7 @@ print "</table>\n";
 print '</div>';
 
 
-if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange. Why showing a report that should rely on result of this step ?
+if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This part of code looks strange. Why showing a report that should rely on result of this step ?
 	print '<br>';
 	print '<br>';
 
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index 5064003c7ff..df226ce115d 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -162,7 +162,10 @@ if ($action == 'validatehistory') {
 		$db->rollback();
 	} else {
 		$db->commit();
-		setEventMessages($langs->trans('AutomaticBindingDone', $nbbinddone, $notpossible), null, 'mesgs');
+		setEventMessages($langs->trans('AutomaticBindingDone', $nbbinddone, $notpossible), null,  ($notpossible ? 'warnings' : 'mesgs'));
+		if ($notpossible) {
+			setEventMessages($langs->trans('DoManualBindingForFailedRecord', $notpossible), null, 'warnings');
+		}
 	}
 }
 
@@ -185,7 +188,7 @@ print '</span><br>';
 
 $y = $year_current;
 
-$buttonbind = '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=validatehistory&token='.newToken().'&year='.$year_current.'">'.$langs->trans("ValidateHistory").'</a>';
+$buttonbind = '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=validatehistory&token='.newToken().'&year='.$year_current.'">'.img_picto('', 'link', 'class="paddingright fa-color-unset"').$langs->trans("ValidateHistory").'</a>';
 
 
 print_barre_liste(img_picto('', 'unlink', 'class="paddingright fa-color-unset"').$langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', '', '', '', -1, '', '', 0, $buttonbind, '', 0, 1, 1);
@@ -269,8 +272,21 @@ if ($resql) {
 		}
 		print '</td>';
 		for ($i = 2; $i <= 13; $i++) {
+			$cursormonth = (($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) + $i - 2);
+			if ($cursormonth > 12) {
+				$cursormonth -= 12;
+			}
+			$cursoryear = ($cursormonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1)) ? $y + 1 : $y;
+			$tmp = dol_getdate(dol_get_last_day($cursoryear, $cursormonth, 'gmt'), false, 'gmt');
+
 			print '<td class="right nowraponall amount">';
 			print price($row[$i]);
+			// Add link to make binding
+			if (!empty(price2num($row[$i]))) {
+				print '<a href="'.$_SERVER['PHP_SELF'].'?action=validatehistory&validatemonth='.((int) $cursormonth).'&validateyear='.((int) $cursoryear).'&token='.newToken().'">';
+				print img_picto($langs->trans("ValidateHistory").' ('.$langs->trans('Month'.str_pad($cursormonth, 2, '0', STR_PAD_LEFT)).' '.$cursoryear.')', 'link', 'class="marginleft2"');
+				print '</a>';
+			}
 			print '</td>';
 		}
 		print '<td class="right nowraponall amount"><b>'.price($row[14]).'</b></td>';
@@ -367,7 +383,7 @@ print '</div>';
 
 
 
-if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange. Why showing a report where results depends on next step (so not yet available) ?
+if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This part of code looks strange. Why showing a report that should rely on result of this step ?
 	print '<br>';
 	print '<br>';
 
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index b214b89734c..b66b791f7b1 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -298,7 +298,10 @@ if ($action == 'validatehistory') {
 		$db->rollback();
 	} else {
 		$db->commit();
-		setEventMessages($langs->trans('AutomaticBindingDone', 	$nbbinddone, $notpossible), null, 'mesgs');
+		setEventMessages($langs->trans('AutomaticBindingDone', 	$nbbinddone, $notpossible), null, ($notpossible ? 'warnings' : 'mesgs'));
+		if ($notpossible) {
+			setEventMessages($langs->trans('DoManualBindingForFailedRecord', $notpossible), null, 'warnings');
+		}
 	}
 }
 
@@ -320,7 +323,7 @@ print '</span><br>';
 
 $y = $year_current;
 
-$buttonbind = '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=validatehistory&token='.newToken().'">'.$langs->trans("ValidateHistory").'</a>';
+$buttonbind = '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=validatehistory&token='.newToken().'">'.img_picto('', 'link', 'class="paddingright fa-color-unset"').$langs->trans("ValidateHistory").'</a>';
 
 
 print_barre_liste(img_picto('', 'unlink', 'class="paddingright fa-color-unset"').$langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', '', '', '', -1, '', '', 0, $buttonbind, '', 0, 1, 1);
@@ -408,8 +411,21 @@ if ($resql) {
 		}
 		print '</td>';
 		for ($i = 2; $i <= 13; $i++) {
+			$cursormonth = (($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) + $i - 2);
+			if ($cursormonth > 12) {
+				$cursormonth -= 12;
+			}
+			$cursoryear = ($cursormonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1)) ? $y + 1 : $y;
+			$tmp = dol_getdate(dol_get_last_day($cursoryear, $cursormonth, 'gmt'), false, 'gmt');
+
 			print '<td class="right nowraponall amount">';
 			print price($row[$i]);
+			// Add link to make binding
+			if (!empty(price2num($row[$i]))) {
+				print '<a href="'.$_SERVER['PHP_SELF'].'?action=validatehistory&validatemonth='.((int) $cursormonth).'&validateyear='.((int) $cursoryear).'&token='.newToken().'">';
+				print img_picto($langs->trans("ValidateHistory").' ('.$langs->trans('Month'.str_pad($cursormonth, 2, '0', STR_PAD_LEFT)).' '.$cursoryear.')', 'link', 'class="marginleft2"');
+				print '</a>';
+			}
 			print '</td>';
 		}
 		print '<td class="right nowraponall amount"><b>'.price($row[14]).'</b></td>';
@@ -541,7 +557,7 @@ print "</table>\n";
 print '</div>';
 
 
-if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange. Why showing a report that should rely on result of this step ?
+if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This part of code looks strange. Why showing a report that should rely on result of this step ?
 	print '<br>';
 	print '<br>';
 
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 419b69a3f90..554087ad5c4 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -297,6 +297,7 @@ DescValidateMovements=Any modification or deletion of writing, lettering and del
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the rows not linked %s automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s

From 765a542e1265493a21996da33021354e665ecbf3 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Tue, 10 Jan 2023 10:32:35 +0100
Subject: [PATCH 422/816] kanban mode for list of fournisseur commande

---
 .../class/fournisseur.commande.class.php      |  32 +
 htdocs/fourn/commande/list.php                | 672 +++++++++---------
 2 files changed, 384 insertions(+), 320 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 00ed65e7616..9482ff7f500 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -3544,6 +3544,38 @@ class CommandeFournisseur extends CommonOrder
 			return -1;
 		}
 	}
+
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $langs;
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		//$return .= '<i class="fa fa-dol-action"></i>'; // Can be image
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>';
+		if (property_exists($this, 'socid') || property_exists($this, 'total_tva')) {
+			$return .='<br><span class="info-box-label amount">'.$this->socid.'</span>';
+		}
+		if (property_exists($this, 'billed')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("Billed").' : </span><span class="info-box-label">'.yn($this->billed).'</span>';
+		}
+		if (method_exists($this, 'getLibStatut')) {
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
 
 
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 3d458247bcf..96c2f7d6cbf 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -56,6 +56,7 @@ $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'supplierorderlist';
+$mode = GETPOST('mode', 'alpha');
 
 // Search Criteria
 $search_date_order_startday = GETPOST('search_date_order_startday', 'int');
@@ -576,6 +577,9 @@ if (empty($reshook)) {
 
 			// Make a redirect to avoid to bill twice if we make a refresh or back
 			$param = '';
+			if (!empty($mode)) {
+				$param .= '&mode='.urlencode($mode);
+			}
 			if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 				$param .= '&contextpage='.urlencode($contextpage);
 			}
@@ -998,6 +1002,9 @@ if ($resql) {
 	llxHeader('', $title, $help_url);
 
 	$param = '';
+	if (!empty($mode)) {
+		$param .= '&mode='.urlencode($mode);
+	}
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 		$param .= '&contextpage='.urlencode($contextpage);
 	}
@@ -1184,7 +1191,10 @@ if ($resql) {
 		$url .= '&socid='.((int) $socid);
 		$url .= '&backtopage='.urlencode(DOL_URL_ROOT.'/fourn/commande/list.php?socid='.((int) $socid));
 	}
-	$newcardbutton = dolGetButtonTitle($langs->trans('NewSupplierOrderShort'), '', 'fa fa-plus-circle', $url, '', $permissiontoadd);
+	$newcardbutton = '';
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('NewSupplierOrderShort'), '', 'fa fa-plus-circle', $url, '', $permissiontoadd);
 
 	// Lines of title fields
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
@@ -1198,6 +1208,7 @@ if ($resql) {
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 	print '<input type="hidden" name="socid" value="'.$socid.'">';
+	print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'supplier_order', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -1660,344 +1671,365 @@ if ($resql) {
 		$objectstatic->note_private = $obj->note_private;
 		$objectstatic->statut = $obj->fk_statut;
 
-		print '<tr class="oddeven">';
-		// Action column
-		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-			print '<td class="nowrap center">';
-			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-				$selected = 0;
-				if (in_array($obj->rowid, $arrayofselected)) {
-					$selected = 1;
-				}
-				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		if ($mode == 'kanban') {
+			if ($i == 0) {
+				print '<tr><td colspan="12">';
+				print '<div class="box-flex-container">';
 			}
-			print '</td>';
-		}
-		// Ref
-		if (!empty($arrayfields['cf.ref']['checked'])) {
-			print '<td class="nowrap">';
 
-			// Picto + Ref
-			print $objectstatic->getNomUrl(1, '', 0, -1, 1);
-			// Other picto tool
-			$filename = dol_sanitizeFileName($obj->ref);
-			$filedir = $conf->fournisseur->commande->dir_output.'/'.dol_sanitizeFileName($obj->ref);
-			print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-
-			print '</td>'."\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Ref Supplier
-		if (!empty($arrayfields['cf.ref_supplier']['checked'])) {
-			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->ref_supplier).'">'.dol_escape_htmltag($obj->ref_supplier).'</td>'."\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Project
-		if (!empty($arrayfields['cf.fk_projet']['checked'])) {
-			$projectstatic->id = $obj->project_id;
-			$projectstatic->ref = $obj->project_ref;
-			$projectstatic->title = $obj->project_title;
-			print '<td>';
-			if ($obj->project_id > 0) {
-				print $projectstatic->getNomUrl(1);
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Author
-		$userstatic->id = $obj->fk_user_author;
-		$userstatic->lastname = $obj->lastname;
-		$userstatic->firstname = $obj->firstname;
-		$userstatic->login = $obj->login;
-		$userstatic->photo = $obj->photo;
-		$userstatic->email = $obj->user_email;
-		$userstatic->statut = $obj->user_status;
-		if (!empty($arrayfields['u.login']['checked'])) {
-			print '<td class="tdoverflowmax150">';
-			if ($userstatic->id) {
-				print $userstatic->getNomUrl(1);
-			}
-			print "</td>";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Thirdparty
-		if (!empty($arrayfields['cf.fk_soc']['checked'])) {
-			print '<td class="tdoverflowmax150">';
 			$thirdpartytmp->id = $obj->socid;
 			$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) {
-				$totalarray['nbfield']++;
+			$objectstatic->socid = $thirdpartytmp->getNomUrl('supplier', 0, 0, -1);
+			// Output Kanban
+			print $objectstatic->getKanbanView('');
+			if ($i == (min($num, $limit) - 1)) {
+				print '</div>';
+				print '</td></tr>';
 			}
-		}
-		//alias
-		if (!empty($arrayfields['s.name_alias']['checked'])) {
-			print '<td class="tdoverflowmax150">';
-			print $obj->alias;
-			print '</td>'."\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
+		} else {
+			print '<tr class="oddeven">';
+			// Action column
+			if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+				print '<td class="nowrap center">';
+				if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+					$selected = 0;
+					if (in_array($obj->rowid, $arrayofselected)) {
+						$selected = 1;
+					}
+					print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+				}
+				print '</td>';
 			}
-		}
-		// Town
-		if (!empty($arrayfields['s.town']['checked'])) {
-			print '<td>';
-			print $obj->town;
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Zip
-		if (!empty($arrayfields['s.zip']['checked'])) {
-			print '<td>';
-			print $obj->zip;
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// State
-		if (!empty($arrayfields['state.nom']['checked'])) {
-			print "<td>".$obj->state_name."</td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Country
-		if (!empty($arrayfields['country.code_iso']['checked'])) {
-			print '<td class="center">';
-			$tmparray = getCountry($obj->fk_pays, 'all');
-			print $tmparray['label'];
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Type ent
-		if (!empty($arrayfields['typent.code']['checked'])) {
-			print '<td class="center">';
-			if (empty($typenArray)) {
-				$typenArray = $formcompany->typent_array(1);
-			}
-			print $typenArray[$obj->typent_code];
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
+			// Ref
+			if (!empty($arrayfields['cf.ref']['checked'])) {
+				print '<td class="nowrap">';
 
-		// Order date
-		if (!empty($arrayfields['cf.date_commande']['checked'])) {
-			print '<td class="center">';
-			print dol_print_date($db->jdate($obj->date_commande), 'day');
-			if ($objectstatic->statut != $objectstatic::STATUS_ORDERSENT && $objectstatic->statut != $objectstatic::STATUS_RECEIVED_PARTIALLY) {
-				if ($objectstatic->hasDelay()) {
-					print ' '.img_picto($langs->trans("Late").' : '.$objectstatic->showDelay(), "warning");
+				// Picto + Ref
+				print $objectstatic->getNomUrl(1, '', 0, -1, 1);
+				// Other picto tool
+				$filename = dol_sanitizeFileName($obj->ref);
+				$filedir = $conf->fournisseur->commande->dir_output.'/'.dol_sanitizeFileName($obj->ref);
+				print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
+
+				print '</td>'."\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
 				}
 			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Plannned date of delivery
-		if (!empty($arrayfields['cf.date_livraison']['checked'])) {
-			print '<td class="center">';
-			print dol_print_date($db->jdate($obj->date_livraison), 'day');
-			if ($objectstatic->statut == $objectstatic::STATUS_ORDERSENT || $objectstatic->statut == $objectstatic::STATUS_RECEIVED_PARTIALLY) {
-				if ($objectstatic->hasDelay()) {
-					print ' '.img_picto($langs->trans("Late").' : '.$objectstatic->showDelay(), "warning");
+			// Ref Supplier
+			if (!empty($arrayfields['cf.ref_supplier']['checked'])) {
+				print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->ref_supplier).'">'.dol_escape_htmltag($obj->ref_supplier).'</td>'."\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
 				}
 			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Amount HT
-		if (!empty($arrayfields['cf.total_ht']['checked'])) {
-			  print '<td class="right"><span class="amount">'.price($obj->total_ht)."</span></td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'cf.total_ht';
-			}
-			  $totalarray['val']['cf.total_ht'] += $obj->total_ht;
-		}
-		// Amount VAT
-		if (!empty($arrayfields['cf.total_tva']['checked'])) {
-			print '<td class="right"><span class="amount">'.price($obj->total_tva)."</span></td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'cf.total_tva';
-			}
-			$totalarray['val']['cf.total_tva'] += $obj->total_tva;
-		}
-		// Amount TTC
-		if (!empty($arrayfields['cf.total_ttc']['checked'])) {
-			print '<td class="right"><span class="amount">'.price($obj->total_ttc)."</span></td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'cf.total_ttc';
-			}
-			$totalarray['val']['cf.total_ttc'] += $obj->total_ttc;
-		}
-
-		// Currency
-		if (!empty($arrayfields['cf.multicurrency_code']['checked'])) {
-			  print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Currency rate
-		if (!empty($arrayfields['cf.multicurrency_tx']['checked'])) {
-			  print '<td class="nowrap">';
-			  $form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
-			  print "</td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Amount HT
-		if (!empty($arrayfields['cf.multicurrency_total_ht']['checked'])) {
-			  print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ht)."</span></td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Amount VAT
-		if (!empty($arrayfields['cf.multicurrency_total_tva']['checked'])) {
-			print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_tva)."</span></td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Amount TTC
-		if (!empty($arrayfields['cf.multicurrency_total_ttc']['checked'])) {
-			print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ttc)."</span></td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Extra fields
-		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
-		print $hookmanager->resPrint;
-		// Date creation
-		if (!empty($arrayfields['cf.date_creation']['checked'])) {
-			print '<td class="center nowrap">';
-			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Date modification
-		if (!empty($arrayfields['cf.tms']['checked'])) {
-			print '<td class="center nowrap">';
-			print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Status
-		if (!empty($arrayfields['cf.fk_statut']['checked'])) {
-			print '<td class="right nowrap">'.$objectstatic->LibStatut($obj->fk_statut, 5, $obj->billed).'</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Billed
-		if (!empty($arrayfields['cf.billed']['checked'])) {
-			print '<td class="center">'.yn($obj->billed).'</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// valid date
-		if (!empty($arrayfields['cf.date_valid']['checked'])) {
-			print '<td class="center">';
-			print dol_print_date($db->jdate($obj->date_valid), 'day');
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// approve date
-		if (!empty($arrayfields['cf.date_approve']['checked'])) {
-			print '<td class="center">';
-			print dol_print_date($db->jdate($obj->date_approve), 'day');
-			print '</td>';
-			if (!$i) {
-				$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
-		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-			print '<td class="nowrap center">';
-			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-				$selected = 0;
-				if (in_array($obj->rowid, $arrayofselected)) {
-					$selected = 1;
+			// Project
+			if (!empty($arrayfields['cf.fk_projet']['checked'])) {
+				$projectstatic->id = $obj->project_id;
+				$projectstatic->ref = $obj->project_ref;
+				$projectstatic->title = $obj->project_title;
+				print '<td>';
+				if ($obj->project_id > 0) {
+					print $projectstatic->getNomUrl(1);
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Author
+			$userstatic->id = $obj->fk_user_author;
+			$userstatic->lastname = $obj->lastname;
+			$userstatic->firstname = $obj->firstname;
+			$userstatic->login = $obj->login;
+			$userstatic->photo = $obj->photo;
+			$userstatic->email = $obj->user_email;
+			$userstatic->statut = $obj->user_status;
+			if (!empty($arrayfields['u.login']['checked'])) {
+				print '<td class="tdoverflowmax150">';
+				if ($userstatic->id) {
+					print $userstatic->getNomUrl(1);
+				}
+				print "</td>";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Thirdparty
+			if (!empty($arrayfields['cf.fk_soc']['checked'])) {
+				print '<td class="tdoverflowmax150">';
+				$thirdpartytmp->id = $obj->socid;
+				$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) {
+					$totalarray['nbfield']++;
+				}
+			}
+			//alias
+			if (!empty($arrayfields['s.name_alias']['checked'])) {
+				print '<td class="tdoverflowmax150">';
+				print $obj->alias;
+				print '</td>'."\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Town
+			if (!empty($arrayfields['s.town']['checked'])) {
+				print '<td>';
+				print $obj->town;
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Zip
+			if (!empty($arrayfields['s.zip']['checked'])) {
+				print '<td>';
+				print $obj->zip;
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// State
+			if (!empty($arrayfields['state.nom']['checked'])) {
+				print "<td>".$obj->state_name."</td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Country
+			if (!empty($arrayfields['country.code_iso']['checked'])) {
+				print '<td class="center">';
+				$tmparray = getCountry($obj->fk_pays, 'all');
+				print $tmparray['label'];
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Type ent
+			if (!empty($arrayfields['typent.code']['checked'])) {
+				print '<td class="center">';
+				if (empty($typenArray)) {
+					$typenArray = $formcompany->typent_array(1);
+				}
+				print $typenArray[$obj->typent_code];
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
 				}
-				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
-			print '</td>';
-		}
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
 
-		print "</tr>\n";
+			// Order date
+			if (!empty($arrayfields['cf.date_commande']['checked'])) {
+				print '<td class="center">';
+				print dol_print_date($db->jdate($obj->date_commande), 'day');
+				if ($objectstatic->statut != $objectstatic::STATUS_ORDERSENT && $objectstatic->statut != $objectstatic::STATUS_RECEIVED_PARTIALLY) {
+					if ($objectstatic->hasDelay()) {
+						print ' '.img_picto($langs->trans("Late").' : '.$objectstatic->showDelay(), "warning");
+					}
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Plannned date of delivery
+			if (!empty($arrayfields['cf.date_livraison']['checked'])) {
+				print '<td class="center">';
+				print dol_print_date($db->jdate($obj->date_livraison), 'day');
+				if ($objectstatic->statut == $objectstatic::STATUS_ORDERSENT || $objectstatic->statut == $objectstatic::STATUS_RECEIVED_PARTIALLY) {
+					if ($objectstatic->hasDelay()) {
+						print ' '.img_picto($langs->trans("Late").' : '.$objectstatic->showDelay(), "warning");
+					}
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Amount HT
+			if (!empty($arrayfields['cf.total_ht']['checked'])) {
+				print '<td class="right"><span class="amount">'.price($obj->total_ht)."</span></td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'cf.total_ht';
+				}
+				$totalarray['val']['cf.total_ht'] += $obj->total_ht;
+			}
+			// Amount VAT
+			if (!empty($arrayfields['cf.total_tva']['checked'])) {
+				print '<td class="right"><span class="amount">'.price($obj->total_tva)."</span></td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'cf.total_tva';
+				}
+				$totalarray['val']['cf.total_tva'] += $obj->total_tva;
+			}
+			// Amount TTC
+			if (!empty($arrayfields['cf.total_ttc']['checked'])) {
+				print '<td class="right"><span class="amount">'.price($obj->total_ttc)."</span></td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'cf.total_ttc';
+				}
+				$totalarray['val']['cf.total_ttc'] += $obj->total_ttc;
+			}
 
-		$total += $obj->total_ht;
-		$subtotal += $obj->total_ht;
+			// Currency
+			if (!empty($arrayfields['cf.multicurrency_code']['checked'])) {
+				print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Currency rate
+			if (!empty($arrayfields['cf.multicurrency_tx']['checked'])) {
+				print '<td class="nowrap">';
+				$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
+				print "</td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Amount HT
+			if (!empty($arrayfields['cf.multicurrency_total_ht']['checked'])) {
+				print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ht)."</span></td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Amount VAT
+			if (!empty($arrayfields['cf.multicurrency_total_tva']['checked'])) {
+				print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_tva)."</span></td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Amount TTC
+			if (!empty($arrayfields['cf.multicurrency_total_ttc']['checked'])) {
+				print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ttc)."</span></td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Extra fields
+			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+			// Fields from hook
+			$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+			print $hookmanager->resPrint;
+			// Date creation
+			if (!empty($arrayfields['cf.date_creation']['checked'])) {
+				print '<td class="center nowrap">';
+				print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Date modification
+			if (!empty($arrayfields['cf.tms']['checked'])) {
+				print '<td class="center nowrap">';
+				print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Status
+			if (!empty($arrayfields['cf.fk_statut']['checked'])) {
+				print '<td class="right nowrap">'.$objectstatic->LibStatut($obj->fk_statut, 5, $obj->billed).'</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Billed
+			if (!empty($arrayfields['cf.billed']['checked'])) {
+				print '<td class="center">'.yn($obj->billed).'</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// valid date
+			if (!empty($arrayfields['cf.date_valid']['checked'])) {
+				print '<td class="center">';
+				print dol_print_date($db->jdate($obj->date_valid), 'day');
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// approve date
+			if (!empty($arrayfields['cf.date_approve']['checked'])) {
+				print '<td class="center">';
+				print dol_print_date($db->jdate($obj->date_approve), 'day');
+				print '</td>';
+				if (!$i) {
+					$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
+			if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+				print '<td class="nowrap center">';
+				if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+					$selected = 0;
+					if (in_array($obj->rowid, $arrayofselected)) {
+						$selected = 1;
+					}
+					print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+				}
+				print '</td>';
+			}
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+
+			print "</tr>\n";
+
+			$total += $obj->total_ht;
+			$subtotal += $obj->total_ht;
+		}
 		$i++;
 	}
 

From 04a216bf62a7d4acb3bf1f408c4feb3a6af32071 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Jan 2023 10:26:36 +0100
Subject: [PATCH 423/816] Debug and clean link page

---
 htdocs/accountancy/customer/index.php      | 27 +++++++++-------------
 htdocs/accountancy/expensereport/index.php | 24 ++++++++++++++++++-
 htdocs/accountancy/supplier/index.php      | 27 +++++++++-------------
 htdocs/langs/en_US/accountancy.lang        |  2 +-
 4 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 46e6832dba2..1029934b8c6 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -126,21 +126,6 @@ if ($action == 'validatehistory') {
 	$db->begin();
 
 	// Now make the binding. Bind automatically only for product with a dedicated account that exists into chart of account, others need a manual bind
-	/*if ($db->type == 'pgsql') {
-		$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet";
-		$sql1 .= " SET fk_code_ventilation = accnt.rowid";
-		$sql1 .= " FROM " . MAIN_DB_PREFIX . "product as p, " . MAIN_DB_PREFIX . "accounting_account as accnt , " . MAIN_DB_PREFIX . "accounting_system as syst";
-		$sql1 .= " WHERE " . MAIN_DB_PREFIX . "facturedet.fk_product = p.rowid  AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=" . ((int) $conf->global->CHARTOFACCOUNTS).' AND accnt.entity = '.((int) $conf->entity);
-		$sql1 .= " AND accnt.active = 1 AND p.accountancy_code_sell=accnt.account_number";
-		$sql1 .= " AND " . MAIN_DB_PREFIX . "facturedet.fk_code_ventilation = 0";
-	} else {
-		$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as fd, " . MAIN_DB_PREFIX . "product as p, " . MAIN_DB_PREFIX . "accounting_account as accnt , " . MAIN_DB_PREFIX . "accounting_system as syst";
-		$sql1 .= " SET fk_code_ventilation = accnt.rowid";
-		$sql1 .= " WHERE fd.fk_product = p.rowid  AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=" . ((int) $conf->global->CHARTOFACCOUNTS).' AND accnt.entity = '.((int) $conf->entity);
-		$sql1 .= " AND accnt.active = 1 AND p.accountancy_code_sell=accnt.account_number";
-		$sql1 .= " AND fd.fk_code_ventilation = 0";
-	}*/
-
 	// Customer Invoice lines (must be same request than into page list.php for manual binding)
 	$sql = "SELECT f.rowid as facid, f.ref as ref, f.datef, f.type as ftype, f.fk_facture_source,";
 	$sql .= " l.rowid, l.fk_product, l.description, l.total_ht, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, l.vat_src_code,";
@@ -408,7 +393,17 @@ if ($resql) {
 		print '</td>';
 		print '<td>';
 		if ($row[0] == 'tobind') {
-			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_year='.((int) $y), $langs->transnoentitiesnoconv("ToBind"));
+			$startmonth = ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1);
+			if ($startmonth > 12) {
+				$startmonth -= 12;
+			}
+			$startyear = ($startmonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1)) ? $y + 1 : $y;
+			$endmonth = ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) + 11;
+			if ($endmonth > 12) {
+				$endmonth -= 12;
+			}
+			$endyear = ($endmonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1)) ? $y + 1 : $y;
+			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_date_startday=1&search_date_startmonth='.((int) $startmonth).'&search_date_startyear='.((int) $startyear).'&search_date_endday=&search_date_endmonth='.((int) $endmonth).'&search_date_endyear='.((int) $endyear), $langs->transnoentitiesnoconv("ToBind"));
 		} else {
 			print $row[1];
 		}
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index df226ce115d..aefa03651cb 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -266,7 +266,17 @@ if ($resql) {
 		print '</td>';
 		print '<td>';
 		if ($row[0] == 'tobind') {
-			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/expensereport/list.php?search_year='.((int) $y), $langs->transnoentitiesnoconv("ToBind"));
+			$startmonth = ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1);
+			if ($startmonth > 12) {
+				$startmonth -= 12;
+			}
+			$startyear = ($startmonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1)) ? $y + 1 : $y;
+			$endmonth = ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) + 11;
+			if ($endmonth > 12) {
+				$endmonth -= 12;
+			}
+			$endyear = ($endmonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1)) ? $y + 1 : $y;
+			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_date_startday=1&search_date_startmonth='.((int) $startmonth).'&search_date_startyear='.((int) $startyear).'&search_date_endday=&search_date_endmonth='.((int) $endmonth).'&search_date_endyear='.((int) $endyear), $langs->transnoentitiesnoconv("ToBind"));
 		} else {
 			print $row[1];
 		}
@@ -293,6 +303,12 @@ if ($resql) {
 		print '</tr>';
 	}
 	$db->free($resql);
+
+	if ($num == 0) {
+		print '<tr class="oddeven"><td colspan="16">';
+		print '<span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span>';
+		print '</td></tr>';
+	}
 } else {
 	print $db->lasterror(); // Show last sql error
 }
@@ -375,6 +391,12 @@ if ($resql) {
 		print '</tr>';
 	}
 	$db->free($resql);
+
+	if ($num == 0) {
+		print '<tr class="oddeven"><td colspan="16">';
+		print '<span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span>';
+		print '</td></tr>';
+	}
 } else {
 	print $db->lasterror(); // Show last sql error
 }
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index b66b791f7b1..1ffe913f9aa 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -124,21 +124,6 @@ if ($action == 'validatehistory') {
 	$db->begin();
 
 	// Now make the binding. Bind automatically only for product with a dedicated account that exists into chart of account, others need a manual bind
-	/*if ($db->type == 'pgsql') {
-		$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det";
-		$sql1 .= " SET fk_code_ventilation = accnt.rowid";
-		$sql1 .= " FROM " . MAIN_DB_PREFIX . "product as p, " . MAIN_DB_PREFIX . "accounting_account as accnt , " . MAIN_DB_PREFIX . "accounting_system as syst";
-		$sql1 .= " WHERE " . MAIN_DB_PREFIX . "facture_fourn_det.fk_product = p.rowid  AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=" . ((int) $conf->global->CHARTOFACCOUNTS).' AND accnt.entity = '.$conf->entity;
-		$sql1 .= " AND accnt.active = 1 AND p.accountancy_code_buy=accnt.account_number";
-		$sql1 .= " AND " . MAIN_DB_PREFIX . "facture_fourn_det.fk_code_ventilation = 0";
-	} else {
-		$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det as fd, " . MAIN_DB_PREFIX . "product as p, " . MAIN_DB_PREFIX . "accounting_account as accnt , " . MAIN_DB_PREFIX . "accounting_system as syst";
-		$sql1 .= " SET fk_code_ventilation = accnt.rowid";
-		$sql1 .= " WHERE fd.fk_product = p.rowid AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=" . ((int) $conf->global->CHARTOFACCOUNTS).' AND accnt.entity = '.$conf->entity;
-		$sql1 .= " AND accnt.active = 1 AND p.accountancy_code_buy=accnt.account_number";
-		$sql1 .= " AND fd.fk_code_ventilation = 0";
-	}*/
-
 	// Supplier Invoice Lines (must be same request than into page list.php for manual binding)
 	$sql = "SELECT f.rowid as facid, f.ref, f.ref_supplier, f.libelle as invoice_label, f.datef, f.type as ftype, f.fk_facture_source,";
 	$sql .= " l.rowid, l.fk_product, l.description, l.total_ht, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, l.vat_src_code,";
@@ -405,7 +390,17 @@ if ($resql) {
 		print '</td>';
 		print '<td>';
 		if ($row[0] == 'tobind') {
-			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/supplier/list.php?search_year='.((int) $y), $langs->transnoentitiesnoconv("ToBind"));
+			$startmonth = ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1);
+			if ($startmonth > 12) {
+				$startmonth -= 12;
+			}
+			$startyear = ($startmonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1)) ? $y + 1 : $y;
+			$endmonth = ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) + 11;
+			if ($endmonth > 12) {
+				$endmonth -= 12;
+			}
+			$endyear = ($endmonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1)) ? $y + 1 : $y;
+			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_date_startday=1&search_date_startmonth='.((int) $startmonth).'&search_date_startyear='.((int) $startyear).'&search_date_endday=&search_date_endmonth='.((int) $endmonth).'&search_date_endyear='.((int) $endyear), $langs->transnoentitiesnoconv("ToBind"));
 		} else {
 			print $row[1];
 		}
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 554087ad5c4..5fb63c1c2ae 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -297,7 +297,7 @@ DescValidateMovements=Any modification or deletion of writing, lettering and del
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
-DoManualBindingForFailedRecord=You have to do a manual link for the rows not linked %s automatically.
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s

From 919849ab088a9c09a198a09c82bc2f8f637075cd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Jan 2023 10:48:26 +0100
Subject: [PATCH 424/816] Fix link

---
 htdocs/accountancy/customer/index.php      | 2 +-
 htdocs/accountancy/expensereport/index.php | 2 +-
 htdocs/accountancy/supplier/index.php      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 1029934b8c6..69702d8b10e 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -420,7 +420,7 @@ if ($resql) {
 			print price($row[$i]);
 			// Add link to make binding
 			if (!empty(price2num($row[$i]))) {
-				print '<a href="'.$_SERVER['PHP_SELF'].'?action=validatehistory&validatemonth='.((int) $cursormonth).'&validateyear='.((int) $cursoryear).'&token='.newToken().'">';
+				print '<a href="'.$_SERVER['PHP_SELF'].'?action=validatehistory&year='.$y.'&validatemonth='.((int) $cursormonth).'&validateyear='.((int) $cursoryear).'&token='.newToken().'">';
 				print img_picto($langs->trans("ValidateHistory").' ('.$langs->trans('Month'.str_pad($cursormonth, 2, '0', STR_PAD_LEFT)).' '.$cursoryear.')', 'link', 'class="marginleft2"');
 				print '</a>';
 			}
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index aefa03651cb..6bc3ff6a0e8 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -293,7 +293,7 @@ if ($resql) {
 			print price($row[$i]);
 			// Add link to make binding
 			if (!empty(price2num($row[$i]))) {
-				print '<a href="'.$_SERVER['PHP_SELF'].'?action=validatehistory&validatemonth='.((int) $cursormonth).'&validateyear='.((int) $cursoryear).'&token='.newToken().'">';
+				print '<a href="'.$_SERVER['PHP_SELF'].'?action=validatehistory&year='.$y.'&validatemonth='.((int) $cursormonth).'&validateyear='.((int) $cursoryear).'&token='.newToken().'">';
 				print img_picto($langs->trans("ValidateHistory").' ('.$langs->trans('Month'.str_pad($cursormonth, 2, '0', STR_PAD_LEFT)).' '.$cursoryear.')', 'link', 'class="marginleft2"');
 				print '</a>';
 			}
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 1ffe913f9aa..e67a75103ac 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -417,7 +417,7 @@ if ($resql) {
 			print price($row[$i]);
 			// Add link to make binding
 			if (!empty(price2num($row[$i]))) {
-				print '<a href="'.$_SERVER['PHP_SELF'].'?action=validatehistory&validatemonth='.((int) $cursormonth).'&validateyear='.((int) $cursoryear).'&token='.newToken().'">';
+				print '<a href="'.$_SERVER['PHP_SELF'].'?action=validatehistory&year='.$y.'&validatemonth='.((int) $cursormonth).'&validateyear='.((int) $cursoryear).'&token='.newToken().'">';
 				print img_picto($langs->trans("ValidateHistory").' ('.$langs->trans('Month'.str_pad($cursormonth, 2, '0', STR_PAD_LEFT)).' '.$cursoryear.')', 'link', 'class="marginleft2"');
 				print '</a>';
 			}

From 92a815644189c57f4c98ad39ad737461b1cb9d00 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Jan 2023 11:03:41 +0100
Subject: [PATCH 425/816] Fix link

---
 htdocs/accountancy/expensereport/index.php | 2 +-
 htdocs/accountancy/supplier/index.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index 6bc3ff6a0e8..d256d13252a 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -276,7 +276,7 @@ if ($resql) {
 				$endmonth -= 12;
 			}
 			$endyear = ($endmonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1)) ? $y + 1 : $y;
-			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_date_startday=1&search_date_startmonth='.((int) $startmonth).'&search_date_startyear='.((int) $startyear).'&search_date_endday=&search_date_endmonth='.((int) $endmonth).'&search_date_endyear='.((int) $endyear), $langs->transnoentitiesnoconv("ToBind"));
+			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/expensereport/list.php?search_date_startday=1&search_date_startmonth='.((int) $startmonth).'&search_date_startyear='.((int) $startyear).'&search_date_endday=&search_date_endmonth='.((int) $endmonth).'&search_date_endyear='.((int) $endyear), $langs->transnoentitiesnoconv("ToBind"));
 		} else {
 			print $row[1];
 		}
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index e67a75103ac..3e0f4fbd784 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -400,7 +400,7 @@ if ($resql) {
 				$endmonth -= 12;
 			}
 			$endyear = ($endmonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1)) ? $y + 1 : $y;
-			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_date_startday=1&search_date_startmonth='.((int) $startmonth).'&search_date_startyear='.((int) $startyear).'&search_date_endday=&search_date_endmonth='.((int) $endmonth).'&search_date_endyear='.((int) $endyear), $langs->transnoentitiesnoconv("ToBind"));
+			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/supplier/list.php?search_date_startday=1&search_date_startmonth='.((int) $startmonth).'&search_date_startyear='.((int) $startyear).'&search_date_endday=&search_date_endmonth='.((int) $endmonth).'&search_date_endyear='.((int) $endyear), $langs->transnoentitiesnoconv("ToBind"));
 		} else {
 			print $row[1];
 		}

From 86ad9118f3dcc036e22a35ca96aedeb14ed42762 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Tue, 10 Jan 2023 11:14:14 +0100
Subject: [PATCH 426/816] kanban mode for list of proposal commande

---
 htdocs/comm/propal/class/propal.class.php |   35 +
 htdocs/comm/propal/list.php               | 1128 +++++++++++----------
 2 files changed, 611 insertions(+), 552 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index a5fd221de87..a363ff03bad 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -3890,6 +3890,41 @@ class Propal extends CommonObject
 
 		return CommonObject::commonReplaceProduct($db, $origin_id, $dest_id, $tables);
 	}
+
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $langs;
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		//$return .= '<i class="fa fa-dol-action"></i>'; // Can be image
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>';
+		if (property_exists($this, 'fk_project')) {
+			$return .= '<span class="info-box-ref"> | '.$this->fk_project.'</span>';
+		}
+		if (property_exists($this, 'author')) {
+			$return .= '<br><span class="info-box-label">'.$this->author.'</span>';
+		}
+		if (property_exists($this, 'total_ht')) {
+			$return .='<br><span class="" >'.$langs->trans("AmountHT").' : </span><span class="info-box-label amount">'.price($this->total_ht).'</span>';
+		}
+		if (method_exists($this, 'getLibStatut')) {
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
 
 /**
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 2426abad9f4..3de7b0bf781 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -70,6 +70,7 @@ $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'proposallist';
+$mode = GETPOST('mode', 'alpha');
 
 $search_user = GETPOST('search_user', 'int');
 $search_sale = GETPOST('search_sale', 'int');
@@ -864,6 +865,9 @@ if ($resql) {
 	}
 
 	$param = '&search_status='.urlencode($search_status);
+	if (!empty($mode)) {
+		$param .= '&mode='.urlencode($mode);
+	}
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 		$param .= '&contextpage='.urlencode($contextpage);
 	}
@@ -1072,6 +1076,9 @@ if ($resql) {
 	if (!empty($socid)) {
 		$url .= '&socid='.$socid;
 	}
+	$newcardbutton = '';
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
 	$newcardbutton = dolGetButtonTitle($langs->trans('NewPropal'), '', 'fa fa-plus-circle', $url, '', $user->rights->propal->creer);
 
 	// Fields title search
@@ -1085,6 +1092,7 @@ if ($resql) {
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+	print '<input type="hidden" name="mode"value="'.$mode.'">';
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'propal', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -1702,574 +1710,590 @@ if ($resql) {
 			$total_margin += $marginInfo['total_margin'];
 		}
 
-		print '<tr class="oddeven">';
+		if ($mode == 'kanban') {
+			if ($i == 0) {
+				print '<tr><td colspan="12">';
+				print '<div class="box-flex-container">';
+			}
+			// Output Kanban
+			$userstatic->fetch($obj->fk_user_author);
+			$objectstatic->author = $userstatic->getNomUrl(1);
+			$objectstatic->fk_project = $projectstatic->getNomUrl(1);
+			print $objectstatic->getKanbanView('');
+			if ($i == (min($num, $limit) - 1)) {
+				print '</div>';
+				print '</td></tr>';
+			}
+		} else {
+			print '<tr class="oddeven">';
 
-		// Action column
-		if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
-			print '<td class="nowrap" align="center">';
-			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-				$selected = 0;
-				if (in_array($obj->rowid, $arrayofselected)) {
-					$selected = 1;
+			// Action column
+			if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+				print '<td class="nowrap" align="center">';
+				if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+					$selected = 0;
+					if (in_array($obj->rowid, $arrayofselected)) {
+						$selected = 1;
+					}
+					print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 				}
-				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		if (!empty($arrayfields['p.ref']['checked'])) {
-			print '<td class="nowraponall">';
-
-			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-			// Picto + Ref
-			print '<td class="nobordernopadding nowraponall">';
-			print $objectstatic->getNomUrl(1, '', '', 0, 1, (isset($conf->global->PROPAL_LIST_SHOW_NOTES) ? $conf->global->PROPAL_LIST_SHOW_NOTES : 1));
-			print '</td>';
-			// Warning
-			$warnornote = '';
-			if ($obj->status == Propal::STATUS_VALIDATED && $db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) {
-				$warnornote .= img_warning($langs->trans("Late"));
-			}
-			if ($warnornote) {
-				print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
-				print $warnornote;
 				print '</td>';
-			}
-			// Other picto tool
-			print '<td width="16" class="nobordernopadding right">';
-			$filename = dol_sanitizeFileName($obj->ref);
-			$filedir = $conf->propal->multidir_output[$obj->propal_entity].'/'.dol_sanitizeFileName($obj->ref);
-			$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
-			print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-			print '</td></tr></table>';
-
-			print "</td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		if (!empty($arrayfields['p.ref_client']['checked'])) {
-			// Customer ref
-			print '<td class="nowrap tdoverflowmax200">';
-			print dol_escape_htmltag($obj->ref_client);
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		if (!empty($arrayfields['pr.ref']['checked'])) {
-			// Project ref
-			print '<td class="nowraponall">';
-			if ($obj->project_id > 0) {
-				print $projectstatic->getNomUrl(1);
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		if (!empty($arrayfields['pr.title']['checked'])) {
-			// Project label
-			print '<td class="nowrap">';
-			if ($obj->project_id > 0) {
-				print dol_escape_htmltag($projectstatic->title);
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Thirdparty
-		if (!empty($arrayfields['s.nom']['checked'])) {
-			print '<td class="tdoverflowmax150">';
-			print $companystatic->getNomUrl(1, 'customer', 0, 0, 1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Alias
-		if (!empty($arrayfields['s.name_alias']['checked'])) {
-			print '<td class="tdoverflowmax200">';
-			print $obj->alias;
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Town
-		if (!empty($arrayfields['s.town']['checked'])) {
-			print '<td class="nocellnopadd">';
-			print $obj->town;
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Zip
-		if (!empty($arrayfields['s.zip']['checked'])) {
-			print '<td class="nocellnopadd">';
-			print $obj->zip;
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// State
-		if (!empty($arrayfields['state.nom']['checked'])) {
-			print "<td>".$obj->state_name."</td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Country
-		if (!empty($arrayfields['country.code_iso']['checked'])) {
-			print '<td class="center">';
-			$tmparray = getCountry($obj->fk_pays, 'all');
-			print $tmparray['label'];
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Type ent
-		if (!empty($arrayfields['typent.code']['checked'])) {
-			if (!is_array($typenArray) || empty($typenArray)) {
-				$typenArray = $formcompany->typent_array(1);
-			}
-
-			print '<td class="center">';
-			print $typenArray[$obj->typent_code];
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Date proposal
-		if (!empty($arrayfields['p.date']['checked'])) {
-			print '<td class="center">';
-			print dol_print_date($db->jdate($obj->dp), 'day');
-			print "</td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Date end validity
-		if (!empty($arrayfields['p.fin_validite']['checked'])) {
-			if ($obj->dfv) {
-				print '<td class="center">'.dol_print_date($db->jdate($obj->dfv), 'day');
-				print '</td>';
-			} else {
-				print '<td>&nbsp;</td>';
-			}
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Date delivery
-		if (!empty($arrayfields['p.date_livraison']['checked'])) {
-			if ($obj->ddelivery) {
-				print '<td class="center">'.dol_print_date($db->jdate($obj->ddelivery), 'day');
-				print '</td>';
-			} else {
-				print '<td>&nbsp;</td>';
-			}
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Date Signature
-		if (!empty($arrayfields['p.date_signature']['checked'])) {
-			if ($obj->dsignature) {
-				print '<td class="center">'.dol_print_date($db->jdate($obj->dsignature), 'day');
-				print '</td>';
-			} else {
-				print '<td>&nbsp;</td>';
-			}
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Availability
-		if (!empty($arrayfields['ava.rowid']['checked'])) {
-			print '<td class="center">';
-			$form->form_availability('', $obj->availability, 'none', 1);
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Shipping Method
-		if (!empty($arrayfields['p.fk_shipping_method']['checked'])) {
-			print '<td>';
-			$form->formSelectShippingMethod('', $obj->fk_shipping_method, 'none', 1);
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Source - input reason
-		if (!empty($arrayfields['p.fk_input_reason']['checked'])) {
-			print '<td class="tdoverflowmax125" title="'.dol_escape_htmltag($form->cache_demand_reason[$obj->fk_input_reason]['label']).'">';
-			if ($obj->fk_input_reason > 0) {
-				print $form->cache_demand_reason[$obj->fk_input_reason]['label'];
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Payment terms
-		if (!empty($arrayfields['p.fk_cond_reglement']['checked'])) {
-			print '<td>';
-			$form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none', 0, '', 1, $obj->deposit_percent);
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Payment mode
-		if (!empty($arrayfields['p.fk_mode_reglement']['checked'])) {
-			print '<td>';
-			$form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1);
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Amount HT
-		if (!empty($arrayfields['p.total_ht']['checked'])) {
-			print '<td class="nowrap right"><span class="amount">'.price($obj->total_ht)."</span></td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'p.total_ht';
-			}
-			if (empty($totalarray['val']['p.total_ht'])) {
-				$totalarray['val']['p.total_ht'] = $obj->total_ht;
-			} else {
-				$totalarray['val']['p.total_ht'] += $obj->total_ht;
-			}
-		}
-		// Amount VAT
-		if (!empty($arrayfields['p.total_tva']['checked'])) {
-			print '<td class="nowrap right"><span class="amount">'.price($obj->total_tva)."</span></td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'p.total_tva';
-			}
-			if (empty($totalarray['val']['p.total_tva'])) {
-				$totalarray['val']['p.total_tva'] = $obj->total_tva;
-			} else {
-				$totalarray['val']['p.total_tva'] += $obj->total_tva;
-			}
-		}
-		// Amount TTC
-		if (!empty($arrayfields['p.total_ttc']['checked'])) {
-			print '<td class="nowrap right"><span class="amount">'.price($obj->total_ttc)."</span></td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'p.total_ttc';
-			}
-			if (empty($totalarray['val']['p.total_ttc'])) {
-				$totalarray['val']['p.total_ttc'] = $obj->total_ttc;
-			} else {
-				$totalarray['val']['p.total_ttc'] += $obj->total_ttc;
-			}
-		}
-		// Amount invoiced HT
-		if (!empty($arrayfields['p.total_ht_invoiced']['checked'])) {
-			print '<td class="nowrap right"><span class="amount">'.price($totalInvoicedHT)."</span></td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'p.total_ht_invoiced';
-			}
-			if (empty($totalarray['val']['p.total_ht_invoiced'])) {
-				$totalarray['val']['p.total_ht_invoiced'] = $totalInvoicedHT;
-			} else {
-				$totalarray['val']['p.total_ht_invoiced'] += $totalInvoicedHT;
-			}
-		}
-		// Amount invoiced TTC
-		if (!empty($arrayfields['p.total_invoiced']['checked'])) {
-			print '<td class="nowrap right"><span class="amount">'.price($totalInvoicedTTC)."</span></td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'p.total_invoiced';
-			}
-			if (empty($totalarray['val']['p.total_invoiced'])) {
-				$totalarray['val']['p.total_invoiced'] = $totalInvoicedTTC;
-			} else {
-				$totalarray['val']['p.total_invoiced'] += $totalInvoicedTTC;
-			}
-		}
-		// Currency
-		if (!empty($arrayfields['p.multicurrency_code']['checked'])) {
-			print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Currency rate
-		if (!empty($arrayfields['p.multicurrency_tx']['checked'])) {
-			print '<td class="nowrap">';
-			$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
-			print "</td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Amount HT
-		if (!empty($arrayfields['p.multicurrency_total_ht']['checked'])) {
-			print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ht)."</span></td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Amount VAT
-		if (!empty($arrayfields['p.multicurrency_total_tva']['checked'])) {
-			print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_tva)."</span></td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Amount TTC
-		if (!empty($arrayfields['p.multicurrency_total_ttc']['checked'])) {
-			print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ttc)."</span></td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Amount invoiced
-		if (!empty($arrayfields['p.multicurrency_total_ht_invoiced']['checked'])) {
-			print '<td class="nowrap right"><span class="amount">'.price($multicurrency_totalInvoicedHT)."</span></td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Amount invoiced
-		if (!empty($arrayfields['p.multicurrency_total_invoiced']['checked'])) {
-			print '<td class="nowrap right"><span class="amount">'.price($multicurrency_totalInvoicedTTC)."</span></td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		$userstatic->id = $obj->fk_user_author;
-		$userstatic->login = $obj->login;
-		$userstatic->lastname = $obj->lastname;
-		$userstatic->firstname = $obj->firstname;
-		$userstatic->email = $obj->user_email;
-		$userstatic->statut = $obj->user_statut;
-		$userstatic->entity = $obj->user_entity;
-		$userstatic->photo = $obj->photo;
-		$userstatic->office_phone = $obj->office_phone;
-		$userstatic->office_fax = $obj->office_fax;
-		$userstatic->user_mobile = $obj->user_mobile;
-		$userstatic->job = $obj->job;
-		$userstatic->gender = $obj->gender;
-
-		// Author
-		if (!empty($arrayfields['u.login']['checked'])) {
-			print '<td class="tdoverflowmax150">';
-			if ($userstatic->id) {
-				print $userstatic->getNomUrl(-1);
-			}
-			print "</td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		if (!empty($arrayfields['sale_representative']['checked'])) {
-			// Sales representatives
-			print '<td class="tdoverflowmax150">';
-			if ($obj->socid > 0) {
-				$listsalesrepresentatives = $companystatic->getSalesRepresentatives($user);
-				if ($listsalesrepresentatives < 0) {
-					dol_print_error($db);
+				if (!$i) {
+					$totalarray['nbfield']++;
 				}
-				$nbofsalesrepresentative = count($listsalesrepresentatives);
-				if ($nbofsalesrepresentative > 6) {
-					// We print only number
-					print $nbofsalesrepresentative;
-				} elseif ($nbofsalesrepresentative > 0) {
-					$userstatic = new User($db);
-					$j = 0;
-					foreach ($listsalesrepresentatives as $val) {
-						$userstatic->id = $val['id'];
-						$userstatic->lastname = $val['lastname'];
-						$userstatic->firstname = $val['firstname'];
-						$userstatic->email = $val['email'];
-						$userstatic->statut = $val['statut'];
-						$userstatic->entity = $val['entity'];
-						$userstatic->photo = $val['photo'];
-						$userstatic->login = $val['login'];
-						$userstatic->office_phone = $val['office_phone'];
-						$userstatic->office_fax = $val['office_fax'];
-						$userstatic->user_mobile = $val['user_mobile'];
-						$userstatic->job = $val['job'];
-						$userstatic->gender = $val['gender'];
-						//print '<div class="float">':
-						print ($nbofsalesrepresentative < 2) ? $userstatic->getNomUrl(-1, '', 0, 0, 12) : $userstatic->getNomUrl(-2);
-						$j++;
-						if ($j < $nbofsalesrepresentative) {
-							print ' ';
+			}
+
+			if (!empty($arrayfields['p.ref']['checked'])) {
+				print '<td class="nowraponall">';
+
+				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+				// Picto + Ref
+				print '<td class="nobordernopadding nowraponall">';
+				print $objectstatic->getNomUrl(1, '', '', 0, 1, (isset($conf->global->PROPAL_LIST_SHOW_NOTES) ? $conf->global->PROPAL_LIST_SHOW_NOTES : 1));
+				print '</td>';
+				// Warning
+				$warnornote = '';
+				if ($obj->status == Propal::STATUS_VALIDATED && $db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) {
+					$warnornote .= img_warning($langs->trans("Late"));
+				}
+				if ($warnornote) {
+					print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
+					print $warnornote;
+					print '</td>';
+				}
+				// Other picto tool
+				print '<td width="16" class="nobordernopadding right">';
+				$filename = dol_sanitizeFileName($obj->ref);
+				$filedir = $conf->propal->multidir_output[$obj->propal_entity].'/'.dol_sanitizeFileName($obj->ref);
+				$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
+				print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
+				print '</td></tr></table>';
+
+				print "</td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			if (!empty($arrayfields['p.ref_client']['checked'])) {
+				// Customer ref
+				print '<td class="nowrap tdoverflowmax200">';
+				print dol_escape_htmltag($obj->ref_client);
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			if (!empty($arrayfields['pr.ref']['checked'])) {
+				// Project ref
+				print '<td class="nowraponall">';
+				if ($obj->project_id > 0) {
+					print $projectstatic->getNomUrl(1);
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			if (!empty($arrayfields['pr.title']['checked'])) {
+				// Project label
+				print '<td class="nowrap">';
+				if ($obj->project_id > 0) {
+					print dol_escape_htmltag($projectstatic->title);
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Thirdparty
+			if (!empty($arrayfields['s.nom']['checked'])) {
+				print '<td class="tdoverflowmax150">';
+				print $companystatic->getNomUrl(1, 'customer', 0, 0, 1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Alias
+			if (!empty($arrayfields['s.name_alias']['checked'])) {
+				print '<td class="tdoverflowmax200">';
+				print $obj->alias;
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Town
+			if (!empty($arrayfields['s.town']['checked'])) {
+				print '<td class="nocellnopadd">';
+				print $obj->town;
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Zip
+			if (!empty($arrayfields['s.zip']['checked'])) {
+				print '<td class="nocellnopadd">';
+				print $obj->zip;
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// State
+			if (!empty($arrayfields['state.nom']['checked'])) {
+				print "<td>".$obj->state_name."</td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Country
+			if (!empty($arrayfields['country.code_iso']['checked'])) {
+				print '<td class="center">';
+				$tmparray = getCountry($obj->fk_pays, 'all');
+				print $tmparray['label'];
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Type ent
+			if (!empty($arrayfields['typent.code']['checked'])) {
+				if (!is_array($typenArray) || empty($typenArray)) {
+					$typenArray = $formcompany->typent_array(1);
+				}
+
+				print '<td class="center">';
+				print $typenArray[$obj->typent_code];
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Date proposal
+			if (!empty($arrayfields['p.date']['checked'])) {
+				print '<td class="center">';
+				print dol_print_date($db->jdate($obj->dp), 'day');
+				print "</td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Date end validity
+			if (!empty($arrayfields['p.fin_validite']['checked'])) {
+				if ($obj->dfv) {
+					print '<td class="center">'.dol_print_date($db->jdate($obj->dfv), 'day');
+					print '</td>';
+				} else {
+					print '<td>&nbsp;</td>';
+				}
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Date delivery
+			if (!empty($arrayfields['p.date_livraison']['checked'])) {
+				if ($obj->ddelivery) {
+					print '<td class="center">'.dol_print_date($db->jdate($obj->ddelivery), 'day');
+					print '</td>';
+				} else {
+					print '<td>&nbsp;</td>';
+				}
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Date Signature
+			if (!empty($arrayfields['p.date_signature']['checked'])) {
+				if ($obj->dsignature) {
+					print '<td class="center">'.dol_print_date($db->jdate($obj->dsignature), 'day');
+					print '</td>';
+				} else {
+					print '<td>&nbsp;</td>';
+				}
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Availability
+			if (!empty($arrayfields['ava.rowid']['checked'])) {
+				print '<td class="center">';
+				$form->form_availability('', $obj->availability, 'none', 1);
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Shipping Method
+			if (!empty($arrayfields['p.fk_shipping_method']['checked'])) {
+				print '<td>';
+				$form->formSelectShippingMethod('', $obj->fk_shipping_method, 'none', 1);
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Source - input reason
+			if (!empty($arrayfields['p.fk_input_reason']['checked'])) {
+				print '<td class="tdoverflowmax125" title="'.dol_escape_htmltag($form->cache_demand_reason[$obj->fk_input_reason]['label']).'">';
+				if ($obj->fk_input_reason > 0) {
+					print $form->cache_demand_reason[$obj->fk_input_reason]['label'];
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Payment terms
+			if (!empty($arrayfields['p.fk_cond_reglement']['checked'])) {
+				print '<td>';
+				$form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none', 0, '', 1, $obj->deposit_percent);
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Payment mode
+			if (!empty($arrayfields['p.fk_mode_reglement']['checked'])) {
+				print '<td>';
+				$form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1);
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Amount HT
+			if (!empty($arrayfields['p.total_ht']['checked'])) {
+				print '<td class="nowrap right"><span class="amount">'.price($obj->total_ht)."</span></td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'p.total_ht';
+				}
+				if (empty($totalarray['val']['p.total_ht'])) {
+					$totalarray['val']['p.total_ht'] = $obj->total_ht;
+				} else {
+					$totalarray['val']['p.total_ht'] += $obj->total_ht;
+				}
+			}
+			// Amount VAT
+			if (!empty($arrayfields['p.total_tva']['checked'])) {
+				print '<td class="nowrap right"><span class="amount">'.price($obj->total_tva)."</span></td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'p.total_tva';
+				}
+				if (empty($totalarray['val']['p.total_tva'])) {
+					$totalarray['val']['p.total_tva'] = $obj->total_tva;
+				} else {
+					$totalarray['val']['p.total_tva'] += $obj->total_tva;
+				}
+			}
+			// Amount TTC
+			if (!empty($arrayfields['p.total_ttc']['checked'])) {
+				print '<td class="nowrap right"><span class="amount">'.price($obj->total_ttc)."</span></td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'p.total_ttc';
+				}
+				if (empty($totalarray['val']['p.total_ttc'])) {
+					$totalarray['val']['p.total_ttc'] = $obj->total_ttc;
+				} else {
+					$totalarray['val']['p.total_ttc'] += $obj->total_ttc;
+				}
+			}
+			// Amount invoiced HT
+			if (!empty($arrayfields['p.total_ht_invoiced']['checked'])) {
+				print '<td class="nowrap right"><span class="amount">'.price($totalInvoicedHT)."</span></td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'p.total_ht_invoiced';
+				}
+				if (empty($totalarray['val']['p.total_ht_invoiced'])) {
+					$totalarray['val']['p.total_ht_invoiced'] = $totalInvoicedHT;
+				} else {
+					$totalarray['val']['p.total_ht_invoiced'] += $totalInvoicedHT;
+				}
+			}
+			// Amount invoiced TTC
+			if (!empty($arrayfields['p.total_invoiced']['checked'])) {
+				print '<td class="nowrap right"><span class="amount">'.price($totalInvoicedTTC)."</span></td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'p.total_invoiced';
+				}
+				if (empty($totalarray['val']['p.total_invoiced'])) {
+					$totalarray['val']['p.total_invoiced'] = $totalInvoicedTTC;
+				} else {
+					$totalarray['val']['p.total_invoiced'] += $totalInvoicedTTC;
+				}
+			}
+			// Currency
+			if (!empty($arrayfields['p.multicurrency_code']['checked'])) {
+				print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Currency rate
+			if (!empty($arrayfields['p.multicurrency_tx']['checked'])) {
+				print '<td class="nowrap">';
+				$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
+				print "</td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Amount HT
+			if (!empty($arrayfields['p.multicurrency_total_ht']['checked'])) {
+				print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ht)."</span></td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Amount VAT
+			if (!empty($arrayfields['p.multicurrency_total_tva']['checked'])) {
+				print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_tva)."</span></td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Amount TTC
+			if (!empty($arrayfields['p.multicurrency_total_ttc']['checked'])) {
+				print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ttc)."</span></td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Amount invoiced
+			if (!empty($arrayfields['p.multicurrency_total_ht_invoiced']['checked'])) {
+				print '<td class="nowrap right"><span class="amount">'.price($multicurrency_totalInvoicedHT)."</span></td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Amount invoiced
+			if (!empty($arrayfields['p.multicurrency_total_invoiced']['checked'])) {
+				print '<td class="nowrap right"><span class="amount">'.price($multicurrency_totalInvoicedTTC)."</span></td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			$userstatic->id = $obj->fk_user_author;
+			$userstatic->login = $obj->login;
+			$userstatic->lastname = $obj->lastname;
+			$userstatic->firstname = $obj->firstname;
+			$userstatic->email = $obj->user_email;
+			$userstatic->statut = $obj->user_statut;
+			$userstatic->entity = $obj->user_entity;
+			$userstatic->photo = $obj->photo;
+			$userstatic->office_phone = $obj->office_phone;
+			$userstatic->office_fax = $obj->office_fax;
+			$userstatic->user_mobile = $obj->user_mobile;
+			$userstatic->job = $obj->job;
+			$userstatic->gender = $obj->gender;
+
+			// Author
+			if (!empty($arrayfields['u.login']['checked'])) {
+				print '<td class="tdoverflowmax150">';
+				if ($userstatic->id) {
+					print $userstatic->getNomUrl(-1);
+				}
+				print "</td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			if (!empty($arrayfields['sale_representative']['checked'])) {
+				// Sales representatives
+				print '<td class="tdoverflowmax150">';
+				if ($obj->socid > 0) {
+					$listsalesrepresentatives = $companystatic->getSalesRepresentatives($user);
+					if ($listsalesrepresentatives < 0) {
+						dol_print_error($db);
+					}
+					$nbofsalesrepresentative = count($listsalesrepresentatives);
+					if ($nbofsalesrepresentative > 6) {
+						// We print only number
+						print $nbofsalesrepresentative;
+					} elseif ($nbofsalesrepresentative > 0) {
+						$userstatic = new User($db);
+						$j = 0;
+						foreach ($listsalesrepresentatives as $val) {
+							$userstatic->id = $val['id'];
+							$userstatic->lastname = $val['lastname'];
+							$userstatic->firstname = $val['firstname'];
+							$userstatic->email = $val['email'];
+							$userstatic->statut = $val['statut'];
+							$userstatic->entity = $val['entity'];
+							$userstatic->photo = $val['photo'];
+							$userstatic->login = $val['login'];
+							$userstatic->office_phone = $val['office_phone'];
+							$userstatic->office_fax = $val['office_fax'];
+							$userstatic->user_mobile = $val['user_mobile'];
+							$userstatic->job = $val['job'];
+							$userstatic->gender = $val['gender'];
+							//print '<div class="float">':
+							print ($nbofsalesrepresentative < 2) ? $userstatic->getNomUrl(-1, '', 0, 0, 12) : $userstatic->getNomUrl(-2);
+							$j++;
+							if ($j < $nbofsalesrepresentative) {
+								print ' ';
+							}
+							//print '</div>';
 						}
-						//print '</div>';
+					}
+					//else print $langs->trans("NoSalesRepresentativeAffected");
+				} else {
+					print '&nbsp;';
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Total buying or cost price
+			if (!empty($arrayfields['total_pa']['checked'])) {
+				print '<td class="right nowrap">'.price($marginInfo['pa_total']).'</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Total margin
+			if (!empty($arrayfields['total_margin']['checked'])) {
+				print '<td class="right nowrap">'.price($marginInfo['total_margin']).'</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'total_margin';
+				}
+				$totalarray['val']['total_margin'] = $total_margin;
+			}
+			// Total margin rate
+			if (!empty($arrayfields['total_margin_rate']['checked'])) {
+				print '<td class="right nowrap">'.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, 2).'%').'</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Total mark rate
+			if (!empty($arrayfields['total_mark_rate']['checked'])) {
+				print '<td class="right nowrap">'.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').'</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'total_mark_rate';
+				}
+				if ($i >= $imaxinloop - 1) {
+					if (!empty($total_ht)) {
+						$totalarray['val']['total_mark_rate'] = price2num($total_margin * 100 / $total_ht, 'MT');
+					} else {
+						$totalarray['val']['total_mark_rate'] = '';
 					}
 				}
-				//else print $langs->trans("NoSalesRepresentativeAffected");
-			} else {
-				print '&nbsp;';
 			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
 
-		// Total buying or cost price
-		if (!empty($arrayfields['total_pa']['checked'])) {
-			print '<td class="right nowrap">'.price($marginInfo['pa_total']).'</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Total margin
-		if (!empty($arrayfields['total_margin']['checked'])) {
-			print '<td class="right nowrap">'.price($marginInfo['total_margin']).'</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'total_margin';
-			}
-			$totalarray['val']['total_margin'] = $total_margin;
-		}
-		// Total margin rate
-		if (!empty($arrayfields['total_margin_rate']['checked'])) {
-			print '<td class="right nowrap">'.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, 2).'%').'</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Total mark rate
-		if (!empty($arrayfields['total_mark_rate']['checked'])) {
-			print '<td class="right nowrap">'.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').'</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'total_mark_rate';
-			}
-			if ($i >= $imaxinloop - 1) {
-				if (!empty($total_ht)) {
-					$totalarray['val']['total_mark_rate'] = price2num($total_margin * 100 / $total_ht, 'MT');
-				} else {
-					$totalarray['val']['total_mark_rate'] = '';
+			// Extra fields
+			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+			// Fields from hook
+			$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			print $hookmanager->resPrint;
+			// Date creation
+			if (!empty($arrayfields['p.datec']['checked'])) {
+				print '<td align="center" class="nowrap">';
+				print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
 				}
 			}
-		}
-
-		// Extra fields
-		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-		print $hookmanager->resPrint;
-		// Date creation
-		if (!empty($arrayfields['p.datec']['checked'])) {
-			print '<td align="center" class="nowrap">';
-			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Date modification
-		if (!empty($arrayfields['p.tms']['checked'])) {
-			print '<td align="center" class="nowrap">';
-			print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Date cloture
-		if (!empty($arrayfields['p.date_cloture']['checked'])) {
-			print '<td align="center" class="nowrap">';
-			print dol_print_date($db->jdate($obj->date_cloture), 'dayhour', 'tzuser');
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Note public
-		if (!empty($arrayfields['p.note_public']['checked'])) {
-			print '<td class="center">';
-			print dol_string_nohtmltag($obj->note_public);
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Note private
-		if (!empty($arrayfields['p.note_private']['checked'])) {
-			print '<td class="center">';
-			print dol_string_nohtmltag($obj->note_private);
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Status
-		if (!empty($arrayfields['p.fk_statut']['checked'])) {
-			print '<td class="nowrap right">'.$objectstatic->getLibStatut(5).'</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Action column
-		if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
-			print '<td class="nowrap" align="center">';
-			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-				$selected = 0;
-				if (in_array($obj->rowid, $arrayofselected)) {
-					$selected = 1;
+			// Date modification
+			if (!empty($arrayfields['p.tms']['checked'])) {
+				print '<td align="center" class="nowrap">';
+				print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
 				}
-				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
+			// Date cloture
+			if (!empty($arrayfields['p.date_cloture']['checked'])) {
+				print '<td align="center" class="nowrap">';
+				print dol_print_date($db->jdate($obj->date_cloture), 'dayhour', 'tzuser');
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
+			// Note public
+			if (!empty($arrayfields['p.note_public']['checked'])) {
+				print '<td class="center">';
+				print dol_string_nohtmltag($obj->note_public);
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Note private
+			if (!empty($arrayfields['p.note_private']['checked'])) {
+				print '<td class="center">';
+				print dol_string_nohtmltag($obj->note_private);
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Status
+			if (!empty($arrayfields['p.fk_statut']['checked'])) {
+				print '<td class="nowrap right">'.$objectstatic->getLibStatut(5).'</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Action column
+			if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+				print '<td class="nowrap" align="center">';
+				if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+					$selected = 0;
+					if (in_array($obj->rowid, $arrayofselected)) {
+						$selected = 1;
+					}
+					print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+
+			print '</tr>'."\n";
 		}
 
-
-		print '</tr>'."\n";
-
 		$i++;
 	}
 

From ce556d56c02ebe7e2ea001cd3540e1965d222405 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Jan 2023 11:32:21 +0100
Subject: [PATCH 427/816] Fix rounding

---
 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 391657135b8..475690e9dba 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7723,7 +7723,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 		$substitutionarray['__AMOUNT_TEXT__']     = is_object($object) ? dol_convertToWord($object->total_ttc, $outputlangs, '', true) : '';
 		$substitutionarray['__AMOUNT_TEXTCURRENCY__'] = is_object($object) ? dol_convertToWord($object->total_ttc, $outputlangs, $conf->currency, true) : '';
 
-		$substitutionarray['__AMOUNT_REMAIN__'] = is_object($object) ? $object->total_ttc - $already_payed_all : '';
+		$substitutionarray['__AMOUNT_REMAIN__'] = is_object($object) ? price2num($object->total_ttc - $already_payed_all) : '';
 
 		$substitutionarray['__AMOUNT_VAT__']      = is_object($object) ? (isset($object->total_vat) ? $object->total_vat : $object->total_tva) : '';
 		$substitutionarray['__AMOUNT_VAT_TEXT__']      = is_object($object) ? (isset($object->total_vat) ? dol_convertToWord($object->total_vat, $outputlangs, '', true) : dol_convertToWord($object->total_tva, $outputlangs, '', true)) : '';

From 2da8c1d9bc2fc9d0e7205d87688eb6957fc56c6f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Jan 2023 11:32:21 +0100
Subject: [PATCH 428/816] Fix rounding

---
 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 391657135b8..f9adc7bcf40 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7723,7 +7723,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 		$substitutionarray['__AMOUNT_TEXT__']     = is_object($object) ? dol_convertToWord($object->total_ttc, $outputlangs, '', true) : '';
 		$substitutionarray['__AMOUNT_TEXTCURRENCY__'] = is_object($object) ? dol_convertToWord($object->total_ttc, $outputlangs, $conf->currency, true) : '';
 
-		$substitutionarray['__AMOUNT_REMAIN__'] = is_object($object) ? $object->total_ttc - $already_payed_all : '';
+		$substitutionarray['__AMOUNT_REMAIN__'] = is_object($object) ? price2num($object->total_ttc - $already_payed_all, 'MT') : '';
 
 		$substitutionarray['__AMOUNT_VAT__']      = is_object($object) ? (isset($object->total_vat) ? $object->total_vat : $object->total_tva) : '';
 		$substitutionarray['__AMOUNT_VAT_TEXT__']      = is_object($object) ? (isset($object->total_vat) ? dol_convertToWord($object->total_vat, $outputlangs, '', true) : dol_convertToWord($object->total_tva, $outputlangs, '', true)) : '';

From 9a249bcbb8b58f6576193604540ec2962543f895 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Tue, 10 Jan 2023 12:10:43 +0100
Subject: [PATCH 429/816] kanban mode for list of proposal supplier

---
 .../class/supplier_proposal.class.php         |  36 ++
 htdocs/supplier_proposal/list.php             | 576 +++++++++---------
 2 files changed, 336 insertions(+), 276 deletions(-)

diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index f283295aeb5..53e78b06f84 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -2723,6 +2723,42 @@ class SupplierProposal extends CommonObject
 
 		return CommonObject::commonReplaceProduct($db, $origin_id, $dest_id, $tables);
 	}
+
+
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $langs;
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		//$return .= '<i class="fa fa-dol-action"></i>'; // Can be image
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>';
+		if (property_exists($this, 'socid')) {
+			$return .= '<span class="info-box-ref"> | '.$this->socid.'</span>';
+		}
+		if (property_exists($this, 'delivery_date')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("DateEnd").'</span> : <span class="info-box-label">'.dol_print_date($this->delivery_date).'</span>';
+		}
+		if (property_exists($this, 'total_ttc')) {
+			$return .='<br><span class="opacitymedium" >'.$langs->trans("AmountHT").' : </span><span class="info-box-label amount">'.price($this->total_ttc).'</span>';
+		}
+		if (method_exists($this, 'getLibStatut')) {
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
 
 
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index add084e91ab..b4426ec84d8 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -57,6 +57,7 @@ $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'supplierproposallist';
+$mode = GETPOST('mode', 'alpha');
 
 $search_user = GETPOST('search_user', 'int');
 $search_sale = GETPOST('search_sale', 'int');
@@ -510,6 +511,9 @@ if ($resql) {
 	}
 
 	$param = '';
+	if (!empty($mode)) {
+		$param .= '&mode='.urlencode($mode);
+	}
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 		$param .= '&contextpage='.urlencode($contextpage);
 	}
@@ -630,7 +634,10 @@ if ($resql) {
 	if (!empty($socid)) {
 		$url .= '&socid='.$socid;
 	}
-	$newcardbutton = dolGetButtonTitle($langs->trans('NewAskPrice'), '', 'fa fa-plus-circle', $url, '', $user->rights->supplier_proposal->creer);
+	$newcardbutton = '';
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('NewAskPrice'), '', 'fa fa-plus-circle', $url, '', $user->rights->supplier_proposal->creer);
 
 	// Fields title search
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
@@ -642,6 +649,7 @@ if ($resql) {
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'supplier_proposal', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -973,288 +981,304 @@ if ($resql) {
 		$companystatic->client = $obj->client;
 		$companystatic->code_client = $obj->code_client;
 
-		print '<tr class="oddeven">';
-		// Action column
-		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-			print '<td class="nowrap center">';
-			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-				$selected = 0;
-				if (in_array($obj->rowid, $arrayofselected)) {
-					$selected = 1;
-				}
-				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		if ($mode == 'kanban') {
+			if ($i == 0) {
+				print '<tr><td colspan="12">';
+				print '<div class="box-flex-container">';
 			}
-			print '</td>';
-		}
-		if (!empty($arrayfields['sp.ref']['checked'])) {
-			print '<td class="nowraponall">';
-
-			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-			// Picto + Ref
-			print '<td class="nobordernopadding nowraponall">';
-			print $objectstatic->getNomUrl(1, '', '', 0, -1, 1);
-			print '</td>';
-			// Warning
-			$warnornote = '';
-			//if ($obj->fk_statut == 1 && $db->jdate($obj->date_valid) < ($now - $conf->supplier_proposal->warning_delay)) $warnornote .= img_warning($langs->trans("Late"));
-			if ($warnornote) {
-				print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
-				print $warnornote;
+			// Output Kanban
+			$userstatic->fetch($obj->fk_user_author);
+			$objectstatic->socid = $companystatic->getNomUrl(1);
+			$objectstatic->user_author_id = $userstatic->getNomUrl(1);
+			$objectstatic->delivery_date = $obj->dp;
+			print $objectstatic->getKanbanView('');
+			if ($i == (min($num, $limit) - 1)) {
+				print '</div>';
+				print '</td></tr>';
+			}
+		} else {
+			print '<tr class="oddeven">';
+			// Action column
+			if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+				print '<td class="nowrap center">';
+				if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+					$selected = 0;
+					if (in_array($obj->rowid, $arrayofselected)) {
+						$selected = 1;
+					}
+					print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+				}
 				print '</td>';
 			}
-			// Other picto tool
-			print '<td width="16" class="right nobordernopadding hideonsmartphone">';
-			$filename = dol_sanitizeFileName($obj->ref);
-			$filedir = $conf->supplier_proposal->dir_output.'/'.dol_sanitizeFileName($obj->ref);
-			$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
-			print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-			print '</td></tr></table>';
+			if (!empty($arrayfields['sp.ref']['checked'])) {
+				print '<td class="nowraponall">';
 
-			print "</td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Thirdparty
-		if (!empty($arrayfields['s.nom']['checked'])) {
-			print '<td class="tdoverflowmax200">';
-			print $companystatic->getNomUrl(1, 'supplier', 0, 0, -1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Alias
-		if (!empty($arrayfields['s.name_alias']['checked'])) {
-			print '<td class="tdoverflowmax200">';
-			print $companystatic->name_alias;
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Town
-		if (!empty($arrayfields['s.town']['checked'])) {
-			print '<td class="nocellnopadd">';
-			print $obj->town;
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Zip
-		if (!empty($arrayfields['s.zip']['checked'])) {
-			print '<td class="nocellnopadd">';
-			print $obj->zip;
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// State
-		if (!empty($arrayfields['state.nom']['checked'])) {
-			print "<td>".$obj->state_name."</td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Country
-		if (!empty($arrayfields['country.code_iso']['checked'])) {
-			print '<td class="center">';
-			$tmparray = getCountry($obj->fk_pays, 'all');
-			print $tmparray['label'];
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Type ent
-		if (!empty($arrayfields['typent.code']['checked'])) {
-			print '<td class="center">';
-			if (empty($typenArray) || !is_array($typenArray) || count($typenArray) == 0) {
-				$typenArray = $formcompany->typent_array(1);
-			}
-			print $typenArray[$obj->typent_code];
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Date proposal
-		if (!empty($arrayfields['sp.date_valid']['checked'])) {
-			print '<td class="center">';
-			print dol_print_date($db->jdate($obj->date_valid), 'day');
-			print "</td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Date delivery
-		if (!empty($arrayfields['sp.date_livraison']['checked'])) {
-			print '<td class="center">';
-			print dol_print_date($db->jdate($obj->dp), 'day');
-			print "</td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Amount HT
-		if (!empty($arrayfields['sp.total_ht']['checked'])) {
-			  print '<td class="right"><span class="amount">'.price($obj->total_ht)."</span></td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'sp.total_ht';
-			}
-			$totalarray['val']['sp.total_ht'] += $obj->total_ht;
-		}
-		// Amount VAT
-		if (!empty($arrayfields['sp.total_tva']['checked'])) {
-			print '<td class="right"><span class="amount">'.price($obj->total_tva)."</span></td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'sp.total_tva';
-			}
-			$totalarray['val']['sp.total_tva'] += $obj->total_tva;
-		}
-		// Amount TTC
-		if (!empty($arrayfields['sp.total_ttc']['checked'])) {
-			print '<td class="right"><span class="amount">'.price($obj->total_ttc)."</span></td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'sp.total_ttc';
-			}
-			$totalarray['val']['sp.total_ttc'] += $obj->total_ttc;
-		}
-
-		// Currency
-		if (!empty($arrayfields['sp.multicurrency_code']['checked'])) {
-			  print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Currency rate
-		if (!empty($arrayfields['sp.multicurrency_tx']['checked'])) {
-			  print '<td class="nowrap">';
-			  $form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
-			  print "</td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Amount HT
-		if (!empty($arrayfields['sp.multicurrency_total_ht']['checked'])) {
-			  print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ht)."</span></td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Amount VAT
-		if (!empty($arrayfields['sp.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
-		if (!empty($arrayfields['sp.multicurrency_total_ttc']['checked'])) {
-			print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ttc)."</span></td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		$userstatic->id = $obj->fk_user_author;
-		$userstatic->login = $obj->login;
-		$userstatic->status = $obj->ustatus;
-		$userstatic->lastname = $obj->name;
-		$userstatic->firstname = $obj->firstname;
-		$userstatic->photo = $obj->photo;
-		$userstatic->admin = $obj->admin;
-		$userstatic->ref = $obj->fk_user_author;
-		$userstatic->employee = $obj->employee;
-		$userstatic->email = $obj->uemail;
-
-		// Author
-		if (!empty($arrayfields['u.login']['checked'])) {
-			print '<td class="center">';
-			if ($userstatic->id > 0) {
-				print $userstatic->getNomUrl(-1, '', 0, 0, 24, 1, 'login', '', 1);
-			} else {
-				print '&nbsp;';
-			}
-			print "</td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Extra fields
-		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
-		print $hookmanager->resPrint;
-		// Date creation
-		if (!empty($arrayfields['sp.datec']['checked'])) {
-			print '<td class="center nowrap">';
-			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Date modification
-		if (!empty($arrayfields['sp.tms']['checked'])) {
-			print '<td class="center nowrap">';
-			print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Status
-		if (!empty($arrayfields['sp.fk_statut']['checked'])) {
-			print '<td class="right">'.$objectstatic->getLibStatut(5)."</td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Action column
-		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-			print '<td class="nowrap center">';
-			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-				$selected = 0;
-				if (in_array($obj->rowid, $arrayofselected)) {
-					$selected = 1;
+				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+				// Picto + Ref
+				print '<td class="nobordernopadding nowraponall">';
+				print $objectstatic->getNomUrl(1, '', '', 0, -1, 1);
+				print '</td>';
+				// Warning
+				$warnornote = '';
+				//if ($obj->fk_statut == 1 && $db->jdate($obj->date_valid) < ($now - $conf->supplier_proposal->warning_delay)) $warnornote .= img_warning($langs->trans("Late"));
+				if ($warnornote) {
+					print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
+					print $warnornote;
+					print '</td>';
+				}
+				// Other picto tool
+				print '<td width="16" class="right nobordernopadding hideonsmartphone">';
+				$filename = dol_sanitizeFileName($obj->ref);
+				$filedir = $conf->supplier_proposal->dir_output.'/'.dol_sanitizeFileName($obj->ref);
+				$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
+				print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
+				print '</td></tr></table>';
+
+				print "</td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
 				}
-				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
-			print '</td>';
+
+			// Thirdparty
+			if (!empty($arrayfields['s.nom']['checked'])) {
+				print '<td class="tdoverflowmax200">';
+				print $companystatic->getNomUrl(1, 'supplier', 0, 0, -1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Alias
+			if (!empty($arrayfields['s.name_alias']['checked'])) {
+				print '<td class="tdoverflowmax200">';
+				print $companystatic->name_alias;
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Town
+			if (!empty($arrayfields['s.town']['checked'])) {
+				print '<td class="nocellnopadd">';
+				print $obj->town;
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Zip
+			if (!empty($arrayfields['s.zip']['checked'])) {
+				print '<td class="nocellnopadd">';
+				print $obj->zip;
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// State
+			if (!empty($arrayfields['state.nom']['checked'])) {
+				print "<td>".$obj->state_name."</td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Country
+			if (!empty($arrayfields['country.code_iso']['checked'])) {
+				print '<td class="center">';
+				$tmparray = getCountry($obj->fk_pays, 'all');
+				print $tmparray['label'];
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Type ent
+			if (!empty($arrayfields['typent.code']['checked'])) {
+				print '<td class="center">';
+				if (empty($typenArray) || !is_array($typenArray) || count($typenArray) == 0) {
+					$typenArray = $formcompany->typent_array(1);
+				}
+				print $typenArray[$obj->typent_code];
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Date proposal
+			if (!empty($arrayfields['sp.date_valid']['checked'])) {
+				print '<td class="center">';
+				print dol_print_date($db->jdate($obj->date_valid), 'day');
+				print "</td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Date delivery
+			if (!empty($arrayfields['sp.date_livraison']['checked'])) {
+				print '<td class="center">';
+				print dol_print_date($db->jdate($obj->dp), 'day');
+				print "</td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Amount HT
+			if (!empty($arrayfields['sp.total_ht']['checked'])) {
+				print '<td class="right"><span class="amount">'.price($obj->total_ht)."</span></td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'sp.total_ht';
+				}
+				$totalarray['val']['sp.total_ht'] += $obj->total_ht;
+			}
+			// Amount VAT
+			if (!empty($arrayfields['sp.total_tva']['checked'])) {
+				print '<td class="right"><span class="amount">'.price($obj->total_tva)."</span></td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'sp.total_tva';
+				}
+				$totalarray['val']['sp.total_tva'] += $obj->total_tva;
+			}
+			// Amount TTC
+			if (!empty($arrayfields['sp.total_ttc']['checked'])) {
+				print '<td class="right"><span class="amount">'.price($obj->total_ttc)."</span></td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'sp.total_ttc';
+				}
+				$totalarray['val']['sp.total_ttc'] += $obj->total_ttc;
+			}
+
+			// Currency
+			if (!empty($arrayfields['sp.multicurrency_code']['checked'])) {
+				print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Currency rate
+			if (!empty($arrayfields['sp.multicurrency_tx']['checked'])) {
+				print '<td class="nowrap">';
+				$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
+				print "</td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Amount HT
+			if (!empty($arrayfields['sp.multicurrency_total_ht']['checked'])) {
+				print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ht)."</span></td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Amount VAT
+			if (!empty($arrayfields['sp.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
+			if (!empty($arrayfields['sp.multicurrency_total_ttc']['checked'])) {
+				print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ttc)."</span></td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			$userstatic->id = $obj->fk_user_author;
+			$userstatic->login = $obj->login;
+			$userstatic->status = $obj->ustatus;
+			$userstatic->lastname = $obj->name;
+			$userstatic->firstname = $obj->firstname;
+			$userstatic->photo = $obj->photo;
+			$userstatic->admin = $obj->admin;
+			$userstatic->ref = $obj->fk_user_author;
+			$userstatic->employee = $obj->employee;
+			$userstatic->email = $obj->uemail;
+
+			// Author
+			if (!empty($arrayfields['u.login']['checked'])) {
+				print '<td class="center">';
+				if ($userstatic->id > 0) {
+					print $userstatic->getNomUrl(-1, '', 0, 0, 24, 1, 'login', '', 1);
+				} else {
+					print '&nbsp;';
+				}
+				print "</td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Extra fields
+			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+			// Fields from hook
+			$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+			print $hookmanager->resPrint;
+			// Date creation
+			if (!empty($arrayfields['sp.datec']['checked'])) {
+				print '<td class="center nowrap">';
+				print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Date modification
+			if (!empty($arrayfields['sp.tms']['checked'])) {
+				print '<td class="center nowrap">';
+				print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Status
+			if (!empty($arrayfields['sp.fk_statut']['checked'])) {
+				print '<td class="right">'.$objectstatic->getLibStatut(5)."</td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Action column
+			if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+				print '<td class="nowrap center">';
+				if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+					$selected = 0;
+					if (in_array($obj->rowid, $arrayofselected)) {
+						$selected = 1;
+					}
+					print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+				}
+				print '</td>';
+			}
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+
+			print "</tr>\n";
+
+			$total += $obj->total_ht;
+			$subtotal += $obj->total_ht;
 		}
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-
-		print "</tr>\n";
-
-		$total += $obj->total_ht;
-		$subtotal += $obj->total_ht;
-
 		$i++;
 	}
 

From c52247e6ac0212b906a3184372e4a05dfd7c57f3 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Tue, 10 Jan 2023 12:43:55 +0100
Subject: [PATCH 430/816] kanban mode for list of client invoice

---
 htdocs/compta/facture/class/facture.class.php |   31 +
 htdocs/compta/facture/list.php                | 1225 +++++++++--------
 2 files changed, 655 insertions(+), 601 deletions(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 87914eac38e..4905ec3d99a 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -5732,6 +5732,37 @@ class Facture extends CommonInvoice
 			dol_print_error($this->db);
 		}
 	}
+
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		//$return .= '<i class="fa fa-dol-action"></i>'; // Can be image
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
+		if (property_exists($this, 'socid')) {
+			$return .= '<br><span class="info-box-label">'.$this->socid.'</span>';
+		}
+		if (property_exists($this, 'fk_user_author')) {
+			$return .= '<br><span class="info-box-label">'.$this->fk_user_author.'</span>';
+		}
+		if (method_exists($this, 'getLibStatut')) {
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
 
 /**
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index afc31d7efe3..a23b736b562 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -75,6 +75,7 @@ $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $optioncss = GETPOST('optioncss', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'invoicelist';
+$mode = GETPOST('mode', 'alpha');
 
 if ($contextpage == 'poslist') {
 	$optioncss = 'print';
@@ -974,6 +975,9 @@ if ($resql) {
 	}
 
 	$param = '&socid='.urlencode($socid);
+	if (!empty($mode)) {
+		$param .= '&mode='.urlencode($mode);
+	}
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 		$param .= '&contextpage='.urlencode($contextpage);
 	}
@@ -1185,6 +1189,9 @@ if ($resql) {
 		if (!empty($socid)) {
 			$url .= '&socid='.$socid;
 		}
+		$newcardbutton  = '';
+		$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+		$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
 		$newcardbutton = dolGetButtonTitle($langs->trans('NewBill'), '', 'fa fa-plus-circle', $url, '', $user->hasRight("facture", "creer"));
 	}
 
@@ -1204,6 +1211,7 @@ if ($resql) {
 	print '<input type="hidden" name="search_status" value="'.$search_status.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 	print '<input type="hidden" name="socid" value="'.$socid.'">';
+	print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 	print_barre_liste($langs->trans('BillsCustomers').' '.($socid > 0 ? ' '.$soc->name : ''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'bill', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -1894,645 +1902,660 @@ if ($resql) {
 				$total_margin += $marginInfo['total_margin'];
 			}
 
-			print '<tr class="oddeven"';
-			if ($contextpage == 'poslist') {
-				print ' onclick="parent.$(\'#poslines\').load(\'invoice.php?action=history&placeid='.$obj->id.'\', function() {parent.$.colorbox.close();';
-				if (strpos($obj->ref, 'PROV') !== false) {
-					//If is a draft invoice, load var to be able to add products
-					$place = str_replace(")", "", str_replace("(PROV-POS".$_SESSION["takeposterminal"]."-", "", $obj->ref));
-					print 'parent.place=\''.$place.'\'';
+			if ($mode == 'kanban') {
+				if ($i == 0) {
+					print '<tr><td colspan="12">';
+					print '<div class="box-flex-container">';
 				}
-				print '});"';
-			}
-			print '>';
-
-
-			// Action column
-			if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
-				print '<td class="nowrap" align="center">';
-				if (($massactionbutton || $massaction) && $contextpage != 'poslist') {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-					$selected = 0;
-					if (in_array($obj->id, $arrayofselected)) {
-						$selected = 1;
+				// Output Kanban
+				$facturestatic->socid = $companystatic->getNomUrl(1, 'company', 15);
+				$userstatic->fetch($obj->fk_user_author);
+				$facturestatic->fk_user_author = $userstatic->getNomUrl(1);
+				print $facturestatic->getKanbanView('');
+				if ($i == (min($num, $limit) - 1)) {
+					print '</div>';
+					print '</td></tr>';
+				}
+			} else {
+				print '<tr class="oddeven"';
+				if ($contextpage == 'poslist') {
+					print ' onclick="parent.$(\'#poslines\').load(\'invoice.php?action=history&placeid='.$obj->id.'\', function() {parent.$.colorbox.close();';
+					if (strpos($obj->ref, 'PROV') !== false) {
+						//If is a draft invoice, load var to be able to add products
+						$place = str_replace(")", "", str_replace("(PROV-POS".$_SESSION["takeposterminal"]."-", "", $obj->ref));
+						print 'parent.place=\''.$place.'\'';
 					}
-					print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>';
+					print '});"';
 				}
-				print '</td>';
-			}
+				print '>';
 
-			// No
-			if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
-				print '<td>'.(($offset * $limit) + $i).'</td>';
-			}
 
-			// Ref
-			if (!empty($arrayfields['f.ref']['checked'])) {
-				print '<td class="nowraponall">';
-
-				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-
-				print '<td class="nobordernopadding nowraponall">';
-				if ($contextpage == 'poslist') {
-					print dol_escape_htmltag($obj->ref);
-				} else {
-					print $facturestatic->getNomUrl(1, '', 200, 0, '', 0, 1);
-				}
-
-				$filename = dol_sanitizeFileName($obj->ref);
-				$filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($obj->ref);
-				$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->id;
-				print $formfile->getDocumentsLink($facturestatic->element, $filename, $filedir);
-				print '</td>';
-				print '</tr>';
-				print '</table>';
-
-				print "</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Customer ref
-			if (!empty($arrayfields['f.ref_client']['checked'])) {
-				print '<td class="nowrap tdoverflowmax200">';
-				print dol_escape_htmltag($obj->ref_client);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Type
-			if (!empty($arrayfields['f.type']['checked'])) {
-				print '<td class="nowraponall tdoverflowmax100" title="'.$facturestatic->getLibType().'">';
-				print $facturestatic->getLibType(2);
-				print "</td>";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Date
-			if (!empty($arrayfields['f.datef']['checked'])) {
-				print '<td align="center" class="nowraponall">';
-				print dol_print_date($db->jdate($obj->datef), 'day');
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Date
-			if (!empty($arrayfields['f.date_valid']['checked'])) {
-				print '<td align="center" class="nowraponall">';
-				print dol_print_date($db->jdate($obj->date_valid), 'day');
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Date limit
-			if (!empty($arrayfields['f.date_lim_reglement']['checked'])) {
-				print '<td align="center" class="nowraponall">'.dol_print_date($datelimit, 'day');
-				if ($facturestatic->hasDelay()) {
-					print img_warning($langs->trans('Alert').' - '.$langs->trans('Late'));
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Project ref
-			if (!empty($arrayfields['p.ref']['checked'])) {
-				print '<td class="nocellnopadd nowraponall">';
-				if ($obj->project_id > 0) {
-					print $projectstatic->getNomUrl(1);
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Project title
-			if (!empty($arrayfields['p.title']['checked'])) {
-				print '<td class="nowraponall">';
-				if ($obj->project_id > 0) {
-					print dol_escape_htmltag($projectstatic->title);
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Third party
-			if (!empty($arrayfields['s.nom']['checked'])) {
-				print '<td class="tdoverflowmax200">';
-				if ($contextpage == 'poslist') {
-					print dol_escape_htmltag($companystatic->name);
-				} else {
-					print $companystatic->getNomUrl(1, 'customer', 0, 0, -1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Alias
-			if (!empty($arrayfields['s.name_alias']['checked'])) {
-				print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($companystatic->name_alias).'">';
-				print dol_escape_htmltag($companystatic->name_alias);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Parent company
-			if (!empty($arrayfields['s2.nom']['checked'])) {
-				print '<td class="tdoverflowmax200">';
-				if ($obj->fk_parent > 0) {
-					if (!isset($company_url_list[$obj->fk_parent])) {
-						$companyparent = new Societe($db);
-						$res = $companyparent->fetch($obj->fk_parent);
-						if ($res > 0) {
-							$company_url_list[$obj->fk_parent] = $companyparent->getNomUrl(1);
+				// Action column
+				if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+					print '<td class="nowrap" align="center">';
+					if (($massactionbutton || $massaction) && $contextpage != 'poslist') {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+						$selected = 0;
+						if (in_array($obj->id, $arrayofselected)) {
+							$selected = 1;
 						}
+						print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>';
 					}
-					if (isset($company_url_list[$obj->fk_parent])) {
-						print $company_url_list[$obj->fk_parent];
+					print '</td>';
+				}
+
+				// No
+				if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+					print '<td>'.(($offset * $limit) + $i).'</td>';
+				}
+
+				// Ref
+				if (!empty($arrayfields['f.ref']['checked'])) {
+					print '<td class="nowraponall">';
+
+					print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+
+					print '<td class="nobordernopadding nowraponall">';
+					if ($contextpage == 'poslist') {
+						print dol_escape_htmltag($obj->ref);
+					} else {
+						print $facturestatic->getNomUrl(1, '', 200, 0, '', 0, 1);
+					}
+
+					$filename = dol_sanitizeFileName($obj->ref);
+					$filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($obj->ref);
+					$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->id;
+					print $formfile->getDocumentsLink($facturestatic->element, $filename, $filedir);
+					print '</td>';
+					print '</tr>';
+					print '</table>';
+
+					print "</td>\n";
+					if (!$i) {
+						$totalarray['nbfield']++;
 					}
 				}
-				print "</td>";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Town
-			if (!empty($arrayfields['s.town']['checked'])) {
-				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($obj->town).'">';
-				print dol_escape_htmltag($obj->town);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Zip
-			if (!empty($arrayfields['s.zip']['checked'])) {
-				print '<td class="nowraponall">';
-				print dol_escape_htmltag($obj->zip);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// State
-			if (!empty($arrayfields['state.nom']['checked'])) {
-				print "<td>".dol_escape_htmltag($obj->state_name)."</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Country
-			if (!empty($arrayfields['country.code_iso']['checked'])) {
-				print '<td class="center">';
-				$tmparray = getCountry($obj->fk_pays, 'all');
-				print $tmparray['label'];
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Type ent
-			if (!empty($arrayfields['typent.code']['checked'])) {
-				print '<td class="center">';
-				if (!is_array($typenArray) || count($typenArray) == 0) {
-					$typenArray = $formcompany->typent_array(1);
-				}
-				print $typenArray[$obj->typent_code];
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Staff
-			if (!empty($arrayfields['staff.code']['checked'])) {
-				print '<td class="center">';
-				if (!is_array($conf->cache['staff']) || count($conf->cache['staff']) == 0) {
-					$conf->cache['staff'] = $formcompany->effectif_array(1);
-				}
-				print $conf->cache['staff'][$obj->staff_code];
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
 
-			// Payment mode
-			if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
-				$s = $form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1, 0, '', 1);
-				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($s).'">';
-				print $s;
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Payment terms
-			if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) {
-				$s = $form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none', 0, '', -1, -1, 1);
-				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($s).'">';
-				print $s;
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Module Source
-			if (!empty($arrayfields['f.module_source']['checked'])) {
-				print '<td>';
-				print dol_escape_htmltag($obj->module_source);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// POS Terminal
-			if (!empty($arrayfields['f.pos_source']['checked'])) {
-				print '<td>';
-				print dol_escape_htmltag($obj->pos_source);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Amount HT
-			if (!empty($arrayfields['f.total_ht']['checked'])) {
-				print '<td class="right nowraponall amount">'.price($obj->total_ht)."</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_ht';
-				}
-				$totalarray['val']['f.total_ht'] += $obj->total_ht;
-			}
-			// Amount VAT
-			if (!empty($arrayfields['f.total_tva']['checked'])) {
-				print '<td class="right nowraponall amount">'.price($obj->total_tva)."</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_tva';
-				}
-				$totalarray['val']['f.total_tva'] += $obj->total_tva;
-			}
-			// Amount LocalTax1
-			if (!empty($arrayfields['f.total_localtax1']['checked'])) {
-				print '<td class="right nowraponall amount">'.price($obj->total_localtax1)."</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_localtax1';
-				}
-				$totalarray['val']['f.total_localtax1'] += $obj->total_localtax1;
-			}
-			// Amount LocalTax2
-			if (!empty($arrayfields['f.total_localtax2']['checked'])) {
-				print '<td class="right nowraponall amount">'.price($obj->total_localtax2)."</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_localtax2';
-				}
-				$totalarray['val']['f.total_localtax2'] += $obj->total_localtax2;
-			}
-			// Amount TTC
-			if (!empty($arrayfields['f.total_ttc']['checked'])) {
-				print '<td class="right nowraponall amount">'.price($obj->total_ttc)."</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_ttc';
-				}
-				$totalarray['val']['f.total_ttc'] += $obj->total_ttc;
-			}
-
-			$userstatic->id = $obj->fk_user_author;
-			$userstatic->login = $obj->login;
-			$userstatic->lastname = $obj->lastname;
-			$userstatic->firstname = $obj->firstname;
-			$userstatic->email = $obj->user_email;
-			$userstatic->statut = $obj->user_statut;
-			$userstatic->entity = $obj->entity;
-			$userstatic->photo = $obj->photo;
-			$userstatic->office_phone = $obj->office_phone;
-			$userstatic->office_fax = $obj->office_fax;
-			$userstatic->user_mobile = $obj->user_mobile;
-			$userstatic->job = $obj->job;
-			$userstatic->gender = $obj->gender;
-
-			// Author
-			if (!empty($arrayfields['u.login']['checked'])) {
-				print '<td class="tdoverflowmax200">';
-				if ($userstatic->id) {
-					print $userstatic->getNomUrl(-1);
-				} else {
-					print '&nbsp;';
-				}
-				print "</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			if (!empty($arrayfields['sale_representative']['checked'])) {
-				// Sales representatives
-				print '<td>';
-				if ($obj->socid > 0) {
-					$listsalesrepresentatives = $companystatic->getSalesRepresentatives($user);
-					if ($listsalesrepresentatives < 0) {
-						dol_print_error($db);
+				// Customer ref
+				if (!empty($arrayfields['f.ref_client']['checked'])) {
+					print '<td class="nowrap tdoverflowmax200">';
+					print dol_escape_htmltag($obj->ref_client);
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
 					}
-					$nbofsalesrepresentative = count($listsalesrepresentatives);
-					if ($nbofsalesrepresentative > 6) {
-						// We print only number
-						print $nbofsalesrepresentative;
-					} elseif ($nbofsalesrepresentative > 0) {
-						$j = 0;
-						foreach ($listsalesrepresentatives as $val) {
-							$userstatic->id = $val['id'];
-							$userstatic->lastname = $val['lastname'];
-							$userstatic->firstname = $val['firstname'];
-							$userstatic->email = $val['email'];
-							$userstatic->statut = $val['statut'];
-							$userstatic->entity = $val['entity'];
-							$userstatic->photo = $val['photo'];
-							$userstatic->login = $val['login'];
-							$userstatic->office_phone = $val['office_phone'];
-							$userstatic->office_fax = $val['office_fax'];
-							$userstatic->user_mobile = $val['user_mobile'];
-							$userstatic->job = $val['job'];
-							$userstatic->gender = $val['gender'];
-							//print '<div class="float">':
-							print ($nbofsalesrepresentative < 2) ? $userstatic->getNomUrl(-1, '', 0, 0, 12) : $userstatic->getNomUrl(-2);
-							$j++;
-							if ($j < $nbofsalesrepresentative) {
-								print ' ';
+				}
+
+				// Type
+				if (!empty($arrayfields['f.type']['checked'])) {
+					print '<td class="nowraponall tdoverflowmax100" title="'.$facturestatic->getLibType().'">';
+					print $facturestatic->getLibType(2);
+					print "</td>";
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+
+				// Date
+				if (!empty($arrayfields['f.datef']['checked'])) {
+					print '<td align="center" class="nowraponall">';
+					print dol_print_date($db->jdate($obj->datef), 'day');
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+
+				// Date
+				if (!empty($arrayfields['f.date_valid']['checked'])) {
+					print '<td align="center" class="nowraponall">';
+					print dol_print_date($db->jdate($obj->date_valid), 'day');
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+
+				// Date limit
+				if (!empty($arrayfields['f.date_lim_reglement']['checked'])) {
+					print '<td align="center" class="nowraponall">'.dol_print_date($datelimit, 'day');
+					if ($facturestatic->hasDelay()) {
+						print img_warning($langs->trans('Alert').' - '.$langs->trans('Late'));
+					}
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+
+				// Project ref
+				if (!empty($arrayfields['p.ref']['checked'])) {
+					print '<td class="nocellnopadd nowraponall">';
+					if ($obj->project_id > 0) {
+						print $projectstatic->getNomUrl(1);
+					}
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+
+				// Project title
+				if (!empty($arrayfields['p.title']['checked'])) {
+					print '<td class="nowraponall">';
+					if ($obj->project_id > 0) {
+						print dol_escape_htmltag($projectstatic->title);
+					}
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+
+				// Third party
+				if (!empty($arrayfields['s.nom']['checked'])) {
+					print '<td class="tdoverflowmax200">';
+					if ($contextpage == 'poslist') {
+						print dol_escape_htmltag($companystatic->name);
+					} else {
+						print $companystatic->getNomUrl(1, 'customer', 0, 0, -1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);
+					}
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				// Alias
+				if (!empty($arrayfields['s.name_alias']['checked'])) {
+					print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($companystatic->name_alias).'">';
+					print dol_escape_htmltag($companystatic->name_alias);
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				// Parent company
+				if (!empty($arrayfields['s2.nom']['checked'])) {
+					print '<td class="tdoverflowmax200">';
+					if ($obj->fk_parent > 0) {
+						if (!isset($company_url_list[$obj->fk_parent])) {
+							$companyparent = new Societe($db);
+							$res = $companyparent->fetch($obj->fk_parent);
+							if ($res > 0) {
+								$company_url_list[$obj->fk_parent] = $companyparent->getNomUrl(1);
 							}
-							//print '</div>';
+						}
+						if (isset($company_url_list[$obj->fk_parent])) {
+							print $company_url_list[$obj->fk_parent];
 						}
 					}
-					//else print $langs->trans("NoSalesRepresentativeAffected");
-				} else {
-					print '&nbsp;';
+					print "</td>";
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
 				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
+				// Town
+				if (!empty($arrayfields['s.town']['checked'])) {
+					print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($obj->town).'">';
+					print dol_escape_htmltag($obj->town);
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				// Zip
+				if (!empty($arrayfields['s.zip']['checked'])) {
+					print '<td class="nowraponall">';
+					print dol_escape_htmltag($obj->zip);
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				// State
+				if (!empty($arrayfields['state.nom']['checked'])) {
+					print "<td>".dol_escape_htmltag($obj->state_name)."</td>\n";
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				// Country
+				if (!empty($arrayfields['country.code_iso']['checked'])) {
+					print '<td class="center">';
+					$tmparray = getCountry($obj->fk_pays, 'all');
+					print $tmparray['label'];
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				// Type ent
+				if (!empty($arrayfields['typent.code']['checked'])) {
+					print '<td class="center">';
+					if (!is_array($typenArray) || count($typenArray) == 0) {
+						$typenArray = $formcompany->typent_array(1);
+					}
+					print $typenArray[$obj->typent_code];
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				// Staff
+				if (!empty($arrayfields['staff.code']['checked'])) {
+					print '<td class="center">';
+					if (!is_array($conf->cache['staff']) || count($conf->cache['staff']) == 0) {
+						$conf->cache['staff'] = $formcompany->effectif_array(1);
+					}
+					print $conf->cache['staff'][$obj->staff_code];
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
 				}
-			}
 
-			if (!empty($arrayfields['f.retained_warranty']['checked'])) {
-				print '<td align="right">'.(!empty($obj->retained_warranty) ? price($obj->retained_warranty).'%' : '&nbsp;').'</td>';
-			}
+				// Payment mode
+				if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
+					$s = $form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1, 0, '', 1);
+					print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($s).'">';
+					print $s;
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
 
-			if (!empty($arrayfields['dynamount_payed']['checked'])) {
-				print '<td class="right nowraponall amount">'.(!empty($totalpay) ? price($totalpay, 0, $langs) : '&nbsp;').'</td>'; // TODO Use a denormalized field
-				if (!$i) {
-					$totalarray['nbfield']++;
+				// Payment terms
+				if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) {
+					$s = $form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none', 0, '', -1, -1, 1);
+					print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($s).'">';
+					print $s;
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
 				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'totalam';
-				}
-				$totalarray['val']['totalam'] += $totalpay;
-			}
 
-			// Pending amount
-			if (!empty($arrayfields['rtp']['checked'])) {
-				print '<td class="right nowraponall amount">';
-				print (!empty($remaintopay) ? price($remaintopay, 0, $langs) : '&nbsp;');
-				print '</td>'; // TODO Use a denormalized field
-				if (!$i) {
-					$totalarray['nbfield']++;
+				// Module Source
+				if (!empty($arrayfields['f.module_source']['checked'])) {
+					print '<td>';
+					print dol_escape_htmltag($obj->module_source);
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
 				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'rtp';
-				}
-				$totalarray['val']['rtp'] += $remaintopay;
-			}
 
+				// POS Terminal
+				if (!empty($arrayfields['f.pos_source']['checked'])) {
+					print '<td>';
+					print dol_escape_htmltag($obj->pos_source);
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
 
-			// Currency
-			if (!empty($arrayfields['f.multicurrency_code']['checked'])) {
-				print '<td class="nowraponall tdoverflowmax125" title="'.dol_escape_htmltag($obj->multicurrency_code.' - '.$langs->transnoentitiesnoconv('Currency'.$obj->multicurrency_code)).'">';
-				if (empty($conf->global->MAIN_SHOW_ONLY_CODE_MULTICURRENCY)) {
-					print $langs->transnoentitiesnoconv('Currency'.$obj->multicurrency_code);
-				} else {
-					print dol_escape_htmltag($obj->multicurrency_code);
+				// Amount HT
+				if (!empty($arrayfields['f.total_ht']['checked'])) {
+					print '<td class="right nowraponall amount">'.price($obj->total_ht)."</td>\n";
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+					if (!$i) {
+						$totalarray['pos'][$totalarray['nbfield']] = 'f.total_ht';
+					}
+					$totalarray['val']['f.total_ht'] += $obj->total_ht;
 				}
-				print "</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
+				// Amount VAT
+				if (!empty($arrayfields['f.total_tva']['checked'])) {
+					print '<td class="right nowraponall amount">'.price($obj->total_tva)."</td>\n";
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+					if (!$i) {
+						$totalarray['pos'][$totalarray['nbfield']] = 'f.total_tva';
+					}
+					$totalarray['val']['f.total_tva'] += $obj->total_tva;
+				}
+				// Amount LocalTax1
+				if (!empty($arrayfields['f.total_localtax1']['checked'])) {
+					print '<td class="right nowraponall amount">'.price($obj->total_localtax1)."</td>\n";
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+					if (!$i) {
+						$totalarray['pos'][$totalarray['nbfield']] = 'f.total_localtax1';
+					}
+					$totalarray['val']['f.total_localtax1'] += $obj->total_localtax1;
+				}
+				// Amount LocalTax2
+				if (!empty($arrayfields['f.total_localtax2']['checked'])) {
+					print '<td class="right nowraponall amount">'.price($obj->total_localtax2)."</td>\n";
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+					if (!$i) {
+						$totalarray['pos'][$totalarray['nbfield']] = 'f.total_localtax2';
+					}
+					$totalarray['val']['f.total_localtax2'] += $obj->total_localtax2;
+				}
+				// Amount TTC
+				if (!empty($arrayfields['f.total_ttc']['checked'])) {
+					print '<td class="right nowraponall amount">'.price($obj->total_ttc)."</td>\n";
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+					if (!$i) {
+						$totalarray['pos'][$totalarray['nbfield']] = 'f.total_ttc';
+					}
+					$totalarray['val']['f.total_ttc'] += $obj->total_ttc;
 				}
-			}
 
-			// Currency rate
-			if (!empty($arrayfields['f.multicurrency_tx']['checked'])) {
-				print '<td class="nowraponall">';
-				$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
-				print "</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Amount HT
-			if (!empty($arrayfields['f.multicurrency_total_ht']['checked'])) {
-				print '<td class="right nowraponall amount">'.price($obj->multicurrency_total_ht)."</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Amount VAT
-			if (!empty($arrayfields['f.multicurrency_total_vat']['checked'])) {
-				print '<td class="right nowraponall amount">'.price($obj->multicurrency_total_vat)."</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Amount TTC
-			if (!empty($arrayfields['f.multicurrency_total_ttc']['checked'])) {
-				print '<td class="right nowraponall amount">'.price($obj->multicurrency_total_ttc)."</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			if (!empty($arrayfields['multicurrency_dynamount_payed']['checked'])) {
-				print '<td class="right nowraponall amount">'.(!empty($multicurrency_totalpay) ?price($multicurrency_totalpay, 0, $langs) : '&nbsp;').'</td>'; // TODO Use a denormalized field
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
+				$userstatic->id = $obj->fk_user_author;
+				$userstatic->login = $obj->login;
+				$userstatic->lastname = $obj->lastname;
+				$userstatic->firstname = $obj->firstname;
+				$userstatic->email = $obj->user_email;
+				$userstatic->statut = $obj->user_statut;
+				$userstatic->entity = $obj->entity;
+				$userstatic->photo = $obj->photo;
+				$userstatic->office_phone = $obj->office_phone;
+				$userstatic->office_fax = $obj->office_fax;
+				$userstatic->user_mobile = $obj->user_mobile;
+				$userstatic->job = $obj->job;
+				$userstatic->gender = $obj->gender;
 
-			// Pending amount
-			if (!empty($arrayfields['multicurrency_rtp']['checked'])) {
-				print '<td class="right nowraponall">';
-				print (!empty($multicurrency_remaintopay) ? price($multicurrency_remaintopay, 0, $langs) : '&nbsp;');
-				print '</td>'; // TODO Use a denormalized field
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Total buying or cost price
-			if (!empty($arrayfields['total_pa']['checked'])) {
-				print '<td class="right nowrap">'.price($marginInfo['pa_total']).'</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Total margin
-			if (!empty($arrayfields['total_margin']['checked'])) {
-				print '<td class="right nowrap">'.price($marginInfo['total_margin']).'</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'total_margin';
-				}
-				$totalarray['val']['total_margin'] += $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>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Total mark rate
-			if (!empty($arrayfields['total_mark_rate']['checked'])) {
-				print '<td class="right nowrap">'.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').'</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'total_mark_rate';
-				}
-				if ($i >= $imaxinloop - 1) {
-					if (!empty($total_ht)) {
-						$totalarray['val']['total_mark_rate'] = price2num($total_margin * 100 / $total_ht, 'MT');
+				// Author
+				if (!empty($arrayfields['u.login']['checked'])) {
+					print '<td class="tdoverflowmax200">';
+					if ($userstatic->id) {
+						print $userstatic->getNomUrl(-1);
 					} else {
-						$totalarray['val']['total_mark_rate'] = '';
+						print '&nbsp;';
+					}
+					print "</td>\n";
+					if (!$i) {
+						$totalarray['nbfield']++;
 					}
 				}
-			}
 
-			// Extra fields
-			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-			// Fields from hook
-			$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-			print $hookmanager->resPrint;
-			// Date creation
-			if (!empty($arrayfields['f.datec']['checked'])) {
-				print '<td class="nowraponall center">';
-				print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Date modification
-			if (!empty($arrayfields['f.tms']['checked'])) {
-				print '<td class="nowraponall center">';
-				print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Date closing
-			if (!empty($arrayfields['f.date_closing']['checked'])) {
-				print '<td class="nowraponall center">';
-				print dol_print_date($db->jdate($obj->date_closing), 'dayhour', 'tzuser');
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Note public
-			if (!empty($arrayfields['f.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['f.note_private']['checked'])) {
-				print '<td class="center">';
-				print dol_string_nohtmltag($obj->note_private);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Template Invoice
-			if (!empty($arrayfields['f.fk_fac_rec_source']['checked'])) {
-				print '<td class="center">';
-				if (!empty($obj->fk_fac_rec_source)) {
-					$facrec = new FactureRec($db);
-					$result = $facrec->fetch($obj->fk_fac_rec_source);
-					if ($result < 0) {
-						setEventMessages($facrec->error, $facrec->errors, 'errors');
+				if (!empty($arrayfields['sale_representative']['checked'])) {
+					// Sales representatives
+					print '<td>';
+					if ($obj->socid > 0) {
+						$listsalesrepresentatives = $companystatic->getSalesRepresentatives($user);
+						if ($listsalesrepresentatives < 0) {
+							dol_print_error($db);
+						}
+						$nbofsalesrepresentative = count($listsalesrepresentatives);
+						if ($nbofsalesrepresentative > 6) {
+							// We print only number
+							print $nbofsalesrepresentative;
+						} elseif ($nbofsalesrepresentative > 0) {
+							$j = 0;
+							foreach ($listsalesrepresentatives as $val) {
+								$userstatic->id = $val['id'];
+								$userstatic->lastname = $val['lastname'];
+								$userstatic->firstname = $val['firstname'];
+								$userstatic->email = $val['email'];
+								$userstatic->statut = $val['statut'];
+								$userstatic->entity = $val['entity'];
+								$userstatic->photo = $val['photo'];
+								$userstatic->login = $val['login'];
+								$userstatic->office_phone = $val['office_phone'];
+								$userstatic->office_fax = $val['office_fax'];
+								$userstatic->user_mobile = $val['user_mobile'];
+								$userstatic->job = $val['job'];
+								$userstatic->gender = $val['gender'];
+								//print '<div class="float">':
+								print ($nbofsalesrepresentative < 2) ? $userstatic->getNomUrl(-1, '', 0, 0, 12) : $userstatic->getNomUrl(-2);
+								$j++;
+								if ($j < $nbofsalesrepresentative) {
+									print ' ';
+								}
+								//print '</div>';
+							}
+						}
+						//else print $langs->trans("NoSalesRepresentativeAffected");
 					} else {
-						print $facrec->getNomUrl();
+						print '&nbsp;';
+					}
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
 					}
 				}
-				print '</td>';
+
+				if (!empty($arrayfields['f.retained_warranty']['checked'])) {
+					print '<td align="right">'.(!empty($obj->retained_warranty) ? price($obj->retained_warranty).'%' : '&nbsp;').'</td>';
+				}
+
+				if (!empty($arrayfields['dynamount_payed']['checked'])) {
+					print '<td class="right nowraponall amount">'.(!empty($totalpay) ? price($totalpay, 0, $langs) : '&nbsp;').'</td>'; // TODO Use a denormalized field
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+					if (!$i) {
+						$totalarray['pos'][$totalarray['nbfield']] = 'totalam';
+					}
+					$totalarray['val']['totalam'] += $totalpay;
+				}
+
+				// Pending amount
+				if (!empty($arrayfields['rtp']['checked'])) {
+					print '<td class="right nowraponall amount">';
+					print (!empty($remaintopay) ? price($remaintopay, 0, $langs) : '&nbsp;');
+					print '</td>'; // TODO Use a denormalized field
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+					if (!$i) {
+						$totalarray['pos'][$totalarray['nbfield']] = 'rtp';
+					}
+					$totalarray['val']['rtp'] += $remaintopay;
+				}
+
+
+				// Currency
+				if (!empty($arrayfields['f.multicurrency_code']['checked'])) {
+					print '<td class="nowraponall tdoverflowmax125" title="'.dol_escape_htmltag($obj->multicurrency_code.' - '.$langs->transnoentitiesnoconv('Currency'.$obj->multicurrency_code)).'">';
+					if (empty($conf->global->MAIN_SHOW_ONLY_CODE_MULTICURRENCY)) {
+						print $langs->transnoentitiesnoconv('Currency'.$obj->multicurrency_code);
+					} else {
+						print dol_escape_htmltag($obj->multicurrency_code);
+					}
+					print "</td>\n";
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+
+				// Currency rate
+				if (!empty($arrayfields['f.multicurrency_tx']['checked'])) {
+					print '<td class="nowraponall">';
+					$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
+					print "</td>\n";
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				// Amount HT
+				if (!empty($arrayfields['f.multicurrency_total_ht']['checked'])) {
+					print '<td class="right nowraponall amount">'.price($obj->multicurrency_total_ht)."</td>\n";
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				// Amount VAT
+				if (!empty($arrayfields['f.multicurrency_total_vat']['checked'])) {
+					print '<td class="right nowraponall amount">'.price($obj->multicurrency_total_vat)."</td>\n";
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				// Amount TTC
+				if (!empty($arrayfields['f.multicurrency_total_ttc']['checked'])) {
+					print '<td class="right nowraponall amount">'.price($obj->multicurrency_total_ttc)."</td>\n";
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				if (!empty($arrayfields['multicurrency_dynamount_payed']['checked'])) {
+					print '<td class="right nowraponall amount">'.(!empty($multicurrency_totalpay) ?price($multicurrency_totalpay, 0, $langs) : '&nbsp;').'</td>'; // TODO Use a denormalized field
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+
+				// Pending amount
+				if (!empty($arrayfields['multicurrency_rtp']['checked'])) {
+					print '<td class="right nowraponall">';
+					print (!empty($multicurrency_remaintopay) ? price($multicurrency_remaintopay, 0, $langs) : '&nbsp;');
+					print '</td>'; // TODO Use a denormalized field
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+
+				// Total buying or cost price
+				if (!empty($arrayfields['total_pa']['checked'])) {
+					print '<td class="right nowrap">'.price($marginInfo['pa_total']).'</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				// Total margin
+				if (!empty($arrayfields['total_margin']['checked'])) {
+					print '<td class="right nowrap">'.price($marginInfo['total_margin']).'</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+					if (!$i) {
+						$totalarray['pos'][$totalarray['nbfield']] = 'total_margin';
+					}
+					$totalarray['val']['total_margin'] += $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>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				// Total mark rate
+				if (!empty($arrayfields['total_mark_rate']['checked'])) {
+					print '<td class="right nowrap">'.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').'</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+					if (!$i) {
+						$totalarray['pos'][$totalarray['nbfield']] = 'total_mark_rate';
+					}
+					if ($i >= $imaxinloop - 1) {
+						if (!empty($total_ht)) {
+							$totalarray['val']['total_mark_rate'] = price2num($total_margin * 100 / $total_ht, 'MT');
+						} else {
+							$totalarray['val']['total_mark_rate'] = '';
+						}
+					}
+				}
+
+				// Extra fields
+				include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+				// Fields from hook
+				$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+				$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+				print $hookmanager->resPrint;
+				// Date creation
+				if (!empty($arrayfields['f.datec']['checked'])) {
+					print '<td class="nowraponall center">';
+					print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				// Date modification
+				if (!empty($arrayfields['f.tms']['checked'])) {
+					print '<td class="nowraponall center">';
+					print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				// Date closing
+				if (!empty($arrayfields['f.date_closing']['checked'])) {
+					print '<td class="nowraponall center">';
+					print dol_print_date($db->jdate($obj->date_closing), 'dayhour', 'tzuser');
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				// Note public
+				if (!empty($arrayfields['f.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['f.note_private']['checked'])) {
+					print '<td class="center">';
+					print dol_string_nohtmltag($obj->note_private);
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				// Template Invoice
+				if (!empty($arrayfields['f.fk_fac_rec_source']['checked'])) {
+					print '<td class="center">';
+					if (!empty($obj->fk_fac_rec_source)) {
+						$facrec = new FactureRec($db);
+						$result = $facrec->fetch($obj->fk_fac_rec_source);
+						if ($result < 0) {
+							setEventMessages($facrec->error, $facrec->errors, 'errors');
+						} else {
+							print $facrec->getNomUrl();
+						}
+					}
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				// Status
+				if (!empty($arrayfields['f.fk_statut']['checked'])) {
+					print '<td class="nowrap right">';
+					print $facturestatic->getLibStatut(5, $paiement);
+					print "</td>";
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+
+				// Action column (Show the massaction button only when this page is not opend from the Extended POS)
+
+				if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+					print '<td class="nowrap" align="center">';
+					if (($massactionbutton || $massaction) && $contextpage != 'poslist') {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+						$selected = 0;
+						if (in_array($obj->id, $arrayofselected)) {
+							$selected = 1;
+						}
+						print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>';
+					}
+					print '</td>';
+				}
 				if (!$i) {
 					$totalarray['nbfield']++;
 				}
+				print "</tr>\n";
 			}
-			// Status
-			if (!empty($arrayfields['f.fk_statut']['checked'])) {
-				print '<td class="nowrap right">';
-				print $facturestatic->getLibStatut(5, $paiement);
-				print "</td>";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Action column (Show the massaction button only when this page is not opend from the Extended POS)
-
-			if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
-				print '<td class="nowrap" align="center">';
-				if (($massactionbutton || $massaction) && $contextpage != 'poslist') {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-					$selected = 0;
-					if (in_array($obj->id, $arrayofselected)) {
-						$selected = 1;
-					}
-					print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>';
-				}
-				print '</td>';
-			}
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			print "</tr>\n";
-
 			$i++;
 		}
 

From 130e9d8df2a931ae4da54e339699922f08e9201a Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Tue, 10 Jan 2023 13:29:46 +0100
Subject: [PATCH 431/816] kanban for list of suppliers invoices

---
 .../fourn/class/fournisseur.facture.class.php |  37 +
 htdocs/fourn/facture/list.php                 | 810 +++++++++---------
 2 files changed, 452 insertions(+), 395 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index de012c86a58..93a8fc0d1ef 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -3225,6 +3225,43 @@ class FactureFournisseur extends CommonInvoice
 
 		return $isUsed;
 	}
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $langs;
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
+		if (property_exists($this, 'socid')) {
+			$return .= ' | <span class="info-box-label">'.$this->socid.'</span>';
+		}
+		if (property_exists($this, 'date_echeance') && property_exists($this, 'date')) {
+			if (!empty($this->date_echeance)) {
+				$return .= '<br><span class="info-box-label">'.dol_print_date($this->date_echeance).'</span>';
+			} else {
+				$return .= '<br><span class="info-box-label">'.dol_print_date($this->date).'</span>';
+			}
+		}
+		if (property_exists($this, 'total_ht')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("AmountHT").'</span> : <span class="info-box-label amount">'.price($this->total_ht).'</span>';
+		}
+		if (method_exists($this, 'getLibStatut')) {
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
 
 
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index be215e891eb..3c4dfb32b15 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -766,6 +766,9 @@ if ($socid) {
 }
 
 $param = '&socid='.$socid;
+if (!empty($mode)) {
+	$param .= '&mode='.urlencode($mode);
+}
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 	$param .= '&contextpage='.urlencode($contextpage);
 }
@@ -918,7 +921,10 @@ $url = DOL_URL_ROOT.'/fourn/facture/card.php?action=create';
 if (!empty($socid)) {
 	$url .= '&socid='.urlencode($socid);
 }
-$newcardbutton = dolGetButtonTitle($langs->trans('NewBill'), '', 'fa fa-plus-circle', $url, '', ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer));
+$newcardbutton  = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('NewBill'), '', 'fa fa-plus-circle', $url, '', ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer));
 
 $i = 0;
 print '<form method="POST" name="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
@@ -1430,409 +1436,423 @@ if ($num > 0) {
 				$remaintopay = -$facturestatic->getSumFromThisCreditNotesNotUsed();
 			}
 		}
-
-		print '<tr class="oddeven">';
-		// Action column
-		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-			print '<td class="nowrap center">';
-			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-				$selected = 0;
-				if (in_array($obj->facid, $arrayofselected)) {
-					$selected = 1;
+		if ($mode == 'kanban') {
+			if ($i == 0) {
+				print '<tr><td colspan="12">';
+				print '<div class="box-flex-container">';
+			}
+			// Output Kanban
+			$facturestatic->socid = $thirdparty->getNomUrl(1, 'supplier', 3);
+			$facturestatic->total_ht = $obj->total_ht;
+			$facturestatic->date = $obj->datef;
+			print $facturestatic->getKanbanView('');
+			if ($i == (min($num, $limit) - 1)) {
+				print '</div>';
+				print '</td></tr>';
+			}
+		} else {
+			print '<tr class="oddeven">';
+			// Action column
+			if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+				print '<td class="nowrap center">';
+				if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+					$selected = 0;
+					if (in_array($obj->facid, $arrayofselected)) {
+						$selected = 1;
+					}
+					print '<input id="cb'.$obj->facid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->facid.'"'.($selected ? ' checked="checked"' : '').'>';
 				}
-				print '<input id="cb'.$obj->facid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->facid.'"'.($selected ? ' checked="checked"' : '').'>';
+				print '</td>';
 			}
-			print '</td>';
-		}
-		if (!empty($arrayfields['f.ref']['checked'])) {
-			print '<td class="nowraponall">';
+			if (!empty($arrayfields['f.ref']['checked'])) {
+				print '<td class="nowraponall">';
 
-			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-			// Picto + Ref
-			print '<td class="nobordernopadding nowraponall">';
-			print $facturestatic->getNomUrl(1, '', 0, 0, '', 0, -1, 1);
+				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+				// Picto + Ref
+				print '<td class="nobordernopadding nowraponall">';
+				print $facturestatic->getNomUrl(1, '', 0, 0, '', 0, -1, 1);
 
-			$filename = dol_sanitizeFileName($obj->ref);
-			$filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($obj->facid, 2, 0, 0, $facturestatic, 'invoice_supplier').dol_sanitizeFileName($obj->ref);
-			$subdir = get_exdir($obj->facid, 2, 0, 0, $facturestatic, 'invoice_supplier').dol_sanitizeFileName($obj->ref);
-			print $formfile->getDocumentsLink('facture_fournisseur', $subdir, $filedir);
-			print '</td></tr></table>';
+				$filename = dol_sanitizeFileName($obj->ref);
+				$filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($obj->facid, 2, 0, 0, $facturestatic, 'invoice_supplier').dol_sanitizeFileName($obj->ref);
+				$subdir = get_exdir($obj->facid, 2, 0, 0, $facturestatic, 'invoice_supplier').dol_sanitizeFileName($obj->ref);
+				print $formfile->getDocumentsLink('facture_fournisseur', $subdir, $filedir);
+				print '</td></tr></table>';
 
-			print "</td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Supplier ref
-		if (!empty($arrayfields['f.ref_supplier']['checked'])) {
-			print '<td class="nowrap tdoverflowmax150" title="'.dol_escape_htmltag($obj->ref_supplier).'">';
-			print $obj->ref_supplier;
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Type
-		if (!empty($arrayfields['f.type']['checked'])) {
-			print '<td class="nowrap">';
-			print $facturestatic->getLibType();
-			print "</td>";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Label
-		if (!empty($arrayfields['f.label']['checked'])) {
-			print '<td class="nowrap">';
-			print $obj->label;
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Date
-		if (!empty($arrayfields['f.datef']['checked'])) {
-			print '<td class="center nowrap">';
-			print dol_print_date($db->jdate($obj->datef), 'day');
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Date limit
-		if (!empty($arrayfields['f.date_lim_reglement']['checked'])) {
-			print '<td class="center nowraponall">'.dol_print_date($datelimit, 'day');
-			if ($facturestatic->hasDelay()) {
-				print img_warning($langs->trans('Alert').' - '.$langs->trans('Late'));
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Project
-		if (!empty($arrayfields['p.ref']['checked'])) {
-			print '<td class="nowrap">';
-			if ($obj->project_id > 0) {
-				$projectstatic->id = $obj->project_id;
-				$projectstatic->ref = $obj->project_ref;
-				$projectstatic->title = $obj->project_label;
-				print $projectstatic->getNomUrl(1);
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Third party
-		if (!empty($arrayfields['s.nom']['checked'])) {
-			print '<td class="tdoverflowmax150">';
-			print $thirdparty->getNomUrl(1, 'supplier', 0, 0, -1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Alias
-		if (!empty($arrayfields['s.name_alias']['checked'])) {
-			print '<td class="tdoverflowmax150">';
-			print $thirdparty->name_alias;
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Town
-		if (!empty($arrayfields['s.town']['checked'])) {
-			print '<td class="nocellnopadd">';
-			print $obj->town;
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Zip
-		if (!empty($arrayfields['s.zip']['checked'])) {
-			print '<td class="nocellnopadd center tdoverflowmax100" title="'.dol_escape_htmltag($obj->zip).'">';
-			print dol_escape_htmltag($obj->zip);
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// State
-		if (!empty($arrayfields['state.nom']['checked'])) {
-			print "<td>".$obj->state_name."</td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Country
-		if (!empty($arrayfields['country.code_iso']['checked'])) {
-			print '<td class="center">';
-			$tmparray = getCountry($obj->fk_pays, 'all');
-			print $tmparray['label'];
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Type ent
-		if (!empty($arrayfields['typent.code']['checked'])) {
-			print '<td class="center">';
-			if (empty($typenArray)) {
-				$typenArray = $formcompany->typent_array(1);
-			}
-			print $typenArray[$obj->typent_code];
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Payment condition
-		if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) {
-			$s = $form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none', 1, '', -1, -1, 1);
-			print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($s).'">';
-			print dol_escape_htmltag($s);
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Payment mode
-		if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
-			$s = $form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1, 0, '', 1);
-			print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($s).'">';
-			print dol_escape_htmltag($s);
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Amount HT
-		if (!empty($arrayfields['f.total_ht']['checked'])) {
-			  print '<td class="right nowrap"><span class="amount">'.price($obj->total_ht)."</span></td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'f.total_ht';
-			}
-			  $totalarray['val']['f.total_ht'] += $obj->total_ht;
-		}
-		// Amount VAT
-		if (!empty($arrayfields['f.total_vat']['checked'])) {
-			print '<td class="right nowrap"><span class="amount">'.price($obj->total_vat)."</span></td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'f.total_vat';
-			}
-			$totalarray['val']['f.total_vat'] += $obj->total_vat;
-		}
-		// Amount LocalTax1
-		if (!empty($arrayfields['f.total_localtax1']['checked'])) {
-			print '<td class="right nowrap"><span class="amount">'.price($obj->total_localtax1)."</span></td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'f.total_localtax1';
-			}
-			$totalarray['val']['f.total_localtax1'] += $obj->total_localtax1;
-		}
-		// Amount LocalTax2
-		if (!empty($arrayfields['f.total_localtax2']['checked'])) {
-			print '<td class="right nowrap"><span class="amount">'.price($obj->total_localtax2)."</span></td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'f.total_localtax2';
-			}
-			$totalarray['val']['f.total_localtax2'] += $obj->total_localtax2;
-		}
-		// Amount TTC
-		if (!empty($arrayfields['f.total_ttc']['checked'])) {
-			print '<td class="right nowrap"><span class="amount">'.price($obj->total_ttc)."</span></td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'f.total_ttc';
-			}
-			$totalarray['val']['f.total_ttc'] += $obj->total_ttc;
-		}
-
-		$userstatic->id = $obj->fk_user_author;
-		$userstatic->login = $obj->login;
-		$userstatic->lastname = $obj->lastname;
-		$userstatic->firstname = $obj->firstname;
-		$userstatic->email = $obj->user_email;
-		$userstatic->statut = $obj->user_statut;
-		$userstatic->entity = $obj->entity;
-		$userstatic->photo = $obj->photo;
-		$userstatic->office_phone = $obj->office_phone;
-		$userstatic->office_fax = $obj->office_fax;
-		$userstatic->user_mobile = $obj->user_mobile;
-		$userstatic->job = $obj->job;
-		$userstatic->gender = $obj->gender;
-
-		// Author
-		if (!empty($arrayfields['u.login']['checked'])) {
-			print '<td class="tdoverflowmax150">';
-			if ($userstatic->id) {
-				print $userstatic->getLoginUrl(-1);
-			} else {
-				print '&nbsp;';
-			}
-			print "</td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		if (!empty($arrayfields['dynamount_payed']['checked'])) {
-			print '<td class="right nowrap"><span class="amount">'.(!empty($totalpay) ?price($totalpay, 0, $langs) : '').'</span></td>'; // TODO Use a denormalized field
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'totalam';
-			}
-			$totalarray['val']['totalam'] += $totalpay;
-		}
-
-		if (!empty($arrayfields['rtp']['checked'])) {
-			print '<td class="right nowrap">'.(!empty($remaintopay) ?price($remaintopay, 0, $langs) : '&nbsp;').'</td>'; // TODO Use a denormalized field
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'rtp';
-			}
-			$totalarray['val']['rtp'] += $remaintopay;
-		}
-
-		// Currency
-		if (!empty($arrayfields['f.multicurrency_code']['checked'])) {
-			  print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Currency rate
-		if (!empty($arrayfields['f.multicurrency_tx']['checked'])) {
-			  print '<td class="nowrap">';
-			  $form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
-			  print "</td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Amount HT
-		if (!empty($arrayfields['f.multicurrency_total_ht']['checked'])) {
-			  print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ht)."</span></td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Amount VAT
-		if (!empty($arrayfields['f.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
-		if (!empty($arrayfields['f.multicurrency_total_ttc']['checked'])) {
-			print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ttc)."</span></td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		if (!empty($arrayfields['multicurrency_dynamount_payed']['checked'])) {
-			print '<td class="right nowrap"><span class="amount">'.(!empty($multicurrency_totalpay) ?price($multicurrency_totalpay, 0, $langs) : '').'</span></td>'; // TODO Use a denormalized field
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Pending amount
-		if (!empty($arrayfields['multicurrency_rtp']['checked'])) {
-			print '<td class="right nowrap"><span class="amount">';
-			print (!empty($multicurrency_remaintopay) ? price($multicurrency_remaintopay, 0, $langs) : '');
-			print '</span></td>'; // TODO Use a denormalized field
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-
-		// Extra fields
-		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-		print $hookmanager->resPrint;
-
-		// Date creation
-		if (!empty($arrayfields['f.datec']['checked'])) {
-			print '<td class="center nowrap">';
-			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Date modification
-		if (!empty($arrayfields['f.tms']['checked'])) {
-			print '<td class="center nowrap">';
-			print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Status
-		if (!empty($arrayfields['f.fk_statut']['checked'])) {
-			print '<td class="right nowrap">';
-			print $facturestatic->LibStatut($obj->paye, $obj->fk_statut, 5, $paiement, $obj->type);
-			print "</td>";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Action column
-		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-			print '<td class="nowrap center">';
-			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-				$selected = 0;
-				if (in_array($obj->facid, $arrayofselected)) {
-					$selected = 1;
+				print "</td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
 				}
-				print '<input id="cb'.$obj->facid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->facid.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
-			print '</td>';
-		}
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
 
-		print "</tr>\n";
+			// Supplier ref
+			if (!empty($arrayfields['f.ref_supplier']['checked'])) {
+				print '<td class="nowrap tdoverflowmax150" title="'.dol_escape_htmltag($obj->ref_supplier).'">';
+				print $obj->ref_supplier;
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
 
+			// Type
+			if (!empty($arrayfields['f.type']['checked'])) {
+				print '<td class="nowrap">';
+				print $facturestatic->getLibType();
+				print "</td>";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Label
+			if (!empty($arrayfields['f.label']['checked'])) {
+				print '<td class="nowrap">';
+				print $obj->label;
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Date
+			if (!empty($arrayfields['f.datef']['checked'])) {
+				print '<td class="center nowrap">';
+				print dol_print_date($db->jdate($obj->datef), 'day');
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Date limit
+			if (!empty($arrayfields['f.date_lim_reglement']['checked'])) {
+				print '<td class="center nowraponall">'.dol_print_date($datelimit, 'day');
+				if ($facturestatic->hasDelay()) {
+					print img_warning($langs->trans('Alert').' - '.$langs->trans('Late'));
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Project
+			if (!empty($arrayfields['p.ref']['checked'])) {
+				print '<td class="nowrap">';
+				if ($obj->project_id > 0) {
+					$projectstatic->id = $obj->project_id;
+					$projectstatic->ref = $obj->project_ref;
+					$projectstatic->title = $obj->project_label;
+					print $projectstatic->getNomUrl(1);
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Third party
+			if (!empty($arrayfields['s.nom']['checked'])) {
+				print '<td class="tdoverflowmax150">';
+				print $thirdparty->getNomUrl(1, 'supplier', 0, 0, -1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Alias
+			if (!empty($arrayfields['s.name_alias']['checked'])) {
+				print '<td class="tdoverflowmax150">';
+				print $thirdparty->name_alias;
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Town
+			if (!empty($arrayfields['s.town']['checked'])) {
+				print '<td class="nocellnopadd">';
+				print $obj->town;
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Zip
+			if (!empty($arrayfields['s.zip']['checked'])) {
+				print '<td class="nocellnopadd center tdoverflowmax100" title="'.dol_escape_htmltag($obj->zip).'">';
+				print dol_escape_htmltag($obj->zip);
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// State
+			if (!empty($arrayfields['state.nom']['checked'])) {
+				print "<td>".$obj->state_name."</td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Country
+			if (!empty($arrayfields['country.code_iso']['checked'])) {
+				print '<td class="center">';
+				$tmparray = getCountry($obj->fk_pays, 'all');
+				print $tmparray['label'];
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Type ent
+			if (!empty($arrayfields['typent.code']['checked'])) {
+				print '<td class="center">';
+				if (empty($typenArray)) {
+					$typenArray = $formcompany->typent_array(1);
+				}
+				print $typenArray[$obj->typent_code];
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Payment condition
+			if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) {
+				$s = $form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none', 1, '', -1, -1, 1);
+				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($s).'">';
+				print dol_escape_htmltag($s);
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Payment mode
+			if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
+				$s = $form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1, 0, '', 1);
+				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($s).'">';
+				print dol_escape_htmltag($s);
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Amount HT
+			if (!empty($arrayfields['f.total_ht']['checked'])) {
+				print '<td class="right nowrap"><span class="amount">'.price($obj->total_ht)."</span></td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_ht';
+				}
+				$totalarray['val']['f.total_ht'] += $obj->total_ht;
+			}
+			// Amount VAT
+			if (!empty($arrayfields['f.total_vat']['checked'])) {
+				print '<td class="right nowrap"><span class="amount">'.price($obj->total_vat)."</span></td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_vat';
+				}
+				$totalarray['val']['f.total_vat'] += $obj->total_vat;
+			}
+			// Amount LocalTax1
+			if (!empty($arrayfields['f.total_localtax1']['checked'])) {
+				print '<td class="right nowrap"><span class="amount">'.price($obj->total_localtax1)."</span></td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_localtax1';
+				}
+				$totalarray['val']['f.total_localtax1'] += $obj->total_localtax1;
+			}
+			// Amount LocalTax2
+			if (!empty($arrayfields['f.total_localtax2']['checked'])) {
+				print '<td class="right nowrap"><span class="amount">'.price($obj->total_localtax2)."</span></td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_localtax2';
+				}
+				$totalarray['val']['f.total_localtax2'] += $obj->total_localtax2;
+			}
+			// Amount TTC
+			if (!empty($arrayfields['f.total_ttc']['checked'])) {
+				print '<td class="right nowrap"><span class="amount">'.price($obj->total_ttc)."</span></td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_ttc';
+				}
+				$totalarray['val']['f.total_ttc'] += $obj->total_ttc;
+			}
+
+			$userstatic->id = $obj->fk_user_author;
+			$userstatic->login = $obj->login;
+			$userstatic->lastname = $obj->lastname;
+			$userstatic->firstname = $obj->firstname;
+			$userstatic->email = $obj->user_email;
+			$userstatic->statut = $obj->user_statut;
+			$userstatic->entity = $obj->entity;
+			$userstatic->photo = $obj->photo;
+			$userstatic->office_phone = $obj->office_phone;
+			$userstatic->office_fax = $obj->office_fax;
+			$userstatic->user_mobile = $obj->user_mobile;
+			$userstatic->job = $obj->job;
+			$userstatic->gender = $obj->gender;
+
+			// Author
+			if (!empty($arrayfields['u.login']['checked'])) {
+				print '<td class="tdoverflowmax150">';
+				if ($userstatic->id) {
+					print $userstatic->getLoginUrl(-1);
+				} else {
+					print '&nbsp;';
+				}
+				print "</td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			if (!empty($arrayfields['dynamount_payed']['checked'])) {
+				print '<td class="right nowrap"><span class="amount">'.(!empty($totalpay) ?price($totalpay, 0, $langs) : '').'</span></td>'; // TODO Use a denormalized field
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'totalam';
+				}
+				$totalarray['val']['totalam'] += $totalpay;
+			}
+
+			if (!empty($arrayfields['rtp']['checked'])) {
+				print '<td class="right nowrap">'.(!empty($remaintopay) ?price($remaintopay, 0, $langs) : '&nbsp;').'</td>'; // TODO Use a denormalized field
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'rtp';
+				}
+				$totalarray['val']['rtp'] += $remaintopay;
+			}
+
+			// Currency
+			if (!empty($arrayfields['f.multicurrency_code']['checked'])) {
+				print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Currency rate
+			if (!empty($arrayfields['f.multicurrency_tx']['checked'])) {
+				print '<td class="nowrap">';
+				$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
+				print "</td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Amount HT
+			if (!empty($arrayfields['f.multicurrency_total_ht']['checked'])) {
+				print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ht)."</span></td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Amount VAT
+			if (!empty($arrayfields['f.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
+			if (!empty($arrayfields['f.multicurrency_total_ttc']['checked'])) {
+				print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ttc)."</span></td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			if (!empty($arrayfields['multicurrency_dynamount_payed']['checked'])) {
+				print '<td class="right nowrap"><span class="amount">'.(!empty($multicurrency_totalpay) ?price($multicurrency_totalpay, 0, $langs) : '').'</span></td>'; // TODO Use a denormalized field
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Pending amount
+			if (!empty($arrayfields['multicurrency_rtp']['checked'])) {
+				print '<td class="right nowrap"><span class="amount">';
+				print (!empty($multicurrency_remaintopay) ? price($multicurrency_remaintopay, 0, $langs) : '');
+				print '</span></td>'; // TODO Use a denormalized field
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+
+			// Extra fields
+			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+			// Fields from hook
+			$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			print $hookmanager->resPrint;
+
+			// Date creation
+			if (!empty($arrayfields['f.datec']['checked'])) {
+				print '<td class="center nowrap">';
+				print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Date modification
+			if (!empty($arrayfields['f.tms']['checked'])) {
+				print '<td class="center nowrap">';
+				print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Status
+			if (!empty($arrayfields['f.fk_statut']['checked'])) {
+				print '<td class="right nowrap">';
+				print $facturestatic->LibStatut($obj->paye, $obj->fk_statut, 5, $paiement, $obj->type);
+				print "</td>";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Action column
+			if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+				print '<td class="nowrap center">';
+				if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+					$selected = 0;
+					if (in_array($obj->facid, $arrayofselected)) {
+						$selected = 1;
+					}
+					print '<input id="cb'.$obj->facid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->facid.'"'.($selected ? ' checked="checked"' : '').'>';
+				}
+				print '</td>';
+			}
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+
+			print "</tr>\n";
+		}
 		$i++;
 	}
 

From 7f96c642f1c610df3f7578bc60bc2da00e079ee8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Jan 2023 14:09:20 +0100
Subject: [PATCH 432/816] Doc

---
 .../mysql/tables/llx_societe_account.sql      | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/htdocs/install/mysql/tables/llx_societe_account.sql b/htdocs/install/mysql/tables/llx_societe_account.sql
index b200d4f3854..56eb4eb1985 100644
--- a/htdocs/install/mysql/tables/llx_societe_account.sql
+++ b/htdocs/install/mysql/tables/llx_societe_account.sql
@@ -1,4 +1,4 @@
--- Copyright (C) 2016	Laurent Destailleur	<eldy@users.sourceforge.net>
+-- Copyright (C) 2016-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
@@ -19,16 +19,17 @@
 CREATE TABLE llx_societe_account(
 	-- BEGIN MODULEBUILDER FIELDS
 	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
-	entity	integer DEFAULT 1, 
-	login             varchar(128) NOT NULL, 
+	entity	integer DEFAULT 1,
+	
+	login             varchar(128) NOT NULL,    -- a login string into website or external system 
 	pass_encoding     varchar(24),
-	pass_crypted      varchar(128),
+	pass_crypted      varchar(128),             -- the hashed password
 	pass_temp         varchar(128),			    -- temporary password when asked for forget password
-	fk_soc integer,
-	fk_website        integer,					-- id of local web site
-	site              varchar(128),				-- name of external web site
-	site_account      varchar(128),				-- a key to identify the account on external web site
-	key_account       varchar(128),				-- the id of third party in external web site (for site_account if site_account defined)
+	fk_soc            integer,                  -- if entry is linked to a thirdparty
+	fk_website        integer,					-- id of local web site (if dk_website is filled, site is empty)
+	site              varchar(128),				-- name of external web site (if site is filled, fk_website is empty)
+	site_account      varchar(128),				-- a key to identify the account on external web site (for example: 'stripe', 'paypal', 'myextapp') 
+	key_account       varchar(128),				-- the id of an account in external web site (for site_account if site_account defined. some sites needs both an account name and a login that is different)
 	note_private      text,
 	date_last_login   datetime,
 	date_previous_login datetime,

From 0601db1c7a3d5973c8c84dfa17c270d1256c49ed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Jan 2023 14:19:12 +0100
Subject: [PATCH 433/816] Doc

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

diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index 1767973a001..f626139abcb 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -23,7 +23,7 @@
 /**
  *     \file       htdocs/societe/societecontact.php
  *     \ingroup    societe
- *     \brief      Onglet de gestion des contacts additionnel d'une société
+ *     \brief      Tab to manage differently contact. Used when unstable feature MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES is on.
  */
 
 

From 7dea3cca50681f5d96d9a942d96166c1a931487c Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Tue, 10 Jan 2023 14:40:06 +0100
Subject: [PATCH 434/816] kanban for list of Donnation

---
 htdocs/don/class/don.class.php | 35 ++++++++++++
 htdocs/don/list.php            | 97 +++++++++++++++++++++++-----------
 2 files changed, 101 insertions(+), 31 deletions(-)

diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 333f9673175..9c80cb85dad 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -1141,4 +1141,39 @@ class Don extends CommonObject
 			return (float) $this->amount - $sum_amount;
 		}
 	}
+
+		/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $langs;
+
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
+		if (property_exists($this, 'date')) {
+			$return .= ' | <span class="opacitymedium" >'.$langs->trans("Date").'</span> : <span class="info-box-label">'.dol_print_date($this->date).'</span>';
+		}
+		if (property_exists($this, 'societe') && !empty($this->societe)) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("Company").'</span> : <span class="info-box-label">'.$this->societe.'</span>';
+		}
+		if (property_exists($this, 'amount')) {
+			$return .= '<br><span class="opacitymedium" >'.$langs->trans("Amount").'</span> : <span class="info-box-label amount">'.price($this->amount).'</span>';
+		}
+		if (method_exists($this, 'LibStatut')) {
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->LibStatut($this->labelStatus, 5).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index ac704571daa..469ebbef6a9 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -42,6 +42,7 @@ $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 $type = GETPOST('type', 'aZ');
+$mode = GETPOST('mode', 'alpha');
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -153,6 +154,9 @@ if ($resql) {
 	$i = 0;
 
 	$param = '';
+	if (!empty($mode)) {
+		$param .= '&mode='.urlencode($mode);
+	}
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 		$param .= '&contextpage='.urlencode($contextpage);
 	}
@@ -179,6 +183,8 @@ if ($resql) {
 	}
 
 	$newcardbutton = '';
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
 	if ($user->rights->don->creer) {
 		$newcardbutton .= dolGetButtonTitle($langs->trans('NewDonation'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/don/card.php?action=create');
 	}
@@ -193,6 +199,9 @@ if ($resql) {
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="type" value="'.$type.'">';
+	print '<input type="hidden" name="mode" value="'.$mode.'">';
+
+
 
 	print_barre_liste($langs->trans("Donations"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'object_donation', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -267,44 +276,70 @@ if ($resql) {
 
 	while ($i < min($num, $limit)) {
 		$objp = $db->fetch_object($resql);
+		$donationstatic->setVarsFromFetchObj($objp);
+		$company = new Societe($db);
+		$result = $company->fetch($objp->socid);
+
+		if ($mode == 'kanban') {
+			if ($i == 0) {
+				print '<tr><td colspan="12">';
+				print '<div class="box-flex-container">';
+			}
+			// Output Kanban
+			$donationstatic->amount = $objp->amount;
+			$donationstatic->date = $objp->datedon;
+			$donationstatic->labelStatus = $objp->status;
+			$donationstatic->id = $objp->rowid;
+			$donationstatic->ref = $objp->rowid;
 
-		print '<tr class="oddeven">';
-		$donationstatic->id = $objp->rowid;
-		$donationstatic->ref = $objp->rowid;
-		$donationstatic->lastname = $objp->lastname;
-		$donationstatic->firstname = $objp->firstname;
-		print "<td>".$donationstatic->getNomUrl(1)."</td>";
-		if (!empty($conf->global->DONATION_USE_THIRDPARTIES)) {
-			$company = new Societe($db);
-			$result = $company->fetch($objp->socid);
 			if (!empty($objp->socid) && $company->id > 0) {
-				print "<td>".$company->getNomUrl(1)."</td>";
+				$donationstatic->societe = $company->getNomUrl(1);
+			} else {
+				$donationstatic->societe = $objp->societe;
+			}
+
+			print $donationstatic->getKanbanView('');
+			if ($i == (min($num, $limit) - 1)) {
+				print '</div>';
+				print '</td></tr>';
+			}
+		} else {
+			print '<tr class="oddeven">';
+			$donationstatic->id = $objp->rowid;
+			$donationstatic->ref = $objp->rowid;
+			$donationstatic->lastname = $objp->lastname;
+			$donationstatic->firstname = $objp->firstname;
+			print "<td>".$donationstatic->getNomUrl(1)."</td>";
+			if (!empty($conf->global->DONATION_USE_THIRDPARTIES)) {
+				if (!empty($objp->socid) && $company->id > 0) {
+					print "<td>".$company->getNomUrl(1)."</td>";
+				} else {
+					print "<td>".$objp->societe."</td>";
+				}
 			} else {
 				print "<td>".$objp->societe."</td>";
 			}
-		} else {
-			print "<td>".$objp->societe."</td>";
-		}
-		print "<td>".$donationstatic->getFullName($langs)."</td>";
-		print '<td class="center">'.dol_print_date($db->jdate($objp->datedon), 'day').'</td>';
-		if (isModEnabled('project')) {
-			print "<td>";
-			if ($objp->pid) {
-				$projectstatic->id = $objp->pid;
-				$projectstatic->ref = $objp->ref;
-				$projectstatic->id = $objp->pid;
-				$projectstatic->public = $objp->public;
-				$projectstatic->title = $objp->title;
-				print $projectstatic->getNomUrl(1);
-			} else {
-				print '&nbsp;';
+			print "<td>".$donationstatic->getFullName($langs)."</td>";
+			print '<td class="center">'.dol_print_date($db->jdate($objp->datedon), 'day').'</td>';
+			if (isModEnabled('project')) {
+				print "<td>";
+				if ($objp->pid) {
+					$projectstatic->id = $objp->pid;
+					$projectstatic->ref = $objp->ref;
+					$projectstatic->id = $objp->pid;
+					$projectstatic->public = $objp->public;
+					$projectstatic->title = $objp->title;
+					print $projectstatic->getNomUrl(1);
+				} else {
+					print '&nbsp;';
+				}
+				print "</td>\n";
 			}
-			print "</td>\n";
+			print '<td class="right"><span class="amount">'.price($objp->amount).'</span></td>';
+			print '<td class="right">'.$donationstatic->LibStatut($objp->status, 5).'</td>';
+			print '<td></td>';
+			print "</tr>";
 		}
-		print '<td class="right"><span class="amount">'.price($objp->amount).'</span></td>';
-		print '<td class="right">'.$donationstatic->LibStatut($objp->status, 5).'</td>';
-		print '<td></td>';
-		print "</tr>";
 		$i++;
 	}
 	print "</table>";

From 8e53013bd97062dbc334032402e563d36ccb6679 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Tue, 10 Jan 2023 15:36:14 +0100
Subject: [PATCH 435/816] kanban mode for list of TVA

---
 htdocs/compta/tva/class/tva.class.php |  35 +++++
 htdocs/compta/tva/list.php            | 209 ++++++++++++++------------
 2 files changed, 152 insertions(+), 92 deletions(-)

diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index dffba34d59b..78fb178ff27 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -906,4 +906,39 @@ class Tva extends CommonObject
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
+
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $langs;
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		//$return .= '<i class="fa fa-dol-action"></i>'; // Can be image
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
+		if (property_exists($this, 'amount')) {
+			$return .= ' | <span class="opacitymedium">'.$langs->trans("Amount").'</span> : <span class="info-box-label amount">'.price($this->amount).'</span>';
+		}
+		if (property_exists($this, 'type_payment')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("Payement").'</span> : <span class="info-box-label">'.$this->type_payment.'</span>';
+		}
+		if (property_exists($this, 'datev')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("DateEnd").'</span> : <span class="info-box-label" >'.dol_print_date($this->datev).'</span>';
+		}
+		if (method_exists($this, 'LibStatut')) {
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->LibStatut($this->paiementtype, 5, $this->alreadypaid).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 1c70cf93c22..e0d5e094c35 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -44,6 +44,7 @@ $massaction					= GETPOST('massaction', 'alpha');
 $confirm					= GETPOST('confirm', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
 $contextpage				= GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'salestaxeslist';
+$mode = GETPOST('mode', 'alpha');
 
 $search_ref					= GETPOST('search_ref', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
@@ -230,6 +231,9 @@ if (!$resql) {
 $num = $db->num_rows($resql);
 
 $param = '';
+if (!empty($mode)) {
+	$param .= '&mode='.urlencode($mode);
+}
 if (!empty($contextpage) && $contextpage != $_SERVER['PHP_SELF']) {
 	$param .= '&contextpage='.$contextpage;
 }
@@ -317,7 +321,10 @@ $url = DOL_URL_ROOT.'/compta/tva/card.php?action=create';
 if (!empty($socid)) {
 	$url .= '&socid='.$socid;
 }
-$newcardbutton = dolGetButtonTitle($langs->trans('NewVATPayment'), '', 'fa fa-plus-circle', $url, '', $user->rights->tax->charges->creer);
+$newcardbutton = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('NewVATPayment'), '', 'fa fa-plus-circle', $url, '', $user->rights->tax->charges->creer);
 print_barre_liste($langs->trans("VATDeclarations"), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 $varpage = empty($contextpage) ? $_SERVER['PHP_SELF'] : $contextpage;
@@ -461,116 +468,134 @@ while ($i < min($num, $limit)) {
 	$tva_static->id = $obj->rowid;
 	$tva_static->ref = $obj->rowid;
 	$tva_static->label = $obj->label;
+	$tva_static->paiementtype = $obj->paye;
+	$tva_static->type_payment = $obj->payment_code;
+	$tva_static->datev = $obj->datev;
+	$tva_static->amount = $obj->amount;
 
-	print '<tr class="oddeven">';
-
-	// No
-	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
-		print '<td>'.(($offset * $limit) + $i).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr><td colspan="12">';
+			print '<div class="box-flex-container">';
 		}
-	}
+		// Output Kanban
 
-	// Ref
-	if (!empty($arrayfields['t.rowid']['checked'])) {
-		print '<td>';
-		print $tva_static->getNomUrl(1);
-		$filename = dol_sanitizeFileName($tva_static->ref);
-		$filedir = $conf->tax->dir_output.'/vat/'.dol_sanitizeFileName($tva_static->ref);
-		$urlsource = $_SERVER['PHP_SELF'].'?id='.$tva_static->id;
-		print $formfile->getDocumentsLink($tva_static->element, $filename, $filedir, '', 'valignmiddle paddingleft2imp');
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
+		print $tva_static->getKanbanView('');
+		if ($i == (min($num, $limit) - 1)) {
+			print '</div>';
+			print '</td></tr>';
 		}
-	}
+	} else {
+		print '<tr class="oddeven">';
 
-	// Label
-	if (!empty($arrayfields['t.label']['checked'])) {
-		print '<td>'.dol_trunc($obj->label, 40).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
+		// No
+		if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+			print '<td>'.(($offset * $limit) + $i).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
-	}
 
-	// Date end period
-	if (!empty($arrayfields['t.datev']['checked'])) {
-		print '<td class="center">'.dol_print_date($db->jdate($obj->datev), 'day').'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
+		// Ref
+		if (!empty($arrayfields['t.rowid']['checked'])) {
+			print '<td>';
+			print $tva_static->getNomUrl(1);
+			$filename = dol_sanitizeFileName($tva_static->ref);
+			$filedir = $conf->tax->dir_output.'/vat/'.dol_sanitizeFileName($tva_static->ref);
+			$urlsource = $_SERVER['PHP_SELF'].'?id='.$tva_static->id;
+			print $formfile->getDocumentsLink($tva_static->element, $filename, $filedir, '', 'valignmiddle paddingleft2imp');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
-	}
 
-	// Date payment
-	/*if (!empty($arrayfields['t.datep']['checked'])) {
-		print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day').'</td>';
-		if (!$i) $totalarray['nbfield']++;
-	}*/
-
-	// Type
-	if (!empty($arrayfields['t.fk_typepayment']['checked'])) {
-		print '<td>';
-		if (!empty($obj->payment_code)) print $langs->trans("PaymentTypeShort".$obj->payment_code);
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
+		// Label
+		if (!empty($arrayfields['t.label']['checked'])) {
+			print '<td>'.dol_trunc($obj->label, 40).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
-	}
 
-	// Account
-	if (!empty($arrayfields['t.fk_account']['checked'])) {
-		print '<td>';
-		if ($obj->fk_account > 0) {
-			$bankstatic->id = $obj->fk_account;
-			$bankstatic->ref = $obj->bref;
-			$bankstatic->number = $obj->bnumber;
-			$bankstatic->iban = $obj->iban;
-			$bankstatic->bic = $obj->bic;
-			$bankstatic->currency_code = $langs->trans("Currency".$obj->currency_code);
-			$bankstatic->account_number = $obj->account_number;
-			$bankstatic->clos = $obj->clos;
-
-			//$accountingjournal->fetch($obj->fk_accountancy_journal);
-			//$bankstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
-
-			$bankstatic->label = $obj->blabel;
-			print $bankstatic->getNomUrl(1);
+		// Date end period
+		if (!empty($arrayfields['t.datev']['checked'])) {
+			print '<td class="center">'.dol_print_date($db->jdate($obj->datev), 'day').'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
-		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
-	}
 
-	// Amount
-	if (!empty($arrayfields['t.amount']['checked'])) {
-		$total = $total + $obj->amount;
-		print '<td class="nowrap right"><span class="amount">' . price($obj->amount) . '</span></td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-		$totalarray['pos'][$totalarray['nbfield']] = 'amount';
-		if (empty($totalarray['val']['amount'])) {
-			$totalarray['val']['amount'] = $obj->amount;
-		} else {
-			$totalarray['val']['amount'] += $obj->amount;
-		}
-	}
+		// Date payment
+		/*if (!empty($arrayfields['t.datep']['checked'])) {
+			print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day').'</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}*/
 
-	if (!empty($arrayfields['t.status']['checked'])) {
-		print '<td class="nowrap right">' . $tva_static->LibStatut($obj->paye, 5, $obj->alreadypayed) . '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
+		// Type
+		if (!empty($arrayfields['t.fk_typepayment']['checked'])) {
+			print '<td>';
+			if (!empty($obj->payment_code)) print $langs->trans("PaymentTypeShort".$obj->payment_code);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
+
+		// Account
+		if (!empty($arrayfields['t.fk_account']['checked'])) {
+			print '<td>';
+			if ($obj->fk_account > 0) {
+				$bankstatic->id = $obj->fk_account;
+				$bankstatic->ref = $obj->bref;
+				$bankstatic->number = $obj->bnumber;
+				$bankstatic->iban = $obj->iban;
+				$bankstatic->bic = $obj->bic;
+				$bankstatic->currency_code = $langs->trans("Currency".$obj->currency_code);
+				$bankstatic->account_number = $obj->account_number;
+				$bankstatic->clos = $obj->clos;
+
+				//$accountingjournal->fetch($obj->fk_accountancy_journal);
+				//$bankstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
+
+				$bankstatic->label = $obj->blabel;
+				print $bankstatic->getNomUrl(1);
+			}
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+
+		// Amount
 		if (!empty($arrayfields['t.amount']['checked'])) {
-			$totalarray['pos'][$totalarray['nbfield']] = '';
+			$total = $total + $obj->amount;
+			print '<td class="nowrap right"><span class="amount">' . price($obj->amount) . '</span></td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			$totalarray['pos'][$totalarray['nbfield']] = 'amount';
+			if (empty($totalarray['val']['amount'])) {
+				$totalarray['val']['amount'] = $obj->amount;
+			} else {
+				$totalarray['val']['amount'] += $obj->amount;
+			}
 		}
+
+		if (!empty($arrayfields['t.status']['checked'])) {
+			print '<td class="nowrap right">' . $tva_static->LibStatut($obj->paye, 5, $obj->alreadypayed) . '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!empty($arrayfields['t.amount']['checked'])) {
+				$totalarray['pos'][$totalarray['nbfield']] = '';
+			}
+		}
+
+		// Buttons
+		print '<td></td>';
+
+		print '</tr>';
 	}
 
-	// Buttons
-	print '<td></td>';
-
-	print '</tr>';
-
 	$i++;
 }
 

From 8238d1df97fa3ef054798f3e97baa3e6887b0697 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Tue, 10 Jan 2023 16:17:16 +0100
Subject: [PATCH 436/816] kanban mode for list charge social

---
 .../sociales/class/chargesociales.class.php   |  34 ++
 htdocs/compta/sociales/list.php               | 306 ++++++++++--------
 2 files changed, 200 insertions(+), 140 deletions(-)

diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 37b3540a0f5..b5e98b3b62e 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -749,4 +749,38 @@ class ChargeSociales extends CommonObject
 		$this->type = 1;
 		$this->type_label = 'Type of social contribution';
 	}
+
+		/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $langs;
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
+		if (property_exists($this, 'fk_project') && !empty($this->fk_project)) {
+			$return .= ' | <span class="info-box-label">'.$this->fk_project.'</span>';
+		}
+		if (property_exists($this, 'date_ech')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("DateEnd").'</span>:<span class="info-box-label">'.dol_print_date($this->date_ech).'</span>';
+		}
+		if (property_exists($this, 'amount')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("Amount").'</span> : <span class="info-box-label amount">'.price($this->amount).'</span>';
+		}
+		if (method_exists($this, 'LibStatut')) {
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->LibStatut($this->paye, 5, $this->alreadypaid).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index f70ed44de0c..18a67ff9e29 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -47,6 +47,8 @@ $massaction = GETPOST('massaction', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'sclist';
+$mode = GETPOST('mode', 'alpha');
+
 
 $search_ref = GETPOST('search_ref', 'int');
 $search_label = GETPOST('search_label', 'alpha');
@@ -294,6 +296,9 @@ $num = $db->num_rows($resql);
 $i = 0;
 
 $param = '';
+if (!empty($mode)) {
+	$param .= '&mode='.urlencode($mode);
+}
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 	$param .= '&contextpage='.urlencode($contextpage);
 }
@@ -367,6 +372,8 @@ if ($search_date_limit_endyear) {
 }
 
 $newcardbutton = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
 if ($user->rights->tax->charges->creer) {
 	$newcardbutton .= dolGetButtonTitle($langs->trans('MenuNewSocialContribution'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/sociales/card.php?action=create');
 }
@@ -382,6 +389,8 @@ print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="search_status" value="'.$search_status.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
+
 
 $center = '';
 
@@ -576,162 +585,179 @@ while ($i < min($num, $limit)) {
 	$chargesociale_static->ref = $obj->rowid;
 	$chargesociale_static->label = $obj->label;
 	$chargesociale_static->type_label = $obj->type_label;
+	$chargesociale_static->amount = $obj->amount;
+	$chargesociale_static->paye = $obj->paye;
+	$chargesociale_static->date_ech = $obj->date_ech;
+
 
 	if (isModEnabled('project')) {
 		$projectstatic->id = $obj->project_id;
 		$projectstatic->ref = $obj->project_ref;
 		$projectstatic->title = $obj->project_label;
 	}
-
-	print '<tr class="oddeven">';
-
-	// Line number
-	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
-		print '<td>'.(($offset * $limit) + $i).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr><td colspan="12">';
+			print '<div class="box-flex-container">';
 		}
-	}
+		// Output Kanban
 
-	// Ref
-	if (!empty($arrayfields['cs.rowid']['checked'])) {
-		print '<td>'.$chargesociale_static->getNomUrl(1, '20').'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
+		$chargesociale_static->fk_project = $projectstatic->getNomUrl();
+		print $chargesociale_static->getKanbanView('');
+		if ($i == (min($num, $limit) - 1)) {
+			print '</div>';
+			print '</td></tr>';
 		}
-	}
+	} else {
+		print '<tr class="oddeven">';
 
-	// Label
-	if (!empty($arrayfields['cs.libelle']['checked'])) {
-		print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->label).'">'.dol_escape_htmltag($obj->label).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Type
-	if (!empty($arrayfields['cs.fk_type']['checked'])) {
-		$typelabeltoshow = $obj->type_label;
-		$typelabelpopup = $obj->type_label;
-		if (isModEnabled('accounting')) {
-			$typelabelpopup .= ' - '.$langs->trans("AccountancyCode").': '.$obj->type_accountancy_code;
-		}
-		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($typelabelpopup).'">'.dol_escape_htmltag($typelabeltoshow).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Date
-	if (!empty($arrayfields['cs.date_ech']['checked'])) {
-		print '<td class="center nowraponall">'.dol_print_date($db->jdate($obj->date_ech), 'day').'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Date end period
-	if (!empty($arrayfields['cs.periode']['checked'])) {
-		print '<td class="center nowraponall">'.dol_print_date($db->jdate($obj->periode), 'day').'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Project ref
-	if (!empty($arrayfields['p.ref']['checked'])) {
-		print '<td class="nowraponall">';
-		if ($obj->project_id > 0) {
-			print $projectstatic->getNomUrl(1);
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	if (!empty($arrayfields['cs.fk_user']['checked'])) {
-		// Employee
-		print '<td class="tdoverflowmax150">';
-		if (!empty($obj->fk_user)) {
-			if (!empty($TLoadedUsers[$obj->fk_user])) {
-				$ustatic = $TLoadedUsers[$obj->fk_user];
-			} else {
-				$ustatic = new User($db);
-				$ustatic->fetch($obj->fk_user);
-				$TLoadedUsers[$obj->fk_user] = $ustatic;
+		// Line number
+		if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+			print '<td>'.(($offset * $limit) + $i).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
 			}
-			print $ustatic->getNomUrl(-1);
 		}
-		print "</td>\n";
+
+		// Ref
+		if (!empty($arrayfields['cs.rowid']['checked'])) {
+			print '<td>'.$chargesociale_static->getNomUrl(1, '20').'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Label
+		if (!empty($arrayfields['cs.libelle']['checked'])) {
+			print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->label).'">'.dol_escape_htmltag($obj->label).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Type
+		if (!empty($arrayfields['cs.fk_type']['checked'])) {
+			$typelabeltoshow = $obj->type_label;
+			$typelabelpopup = $obj->type_label;
+			if (isModEnabled('accounting')) {
+				$typelabelpopup .= ' - '.$langs->trans("AccountancyCode").': '.$obj->type_accountancy_code;
+			}
+			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($typelabelpopup).'">'.dol_escape_htmltag($typelabeltoshow).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Date
+		if (!empty($arrayfields['cs.date_ech']['checked'])) {
+			print '<td class="center nowraponall">'.dol_print_date($db->jdate($obj->date_ech), 'day').'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Date end period
+		if (!empty($arrayfields['cs.periode']['checked'])) {
+			print '<td class="center nowraponall">'.dol_print_date($db->jdate($obj->periode), 'day').'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Project ref
+		if (!empty($arrayfields['p.ref']['checked'])) {
+			print '<td class="nowraponall">';
+			if ($obj->project_id > 0) {
+				print $projectstatic->getNomUrl(1);
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		if (!empty($arrayfields['cs.fk_user']['checked'])) {
+			// Employee
+			print '<td class="tdoverflowmax150">';
+			if (!empty($obj->fk_user)) {
+				if (!empty($TLoadedUsers[$obj->fk_user])) {
+					$ustatic = $TLoadedUsers[$obj->fk_user];
+				} else {
+					$ustatic = new User($db);
+					$ustatic->fetch($obj->fk_user);
+					$TLoadedUsers[$obj->fk_user] = $ustatic;
+				}
+				print $ustatic->getNomUrl(-1);
+			}
+			print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Type
+		if (!empty($arrayfields['cs.fk_mode_reglement']['checked'])) {
+			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);
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Account
+		if (!empty($arrayfields['cs.fk_account']['checked'])) {
+			print '<td class="toverflowmax150">';
+			if ($obj->fk_account > 0) {
+				$bankstatic->id = $obj->fk_account;
+				$bankstatic->ref = $obj->bref;
+				$bankstatic->number = $obj->bnumber;
+				$bankstatic->iban = $obj->iban;
+				$bankstatic->bic = $obj->bic;
+				$bankstatic->currency_code = $langs->trans("Currency".$obj->currency_code);
+				$bankstatic->account_number = $obj->account_number;
+				$bankstatic->clos = $obj->clos;
+
+				//$accountingjournal->fetch($obj->fk_accountancy_journal);
+				//$bankstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
+
+				$bankstatic->label = $obj->blabel;
+				print $bankstatic->getNomUrl(1);
+			}
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+
+		// Amount
+		if (!empty($arrayfields['cs.amount']['checked'])) {
+			print '<td class="nowraponall amount right">'.price($obj->amount).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
+			}
+			$totalarray['val']['totalttcfield'] += $obj->amount;
+		}
+
+		// Status
+		if (!empty($arrayfields['cs.paye']['checked'])) {
+			print '<td class="nowraponall right">'.$chargesociale_static->LibStatut($obj->paye, 5, $obj->alreadypayed).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Buttons
+		print '<td></td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
+
+		print '</tr>'."\n";
 	}
-
-	// Type
-	if (!empty($arrayfields['cs.fk_mode_reglement']['checked'])) {
-		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);
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Account
-	if (!empty($arrayfields['cs.fk_account']['checked'])) {
-		print '<td class="toverflowmax150">';
-		if ($obj->fk_account > 0) {
-			$bankstatic->id = $obj->fk_account;
-			$bankstatic->ref = $obj->bref;
-			$bankstatic->number = $obj->bnumber;
-			$bankstatic->iban = $obj->iban;
-			$bankstatic->bic = $obj->bic;
-			$bankstatic->currency_code = $langs->trans("Currency".$obj->currency_code);
-			$bankstatic->account_number = $obj->account_number;
-			$bankstatic->clos = $obj->clos;
-
-			//$accountingjournal->fetch($obj->fk_accountancy_journal);
-			//$bankstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
-
-			$bankstatic->label = $obj->blabel;
-			print $bankstatic->getNomUrl(1);
-		}
-		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
-	}
-
-	// Amount
-	if (!empty($arrayfields['cs.amount']['checked'])) {
-		print '<td class="nowraponall amount right">'.price($obj->amount).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-		if (!$i) {
-			$totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
-		}
-		$totalarray['val']['totalttcfield'] += $obj->amount;
-	}
-
-	// Status
-	if (!empty($arrayfields['cs.paye']['checked'])) {
-		print '<td class="nowraponall right">'.$chargesociale_static->LibStatut($obj->paye, 5, $obj->alreadypayed).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Buttons
-	print '<td></td>';
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
-
-	print '</tr>'."\n";
-
 	$i++;
 }
 

From d1e7e527ba63d2edea7b50689e5090dad2b8bfa4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Jan 2023 16:31:12 +0100
Subject: [PATCH 437/816] Debug virtual card

---
 htdocs/core/class/vcard.class.php | 226 ++++++++++++++++++++----------
 htdocs/public/users/view.php      | 106 +++++++++-----
 htdocs/user/virtualcard.php       |   8 ++
 3 files changed, 230 insertions(+), 110 deletions(-)

diff --git a/htdocs/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php
index 8a62c0aea5e..0e9372360e6 100644
--- a/htdocs/core/class/vcard.class.php
+++ b/htdocs/core/class/vcard.class.php
@@ -117,22 +117,25 @@ class vCard
 		if ($type != "") {
 			$key .= ";".$type;
 		}
-		$key .= ";".$this->encoding;
-		$this->properties[$key] = 'VALUE=uri:tel:'.encode($number);
+		$key .= ";VALUE=uri";
+		//$key .= ";".$this->encoding;
+		$this->properties[$key] = 'tel:'.$number;
 	}
 
 	/**
 	 *	mise en forme de la photo
 	 *  warning NON TESTE !
 	 *
-	 *  @param  string  $type			Type 'image/gif'
+	 *  @param  string  $type			Type 'image/jpeg' or 'JPEG'
 	 *  @param  string  $photo			Photo
 	 *  @return	void
 	 */
 	public function setPhoto($type, $photo)
 	{
 		// $type = "GIF" | "JPEG"
-		$this->properties["PHOTO;MEDIATYPE=$type;ENCODING=BASE64"] = base64_encode($photo);
+		//$this->properties["PHOTO;MEDIATYPE=$type;ENCODING=BASE64"] = base64_encode($photo);
+		$this->properties["PHOTO;MEDIATYPE=$type"] = $photo;		// must be url of photo
+		//$this->properties["PHOTO;TYPE=$type;ENCODING=BASE64"] = base64_encode($photo);   // must be content of image
 	}
 
 	/**
@@ -152,13 +155,14 @@ class vCard
 	 *	@param	string	$family			Family name
 	 *	@param	string	$first			First name
 	 *	@param	string	$additional		Additional (e.g. second name, nick name)
-	 *	@param	string	$prefix			Prefix (e.g. "Mr.", "Ms.", "Prof.")
+	 *	@param	string	$prefix			Title prefix (e.g. "Mr.", "Ms.", "Prof.")
 	 *	@param	string	$suffix			Suffix (e.g. "sen." for senior, "jun." for junior)
 	 *	@return	void
 	 */
 	public function setName($family = "", $first = "", $additional = "", $prefix = "", $suffix = "")
 	{
-		$this->properties["N;".$this->encoding] = encode($family).";".encode($first).";".encode($additional).";".encode($prefix).";".encode($suffix);
+		//$this->properties["N;".$this->encoding] = encode($family).";".encode($first).";".encode($additional).";".encode($prefix).";".encode($suffix);
+		$this->properties["N"] = encode($family).";".encode($first).";".encode($additional).";".encode($prefix).";".encode($suffix);
 		$this->filename = "$first%20$family.vcf";
 		if (empty($this->properties["FN"])) {
 			$this->setFormattedName(trim("$prefix $first $additional $family $suffix"));
@@ -173,8 +177,9 @@ class vCard
 	 */
 	public function setBirthday($date)
 	{
-		// $date format is YYYY-MM-DD - RFC 2425 and RFC 2426
-		$this->properties["BDAY"] = dol_print_date($date, 'dayrfc');
+		// $date format is YYYY-MM-DD - RFC 2425 and RFC 2426 for vcard v3
+		// $date format is YYYYMMDD or ISO8601 for vcard v4
+		$this->properties["BDAY"] = dol_print_date($date, 'dayxcard');
 	}
 
 	/**
@@ -309,7 +314,7 @@ class vCard
 	 */
 	public function setProdId($prodid)
 	{
-		$this->properties["PRODID;".$this->encoding] = encode($prodid);
+		$this->properties["PRODID"] = encode($prodid);
 	}
 
 
@@ -321,7 +326,7 @@ class vCard
 	 */
 	public function setUID($uid)
 	{
-		$this->properties["UID;".$this->encoding] = encode($uid);
+		$this->properties["UID"] = encode($uid);
 	}
 
 
@@ -355,7 +360,7 @@ class vCard
 		foreach ($this->properties as $key => $value) {
 			$text .= $key.":".$value."\r\n";
 		}
-		$text .= "REV:".date("Y-m-d")."T".date("H:i:s")."Z\r\n";
+		$text .= "REV:".date("Ymd")."T".date("His")."Z\r\n";
 		//$text .= "MAILER: Dolibarr\r\n";
 		$text .= "END:VCARD\r\n";
 		return $text;
@@ -374,12 +379,13 @@ class vCard
 	/**
 	 * Return a VCARD string
 	 *
-	 * @param	Object		$object		Object (User, Contact)
-	 * @param	Societe		$company	Company
-	 * @param	Translate	$langs		Lang object
-	 * @return	string					String
+	 * @param	Object			$object		Object (User or Contact)
+	 * @param	Societe|null	$company	Company. May be null
+	 * @param	Translate		$langs		Lang object
+	 * @param	string			$urlphoto	Full public URL of photo
+	 * @return	string						String
 	 */
-	public function buildVCardString($object, $company, $langs)
+	public function buildVCardString($object, $company, $langs, $urlphoto = '')
 	{
 		global $dolibarr_main_instance_unique_id;
 
@@ -389,70 +395,136 @@ class vCard
 		$this->setName($object->lastname, $object->firstname, "", $object->civility_code, "");
 		$this->setFormattedName($object->getFullName($langs, 1));
 
-		$this->setPhoneNumber($object->office_phone, "TYPE=WORK,VOICE");
-		$this->setPhoneNumber($object->personal_mobile, "TYPE=HOME,VOICE");
-		$this->setPhoneNumber($object->user_mobile, "TYPE=CELL,VOICE");
-		$this->setPhoneNumber($object->office_fax, "TYPE=WORK,FAX");
-
-		$country = $object->country_code ? $object->country : '';
-
-		$this->setAddress("", "", $object->address, $object->town, $object->state, $object->zip, $country, "TYPE=WORK");
-		//$this->setLabel("", "", $object->address, $object->town, $object->state, $object->zip, $country, "TYPE=WORK");
-
-		$this->setEmail($object->email, "TYPE=WORK");
-		$this->setNote($object->note_public);
-		$this->setTitle($object->job);
-
-		// For user, type=home
-		// For contact, this is not defined
-		$this->setURL($object->url, "TYPE=HOME");
-
-		if (is_object($company)) {
-			$this->setURL($company->url, "TYPE=WORK");
-
-			if (!$object->office_phone) {
-				$this->setPhoneNumber($company->phone, "TYPE=WORK,VOICE");
-			}
-			if (!$object->office_fax) {
-				$this->setPhoneNumber($company->fax, "TYPE=WORK,FAX");
-			}
-			if (!$object->zip) {
-				$this->setAddress("", "", $company->address, $company->town, $company->state, $company->zip, $company->country, "TYPE=WORK");
-			}
-
-			// when company e-mail is empty, use only user e-mail
-			if (empty(trim($company->email))) {
-				// was set before, don't set twice
-			} elseif (empty(trim($object->email))) {
-				// when user e-mail is empty, use only company e-mail
-				$this->setEmail($company->email, "TYPE=WORK");
-			} else {
-				$tmpuser2 = explode("@", trim($object->email));
-				$tmpcompany = explode("@", trim($company->email));
-
-				if (strtolower(end($tmpuser2)) == strtolower(end($tmpcompany))) {
-					// when e-mail domain of user and company are the same, use user e-mail at first (and company e-mail at second)
-					$this->setEmail($object->email, "TYPE=WORK");
-
-					// support by Microsoft Outlook (2019 and possible earlier)
-					$this->setEmail($company->email, '');
-				} else {
-					// when e-mail of user and company complete different use company e-mail at first (and user e-mail at second)
-					$this->setEmail($company->email, "TYPE=WORK");
-
-					// support by Microsoft Outlook (2019 and possible earlier)
-					$this->setEmail($object->email, '');
-				}
-			}
-
-			// Si user lie a un tiers non de type "particulier"
-			if ($company->typent_code != 'TE_PRIVATE') {
-				$this->setOrg($company->name);
+		if ($urlphoto) {
+			$mimetype = dol_mimetype($urlphoto);
+			if ($mimetype) {
+				$this->setPhoto($mimetype, $urlphoto);
 			}
 		}
 
-		// Personal informations
-		$this->setPhoneNumber($object->personal_mobile, "TYPE=HOME,VOICE");
+		if ($object->office_phone) {
+			$this->setPhoneNumber($object->office_phone, "TYPE=WORK,VOICE");
+		}
+		/* disabled
+		if ($object->personal_mobile) {
+			$this->setPhoneNumber($object->personal_mobile, "TYPE=CELL,VOICE");
+		}*/
+		if ($object->user_mobile) {
+			$this->setPhoneNumber($object->user_mobile, "TYPE=CELL,VOICE");
+		}
+		if ($object->office_fax) {
+			$this->setPhoneNumber($object->office_fax, "TYPE=WORK,FAX");
+		}
+
+		if (!empty($object->socialnetworks)) {
+			foreach ($object->socialnetworks as $key => $val) {
+				$urlsn = '';
+				if ($key == 'linkedin') {
+					if (!preg_match('/^http/', $val)) {
+						$urlsn = 'https://www.'.$key.'.com/company/'.urlencode($val);
+					} else {
+						$urlsn = $val;
+					}
+				} elseif ($key == 'youtube') {
+					if (!preg_match('/^http/', $val)) {
+						$urlsn = 'https://www.'.$key.'.com/user/'.urlencode($val);
+					} else {
+						$urlsn = $val;
+					}
+				} else {
+					if (!preg_match('/^http/', $val)) {
+						$urlsn = 'https://www.'.$key.'.com/'.urlencode($val);
+					} else {
+						$urlsn = $val;
+					}
+				}
+				if ($urlsn) {
+					$this->properties["socialProfile;type=".$key] = $urlsn;
+				}
+			}
+		}
+
+		$country = $object->country_code ? $object->country : '';
+
+		if ($object->address || $object->town || $object->state || $object->zip || $object->country) {
+			$this->setAddress("", "", $object->address, $object->town, $object->state, $object->zip, $country, "TYPE=WORK");
+			//$this->setLabel("", "", $object->address, $object->town, $object->state, $object->zip, $country, "TYPE=HOME");
+		}
+
+		if ($object->email) {
+			$this->setEmail($object->email, "TYPE=WORK");
+		}
+		/* disabled
+		if ($object->personal_email) {
+			$this->setEmail($object->personal_email, "TYPE=HOME");
+		} */
+		if ($object->note_public) {
+			$this->setNote($object->note_public);
+		}
+		if ($object->job) {
+			$this->setTitle($object->job);
+		}
+
+		// For user, type=home
+		// For contact, $object->url is not defined
+		if ($object->url) {
+			$this->setURL($object->url, "");
+		}
+
+		if (is_object($company)) {
+			// Si user linked to a thirdparty and not a physical people
+			if ($company->typent_code != 'TE_PRIVATE') {
+				$this->setOrg($company->name);
+			}
+
+			$this->setURL($company->url, "");
+
+			if ($company->phone && $company->phone != $object->office_phone) {
+				$this->setPhoneNumber($company->phone, "TYPE=WORK,VOICE");
+			}
+			if ($company->fax && $company->fax != $object->office_fax) {
+				$this->setPhoneNumber($company->fax, "TYPE=WORK,FAX");
+			}
+			if ($company->address || $company->town || $company->state || $company->zip || $company->country) {
+				$this->setAddress("", "", $company->address, $company->town, $company->state, $company->zip, $company->country, "TYPE=WORK");
+			}
+
+			if ($company->email && $company->email != $object->email) {
+				$this->setEmail($company->email, "TYPE=WORK");
+			}
+
+			/*
+			if (!empty($company->socialnetworks)) {
+				foreach ($company->socialnetworks as $key => $val) {
+					$urlsn = '';
+					if ($key == 'linkedin') {
+						if (!preg_match('/^http/', $val)) {
+							$urlsn = 'https://www.'.$key.'.com/company/'.urlencode($val);
+						} else {
+							$urlsn = $val;
+						}
+					} elseif ($key == 'youtube') {
+						if (!preg_match('/^http/', $val)) {
+							$urlsn = 'https://www.'.$key.'.com/user/'.urlencode($val);
+						} else {
+							$urlsn = $val;
+						}
+					} else {
+						if (!preg_match('/^http/', $val)) {
+							$urlsn = 'https://www.'.$key.'.com/'.urlencode($val);
+						} else {
+							$urlsn = $val;
+						}
+					}
+					if ($urlsn) {
+						$this->properties["socialProfile;type=".$key] = $urlsn;
+					}
+				}
+			}
+			*/
+		}
+
+		// Birthday
 		if ($object->birth) {
 			$this->setBirthday($object->birth);
 		}
diff --git a/htdocs/public/users/view.php b/htdocs/public/users/view.php
index ba1a6dd0908..ec5f53377c2 100644
--- a/htdocs/public/users/view.php
+++ b/htdocs/public/users/view.php
@@ -91,13 +91,79 @@ if ($cancel) {
  */
 
 $form = new Form($db);
+$v = new vCard();
+
 $company = $mysoc;
 
-if ($mode == 'vcard') {
-	// We create VCard
-	$v = new vCard();
+$modulepart = 'userphotopublic';
+$dir = $conf->user->dir_output;
 
-	$output = $v->buildVCardString($object, $company, $langs);
+// Show logo (search order: logo defined by ONLINE_SIGN_LOGO_suffix, then ONLINE_SIGN_LOGO_, then small company logo, large company logo, theme logo, common logo)
+// Define logo and logosmall
+$logo = '';
+$logosmall = '';
+if (!empty($object->photo)) {
+	if (dolIsAllowedForPreview($object->photo)) {
+		$logosmall = get_exdir(0, 0, 0, 0, $object, 'user').'photos/'.getImageFileNameForSize($object->photo, '_small');
+		$logo = get_exdir(0, 0, 0, 0, $object, 'user').'photos/'.$object->photo;
+		//$originalfile = get_exdir(0, 0, 0, 0, $object, 'user').'photos/'.$object->photo;
+	}
+}
+//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
+// Define urllogo
+$urllogo = '';
+$urllogofull = '';
+if (!empty($logosmall) && is_readable($dir.'/'.$logosmall)) {
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&amp;entity='.$conf->entity.'&amp;securekey='.urlencode($securekey).'&amp;file='.urlencode($logosmall);
+	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart='.$modulepart.'&entity='.$conf->entity.'&securekey='.urlencode($securekey).'&file='.urlencode($logosmall);
+} elseif (!empty($logo) && is_readable($dir.'/'.$logo)) {
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&amp;entity='.$conf->entity.'&amp;securekey='.urlencode($securekey).'&amp;file='.urlencode($logo);
+	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart='.$modulepart.'&amp;entity='.$conf->entity.'&amp;securekey='.urlencode($securekey).'&amp;file='.urlencode($logo);
+}
+
+// Clean data we don't want on public page
+if (getDolUserInt('USER_PUBLIC_HIDE_PHOTO', 0, $object)) {
+	$logo = '';
+	$logosmall = '';
+	$urllogo = '';
+	$urllogofull = '';
+}
+if (getDolUserInt('USER_PUBLIC_HIDE_JOBPOSITION', 0, $object)) {
+	$object->job = '';
+}
+if (getDolUserInt('USER_PUBLIC_HIDE_EMAIL', 0, $object)) {
+	$object->email = '';
+}
+if (getDolUserInt('USER_PUBLIC_HIDE_EMAIL', 0, $object)) {
+	$object->job = '';
+}
+if (getDolUserInt('USER_PUBLIC_HIDE_OFFICE_PHONE', 0, $object)) {
+	$object->office_phone = '';
+}
+if (getDolUserInt('USER_PUBLIC_HIDE_OFFICE_FAX', 0, $object)) {
+	$object->office_fax = '';
+}
+if (getDolUserInt('USER_PUBLIC_HIDE_USER_MOBILE', 0, $object)) {
+	$object->user_mobile = '';
+}
+if (getDolUserInt('USER_PUBLIC_HIDE_BIRTH', 0, $object)) {
+	$object->birth = '';
+}
+if (getDolUserInt('USER_PUBLIC_HIDE_SOCIALNETWORKS', 0, $object)) {
+	$object->socialnetworks = '';
+}
+if (getDolUserInt('USER_PUBLIC_HIDE_COMPANY', 0, $object)) {
+	$company = null;
+}
+
+
+// Output vcard
+if ($mode == 'vcard') {
+	// Reset data no selected for public VCard
+
+
+	// We create VCard
+	$output = $v->buildVCardString($object, $company, $langs, $urllogofull);
 
 	$filename = trim(urldecode($v->getFileName())); // "Nom prenom.vcf"
 	$filenameurlencoded = dol_sanitizeFileName(urlencode($filename));
@@ -147,34 +213,6 @@ print '<input type="hidden" name="entity" value="'.$entity.'" />';
 print "\n";
 print '<!-- Form to view job -->'."\n";
 
-$modulepart = 'userphotopublic';
-$imagesize = 'small';
-$dir = $conf->user->dir_output;
-$email = $object->email;
-
-// Show logo (search order: logo defined by ONLINE_SIGN_LOGO_suffix, then ONLINE_SIGN_LOGO_, then small company logo, large company logo, theme logo, common logo)
-// Define logo and logosmall
-$logo = '';
-$logosmall = '';
-if (!empty($object->photo)) {
-	if (dolIsAllowedForPreview($object->photo)) {
-		$logosmall = get_exdir(0, 0, 0, 0, $object, 'user').'photos/'.getImageFileNameForSize($object->photo, '_small');
-		$logo = get_exdir(0, 0, 0, 0, $object, 'user').'photos/'.$object->photo;
-		//$originalfile = get_exdir(0, 0, 0, 0, $object, 'user').'photos/'.$object->photo;
-	}
-}
-//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
-// Define urllogo
-$urllogo = '';
-$urllogofull = '';
-if (!empty($logosmall) && is_readable($conf->user->dir_output.'/'.$logosmall)) {
-	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&amp;entity='.$conf->entity.'&amp;securekey='.urlencode($securekey).'&amp;file='.urlencode($logosmall);
-	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart='.$modulepart.'&entity='.$conf->entity.'&amp;securekey='.urlencode($securekey).'&file='.urlencode($logosmall);
-} elseif (!empty($logo) && is_readable($conf->user->dir_output.'/'.$logo)) {
-	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&amp;entity='.$conf->entity.'&amp;securekey='.urlencode($securekey).'&amp;file='.urlencode($logo);
-	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart='.$modulepart.'&entity='.$conf->entity.'&amp;securekey='.urlencode($securekey).'&file='.urlencode($logo);
-}
-
 // Output html code for logo
 print '<div class="backgreypublicpayment">';
 print '<div class="logopublicpayment">';
@@ -211,9 +249,11 @@ $socialnetworksdict = getArrayOfSocialNetworks();
 // Show barcode
 $showbarcode = GETPOST('nobarcode') ? 0 : 1;
 if ($showbarcode) {
+	$qrcodecontent = $output = $v->buildVCardString($object, $company, $langs);
+
 	print '<br>';
 	print '<div class="floatleft inline-block valignmiddle divphotoref">';
-	print '<img src="'.$dolibarr_main_url_root.'/viewimage.php?modulepart=barcode&entity='.((int) $conf->entity).'&generator=tcpdfbarcode&encoding=QRCODE&code='.urlencode($urlforqrcode).'">';
+	print '<img src="'.$dolibarr_main_url_root.'/viewimage.php?modulepart=barcode&entity='.((int) $conf->entity).'&generator=tcpdfbarcode&encoding=QRCODE&code='.urlencode($qrcodecontent).'">';
 	print '</div>';
 	print '<br>';
 }
diff --git a/htdocs/user/virtualcard.php b/htdocs/user/virtualcard.php
index 8d023c2c9a9..c2de7e17b06 100644
--- a/htdocs/user/virtualcard.php
+++ b/htdocs/user/virtualcard.php
@@ -73,6 +73,7 @@ if ($action == 'update') {
 	$tmparray['USER_PUBLIC_HIDE_OFFICE_PHONE'] = (GETPOST('USER_PUBLIC_HIDE_OFFICE_PHONE') ? 1 : 0);
 	$tmparray['USER_PUBLIC_HIDE_OFFICE_FAX'] = (GETPOST('USER_PUBLIC_HIDE_OFFICE_FAX') ? 1 : 0);
 	$tmparray['USER_PUBLIC_HIDE_USER_MOBILE'] = (GETPOST('USER_PUBLIC_HIDE_USER_MOBILE') ? 1 : 0);
+	$tmparray['USER_PUBLIC_HIDE_BIRTH'] = (GETPOST('USER_PUBLIC_HIDE_BIRTH') ? 1 : 0);
 	$tmparray['USER_PUBLIC_HIDE_SOCIALNETWORKS'] = (GETPOST('USER_PUBLIC_HIDE_SOCIALNETWORKS') ? 1 : 0);
 	$tmparray['USER_PUBLIC_HIDE_COMPANY'] = (GETPOST('USER_PUBLIC_HIDE_COMPANY') ? 1 : 0);
 	$tmparray['USER_PUBLIC_MORE'] = (GETPOST('USER_PUBLIC_MORE') ? GETPOST('USER_PUBLIC_MORE') : '');
@@ -230,6 +231,13 @@ if (getDolUserInt('USER_ENABLE_PUBLIC', 0, $object)) {
 	print $form->selectyesno("USER_PUBLIC_HIDE_USER_MOBILE", (getDolUserInt('USER_PUBLIC_HIDE_USER_MOBILE', 0, $object) ? getDolUserInt('USER_PUBLIC_HIDE_USER_MOBILE', 0, $object) : 0), 1);
 	print "</td></tr>\n";
 
+	// User mobile
+	print '<tr class="oddeven" id="tredit"><td>';
+	print $langs->trans("HideOnVCard", $langs->transnoentitiesnoconv("Birthdate"));
+	print '</td><td>';
+	print $form->selectyesno("USER_PUBLIC_HIDE_BIRTH", (getDolUserInt('USER_PUBLIC_HIDE_BIRTH', 0, $object) ? getDolUserInt('USER_PUBLIC_HIDE_BIRTH', 0, $object) : 0), 1);
+	print "</td></tr>\n";
+
 	// Social networks
 	print '<tr class="oddeven" id="tredit"><td>';
 	print $langs->trans("HideOnVCard", $langs->transnoentitiesnoconv("SocialNetworks"));

From ac5a07fee803d9f9712f7c2f76c38a6e244f3ea8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Jan 2023 17:27:19 +0100
Subject: [PATCH 438/816] Debug v17

---
 htdocs/comm/propal/card.php                              | 2 +-
 htdocs/commande/card.php                                 | 2 +-
 htdocs/compta/facture/card.php                           | 2 +-
 htdocs/supplier_proposal/card.php                        | 2 --
 .../supplier_proposal/class/supplier_proposal.class.php  | 9 +++++++--
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 7953691f11b..84e4e1bfb5e 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -938,7 +938,7 @@ if (empty($reshook)) {
 		$prod_entry_mode = GETPOST('prod_entry_mode', 'aZ09');
 		if ($prod_entry_mode == 'free') {
 			$idprod = 0;
-			$tva_tx = (GETPOST('tva_tx', 'alpha') ? price2num(preg_replace('/\s*\(.*\)/', '', GETPOST('tva_tx', 'alpha'))) : 0);
+			$tva_tx = (GETPOSTISSET('tva_tx') ? GETPOST('tva_tx', 'alpha') : 0);
 		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 135c6fc9ab9..0510f089045 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -676,7 +676,7 @@ if (empty($reshook)) {
 		$prod_entry_mode = GETPOST('prod_entry_mode', 'aZ09');
 		if ($prod_entry_mode == 'free') {
 			$idprod = 0;
-			$tva_tx = (GETPOST('tva_tx', 'alpha') ? price2num(preg_replace('/\s*\(.*\)/', '', GETPOST('tva_tx', 'alpha'))) : 0);
+			$tva_tx = (GETPOSTISSET('tva_tx') ? GETPOST('tva_tx', 'alpha') : 0);
 		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index d8e235193b5..287d99fc1fb 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2038,7 +2038,7 @@ if (empty($reshook)) {
 		$prod_entry_mode = GETPOST('prod_entry_mode', 'aZ09');
 		if ($prod_entry_mode == 'free') {
 			$idprod = 0;
-			$tva_tx = (GETPOST('tva_tx', 'alpha') ? price2num(preg_replace('/\s*\(.*\)/', '', GETPOST('tva_tx', 'alpha'))) : 0);
+			$tva_tx = (GETPOSTISSET('tva_tx') ? GETPOST('tva_tx', 'alpha') : 0);
 		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 4b898a75645..c9dc776c9c5 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -591,10 +591,8 @@ if (empty($reshook)) {
 		$prod_entry_mode = GETPOST('prod_entry_mode', 'aZ09');
 		if ($prod_entry_mode == 'free') {
 			$idprod = 0;
-			$tva_tx = (GETPOST('tva_tx', 'alpha') ? price2num(preg_replace('/\s*\(.*\)/', '', GETPOST('tva_tx', 'alpha'))) : 0);
 		} else {
 			$idprod = GETPOST('idprod', 'int');
-			$tva_tx = '';
 		}
 
 		$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);		// Can be '1.2' or '1.2 (CODE)'
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 1f95e3de5fd..16211e7a027 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -2584,7 +2584,7 @@ class SupplierProposal extends CommonObject
 		// For other object, here we call fetch_lines. But fetch_lines does not exists on supplier proposal
 
 		$sql = 'SELECT pt.rowid, pt.label as custom_label, pt.description, pt.fk_product, pt.fk_remise_except,';
-		$sql .= ' pt.qty, pt.tva_tx, pt.remise_percent, pt.subprice, pt.info_bits,';
+		$sql .= ' pt.qty, pt.tva_tx, pt.vat_src_code, pt.remise_percent, pt.subprice, pt.info_bits,';
 		$sql .= ' pt.total_ht, pt.total_tva, pt.total_ttc, pt.fk_product_fournisseur_price as fk_fournprice, pt.buy_price_ht as pa_ht, pt.special_code, pt.localtax1_tx, pt.localtax2_tx,';
 		$sql .= ' pt.product_type, pt.rang, pt.fk_parent_line,';
 		$sql .= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid,';
@@ -2620,6 +2620,7 @@ class SupplierProposal extends CommonObject
 				$this->lines[$i]->fk_remise_except = $obj->fk_remise_except;
 				$this->lines[$i]->remise_percent = $obj->remise_percent;
 				$this->lines[$i]->tva_tx = $obj->tva_tx;
+				$this->lines[$i]->vat_src_code = $obj->vat_src_code;
 				$this->lines[$i]->info_bits			= $obj->info_bits;
 				$this->lines[$i]->total_ht = $obj->total_ht;
 				$this->lines[$i]->total_tva			= $obj->total_tva;
@@ -2988,6 +2989,9 @@ class SupplierProposalLine extends CommonObjectLine
 		if (empty($this->tva_tx)) {
 			$this->tva_tx = 0;
 		}
+		if (empty($this->vat_src_code)) {
+			$this->vat_src_code = '';
+		}
 		if (empty($this->localtax1_tx)) {
 			$this->localtax1_tx = 0;
 		}
@@ -3056,7 +3060,7 @@ class SupplierProposalLine extends CommonObjectLine
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'supplier_proposaldet';
 		$sql .= ' (fk_supplier_proposal, fk_parent_line, label, description, fk_product, product_type,';
 		$sql .= ' date_start, date_end,';
-		$sql .= ' fk_remise_except, qty, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
+		$sql .= ' fk_remise_except, qty, tva_tx, vat_src_code, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
 		$sql .= ' subprice, remise_percent, ';
 		$sql .= ' info_bits, ';
 		$sql .= ' total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_product_fournisseur_price, buy_price_ht, special_code, rang,';
@@ -3073,6 +3077,7 @@ class SupplierProposalLine extends CommonObjectLine
 		$sql .= " ".($this->fk_remise_except ? ((int) $this->fk_remise_except) : "null").",";
 		$sql .= " ".price2num($this->qty, 'MS').",";
 		$sql .= " ".price2num($this->tva_tx).",";
+		$sql .= " '".$this->db->escape($this->vat_src_code)."',";
 		$sql .= " ".price2num($this->localtax1_tx).",";
 		$sql .= " ".price2num($this->localtax2_tx).",";
 		$sql .= " '".$this->db->escape($this->localtax1_type)."',";

From 83bb95f318c5039eaa584b76e2d853b76b7d617b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Jan 2023 18:50:01 +0100
Subject: [PATCH 439/816] Fix warning php8

---
 htdocs/core/modules/propale/doc/pdf_azur.modules.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index eac6e0261ee..5f637373507 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -675,10 +675,18 @@ class pdf_azur extends ModelePDFPropales
 
 					// retrieve global local tax
 					if ($localtax1_type && $localtax1ligne != 0) {
-						$this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
+						if (empty($this->localtax1[$localtax1_type][$localtax1_rate])) {
+							$this->localtax1[$localtax1_type][$localtax1_rate] = $localtax1ligne;
+						} else {
+							$this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
+						}
 					}
 					if ($localtax2_type && $localtax2ligne != 0) {
-						$this->localtax2[$localtax2_type][$localtax2_rate] += $localtax2ligne;
+						if (empty($this->localtax2[$localtax2_type][$localtax2_rate])) {
+							$this->localtax2[$localtax2_type][$localtax2_rate] = $localtax2ligne;
+						} else {
+							$this->localtax2[$localtax2_type][$localtax2_rate] += $localtax2ligne;
+						}
 					}
 
 					if (($object->lines[$i]->info_bits & 0x01) == 0x01) {

From 153a91335e69ca058ff77bf2f3c9ab9074d28c26 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 10 Jan 2023 20:05:40 +0100
Subject: [PATCH 440/816] Update ChangeLog

---
 ChangeLog | 42 +++++++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9ec9fb4525a..f752894b4d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -96,18 +96,18 @@ NEW: can sort and preselected best supplier price
 NEW: Can use products categories to make inventory
 NEW: Change filter type on tickets list into a multiselect combo
 NEW: conf TIMESPENT_ALWAYS_UPDATE_THM, when it's on we always check current thm of user to update it in task time line
-NEW: constant PROPAL_NEW_AS_SIGNED
 NEW: show date delivery planned on orders linked to company and product
 NEW: Default values in extrafields are not more limited to 255 char.
 NEW: display currency in takepos menu
 NEW: Enable online signature for interventions
 NEW: Encrypt all sensitive constants in llx_const
-NEW: extrafield price with currency
 NEW: filter on reception dates (from / to) in cheque paiement card
 NEW: Contracts: Default template of contract is not mandatory
 NEW: Contracts: Manage Position (Rank) on Contract Lines
 NEW: EMail-Collector: add IMAP port setting 
 NEW: EMail-Collector: add a button "Test collect"
+NEW: Extrafields: field price with currency
+NEW: Extrafields: support IP type in extrafields
 NEW: Members: default_lang for members
 NEW: Members: Table of membership types
 NEW: Members: add free membership amounts at the membership type level
@@ -127,21 +127,17 @@ NEW: Website: can switch status of website and page from the website toolbar
 NEW: Website: Templates of websites are now directories and not zip into core repo
 NEW: Website: add 4 other templates in website module
 NEW: If we select another view list mode, we keep it
-NEW: Init module bookcal
 NEW: Introduce dolEncrypt and dolDecrypt to be able to encrypt data in db
 NEW: Invoice - Add french mention on pdf when vat debit option is on
 NEW: invoice export : add accounting affectation
 NEW: label on products categories filter
 NEW: The link "add to bookmark" is always on top in the bookmark popup
-NEW: MAIN_SEARCH_CATEGORY_PRODUCT_ON_LISTS const to show category customer filter
 NEW: Make module WebservicesClient deprecated. Use module WebHook instead.
 NEW: manage no email with thirdparties (better for GDPR)
 NEW: Manage VAT on all lines on purchases cycle
 NEW: manage virtual stock at a future date
 NEW: On a bank reconciled line, we can modify the bank receipt
 NEW: On a form to send an email, we show all emails of all contacts of object
-NEW: Option PRODUCTBATCH_SHOW_WAREHOUSE_ON_SHIPMENT showing wh on PDF
-NEW: Option PRODUIT_DESC_IN_FORM accept (desktop only or +smartphone)
 NEW: Page for mass stock transfer can be used with no source stock
 NEW: parent company column and filter in invoice and order list
 NEW: Add show "Sales rep" option for PDF
@@ -168,19 +164,25 @@ NEW: skip accept/refuse process for proposals (option PROPAL_SKIP_ACCEPT_REFUSE)
 NEW: experimental SMTP using PhpImap allowing OAuth2 authentication (need to add option MAIN_IMAP_USE_PHPIMAP)
 NEW: can substitue project title in mail template
 NEW: Supplier order list - Add column private and public note
-NEW: Support IP type in extrafields
 NEW: The purge of files can purge only if older than a number of seconds
 NEW: Update ActionComm type_code on email message ticket
 NEW: VAT - Admin - Add information on deadline day for submission of VAT declaration
 NEW: expand/collapse permissions on user permission page
 NEW: Add the target to select attendees of event for emailings
 
+ Option / Const for System: 
+NEW: Option PRODUCTBATCH_SHOW_WAREHOUSE_ON_SHIPMENT showing warehouse on PDF
+NEW: Option PRODUIT_DESC_IN_FORM accept (desktop only or +smartphone)
+NEW: MAIN_SEARCH_CATEGORY_PRODUCT_ON_LISTS const to show category customer filter
+NEW: constant PROPAL_NEW_AS_SIGNED
+
  Localisation:
 NEW: adding JAPAN Chart-of-Account and regions/departments
 NEW: adding NIF verification for Algeria
 
  Modules
 NEW: Experimental module Asset
+NEW: Init module bookcal
 
 
 For developers or integrators:
@@ -190,20 +192,26 @@ NEW: ModuleBuilder can generate code of class from an existing SQL table
 NEW: #20912 Add trigger to record the event of sending an email from a project
 NEW: #21750 Added "Get lines and Post lines from BOM" at the REST Service
 NEW: #22370 Modulebuilder supports 'alwayseditable' (like extrafields)
-NEW: Removed completely the need for the library adodbtime
-NEW: hook on agenda pages
-NEW: hook to complete payment in TakePOS
-NEW: hook "changeHelpURL" to modify target of the help button
-NEW: hook formConfirm on action comm card
-NEW: hook to modify supplier product html select
-NEW: Add new hook for show virtual stock details on product stock card
-NEW: Add new hooks for actioncomm
 NEW: conf->global->SYSLOG_FILE_ONEPERSESSION accept a string
-NEW: translate for contact type API, setup/ticket API, shipping method API
 NEW: All ajax pages have now a top_httphead()
-NEW: support multilang in Civilities API
+
+ API:
 NEW: Add API for the partnership module
 NEW: Add "Get lines and Post lines from BOM" in the API
+NEW: translate for contact type API, setup/ticket API, shipping method API
+NEW: support multilang in Civilities API
+
+ Hooks:
+NEW: Actioncomm - add new hooks for actioncomm
+NEW: Actioncomm - hook formConfirm on action comm card
+NEW: Agenda - hook on agenda pages
+NEW: Help - hook "changeHelpURL" to modify target of the help button
+NEW: Product - add hook to show virtual stock details on product stock card
+NEW: Product - add hook to modify supplier product html select
+NEW: TakePOS - add hook to complete payment in TakePOS
+
+
+NEW: Removed completely the need for the library adodbtime
 NEW: Replace fk_categories_product with categories_product in inventory
 NEW: Rewrite of SQL request. Removed the join on category (for filter on categ), replaced with a EXISTS/NOT
 

From f52f18fb95da1558f516e72d0d035227418e18f2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Jan 2023 21:27:56 +0100
Subject: [PATCH 441/816] Fix picto edit must not be visilbe in edit mode

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

diff --git a/htdocs/core/tpl/objectline_title.tpl.php b/htdocs/core/tpl/objectline_title.tpl.php
index 7fe63613ea1..4640d710705 100644
--- a/htdocs/core/tpl/objectline_title.tpl.php
+++ b/htdocs/core/tpl/objectline_title.tpl.php
@@ -71,7 +71,7 @@ if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || !empty($conf->global->FA
 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)) {
+	if (empty($disableedit) && GETPOST('mode', 'aZ09') != 'vatforalllines') {
 		print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?mode=vatforalllines&id='.$object->id.'">'.img_edit($langs->trans("UpdateForAllLines"), 0, 'class="clickvatforalllines opacitymedium paddingleft cursorpointer"').'</a>';
 	}
 	//print '<script>$(document).ready(function() { $(".clickvatforalllines").click(function() { jQuery(".classvatforalllines").toggle(); }); });</script>';
@@ -111,7 +111,7 @@ print $langs->trans('ReductionShort');
 if (in_array($object->element, array('propal', 'commande', 'facture')) && $object->status == $object::STATUS_DRAFT) {
 	global $mysoc;
 
-	if (empty($disableedit)) {
+	if (empty($disableedit) && GETPOST('mode', 'aZ09') != 'remiseforalllines') {
 		print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?mode=remiseforalllines&id='.$object->id.'">'.img_edit($langs->trans("UpdateForAllLines"), 0, 'class="clickvatforalllines opacitymedium paddingleft cursorpointer"').'</a>';
 	}
 	//print '<script>$(document).ready(function() { $(".clickremiseforalllines").click(function() { jQuery(".classremiseforalllines").toggle(); }); });</script>';

From 2f2c710a33b116f7ef0b86a73d062fde8f468e02 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Jan 2023 21:34:59 +0100
Subject: [PATCH 442/816] Fix reposition when adding a contract line

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

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 79897cdc16d..12f53b49390 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -2046,11 +2046,12 @@ if ($action == 'create') {
 			$dateSelector = 1;
 
 			print "\n";
-			print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#add' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+			print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
 			<input type="hidden" name="token" value="'.newToken().'">
 			<input type="hidden" name="action" value="'.(($action != 'editline') ? 'addline' : 'updateline').'">
 			<input type="hidden" name="mode" value="">
 			<input type="hidden" name="id" value="'.$object->id.'">
+			<input type="hidden" name="page_y" value="">
 			';
 
 			print '<div class="div-table-responsive-no-min">';

From 3769861a8adb54fd99306bf3f55f0508a4e3a921 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Jan 2023 21:46:11 +0100
Subject: [PATCH 443/816] NEW VAT can be modified during add of line

---
 htdocs/comm/propal/card.php               | 27 +++++++------
 htdocs/commande/card.php                  |  8 ++--
 htdocs/compta/facture/card.php            |  9 ++---
 htdocs/contrat/card.php                   | 11 +++---
 htdocs/core/class/html.form.class.php     |  7 +---
 htdocs/core/tpl/objectline_create.tpl.php | 35 ++++++++++++++++-
 htdocs/product/ajax/products.php          | 48 ++++++++++++++---------
 7 files changed, 91 insertions(+), 54 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 5fb464a6e8e..c2dcd19eb9b 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -938,12 +938,12 @@ if (empty($reshook)) {
 		$prod_entry_mode = GETPOST('prod_entry_mode', 'aZ09');
 		if ($prod_entry_mode == 'free') {
 			$idprod = 0;
-			$tva_tx = (GETPOST('tva_tx', 'alpha') ? price2num(preg_replace('/\s*\(.*\)/', '', GETPOST('tva_tx', 'alpha'))) : 0);
 		} else {
 			$idprod = GETPOST('idprod', 'int');
-			$tva_tx = '';
 		}
 
+		$tva_tx = GETPOST('tva_tx', 'alpha');
+
 		$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS', 2);
 		$remise_percent = (GETPOSTISSET('remise_percent'.$predef) ? price2num(GETPOST('remise_percent'.$predef, 'alpha'), '', 2) : 0);
 		if (empty($remise_percent)) {
@@ -992,6 +992,8 @@ if (empty($reshook)) {
 		if (!$error && ($qty >= 0) && (!empty($product_desc) || (!empty($idprod) && $idprod > 0))) {
 			$pu_ht = 0;
 			$pu_ttc = 0;
+			$pu_ht_devise = 0;
+			$pu_ttc_devise = 0;
 			$price_min = 0;
 			$price_min_ttc = 0;
 			$price_base_type = (GETPOST('price_base_type', 'alpha') ? GETPOST('price_base_type', 'alpha') : 'HT');
@@ -1002,7 +1004,6 @@ if (empty($reshook)) {
 
 			// Ecrase $pu par celui du produit
 			// Ecrase $desc par celui du produit
-			// Ecrase $tva_tx par celui du produit
 			// Replaces $fk_unit with the product unit
 			if (!empty($idprod) && $idprod > 0) {
 				$prod = new Product($db);
@@ -1011,11 +1012,11 @@ if (empty($reshook)) {
 				$label = ((GETPOST('product_label') && GETPOST('product_label') != $prod->label) ? GETPOST('product_label') : '');
 
 				// Update if prices fields are defined
-				$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
+				/*$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
 				$tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
 				if (empty($tva_tx)) {
 					$tva_npr = 0;
-				}
+				}*/
 
 				// Price unique per product
 				$pu_ht = $prod->price;
@@ -1056,14 +1057,14 @@ if (empty($reshook)) {
 							$price_min =  price($prodcustprice->lines[0]->price_min);
 							$price_min_ttc =  price($prodcustprice->lines[0]->price_min_ttc);
 							$price_base_type = $prodcustprice->lines[0]->price_base_type;
-							$tva_tx = ($prodcustprice->lines[0]->default_vat_code ? $prodcustprice->lines[0]->tva_tx.' ('.$prodcustprice->lines[0]->default_vat_code.' )' : $prodcustprice->lines[0]->tva_tx);
+							/*$tva_tx = ($prodcustprice->lines[0]->default_vat_code ? $prodcustprice->lines[0]->tva_tx.' ('.$prodcustprice->lines[0]->default_vat_code.' )' : $prodcustprice->lines[0]->tva_tx);
 							if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) {
 								$tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
 							}
 							$tva_npr = $prodcustprice->lines[0]->recuperableonly;
 							if (empty($tva_tx)) {
 								$tva_npr = 0;
-							}
+							}*/
 						}
 					}
 				} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
@@ -1114,12 +1115,12 @@ if (empty($reshook)) {
 				$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
 
 				// Set unit price to use
-				if (!empty($price_ht) || $price_ht === '0') {
+				if (!empty($price_ht) || (string) $price_ht === '0') {
 					$pu_ht = price2num($price_ht, 'MU');
-					$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
-				} elseif (!empty($price_ttc) || $price_ttc === '0') {
+					$pu_ttc = price2num($pu_ht * (1 + ((float) $tmpvat / 100)), 'MU');
+				} elseif (!empty($price_ttc) || (string) $price_ttc === '0') {
 					$pu_ttc = price2num($price_ttc, 'MU');
-					$pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
+					$pu_ht = price2num($pu_ttc / (1 + ((float) $tmpvat / 100)), 'MU');
 				} elseif ($tmpvat != $tmpprodvat) {
 					// Is this still used ?
 					if ($price_base_type != 'HT') {
@@ -1416,12 +1417,12 @@ if (empty($reshook)) {
 			//var_dump(price2num($price_min_ttc)); var_dump(price2num($pu_ttc)); var_dump($remise_percent);exit;
 
 			if ($usermustrespectpricemin) {
-				if ($pu_equivalent && $price_min && ((price2num($pu_equivalent) * (1 - $remise_percent / 100)) < price2num($price_min))) {
+				if ($pu_equivalent && $price_min && ((price2num($pu_equivalent) * (1 - (float) $remise_percent / 100)) < price2num($price_min))) {
 					$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
 					setEventMessages($mesg, null, 'errors');
 					$error++;
 					$action = 'editline';
-				} elseif ($pu_equivalent_ttc && $price_min_ttc && ((price2num($pu_equivalent_ttc) * (1 - $remise_percent / 100)) < price2num($price_min_ttc))) {
+				} elseif ($pu_equivalent_ttc && $price_min_ttc && ((price2num($pu_equivalent_ttc) * (1 - (float) $remise_percent / 100)) < price2num($price_min_ttc))) {
 					$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min_ttc, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
 					setEventMessages($mesg, null, 'errors');
 					$error++;
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index ccf706c9ac7..c2ab4fcd3bc 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -676,12 +676,11 @@ if (empty($reshook)) {
 		$prod_entry_mode = GETPOST('prod_entry_mode', 'aZ09');
 		if ($prod_entry_mode == 'free') {
 			$idprod = 0;
-			$tva_tx = (GETPOST('tva_tx', 'alpha') ? price2num(preg_replace('/\s*\(.*\)/', '', GETPOST('tva_tx', 'alpha'))) : 0);
 		} else {
 			$idprod = GETPOST('idprod', 'int');
-			$tva_tx = '';
 		}
 
+		$tva_tx = GETPOST('tva_tx', 'alpha');
 
 		// Prepare a price equivalent for minimum price check
 		$pu_equivalent = $pu_ht;
@@ -762,7 +761,6 @@ if (empty($reshook)) {
 
 			// Ecrase $pu par celui du produit
 			// Ecrase $desc par celui du produit
-			// Ecrase $tva_tx par celui du produit
 			// Ecrase $base_price_type par celui du produit
 			if (!empty($idprod) && $idprod > 0) {
 				$prod = new Product($db);
@@ -771,11 +769,11 @@ if (empty($reshook)) {
 				$label = ((GETPOST('product_label') && GETPOST('product_label') != $prod->label) ? GETPOST('product_label') : '');
 
 				// Update if prices fields are defined
-				$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
+				/*$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
 				$tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
 				if (empty($tva_tx)) {
 					$tva_npr = 0;
-				}
+				}*/
 
 				$pu_ht = $prod->price;
 				$pu_ttc = $prod->price_ttc;
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index cc6b92f72cb..5f24ca87830 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2038,12 +2038,12 @@ if (empty($reshook)) {
 		$prod_entry_mode = GETPOST('prod_entry_mode', 'aZ09');
 		if ($prod_entry_mode == 'free') {
 			$idprod = 0;
-			$tva_tx = (GETPOST('tva_tx', 'alpha') ? price2num(preg_replace('/\s*\(.*\)/', '', GETPOST('tva_tx', 'alpha'))) : 0);
 		} else {
 			$idprod = GETPOST('idprod', 'int');
-			$tva_tx = '';
 		}
 
+		$tva_tx = GETPOST('tva_tx', 'alpha');
+
 		$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS', 2);
 		$remise_percent = (GETPOSTISSET('remise_percent'.$predef) ? price2num(GETPOST('remise_percent'.$predef, 'alpha'), '', 2) : 0);
 		if (empty($remise_percent)) {
@@ -2137,7 +2137,6 @@ if (empty($reshook)) {
 
 			// Ecrase $pu par celui du produit
 			// Ecrase $desc par celui du produit
-			// 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) {
@@ -2157,8 +2156,8 @@ if (empty($reshook)) {
 				$price_min_ttc = $datapriceofproduct['price_min_ttc'];
 				$price_base_type = $datapriceofproduct['price_base_type'];
 
-				$tva_tx = $datapriceofproduct['tva_tx'];
-				$tva_npr = $datapriceofproduct['tva_npr'];
+				//$tva_tx = $datapriceofproduct['tva_tx'];
+				//$tva_npr = $datapriceofproduct['tva_npr'];
 
 				$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
 				$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 12f53b49390..123366fd630 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -427,6 +427,7 @@ if (empty($reshook)) {
 		} else {
 			$idprod = GETPOST('idprod', 'int');
 		}
+
 		$tva_tx = GETPOST('tva_tx', 'alpha');
 
 		$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS');
@@ -474,11 +475,11 @@ if (empty($reshook)) {
 				$prod->fetch($idprod);
 
 				// Update if prices fields are defined
-				$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
+				/*$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
 				$tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
 				if (empty($tva_tx)) {
 					$tva_npr = 0;
-				}
+				}*/
 
 				$price_min = $prod->price_min;
 				$price_min_ttc = $prod->price_min_ttc;
@@ -500,14 +501,14 @@ if (empty($reshook)) {
 						if (count($prodcustprice->lines) > 0) {
 							$price_min =  price($prodcustprice->lines[0]->price_min);
 							$price_min_ttc =  price($prodcustprice->lines[0]->price_min_ttc);
-							$tva_tx = $prodcustprice->lines[0]->tva_tx;
+							/*$tva_tx = $prodcustprice->lines[0]->tva_tx;
 							if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) {
 								$tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
 							}
 							$tva_npr = $prodcustprice->lines[0]->recuperableonly;
 							if (empty($tva_tx)) {
 								$tva_npr = 0;
-							}
+							}*/
 						}
 					}
 				}
@@ -699,7 +700,7 @@ if (empty($reshook)) {
 				$date_end_real_update = $objectline->date_end_real;
 			}
 
-			$vat_rate = GETPOST('eltva_tx');
+			$vat_rate = GETPOST('eltva_tx', 'alpha');
 			// Define info_bits
 			$info_bits = 0;
 			if (preg_match('/\*/', $vat_rate)) {
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 1c54df24e06..369deba4455 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2344,11 +2344,7 @@ class Form
 				}
 			}
 			// mode=1 means customers products
-			$urloption = 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&status_purchase='.$status_purchase.'&finished='.$finished.'&hidepriceinlabel='.$hidepriceinlabel.'&warehousestatus='.$warehouseStatus;
-			//Price by customer
-			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {
-				$urloption .= '&socid='.$socid;
-			}
+			$urloption = ($socid > 0 ? 'socid='.$socid.'&' : '').'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&status_purchase='.$status_purchase.'&finished='.$finished.'&hidepriceinlabel='.$hidepriceinlabel.'&warehousestatus='.$warehouseStatus;
 			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 1, $ajaxoptions);
 
 			if (isModEnabled('variants') && is_array($selected_combinations)) {
@@ -3247,6 +3243,7 @@ class Form
 			// mode=2 means suppliers products
 			$urloption = ($socid > 0 ? 'socid='.$socid.'&' : '').'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished.'&alsoproductwithnosupplierprice='.$alsoproductwithnosupplierprice;
 			print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
+
 			print ($hidelabel ? '' : $langs->trans("RefOrLabel").' : ').'<input type="text" class="minwidth300" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.($placeholder ? ' placeholder="'.$placeholder.'"' : '').'>';
 		} else {
 			print $this->select_produits_fournisseurs_list($socid, $selected, $htmlname, $filtertype, $filtre, '', $status, 0, 0, $alsoproductwithnosupplierprice, $morecss, 0, $placeholder);
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 32a9f1cdaae..52761509890 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -40,6 +40,7 @@ if (empty($object) || !is_object($object)) {
 	print "Error: this template page cannot be called directly as an URL";
 	exit;
 }
+
 $usemargins = 0;
 if (isModEnabled('margin') && !empty($object->element) && in_array($object->element, array('facture', 'facturerec', 'propal', 'commande'))) {
 	$usemargins = 1;
@@ -48,6 +49,7 @@ if (!isset($dateSelector)) {
 	global $dateSelector; // Take global var only if not already defined into function calling (for example formAddObjectLine)
 }
 global $forceall, $forcetoshowtitlelines, $senderissupplier, $inputalsopricewithtax;
+global $mysoc;
 
 if (!isset($dateSelector)) {
 	$dateSelector = 1; // For backward compatibility
@@ -776,6 +778,35 @@ if (!empty($usemargins) && $user->rights->margins->creer) {
 						var stringforvatrateselection = tva_tx;
 						if (typeof default_vat_code != 'undefined' && default_vat_code != null && default_vat_code != '') {
 							stringforvatrateselection = stringforvatrateselection+' ('+default_vat_code+')';
+							<?php
+							// Special case for India
+							if (getDolGlobalString('MAIN_SALETAX_AUTOSWITCH_I_CS_FOR_INDIA')) {
+								?>
+								console.log("MAIN_SALETAX_AUTOSWITCH_I_CS_FOR_INDIA is on so we check if we need to autoswith the vat code");
+								console.log("mysoc->country_code=<?php echo $mysoc->country_code; ?> thirdparty->country_code=<?php echo $object->thirdparty->country_code; ?>");
+								new_default_vat_code = default_vat_code;
+								<?php
+								if ($mysoc->country_code == 'IN' && !empty($object->thirdparty) && $object->thirdparty->country_code == 'IN' && $mysoc->state_code == $object->thirdparty->state_code) {
+									// We are in India and states are same, we revert the vat code "I-x" into "CS-x"
+									?>
+									console.log("Countries are both IN and states are same, so we revert I into CS in default_vat_code="+default_vat_code);
+									new_default_vat_code = default_vat_code.replace(/^I\-/, 'C+S-');
+									<?php
+								} elseif ($mysoc->country_code == 'IN' && !empty($object->thirdparty) && $object->thirdparty->country_code == 'IN' && $mysoc->state_code != $object->thirdparty->state_code) {
+									// We are in India and states differs, we revert the vat code "CS-x" into "I-x"
+									?>
+									console.log("Countries are both IN and states differs, so we revert CS into I in default_vat_code="+default_vat_code);
+									new_default_vat_code = default_vat_code.replace(/^C\+S\-/, 'I-');
+									<?php
+								}
+								?>
+								if (new_default_vat_code != default_vat_code && jQuery('#tva_tx option:contains("'+new_default_vat_code+'")').val()) {
+									console.log("We found en entry into VAT with new default_vat_code, we will use it");
+									stringforvatrateselection = jQuery('#tva_tx option:contains("'+new_default_vat_code+'")').val();
+								}
+								<?php
+							}
+							?>
 						}
 						// Set vat rate if field is an input box
 						$('#tva_tx').val(tva_tx);
@@ -1113,7 +1144,7 @@ if (!empty($usemargins) && $user->rights->margins->creer) {
 		<?php } ?>
 	});
 
-	/* Function to set fields from choice */
+	/* Function to set fields visibility after selecting a free product */
 	function setforfree() {
 		console.log("objectline_create.tpl::setforfree. We show most fields");
 		jQuery("#idprodfournprice").val('0');	// Set cursor on not selected product
@@ -1148,7 +1179,7 @@ if (!empty($usemargins) && $user->rights->margins->creer) {
 			jQuery("#multicurrency_price_ttc").val('').hide();
 			jQuery("#title_up_ttc, #title_up_ttc_currency").hide();
 		<?php } ?>
-		jQuery("#tva_tx, #title_vat").hide();
+		/* jQuery("#tva_tx, #title_vat").hide(); */
 		/* jQuery("#title_fourn_ref").hide(); */
 		jQuery("#np_marginRate, #np_markRate, .np_marginRate, .np_markRate, #units, #title_units").hide();
 		jQuery("#buying_price").show();
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index f61e92c56f3..e07aa4ab5c5 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -103,26 +103,36 @@ if ($action == 'fetch' && !empty($id)) {
 
 		$price_level = 1;
 		if ($socid > 0) {
-			$thirdpartytemp = new Societe($db);
-			$thirdpartytemp->fetch($socid);
-
-			//Load translation description and label
-			if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
-				$newlang = $thirdpartytemp->default_lang;
-
-				if (!empty($newlang)) {
-					$outputlangs = new Translate("", $conf);
-					$outputlangs->setDefaultLang($newlang);
-					$outdesc_trans = (!empty($object->multilangs[$outputlangs->defaultlang]["description"])) ? $object->multilangs[$outputlangs->defaultlang]["description"] : $object->description;
-					$outlabel_trans = (!empty($object->multilangs[$outputlangs->defaultlang]["label"])) ? $object->multilangs[$outputlangs->defaultlang]["label"] : $object->label;
-				} else {
-					$outdesc_trans = $object->description;
-					$outlabel_trans = $object->label;
-				}
+			$needchangeaccordingtothirdparty = 0;
+			if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
+				$needchangeaccordingtothirdparty = 1;
 			}
+			if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
+				$needchangeaccordingtothirdparty = 1;
+			}
+			if ($needchangeaccordingtothirdparty) {
+				$thirdpartytemp = new Societe($db);
+				$thirdpartytemp->fetch($socid);
 
-			if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
-				$price_level = $thirdpartytemp->price_level;
+				//Load translation description and label according to thirdparty language
+				if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
+					$newlang = $thirdpartytemp->default_lang;
+
+					if (!empty($newlang)) {
+						$outputlangs = new Translate("", $conf);
+						$outputlangs->setDefaultLang($newlang);
+						$outdesc_trans = (!empty($object->multilangs[$outputlangs->defaultlang]["description"])) ? $object->multilangs[$outputlangs->defaultlang]["description"] : $object->description;
+						$outlabel_trans = (!empty($object->multilangs[$outputlangs->defaultlang]["label"])) ? $object->multilangs[$outputlangs->defaultlang]["label"] : $object->label;
+					} else {
+						$outdesc_trans = $object->description;
+						$outlabel_trans = $object->label;
+					}
+				}
+
+				//Set price level according to thirdparty
+				if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
+					$price_level = $thirdpartytemp->price_level;
+				}
 			}
 		}
 
@@ -185,7 +195,7 @@ if ($action == 'fetch' && !empty($id)) {
 		}
 
 		// Price by customer
-		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {
+		if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') && !empty($socid)) {
 			require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
 			$prodcustprice = new Productcustomerprice($db);

From 098e6c40759172bbb7e0d51305f246ad901ff3fb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Jan 2023 21:49:51 +0100
Subject: [PATCH 444/816] Fix look and feel v17

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

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 98d2b59d6a3..9ef9072d16a 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1526,16 +1526,16 @@ if ($resql) {
 	}
 	// Town
 	if (!empty($arrayfields['s.town']['checked'])) {
-		print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_town" value="'.dol_escape_htmltag($search_town).'"></td>';
+		print '<td class="liste_titre"><input class="flat width50" type="text" name="search_town" value="'.dol_escape_htmltag($search_town).'"></td>';
 	}
 	// Zip
 	if (!empty($arrayfields['s.zip']['checked'])) {
-		print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="'.dol_escape_htmltag($search_zip).'"></td>';
+		print '<td class="liste_titre"><input class="flat width50" type="text" name="search_zip" value="'.dol_escape_htmltag($search_zip).'"></td>';
 	}
 	// State
 	if (!empty($arrayfields['state.nom']['checked'])) {
 		print '<td class="liste_titre">';
-		print '<input class="flat" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
+		print '<input class="flat width50" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
 		print '</td>';
 	}
 	// Country
@@ -1723,18 +1723,18 @@ if ($resql) {
 	}
 	// Status billed
 	if (!empty($arrayfields['c.facture']['checked'])) {
-		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
+		print '<td class="liste_titre maxwidthonsmartphone center">';
 		print $form->selectyesno('search_billed', $search_billed, 1, 0, 1, 1);
 		print '</td>';
 	}
 	// Import key
 	if (!empty($arrayfields['c.import_key']['checked'])) {
-		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
+		print '<td class="liste_titre maxwidthonsmartphone center">';
 		print '</td>';
 	}
 	// Status
 	if (!empty($arrayfields['c.fk_statut']['checked'])) {
-		print '<td class="liste_titre center parentonrightofpage">';
+		print '<td class="liste_titre right parentonrightofpage">';
 		$liststatus = array(
 			Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraftShort"),
 			Commande::STATUS_VALIDATED=>$langs->trans("StatusOrderValidated"),
@@ -1907,7 +1907,7 @@ if ($resql) {
 		print_liste_field_titre($arrayfields['c.import_key']['label'], $_SERVER["PHP_SELF"], "c.import_key", "", $param, '', $sortfield, $sortorder, 'center ');
 	}
 	if (!empty($arrayfields['c.fk_statut']['checked'])) {
-		print_liste_field_titre($arrayfields['c.fk_statut']['label'], $_SERVER["PHP_SELF"], "c.fk_statut", "", $param, '', $sortfield, $sortorder, 'center ');
+		print_liste_field_titre($arrayfields['c.fk_statut']['label'], $_SERVER["PHP_SELF"], "c.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
 	}
 	if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
 		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ');
@@ -2631,7 +2631,7 @@ if ($resql) {
 
 			// Status
 			if (!empty($arrayfields['c.fk_statut']['checked'])) {
-				print '<td class="nowrap center">'.$generic_commande->LibStatut($obj->fk_statut, $obj->billed, 5, 1).'</td>';
+				print '<td class="nowrap right">'.$generic_commande->LibStatut($obj->fk_statut, $obj->billed, 5, 1).'</td>';
 				if (!$i) {
 					$totalarray['nbfield']++;
 				}

From c78ad19186f8c410b01a85678dc74db776fb6366 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Jan 2023 18:50:01 +0100
Subject: [PATCH 445/816] Fix warning php8

---
 htdocs/core/modules/propale/doc/pdf_azur.modules.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index e1afcc0c7a0..db076cd97b9 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -675,10 +675,18 @@ class pdf_azur extends ModelePDFPropales
 
 					// retrieve global local tax
 					if ($localtax1_type && $localtax1ligne != 0) {
-						$this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
+						if (empty($this->localtax1[$localtax1_type][$localtax1_rate])) {
+							$this->localtax1[$localtax1_type][$localtax1_rate] = $localtax1ligne;
+						} else {
+							$this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
+						}
 					}
 					if ($localtax2_type && $localtax2ligne != 0) {
-						$this->localtax2[$localtax2_type][$localtax2_rate] += $localtax2ligne;
+						if (empty($this->localtax2[$localtax2_type][$localtax2_rate])) {
+							$this->localtax2[$localtax2_type][$localtax2_rate] = $localtax2ligne;
+						} else {
+							$this->localtax2[$localtax2_type][$localtax2_rate] += $localtax2ligne;
+						}
 					}
 
 					if (($object->lines[$i]->info_bits & 0x01) == 0x01) {

From 09a2028522f069acc032f36ee80d93b9dad8dc9f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Jan 2023 21:27:56 +0100
Subject: [PATCH 446/816] Fix picto edit must not be visilbe in edit mode

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

diff --git a/htdocs/core/tpl/objectline_title.tpl.php b/htdocs/core/tpl/objectline_title.tpl.php
index 7fe63613ea1..4640d710705 100644
--- a/htdocs/core/tpl/objectline_title.tpl.php
+++ b/htdocs/core/tpl/objectline_title.tpl.php
@@ -71,7 +71,7 @@ if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || !empty($conf->global->FA
 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)) {
+	if (empty($disableedit) && GETPOST('mode', 'aZ09') != 'vatforalllines') {
 		print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?mode=vatforalllines&id='.$object->id.'">'.img_edit($langs->trans("UpdateForAllLines"), 0, 'class="clickvatforalllines opacitymedium paddingleft cursorpointer"').'</a>';
 	}
 	//print '<script>$(document).ready(function() { $(".clickvatforalllines").click(function() { jQuery(".classvatforalllines").toggle(); }); });</script>';
@@ -111,7 +111,7 @@ print $langs->trans('ReductionShort');
 if (in_array($object->element, array('propal', 'commande', 'facture')) && $object->status == $object::STATUS_DRAFT) {
 	global $mysoc;
 
-	if (empty($disableedit)) {
+	if (empty($disableedit) && GETPOST('mode', 'aZ09') != 'remiseforalllines') {
 		print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?mode=remiseforalllines&id='.$object->id.'">'.img_edit($langs->trans("UpdateForAllLines"), 0, 'class="clickvatforalllines opacitymedium paddingleft cursorpointer"').'</a>';
 	}
 	//print '<script>$(document).ready(function() { $(".clickremiseforalllines").click(function() { jQuery(".classremiseforalllines").toggle(); }); });</script>';

From 00fce7eccd17d09074d1a6abb306d914b2b6217c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Jan 2023 21:34:59 +0100
Subject: [PATCH 447/816] Fix reposition when adding a contract line

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

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 38efdb3cca9..8af35072b93 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -2046,11 +2046,12 @@ if ($action == 'create') {
 			$dateSelector = 1;
 
 			print "\n";
-			print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#add' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+			print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
 			<input type="hidden" name="token" value="'.newToken().'">
 			<input type="hidden" name="action" value="'.(($action != 'editline') ? 'addline' : 'updateline').'">
 			<input type="hidden" name="mode" value="">
 			<input type="hidden" name="id" value="'.$object->id.'">
+			<input type="hidden" name="page_y" value="">
 			';
 
 			print '<div class="div-table-responsive-no-min">';

From 3c169ae09a96653be9c5d9bbf5c45c36b30810d4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Jan 2023 21:49:51 +0100
Subject: [PATCH 448/816] Fix look and feel v17

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

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 42b71b14c86..93a0d302fbf 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1515,16 +1515,16 @@ if ($resql) {
 	}
 	// Town
 	if (!empty($arrayfields['s.town']['checked'])) {
-		print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_town" value="'.dol_escape_htmltag($search_town).'"></td>';
+		print '<td class="liste_titre"><input class="flat width50" type="text" name="search_town" value="'.dol_escape_htmltag($search_town).'"></td>';
 	}
 	// Zip
 	if (!empty($arrayfields['s.zip']['checked'])) {
-		print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="'.dol_escape_htmltag($search_zip).'"></td>';
+		print '<td class="liste_titre"><input class="flat width50" type="text" name="search_zip" value="'.dol_escape_htmltag($search_zip).'"></td>';
 	}
 	// State
 	if (!empty($arrayfields['state.nom']['checked'])) {
 		print '<td class="liste_titre">';
-		print '<input class="flat" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
+		print '<input class="flat width50" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
 		print '</td>';
 	}
 	// Country
@@ -1712,18 +1712,18 @@ if ($resql) {
 	}
 	// Status billed
 	if (!empty($arrayfields['c.facture']['checked'])) {
-		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
+		print '<td class="liste_titre maxwidthonsmartphone center">';
 		print $form->selectyesno('search_billed', $search_billed, 1, 0, 1, 1);
 		print '</td>';
 	}
 	// Import key
 	if (!empty($arrayfields['c.import_key']['checked'])) {
-		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
+		print '<td class="liste_titre maxwidthonsmartphone center">';
 		print '</td>';
 	}
 	// Status
 	if (!empty($arrayfields['c.fk_statut']['checked'])) {
-		print '<td class="liste_titre maxwidthonsmartphone center">';
+		print '<td class="liste_titre right parentonrightofpage">';
 		$liststatus = array(
 			Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraftShort"),
 			Commande::STATUS_VALIDATED=>$langs->trans("StatusOrderValidated"),
@@ -1896,7 +1896,7 @@ if ($resql) {
 		print_liste_field_titre($arrayfields['c.import_key']['label'], $_SERVER["PHP_SELF"], "c.import_key", "", $param, '', $sortfield, $sortorder, 'center ');
 	}
 	if (!empty($arrayfields['c.fk_statut']['checked'])) {
-		print_liste_field_titre($arrayfields['c.fk_statut']['label'], $_SERVER["PHP_SELF"], "c.fk_statut", "", $param, '', $sortfield, $sortorder, 'center ');
+		print_liste_field_titre($arrayfields['c.fk_statut']['label'], $_SERVER["PHP_SELF"], "c.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
 	}
 	if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
 		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ');
@@ -2604,7 +2604,7 @@ if ($resql) {
 
 		// Status
 		if (!empty($arrayfields['c.fk_statut']['checked'])) {
-			print '<td class="nowrap center">'.$generic_commande->LibStatut($obj->fk_statut, $obj->billed, 5, 1).'</td>';
+			print '<td class="nowrap right">'.$generic_commande->LibStatut($obj->fk_statut, $obj->billed, 5, 1).'</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}

From 313adba8f45382df6873c7749bb292192dd91d69 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Jan 2023 22:06:03 +0100
Subject: [PATCH 449/816] Fix set job recruitement back to draft

---
 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 d1ca4ef2db1..34365e05792 100644
--- a/htdocs/recruitment/recruitmentjobposition_card.php
+++ b/htdocs/recruitment/recruitmentjobposition_card.php
@@ -401,7 +401,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// Back to draft
 			if ($object->status == $object::STATUS_VALIDATED) {
 				if ($permissiontoadd) {
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes">'.$langs->trans("SetToDraft").'</a>';
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_setdraft&token='.newToken().'&confirm=yes">'.$langs->trans("SetToDraft").'</a>';
 				}
 			}
 

From 3e4da8a1c587dea5feb861ea23dc2f7caa94f125 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Jan 2023 22:25:41 +0100
Subject: [PATCH 450/816] Fix standardize code

---
 .../recruitmentjobposition_card.php           | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/htdocs/recruitment/recruitmentjobposition_card.php b/htdocs/recruitment/recruitmentjobposition_card.php
index 34365e05792..b33ce55808e 100644
--- a/htdocs/recruitment/recruitmentjobposition_card.php
+++ b/htdocs/recruitment/recruitmentjobposition_card.php
@@ -108,7 +108,7 @@ if (empty($reshook)) {
 			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
 				$backtopage = $backurlforlist;
 			} else {
-				$backtopage = dol_buildpath('/recruitment/recruitmentjobposition_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
+				$backtopage = dol_buildpath('/recruitment/recruitmentjobposition_card.php', 1).'?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
 			}
 		}
 	}
@@ -130,7 +130,7 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	if ($action == 'set_thirdparty' && $permissiontoadd) {
-		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, 'RECRUITMENTJOBPOSITION_MODIFY');
+		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
 	}
 	if ($action == 'classin' && $permissiontoadd) {
 		$object->setProject(GETPOST('projectid', 'int'));
@@ -257,8 +257,6 @@ if (($id || $ref) && $action == 'edit') {
 
 // Part to show record
 if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
-	$res = $object->fetch_optionals();
-
 	$head = recruitmentjobpositionPrepareHead($object);
 	print dol_get_fiche_head($head, 'card', $langs->trans("RecruitmentJobPosition"), -1, $object->picto);
 
@@ -395,31 +393,27 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		if (empty($reshook)) {
 			// Send
 			if (empty($user->socid)) {
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>'."\n";
+				print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init&token='.newToken().'#formmailbeforetitle');
 			}
 
 			// Back to draft
 			if ($object->status == $object::STATUS_VALIDATED) {
 				if ($permissiontoadd) {
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_setdraft&token='.newToken().'&confirm=yes">'.$langs->trans("SetToDraft").'</a>';
+					print dolGetButtonAction('', $langs->trans('SetToDraft'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes&token='.newToken(), '', $permissiontoadd);
 				}
 			}
 
 			// Modify
-			if ($permissiontoadd) {
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>'."\n";
-			} else {
-				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
-			}
+			print dolGetButtonAction('', $langs->trans('Modify'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken(), '', $permissiontoadd);
 
 			// Validate
 			if ($object->status == $object::STATUS_DRAFT) {
 				if ($permissiontoadd) {
 					if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0)) {
-						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&token='.newToken().'&confirm=yes">'.$langs->trans("Validate").'</a>';
+						print dolGetButtonAction('', $langs->trans('Validate'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes&token='.newToken(), '', $permissiontoadd);
 					} else {
 						$langs->load("errors");
-						print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
+						print dolGetButtonAction($langs->trans("ErrorAddAtLeastOneLineFirst"), $langs->trans("Validate"), 'default', '#', '', 0);
 					}
 				}
 			}
@@ -442,9 +436,10 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			/*
 			if ($permissiontoadd) {
 				if ($object->status == $object::STATUS_ENABLED) {
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=disable&token='.newToken().'">'.$langs->trans("Disable").'</a>'."\n";
+					print dolGetButtonAction('', $langs->trans('Disable'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=disable&token='.newToken(), '', $permissiontoadd);
 				} else {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=enable&token='.newToken().'">'.$langs->trans("Enable").'</a>'."\n";
+					print dolGetButtonAction('', $langs->trans('Enable'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=enable&token='.newToken(), '', $permissiontoadd);
+				}
 				}
 			}*/
 			if ($permissiontoadd) {
@@ -454,7 +449,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			}
 
 			// Delete
-			print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', $permissiontodelete);
+			$params = array();
+			print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', $permissiontodelete, $params);
 		}
 		print '</div>'."\n";
 	}

From 76d729573291eea6a7bcd1b04e1a509d5ab046b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 10 Jan 2023 23:16:28 +0100
Subject: [PATCH 451/816] fix properties

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

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index a34861e17d6..a397433979b 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2015 Jean-François FERRY     <hello@librethic.io>
  * Copyright (C) 2016      Christophe Battarel     <christophe@altairis.fr>
- * Copyright (C) 2019      Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2022 Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2021      Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2021      Alexandre Spangaro      <aspangaro@open-dsi.fr>
  *
@@ -50,9 +50,15 @@ class FormTicket
 
 	/**
 	 * @var string	The track_id of the ticket. Used also for the $keytoavoidconflict to name session vars to upload files.
+	 * @deprecated
 	 */
 	public $track_id;
 
+	/**
+	 * @var string trackid
+	 */
+	public $trackid;
+
 	/**
 	 * @var int ID
 	 */
@@ -89,8 +95,12 @@ class FormTicket
 	public $withusercreate;  // to show name of creating user in form
 	public $withcreatereadonly;
 
-	public $withref;  // to show ref field
+	/**
+	 * @var int withextrafields
+	 */
+	public $withextrafields;
 
+	public $withref;  // to show ref field
 	public $withcancel;
 
 	public $type_code;

From c5a83972ca9e7c1234799c8a5005b30060e33c0d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Jan 2023 23:47:47 +0100
Subject: [PATCH 452/816] Fix return warnings

---
 htdocs/core/class/stats.class.php          |  2 +-
 htdocs/projet/class/projectstats.class.php | 12 ++++++------
 htdocs/projet/class/taskstats.class.php    |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/class/stats.class.php b/htdocs/core/class/stats.class.php
index c8dbca747b9..60cdc5d5226 100644
--- a/htdocs/core/class/stats.class.php
+++ b/htdocs/core/class/stats.class.php
@@ -237,7 +237,7 @@ abstract class Stats
 
 	/**
 	 * @param	int     $year           year number
-	 * @return 	int						value
+	 * @return 	array					array of values
 	 */
 	protected abstract function getAverageByMonth($year);
 
diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php
index 65d673a9ad2..e2b6c5129ff 100644
--- a/htdocs/projet/class/projectstats.class.php
+++ b/htdocs/projet/class/projectstats.class.php
@@ -298,7 +298,7 @@ class ProjectStats extends Stats
 	 * @param	int		$startyear		End year
 	 * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
 	 * @param   int     $wonlostfilter  Add a filter on status won/lost
-	 * @return 	array					Array of values
+	 * @return 	array|int				Array of values or <0 if error
 	 */
 	public function getWeightedAmountByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0, $wonlostfilter = 1)
 	{
@@ -411,10 +411,10 @@ class ProjectStats extends Stats
 	/**
 	 * Return amount of elements by month for several years
 	 *
-	 * @param int $endyear		End year
-	 * @param int $startyear	Start year
-	 * @param int $cachedelay accept for cache file (0=No read, no save of cache, -1=No read but save)
-	 * @return array of values
+	 * @param 	int 		$endyear		End year
+	 * @param 	int 		$startyear		Start year
+	 * @param 	int 		$cachedelay 	accept for cache file (0=No read, no save of cache, -1=No read but save)
+	 * @return 	array|int					Array of values or <0 if error
 	 */
 	public function getTransformRateByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0)
 	{
@@ -549,7 +549,7 @@ class ProjectStats extends Stats
 	/**
 	 * Return average of entity by month
 	 * @param	int     $year           year number
-	 * @return 	int						value
+	 * @return 	array
 	 */
 	protected function getAverageByMonth($year)
 	{
diff --git a/htdocs/projet/class/taskstats.class.php b/htdocs/projet/class/taskstats.class.php
index ce7c6c4f4c5..6ff56fd8132 100644
--- a/htdocs/projet/class/taskstats.class.php
+++ b/htdocs/projet/class/taskstats.class.php
@@ -212,7 +212,7 @@ class TaskStats extends Stats
 	/**
 	 * Return average of entity by month
 	 * @param	int     $year           year number
-	 * @return 	int						value
+	 * @return 	array					array of values
 	 */
 	protected function getAverageByMonth($year)
 	{

From e50a56290cd73811e10306ef6dadb876214252e9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Jan 2023 23:49:31 +0100
Subject: [PATCH 453/816] Fix warning

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

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 2b429d0e8d1..b0aa5dba54c 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -2903,7 +2903,7 @@ class Propal extends CommonObject
 	 *    @param    int		$offset				For pagination
 	 *    @param    string	$sortfield			Sort criteria
 	 *    @param    string	$sortorder			Sort order
-	 *    @return	int		       				-1 if KO, array with result if OK
+	 *    @return	array|int		       		-1 if KO, array with result if OK
 	 */
 	public function liste_array($shortlist = 0, $draft = 0, $notcurrentuser = 0, $socid = 0, $limit = 0, $offset = 0, $sortfield = 'p.datep', $sortorder = 'DESC')
 	{
@@ -2982,8 +2982,8 @@ class Propal extends CommonObject
 	/**
 	 *  Returns an array with id and ref of related invoices
 	 *
-	 *	@param		int		$id			Id propal
-	 *	@return		array				Array of invoices id
+	 *	@param		int			$id			Id propal
+	 *	@return		array|int				Array of invoices id
 	 */
 	public function InvoiceArrayList($id)
 	{

From 52f80737f593f7e199d106a4032adc2b0844e7ea Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 11 Jan 2023 00:37:00 +0100
Subject: [PATCH 454/816] css

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

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 289f44333cc..b9e35e1e9ea 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -49,7 +49,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 	--colortextbacktab: #<?php print $colortextbacktab; ?>;
 	--colorboxiconbg: #eee;
 	--refidnocolor:#444;
-	--tableforfieldcolor:#666;
+	--tableforfieldcolor:#888;
 	--amountremaintopaycolor:#880000;
 	--amountpaymentcomplete:#008800;
 	--amountremaintopaybackcolor:none;

From 33917e97b6bf5093cdaf80390d4d2e2b26ee16ba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 11 Jan 2023 01:12:08 +0100
Subject: [PATCH 455/816] NEW Increment website counter on each page access in
 website module

---
 htdocs/core/lib/website.lib.php  | 27 +++++++++++++++++++++++++++
 htdocs/core/lib/website2.lib.php |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index c258e3198ce..32a6d9d962a 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -423,6 +423,33 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
 	print $content;
 }
 
+/**
+ * Increase the website counter of page access.
+ *
+ * @param   int		$websiteid			ID of website
+ * @param	string	$websitepagetype	Type of page ('blogpost', 'page', ...)
+ * @param	int		$websitepageid		ID of page
+ * @return  int							<0 if KO, >0 if OK
+ */
+function dolWebsiteIncrementCounter($websiteid, $websitepagetype, $websitepageid)
+{
+	if (!getDolGlobalInt('WEBSITE_PERF_DISABLE_COUNTERS')) {
+		//dol_syslog("dolWebsiteIncrementCounter websiteid=".$websiteid." websitepagetype=".$websitepagetype." websitepageid=".$websitepageid);
+		if (in_array($websitepagetype, array('blogpost', 'page'))) {
+			global $db;
+
+			$sql = "UPDATE ".$db->prefix()."website SET pageviews_total = pageviews_total + 1, lastaccess = '".$db->idate(dol_now())."'";
+			$sql .= " WHERE rowid = ".((int) $websiteid);
+			$resql = $db->query($sql);
+			if (! $resql) {
+				return -1;
+			}
+		}
+	}
+
+	return 1;
+}
+
 
 /**
  * Format img tags to introduce viewimage on img src.
diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 05727a1e539..c7099e8d2ed 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -271,7 +271,7 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 	$tplcontent .= '</html>'."\n";
 
 	$tplcontent .= '<?php // BEGIN PHP'."\n";
-	$tplcontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "html", '.$objectpage->id.');'."\n";
+	$tplcontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "html", '.$objectpage->id.'); dolWebsiteIncrementCounter('.$object->id.', "'.$objectpage->type_container.'", '.$objectpage->id.');'."\n";
 	$tplcontent .= "// END PHP ?>\n";
 
 	//var_dump($filetpl);exit;

From 8f5edcab02d45dcfaa84200013d36c9fad807be9 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 11 Jan 2023 06:11:41 +0100
Subject: [PATCH 456/816] Use isModEnabled()

---
 htdocs/bookcal/class/booking.class.php        |  2 +-
 htdocs/comm/propal/class/propal.class.php     |  2 +-
 htdocs/commande/class/commande.class.php      |  2 +-
 .../facture/class/facture-rec.class.php       |  2 +-
 htdocs/contrat/class/contrat.class.php        |  2 +-
 htdocs/core/menus/init_menu_auguria.sql       | 42 +++++++++----------
 .../class/conferenceorbooth.class.php         |  2 +-
 .../class/conferenceorboothattendee.class.php |  2 +-
 htdocs/fichinter/class/fichinter.class.php    |  2 +-
 .../class/fournisseur.commande.class.php      |  2 +-
 .../class/fournisseur.facture-rec.class.php   |  2 +-
 .../fourn/class/fournisseur.facture.class.php |  2 +-
 .../template/class/myobject.class.php         |  2 +-
 htdocs/mrp/class/mo.class.php                 |  2 +-
 .../class/recruitmentjobposition.class.php    |  2 +-
 htdocs/ticket/class/ticket.class.php          |  2 +-
 16 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/htdocs/bookcal/class/booking.class.php b/htdocs/bookcal/class/booking.class.php
index a74cb87a43d..51799fa09da 100644
--- a/htdocs/bookcal/class/booking.class.php
+++ b/htdocs/bookcal/class/booking.class.php
@@ -104,7 +104,7 @@ class Booking extends CommonObject
 	public $fields=array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>1.2, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'searchall'=>1, 'validate'=>'1', 'comment'=>"Reference of object"),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'picto'=>'company', 'enabled'=>'$conf->societe->enabled', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'help'=>"LinkToThirparty", 'validate'=>'1',),
+		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'picto'=>'company', 'enabled'=>'isModEnabled("societe")', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'help'=>"LinkToThirparty", 'validate'=>'1',),
 		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'picto'=>'project', 'enabled'=>'$conf->project->enabled', 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'validate'=>'1',),
 		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>3, 'validate'=>'1',),
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0, 'cssview'=>'wordbreak', 'validate'=>'1',),
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 1b3df25c7d2..596e6e708aa 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -301,7 +301,7 @@ class Propal extends CommonObject
 		'ref' =>array('type'=>'varchar(30)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'showoncombobox'=>1, 'position'=>20),
 		'ref_client' =>array('type'=>'varchar(255)', 'label'=>'RefCustomer', 'enabled'=>1, 'visible'=>-1, 'position'=>22),
 		'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'RefExt', 'enabled'=>1, 'visible'=>0, 'position'=>40),
-		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'visible'=>-1, 'position'=>23),
+		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'isModEnabled("societe")', 'visible'=>-1, 'position'=>23),
 		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Fk projet', 'enabled'=>"isModEnabled('project')", 'visible'=>-1, 'position'=>24),
 		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>25),
 		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>55),
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 73988594e6f..f6b304a7a52 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -306,7 +306,7 @@ class Commande extends CommonOrder
 		'ref' =>array('type'=>'varchar(30)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'showoncombobox'=>1, 'position'=>25),
 		'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'RefExt', 'enabled'=>1, 'visible'=>0, 'position'=>26),
 		'ref_client' =>array('type'=>'varchar(255)', 'label'=>'RefCustomer', 'enabled'=>1, 'visible'=>-1, 'position'=>28),
-		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'visible'=>-1, 'notnull'=>1, 'position'=>20),
+		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'isModEnabled("societe")', 'visible'=>-1, 'notnull'=>1, 'position'=>20),
 		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'enabled'=>"isModEnabled('project')", 'visible'=>-1, 'position'=>25),
 		'date_commande' =>array('type'=>'date', 'label'=>'Date', 'enabled'=>1, 'visible'=>1, 'position'=>60),
 		'date_valid' =>array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>62),
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 3a586dfc3e5..6d7d2117147 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -169,7 +169,7 @@ class FactureRec extends CommonInvoice
 		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
 		'titre' =>array('type'=>'varchar(100)', 'label'=>'Titre', 'enabled'=>1, 'showoncombobox' => 1, 'visible'=>-1, 'position'=>15),
 		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>20, 'index'=>1),
-		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'visible'=>-1, 'notnull'=>1, 'position'=>25),
+		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'isModEnabled("societe")', 'visible'=>-1, 'notnull'=>1, 'position'=>25),
 		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>30),
 		//'amount' =>array('type'=>'double(24,8)', 'label'=>'Amount', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>35),
 		'remise' =>array('type'=>'double', 'label'=>'Remise', 'enabled'=>1, 'visible'=>-1, 'position'=>40),
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 4352364452b..cc9f3319a5d 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -232,7 +232,7 @@ class Contrat extends CommonObject
 		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>35),
 		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>40),
 		'date_contrat' =>array('type'=>'datetime', 'label'=>'Date contrat', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
-		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'visible'=>-1, 'notnull'=>1, 'position'=>70),
+		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'isModEnabled("societe")', 'visible'=>-1, 'notnull'=>1, 'position'=>70),
 		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'enabled'=>"isModEnabled('project')", 'visible'=>-1, 'position'=>75),
 		'fk_commercial_signature' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'SaleRepresentative Signature', 'enabled'=>1, 'visible'=>-1, 'position'=>80),
 		'fk_commercial_suivi' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'SaleRepresentative follower', 'enabled'=>1, 'visible'=>-1, 'position'=>85),
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index e6fc16a62d6..0308d52f67d 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -12,7 +12,7 @@ delete from llx_menu where menu_handler=__HANDLER__ and entity=__ENTITY__;
 -- Top-Menu
 -- old:              (module, enabled, rowid, ...)
 insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values (  1__+MAX_llx_menu__, '', '1',  __HANDLER__, 'top', 'home', '', 0, '/index.php?mainmenu=home&amp;leftmenu=', 'Home', -1, '', '', '', 2, 10, __ENTITY__);
-insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values (  2__+MAX_llx_menu__, 'societe|fournisseur|supplier_order|supplier_invoice', '($conf->societe->enabled && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) || isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || $conf->supplier_order->enabled || $conf->supplier_invoice->enabled))', __HANDLER__, 'top', 'companies',   '', 0, '/societe/index.php?mainmenu=companies&amp;leftmenu=', 'ThirdParties', -1, 'companies', '$user->rights->societe->lire || $user->rights->societe->contact->lire', '', 2, 20, __ENTITY__);
+insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values (  2__+MAX_llx_menu__, 'societe|fournisseur|supplier_order|supplier_invoice', '(isModEnabled("societe") && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) || isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || $conf->supplier_order->enabled || $conf->supplier_invoice->enabled))', __HANDLER__, 'top', 'companies',   '', 0, '/societe/index.php?mainmenu=companies&amp;leftmenu=', 'ThirdParties', -1, 'companies', '$user->rights->societe->lire || $user->rights->societe->contact->lire', '', 2, 20, __ENTITY__);
 insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values (  3__+MAX_llx_menu__, 'product|service', '$conf->product->enabled || $conf->service->enabled', __HANDLER__, 'top', 'products',    '', 0, '/product/index.php?mainmenu=products&amp;leftmenu=', 'ProductsPipeServices', -1, 'products', '$user->rights->produit->lire||$user->rights->service->lire', '', 0, 30, __ENTITY__);
 insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ( 16__+MAX_llx_menu__, 'bom|mrp', '$conf->bom->enabled || $conf->mrp->enabled', __HANDLER__, 'top', 'mrp',    '', 0, '/mrp/index.php?mainmenu=mrp&amp;leftmenu=', 'MRP', -1, 'mrp', '$user->rights->bom->read||$user->rights->mrp->read', '', 0, 31, __ENTITY__);
 insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values (  7__+MAX_llx_menu__, 'projet', '$conf->project->enabled', __HANDLER__, 'top', 'project',     '', 0, '/projet/index.php?mainmenu=project&amp;leftmenu=', 'Projects', -1, 'projects', '$user->rights->projet->lire', '', 2, 32, __ENTITY__);
@@ -83,36 +83,36 @@ 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 ('', '$leftmenu=="users"', __HANDLER__, 'left', 408__+MAX_llx_menu__, 'home', '', 407__+MAX_llx_menu__, '/user/group/card.php?mainmenu=home&amp;leftmenu=users&amp;action=create', 'NewGroup', 2, 'users', '(($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)', '', 2, 0, __ENTITY__);
 
 -- Third parties
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 500__+MAX_llx_menu__, 'companies', 'thirdparties', 2__+MAX_llx_menu__, '/societe/index.php?mainmenu=companies&amp;leftmenu=thirdparties', 'ThirdParty', 0, 'companies', '$user->rights->societe->lire', '', 2, 0, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 501__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/card.php?mainmenu=companies&amp;action=create', 'MenuNewThirdParty', 1, 'companies', '$user->rights->societe->creer', '', 2, 0, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 502__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/list.php?mainmenu=companies&amp;leftmenu=thirdparties', 'List', 1, 'companies', '$user->rights->societe->lire', '', 2, 0, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled && (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || isModEnabled("supplier_order") || isModEnabled("supplier_invoice"))', __HANDLER__, 'left', 503__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/list.php?mainmenu=companies&amp;type=f&leftmenu=suppliers', 'ListSuppliersShort', 1, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 5, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled && (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || isModEnabled("supplier_order") || isModEnabled("supplier_invoice"))', __HANDLER__, 'left', 504__+MAX_llx_menu__, 'companies', '', 503__+MAX_llx_menu__, '/societe/card.php?mainmenu=companies&amp;leftmenu=supplier&amp;action=create&amp;type=f', 'NewSupplier', 2, 'suppliers', '$user->rights->societe->creer', '', 2, 0, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 506__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/list.php?mainmenu=companies&amp;type=p&leftmenu=prospects', 'ListProspectsShort', 1, 'companies', '$user->rights->societe->lire', '', 2, 3, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 507__+MAX_llx_menu__, 'companies', '', 506__+MAX_llx_menu__, '/societe/card.php?mainmenu=companies&amp;leftmenu=prospects&amp;action=create&amp;type=p', 'MenuNewProspect', 2, 'companies', '$user->rights->societe->creer', '', 2, 0, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 509__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/list.php?mainmenu=companies&amp;type=c&leftmenu=customers', 'ListCustomersShort', 1, 'companies', '$user->rights->societe->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->societe->enabled', __HANDLER__, 'left', 510__+MAX_llx_menu__, 'companies', '', 509__+MAX_llx_menu__, '/societe/card.php?mainmenu=companies&amp;leftmenu=customers&amp;action=create&amp;type=c', 'MenuNewCustomer', 2, 'companies', '$user->rights->societe->creer', '', 2, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("societe")', __HANDLER__, 'left', 500__+MAX_llx_menu__, 'companies', 'thirdparties', 2__+MAX_llx_menu__, '/societe/index.php?mainmenu=companies&amp;leftmenu=thirdparties', 'ThirdParty', 0, 'companies', '$user->rights->societe->lire', '', 2, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("societe")', __HANDLER__, 'left', 501__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/card.php?mainmenu=companies&amp;action=create', 'MenuNewThirdParty', 1, 'companies', '$user->rights->societe->creer', '', 2, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("societe")', __HANDLER__, 'left', 502__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/list.php?mainmenu=companies&amp;leftmenu=thirdparties', 'List', 1, 'companies', '$user->rights->societe->lire', '', 2, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("societe") && (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || isModEnabled("supplier_order") || isModEnabled("supplier_invoice"))', __HANDLER__, 'left', 503__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/list.php?mainmenu=companies&amp;type=f&leftmenu=suppliers', 'ListSuppliersShort', 1, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 5, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("societe") && (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || isModEnabled("supplier_order") || isModEnabled("supplier_invoice"))', __HANDLER__, 'left', 504__+MAX_llx_menu__, 'companies', '', 503__+MAX_llx_menu__, '/societe/card.php?mainmenu=companies&amp;leftmenu=supplier&amp;action=create&amp;type=f', 'NewSupplier', 2, 'suppliers', '$user->rights->societe->creer', '', 2, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("societe")', __HANDLER__, 'left', 506__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/list.php?mainmenu=companies&amp;type=p&leftmenu=prospects', 'ListProspectsShort', 1, 'companies', '$user->rights->societe->lire', '', 2, 3, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("societe")', __HANDLER__, 'left', 507__+MAX_llx_menu__, 'companies', '', 506__+MAX_llx_menu__, '/societe/card.php?mainmenu=companies&amp;leftmenu=prospects&amp;action=create&amp;type=p', 'MenuNewProspect', 2, 'companies', '$user->rights->societe->creer', '', 2, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("societe")', __HANDLER__, 'left', 509__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/list.php?mainmenu=companies&amp;type=c&leftmenu=customers', 'ListCustomersShort', 1, 'companies', '$user->rights->societe->lire', '', 2, 4, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("societe")', __HANDLER__, 'left', 510__+MAX_llx_menu__, 'companies', '', 509__+MAX_llx_menu__, '/societe/card.php?mainmenu=companies&amp;leftmenu=customers&amp;action=create&amp;type=c', 'MenuNewCustomer', 2, 'companies', '$user->rights->societe->creer', '', 2, 0, __ENTITY__);
 
 -- Third parties - Contacts
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 600__+MAX_llx_menu__, 'companies', 'contacts', 2__+MAX_llx_menu__, '/contact/list.php?mainmenu=companies&amp;leftmenu=contacts', 'ContactsAddresses', 0, 'companies', '$user->rights->societe->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->societe->enabled', __HANDLER__, 'left', 601__+MAX_llx_menu__, 'companies', '', 600__+MAX_llx_menu__, '/contact/card.php?mainmenu=companies&amp;leftmenu=contacts&amp;action=create', 'NewContactAddress', 1, 'companies', '$user->rights->societe->creer', '', 2, 0, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 602__+MAX_llx_menu__, 'companies', '', 600__+MAX_llx_menu__, '/contact/list.php?mainmenu=companies&amp;leftmenu=contacts', 'List', 1, 'companies', '$user->rights->societe->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->societe->enabled', __HANDLER__, 'left', 604__+MAX_llx_menu__, 'companies', '', 602__+MAX_llx_menu__, '/contact/list.php?mainmenu=companies&amp;leftmenu=contacts&amp;type=p', 'ThirdPartyProspects', 2, 'companies', '$user->rights->societe->contact->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->societe->enabled', __HANDLER__, 'left', 605__+MAX_llx_menu__, 'companies', '', 602__+MAX_llx_menu__, '/contact/list.php?mainmenu=companies&amp;leftmenu=contacts&amp;type=c', 'ThirdPartyCustomers', 2, 'companies', '$user->rights->societe->contact->lire', '', 2, 2, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled && (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || isModEnabled("supplier_order") || isModEnabled("supplier_invoice"))', __HANDLER__, 'left', 606__+MAX_llx_menu__, 'companies', '', 602__+MAX_llx_menu__, '/contact/list.php?mainmenu=companies&amp;leftmenu=contacts&amp;type=f', 'ThirdPartySuppliers', 2, 'companies', '$user->rights->societe->contact->lire', '', 2, 3, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 607__+MAX_llx_menu__, 'companies', '', 602__+MAX_llx_menu__, '/contact/list.php?mainmenu=companies&amp;leftmenu=contacts&amp;type=o', 'Others', 2, 'companies', '$user->rights->societe->contact->lire', '', 2, 4, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("societe")', __HANDLER__, 'left', 600__+MAX_llx_menu__, 'companies', 'contacts', 2__+MAX_llx_menu__, '/contact/list.php?mainmenu=companies&amp;leftmenu=contacts', 'ContactsAddresses', 0, 'companies', '$user->rights->societe->lire', '', 2, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("societe")', __HANDLER__, 'left', 601__+MAX_llx_menu__, 'companies', '', 600__+MAX_llx_menu__, '/contact/card.php?mainmenu=companies&amp;leftmenu=contacts&amp;action=create', 'NewContactAddress', 1, 'companies', '$user->rights->societe->creer', '', 2, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("societe")', __HANDLER__, 'left', 602__+MAX_llx_menu__, 'companies', '', 600__+MAX_llx_menu__, '/contact/list.php?mainmenu=companies&amp;leftmenu=contacts', 'List', 1, 'companies', '$user->rights->societe->lire', '', 2, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("societe")', __HANDLER__, 'left', 604__+MAX_llx_menu__, 'companies', '', 602__+MAX_llx_menu__, '/contact/list.php?mainmenu=companies&amp;leftmenu=contacts&amp;type=p', 'ThirdPartyProspects', 2, 'companies', '$user->rights->societe->contact->lire', '', 2, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("societe")', __HANDLER__, 'left', 605__+MAX_llx_menu__, 'companies', '', 602__+MAX_llx_menu__, '/contact/list.php?mainmenu=companies&amp;leftmenu=contacts&amp;type=c', 'ThirdPartyCustomers', 2, 'companies', '$user->rights->societe->contact->lire', '', 2, 2, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("societe") && (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || isModEnabled("supplier_order") || isModEnabled("supplier_invoice"))', __HANDLER__, 'left', 606__+MAX_llx_menu__, 'companies', '', 602__+MAX_llx_menu__, '/contact/list.php?mainmenu=companies&amp;leftmenu=contacts&amp;type=f', 'ThirdPartySuppliers', 2, 'companies', '$user->rights->societe->contact->lire', '', 2, 3, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("societe")', __HANDLER__, 'left', 607__+MAX_llx_menu__, 'companies', '', 602__+MAX_llx_menu__, '/contact/list.php?mainmenu=companies&amp;leftmenu=contacts&amp;type=o', 'Others', 2, 'companies', '$user->rights->societe->contact->lire', '', 2, 4, __ENTITY__);
 
 -- Third parties - Category customer
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 650__+MAX_llx_menu__, 'companies', 'cat', 2__+MAX_llx_menu__, '/categories/index.php?mainmenu=companies&amp;leftmenu=cat&amp;type=1', 'SuppliersCategoriesShort', 0, 'categories', '$user->rights->categorie->lire', '', 2, 3, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 651__+MAX_llx_menu__, 'companies', '', 650__+MAX_llx_menu__, '/categories/card.php?mainmenu=companies&amp;action=create&amp;type=1', 'NewCategory', 1, 'categories', '$user->rights->categorie->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 ('', 'isModEnabled("societe") && $conf->categorie->enabled', __HANDLER__, 'left', 650__+MAX_llx_menu__, 'companies', 'cat', 2__+MAX_llx_menu__, '/categories/index.php?mainmenu=companies&amp;leftmenu=cat&amp;type=1', 'SuppliersCategoriesShort', 0, 'categories', '$user->rights->categorie->lire', '', 2, 3, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("societe") && $conf->categorie->enabled', __HANDLER__, 'left', 651__+MAX_llx_menu__, 'companies', '', 650__+MAX_llx_menu__, '/categories/card.php?mainmenu=companies&amp;action=create&amp;type=1', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__);
 
 -- Third parties - Category supplier
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '(isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) && $conf->categorie->enabled', __HANDLER__, 'left', 660__+MAX_llx_menu__, 'companies', 'cat', 2__+MAX_llx_menu__, '/categories/index.php?mainmenu=companies&amp;leftmenu=cat&amp;type=2', 'CustomersProspectsCategoriesShort', 0, 'categories', '$user->rights->categorie->lire', '', 2, 4, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '(isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) && $conf->categorie->enabled', __HANDLER__, 'left', 661__+MAX_llx_menu__, 'companies', '', 660__+MAX_llx_menu__, '/categories/card.php?mainmenu=companies&amp;action=create&amp;type=2', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__);
 
 -- Third parties - Category contact
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 670__+MAX_llx_menu__, 'companies', 'cat', 2__+MAX_llx_menu__, '/categories/index.php?mainmenu=companies&amp;leftmenu=cat&amp;type=4', 'ContactCategoriesShort', 0, 'categories', '$user->rights->categorie->lire', '', 2, 3, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 671__+MAX_llx_menu__, 'companies', '', 670__+MAX_llx_menu__, '/categories/card.php?mainmenu=companies&amp;action=create&amp;type=4', 'NewCategory', 1, 'categories', '$user->rights->categorie->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 ('', 'isModEnabled("societe") && $conf->categorie->enabled', __HANDLER__, 'left', 670__+MAX_llx_menu__, 'companies', 'cat', 2__+MAX_llx_menu__, '/categories/index.php?mainmenu=companies&amp;leftmenu=cat&amp;type=4', 'ContactCategoriesShort', 0, 'categories', '$user->rights->categorie->lire', '', 2, 3, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("societe") && $conf->categorie->enabled', __HANDLER__, 'left', 671__+MAX_llx_menu__, 'companies', '', 670__+MAX_llx_menu__, '/categories/card.php?mainmenu=companies&amp;action=create&amp;type=4', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__);
 
 -- Product - Product
 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', 2800__+MAX_llx_menu__, 'products', 'product', 3__+MAX_llx_menu__, '/product/index.php?mainmenu=products&amp;leftmenu=product&amp;type=0', 'Products', 0, 'products', '$user->rights->produit->lire', '', 2, 0, __ENTITY__);
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index cdb67a2c37b..2d7d56ec65d 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -106,7 +106,7 @@ class ConferenceOrBooth extends ActionComm
 		'id' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
 		'ref' => array('type'=>'integer', 'label'=>'Ref', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>2, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', '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_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'isModEnabled("societe")', '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'),
 		'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'),
diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index 595eaf67eeb..f1e4fe2f3d5 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -108,7 +108,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 		'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),
-		'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'=>40, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'help'=>"OrganizationEventLinkToThirdParty", 'picto'=>'company', 'css'=>'tdoverflowmax150 maxwidth500'),
+		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status = 1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'isModEnabled("societe")', 'position'=>40, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'help'=>"OrganizationEventLinkToThirdParty", 'picto'=>'company', 'css'=>'tdoverflowmax150 maxwidth500'),
 		'email_company' => array('type'=>'mail', 'label'=>'EmailCompany', 'enabled'=>'1', 'position'=>41, 'notnull'=>0, 'visible'=>-2, 'searchall'=>1),
 		'date_subscription' => array('type'=>'datetime', 'label'=>'DateOfRegistration', 'enabled'=>'1', 'position'=>56, 'notnull'=>1, 'visible'=>1, 'showoncombobox'=>'1',),
 		'fk_invoice' => array('type'=>'integer:Facture:compta/facture/class/facture.class.php', 'label'=>'Invoice', 'enabled'=>'$conf->facture->enabled', 'position'=>57, 'notnull'=>0, 'visible'=>-1, 'index'=>0, 'picto'=>'bill', 'css'=>'tdoverflowmax150 maxwidth500'),
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index e36598d04bc..a7c3e43f599 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -38,7 +38,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_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'isModEnabled("societe")', 'visible'=>-1, 'notnull'=>1, 'position'=>15),
 		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Fk projet', 'enabled'=>'isModEnabled("project")', 'visible'=>-1, 'position'=>20),
 		'fk_contrat' =>array('type'=>'integer', 'label'=>'Fk contrat', 'enabled'=>'$conf->contrat->enabled', 'visible'=>-1, 'position'=>25),
 		'ref' =>array('type'=>'varchar(30)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'showoncombobox'=>1, 'position'=>30),
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 4fc242bdbcc..0cfff5a8297 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -254,7 +254,7 @@ class CommandeFournisseur extends CommonOrder
 		'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),
+		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'isModEnabled("societe")', 'visible'=>1, 'notnull'=>1, 'position'=>46),
 		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>1000, 'index'=>1),
 		'tms'=>array('type'=>'datetime', 'label'=>"DateModificationShort", 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>501),
 		'last_main_doc' =>array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>1, 'visible'=>0, 'position'=>700),
diff --git a/htdocs/fourn/class/fournisseur.facture-rec.class.php b/htdocs/fourn/class/fournisseur.facture-rec.class.php
index 738e27a84e9..53066afc0b7 100644
--- a/htdocs/fourn/class/fournisseur.facture-rec.class.php
+++ b/htdocs/fourn/class/fournisseur.facture-rec.class.php
@@ -181,7 +181,7 @@ class FactureFournisseurRec extends CommonInvoice
 		'titre' =>array('type'=>'varchar(100)', 'label'=>'Titre', 'enabled'=>1, 'showoncombobox' => 1, 'visible'=>-1, 'position'=>15),
 		'ref_supplier' =>array('type'=>'varchar(180)', 'label'=>'RefSupplier', 'enabled'=>1, 'showoncombobox' => 1, 'visible'=>-1, 'position'=>20),
 		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>25, 'index'=>1),
-		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'visible'=>-1, 'notnull'=>1, 'position'=>30),
+		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'isModEnabled("societe")', 'visible'=>-1, 'notnull'=>1, 'position'=>30),
 		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>35),
 		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>40),
 		'suspended' =>array('type'=>'integer', 'label'=>'Suspended', 'enabled'=>1, 'visible'=>-1, 'position'=>225),
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index adf9fac3bde..524b50a5061 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -275,7 +275,7 @@ class FactureFournisseur extends CommonInvoice
 		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>25, 'index'=>1),
 		'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'RefExt', 'enabled'=>1, 'visible'=>0, 'position'=>30),
 		'type' =>array('type'=>'smallint(6)', 'label'=>'Type', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>35),
-		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'visible'=>-1, 'notnull'=>1, 'position'=>40),
+		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'isModEnabled("societe")', 'visible'=>-1, 'notnull'=>1, 'position'=>40),
 		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
 		'datef' =>array('type'=>'date', 'label'=>'Date', 'enabled'=>1, 'visible'=>-1, 'position'=>50),
 		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>55),
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 2fe7d983513..086420ef653 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -119,7 +119,7 @@ class MyObject extends CommonObject
 		'label'         => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>'Help text', 'showoncombobox'=>2, 'validate'=>1, 'alwayseditable'=>1),
 		'amount'        => array('type'=>'price', 'label'=>'Amount', 'enabled'=>1, 'visible'=>1, 'default'=>'null', 'position'=>40, 'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for amount', 'validate'=>1),
 		'qty'           => array('type'=>'real', 'label'=>'Qty', 'enabled'=>1, 'visible'=>1, 'default'=>'0', 'position'=>45, 'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for quantity', 'css'=>'maxwidth75imp', 'validate'=>1),
-		'fk_soc' 		=> array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'picto'=>'company', 'label'=>'ThirdParty', 'visible'=> 1, 'enabled'=>'$conf->societe->enabled', 'position'=>50, 'notnull'=>-1, 'index'=>1, 'help'=>'OrganizationEventLinkToThirdParty', 'validate'=>1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150'),
+		'fk_soc' 		=> array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'picto'=>'company', 'label'=>'ThirdParty', 'visible'=> 1, 'enabled'=>'isModEnabled("societe")', 'position'=>50, 'notnull'=>-1, 'index'=>1, 'help'=>'OrganizationEventLinkToThirdParty', 'validate'=>1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150'),
 		'fk_project'    => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'picto'=>'project', 'enabled'=>'$conf->project->enabled', 'visible'=>-1, 'position'=>52, 'notnull'=>-1, 'index'=>1, 'validate'=>1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150'),
 		'description'   => array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>3, 'position'=>60, 'validate'=>1),
 		'note_public'   => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61, 'validate'=>1, 'cssview'=>'wordbreak'),
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 8624713c689..1aaf51808b8 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -106,7 +106,7 @@ class Mo extends CommonObject
 		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:0', 'label'=>'Product', 'enabled'=>'$conf->product->enabled', 'visible'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'comment'=>"Product to produce", 'css'=>'maxwidth300', 'csslist'=>'tdoverflowmax100', 'picto'=>'product'),
 		'qty' => array('type'=>'real', 'label'=>'QtyToProduce', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'notnull'=>1, 'comment'=>"Qty to produce", 'css'=>'width75', 'default'=>1, 'isameasure'=>1),
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>42, 'notnull'=>-1, 'searchall'=>1, 'showoncombobox'=>'2', 'css'=>'maxwidth300', 'csslist'=>'tdoverflowmax200', 'alwayseditable'=>1),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1', 'label'=>'ThirdParty', 'picto'=>'company', 'enabled'=>'$conf->societe->enabled', 'visible'=>-1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'css'=>'maxwidth400', 'csslist'=>'tdoverflowmax150'),
+		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1', 'label'=>'ThirdParty', 'picto'=>'company', 'enabled'=>'isModEnabled("societe")', 'visible'=>-1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'css'=>'maxwidth400', 'csslist'=>'tdoverflowmax150'),
 		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'picto'=>'project', 'enabled'=>'$conf->project->enabled', 'visible'=>-1, 'position'=>51, 'notnull'=>-1, 'index'=>1, 'css'=>'minwidth200 maxwidth400', 'csslist'=>'tdoverflowmax100'),
 		'fk_warehouse' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:0', 'label'=>'WarehouseForProduction', 'picto'=>'stock', 'enabled'=>'$conf->stock->enabled', 'visible'=>1, 'position'=>52, 'css'=>'maxwidth400', 'csslist'=>'tdoverflowmax200'),
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61, 'notnull'=>-1,),
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index 7a9d077f910..fb34e33376e 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -124,7 +124,7 @@ class RecruitmentJobPosition extends CommonObject
 		'email_recruiter' => array('type'=>'varchar(255)', 'label'=>'EmailRecruiter', 'enabled'=>'1', 'position'=>54, 'notnull'=>0, 'visible'=>-1, 'help'=>'ToUseAGenericEmail', 'picto'=>'email'),
 		'fk_user_supervisor' => array('type'=>'integer:User:user/class/user.class.php:t.statut = 1', 'label'=>'FutureManager', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>-1, 'foreignkey'=>'user.rowid', 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax150', 'picto'=>'user'),
 		'fk_establishment' => array('type'=>'integer:Establishment:hrm/class/establishment.class.php', 'label'=>'Establishment', 'enabled'=>'$conf->hrm->enabled', 'position'=>56, 'notnull'=>0, 'visible'=>-1, 'foreignkey'=>'establishment.rowid',),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'WorkPlace', 'enabled'=>'$conf->societe->enabled', 'position'=>57, 'notnull'=>-1, 'visible'=>-1, 'css'=>'maxwidth500', 'index'=>1, 'help'=>"IfJobIsLocatedAtAPartner", 'picto'=>'company'),
+		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'WorkPlace', 'enabled'=>'isModEnabled("societe")', 'position'=>57, 'notnull'=>-1, 'visible'=>-1, 'css'=>'maxwidth500', 'index'=>1, 'help'=>"IfJobIsLocatedAtAPartner", 'picto'=>'company'),
 		'date_planned' => array('type'=>'date', 'label'=>'DateExpected', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>1,),
 		'remuneration_suggested' => array('type'=>'varchar(255)', 'label'=>'Remuneration', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>1,),
 		'description' => array('type'=>'html', 'label'=>'Description', 'enabled'=>'1', 'position'=>65, 'notnull'=>0, 'visible'=>3,),
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 2aacffefcd1..ac6abea95d3 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -280,7 +280,7 @@ class Ticket extends CommonObject
 		'type_code' => array('type'=>'varchar(32)', 'label'=>'Type', 'visible'=>1, 'enabled'=>1, 'position'=>20, 'notnull'=>-1, 'help'=>"", 'csslist'=>'maxwidth125 tdoverflowmax50'),
 		'category_code' => array('type'=>'varchar(32)', 'label'=>'TicketCategory', 'visible'=>-1, 'enabled'=>1, 'position'=>21, 'notnull'=>-1, 'help'=>"", 'css'=>'maxwidth100 tdoverflowmax200'),
 		'severity_code' => array('type'=>'varchar(32)', 'label'=>'Severity', 'visible'=>1, 'enabled'=>1, 'position'=>22, 'notnull'=>-1, 'help'=>"", 'css'=>'maxwidth100'),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'visible'=>1, 'enabled'=>'$conf->societe->enabled', 'position'=>50, 'notnull'=>-1, 'index'=>1, 'searchall'=>1, 'help'=>"OrganizationEventLinkToThirdParty", 'css'=>'tdoverflowmax150 maxwidth150onsmartphone'),
+		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'visible'=>1, 'enabled'=>'isModEnabled("societe")', 'position'=>50, 'notnull'=>-1, 'index'=>1, 'searchall'=>1, 'help'=>"OrganizationEventLinkToThirdParty", 'css'=>'tdoverflowmax150 maxwidth150onsmartphone'),
 		'notify_tiers_at_create' => array('type'=>'integer', 'label'=>'NotifyThirdparty', 'visible'=>-1, 'enabled'=>0, 'position'=>51, 'notnull'=>1, 'index'=>1),
 		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php', 'label'=>'Project', 'visible'=>-1, 'enabled'=>'$conf->project->enabled', 'position'=>52, 'notnull'=>-1, 'index'=>1, 'help'=>"LinkToProject"),
 		//'timing' => array('type'=>'varchar(20)', 'label'=>'Timing', 'visible'=>-1, 'enabled'=>1, 'position'=>42, 'notnull'=>-1, 'help'=>""),	// what is this ?

From f6cde9507ec3bccabb1dc07b0e94e0ccec2195b2 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Wed, 11 Jan 2023 09:35:28 +0100
Subject: [PATCH 457/816] FIX : alias name in contact list

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

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index da07a2b699b..a025ef81b97 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -357,6 +357,9 @@ if (!empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES)
 	$contactstatic->loadCacheOfProspStatus();
 }
 
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+
 // Select every potentiels, and note each potentiels which fit in search parameters
 $tab_level = array();
 $sql = "SELECT code, label, sortorder";
@@ -692,9 +695,6 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && (
 	exit;
 }
 
-$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
-
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:M&oacute;dulo_Empresas';
 llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');
 
@@ -1377,7 +1377,7 @@ while ($i < min($num, $limit)) {
 			if ($obj->socid) {
 				$objsoc = new Societe($db);
 				$objsoc->fetch($obj->socid);
-				print $objsoc->getNomUrl(1);
+				print $objsoc->getNomUrl(1, '', 100, 0, 1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);
 			} else {
 				print '&nbsp;';
 			}

From c0a7bca04e173b6f4aa692f2dc2e0d2b6143bd7f Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Wed, 11 Jan 2023 10:50:58 +0100
Subject: [PATCH 458/816] Fix supplier reccurent invoice if no pdf model

---
 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..024f6bf3e6f 100644
--- a/htdocs/fourn/class/fournisseur.facture-rec.class.php
+++ b/htdocs/fourn/class/fournisseur.facture-rec.class.php
@@ -1331,7 +1331,7 @@ class FactureFournisseurRec extends CommonInvoice
 						// We refresh the object in order to have all necessary data (like date_lim_reglement)
 						$new_fac_fourn->fetch($new_fac_fourn->id);
 						$result = $new_fac_fourn->generateDocument($facturerec->model_pdf, $langs);
-						if ($result <= 0) {
+						if ($result < 0) {
 							$this->errors = $new_fac_fourn->errors;
 							$this->error = $new_fac_fourn->error;
 							$error++;

From 7bcaae86f4b9656302a544805a316282e6591805 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Wed, 11 Jan 2023 13:33:29 +0100
Subject: [PATCH 459/816] Fix php 8 warning

---
 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 d928931c9ab..e5c9dcb3127 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -2514,7 +2514,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			print '</td>';
 		} elseif ($value == 'type_duration') {
 			print '<td>';
-			print $form->selectTypeDuration('', $obj->{$value}, array('i','h'));
+			print $form->selectTypeDuration('', (!empty($obj->{$value}) ? $obj->{$value}:''), array('i','h'));
 			print '</td>';
 		} else {
 			$fieldValue = isset($obj->{$value}) ? $obj->{$value}: '';

From e820bb91c2662002e080c3e3796a8f6f1680e19d Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Wed, 11 Jan 2023 14:18:45 +0100
Subject: [PATCH 460/816] kanban view for localtax list

---
 .../compta/localtax/class/localtax.class.php  | 34 ++++++++++++++
 htdocs/compta/localtax/list.php               | 44 ++++++++++++++-----
 2 files changed, 68 insertions(+), 10 deletions(-)

diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index ed467ec91f4..f5cb98c1199 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -629,4 +629,38 @@ class Localtax extends CommonObject
 
 		return '';
 	}
+
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $langs, $db;
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>';
+		if (property_exists($this, 'label')) {
+			$return .= ' | <span class="info-box-label">'.$this->label.'</span>';
+		}
+		if (property_exists($this, 'datev')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("DateEnd").'</span> : <span class="info-box-label">'.dol_print_date($db->jdate($this->datev), 'day').'</span>';
+		}
+		if (property_exists($this, 'datep')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("DatePayment", '', '', '', '', 5).'</span> : <span class="info-box-label">'.dol_print_date($db->jdate($this->datep), 'day').'</span>';
+		}
+		if (property_exists($this, 'amount')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("Amount").'</span> : <span class="info-box-label amount">'.price($this->amount).'</span>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
diff --git a/htdocs/compta/localtax/list.php b/htdocs/compta/localtax/list.php
index ee2e13e1d57..42f4d326811 100644
--- a/htdocs/compta/localtax/list.php
+++ b/htdocs/compta/localtax/list.php
@@ -35,7 +35,7 @@ if ($user->socid) {
 }
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 $ltt = GETPOST("localTaxType", 'int');
-
+$mode = GETPOST('mode', 'alpha');
 
 /*
  * View
@@ -49,7 +49,14 @@ $url = DOL_URL_ROOT.'/compta/localtax/card.php?action=create&localTaxType='.$ltt
 if (!empty($socid)) {
 	$url .= '&socid='.$socid;
 }
-$newcardbutton = dolGetButtonTitle($langs->trans('NewLocalTaxPayment', ($ltt + 1)), '', 'fa fa-plus-circle', $url, '', $user->rights->tax->charges->creer);
+$param = '';
+if (!empty($mode)) {
+	$param .= '&mode='.urlencode($mode);
+}
+$newcardbutton = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?localTaxType='.$ltt.'&mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?localTaxType='.$ltt.'&mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('NewLocalTaxPayment', ($ltt + 1)), '', 'fa fa-plus-circle', $url, '', $user->rights->tax->charges->creer);
 
 print load_fiche_titre($langs->transcountry($ltt == 2 ? "LT2Payments" : "LT1Payments", $mysoc->country_code), $newcardbutton, 'title_accountancy');
 
@@ -77,19 +84,36 @@ if ($result) {
 	while ($i < $num) {
 		$obj = $db->fetch_object($result);
 
-		print '<tr class="oddeven">';
-
+		$localtax_static->label = $obj->label;
 		$localtax_static->id = $obj->rowid;
 		$localtax_static->ref = $obj->rowid;
-		print "<td>".$localtax_static->getNomUrl(1)."</td>\n";
-		print "<td>".dol_trunc($obj->label, 40)."</td>\n";
-		print '<td class="left">'.dol_print_date($db->jdate($obj->datev), 'day')."</td>\n";
-		print '<td class="left">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
+		$localtax_static->datev = $obj->datev;
+		$localtax_static->datep = $obj->datep;
+		$localtax_static->amount = $obj->amount;
+
 		$total = $total + $obj->amount;
 
-		print '<td class="right nowraponall"><span class="amount">'.price($obj->amount).'</span></td>';
-		print "</tr>\n";
+		if ($mode == 'kanban') {
+			if ($i == 0) {
+				print '<tr><td colspan="12">';
+				print '<div class="box-flex-container">';
+			}
+			// Output Kanban
+			print $localtax_static->getKanbanView('');
+			if ($i == ($num - 1)) {
+				print '</div>';
+				print '</td></tr>';
+			}
+		} else {
+			print '<tr class="oddeven">';
+			print "<td>".$localtax_static->getNomUrl(1)."</td>\n";
+			print "<td>".dol_trunc($obj->label, 40)."</td>\n";
+			print '<td class="left">'.dol_print_date($db->jdate($obj->datev), 'day')."</td>\n";
+			print '<td class="left">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
 
+			print '<td class="right nowraponall"><span class="amount">'.price($obj->amount).'</span></td>';
+			print "</tr>\n";
+		}
 		$i++;
 	}
 	print '<tr class="liste_total"><td colspan="4">'.$langs->trans("Total").'</td>';

From 91837dd2efc979721ed300807e827eb6d1c58da3 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Wed, 11 Jan 2023 15:03:55 +0100
Subject: [PATCH 461/816] kanban mode for list of salaries

---
 htdocs/salaries/class/salary.class.php |  34 ++++
 htdocs/salaries/list.php               | 217 ++++++++++++++-----------
 2 files changed, 155 insertions(+), 96 deletions(-)

diff --git a/htdocs/salaries/class/salary.class.php b/htdocs/salaries/class/salary.class.php
index 25adb60382c..72a228658d8 100644
--- a/htdocs/salaries/class/salary.class.php
+++ b/htdocs/salaries/class/salary.class.php
@@ -707,4 +707,38 @@ class Salary extends CommonObject
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
+
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $langs, $db;
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
+		if (property_exists($this, 'fk_user')) {
+			$return .= ' | <span class="info-box-label">'.$this->fk_user.'</span>';
+		}
+		if (property_exists($this, 'type_payment')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("PaymentMode").'</span> : <span class="info-box-label">'.$this->type_payment.'</span>';
+		}
+		if (property_exists($this, 'amount')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("Amount").'</span> : <span class="info-box-label amount">'.price($this->amount).'</span>';
+		}
+		if (method_exists($this, 'LibStatut')) {
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->LibStatut($this->paye, 5, $this->alreadypaid).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 361107005a6..edeafa94c6a 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -44,6 +44,8 @@ $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$mode       = GETPOST('mode', 'alpha');  //for mode view
+
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
@@ -315,6 +317,9 @@ llxHeader('', $title, $help_url);
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
+if (!empty($mode)) {
+	$param .= '&mode='.urlencode($mode);
+}
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 	$param .= '&contextpage='.urlencode($contextpage);
 }
@@ -379,11 +384,16 @@ print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
+
 
 $url = DOL_URL_ROOT.'/salaries/card.php?action=create';
 if (!empty($socid)) {
 	$url .= '&socid='.$socid;
 }
+$newcardbutton  = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
 $newcardbutton = dolGetButtonTitle($langs->trans('NewSalaryPayment'), '', 'fa fa-plus-circle', $url, '', $user->rights->salaries->write);
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'salary', 0, $newcardbutton, '', $limit, 0, 0, 1);
@@ -534,121 +544,136 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	$salstatic->ref = $obj->rowid;
 	$salstatic->label = $obj->label;
 	$salstatic->paye = $obj->paye;
-	$salstatic->datesp = $db->jdate($obj->datesp);
-	$salstatic->dateep = $db->jdate($obj->dateep);
+	$salstatic->datesp = $obj->datesp;
+	$salstatic->dateep = $obj->dateep;
+	$salstatic->amount = $obj->amount;
+	$salstatic->fk_user = $userstatic->getNomUrl(1);
+	$salstatic->type_payment = $obj->payment_code;
 
-	// Show here line of result
-	print '<tr class="oddeven">';
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr><td colspan="12">';
+			print '<div class="box-flex-container">';
+		}
+		// Output Kanban
+		print $salstatic->getKanbanView('');
+		if ($i == (min($num, $limit) - 1)) {
+			print '</div>';
+			print '</td></tr>';
+		}
+	} else {
+		// Show here line of result
+		print '<tr class="oddeven">';
 
-	// Ref
-	print "<td>".$salstatic->getNomUrl(1)."</td>\n";
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
+		// Ref
+		print "<td>".$salstatic->getNomUrl(1)."</td>\n";
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
-	// Label payment
-	print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->label).'">'.dol_escape_htmltag($obj->label)."</td>\n";
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
+		// Label payment
+		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->label).'">'.dol_escape_htmltag($obj->label)."</td>\n";
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
-	// Date Start
-	print '<td class="center">'.dol_print_date($db->jdate($obj->datesp), 'day')."</td>\n";
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
+		// Date Start
+		print '<td class="center">'.dol_print_date($db->jdate($obj->datesp), 'day')."</td>\n";
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
-	// Date End
-	print '<td class="center">'.dol_print_date($db->jdate($obj->dateep), 'day')."</td>\n";
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
+		// Date End
+		print '<td class="center">'.dol_print_date($db->jdate($obj->dateep), 'day')."</td>\n";
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
-	// Employee
-	print '<td class="tdoverflowmax150">'.$userstatic->getNomUrl(1)."</td>\n";
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
+		// Employee
+		print '<td class="tdoverflowmax150">'.$userstatic->getNomUrl(1)."</td>\n";
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
-	// Type
-	print '<td>';
-	if (!empty($obj->payment_code)) print $langs->trans("PaymentTypeShort".$obj->payment_code);
-	print '</td>';
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
-
-	// Account
-	if (isModEnabled("banque")) {
+		// Type
 		print '<td>';
-		if ($obj->fk_account > 0) {
-			//$accountstatic->fetch($obj->fk_bank);
-			$accountstatic->id = $obj->bid;
-			$accountstatic->ref = $obj->bref;
-			$accountstatic->label = $obj->blabel;
-			$accountstatic->number = $obj->bnumber;
-			$accountstatic->iban = $obj->iban;
-			$accountstatic->bic = $obj->bic;
-			$accountstatic->currency_code = $langs->trans("Currency".$obj->currency_code);
-			$accountstatic->account_number = $obj->account_number;
-			$accountstatic->clos = $obj->clos;
+		if (!empty($obj->payment_code)) print $langs->trans("PaymentTypeShort".$obj->payment_code);
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
-			if (isModEnabled('accounting')) {
+		// Account
+		if (isModEnabled("banque")) {
+			print '<td>';
+			if ($obj->fk_account > 0) {
+				//$accountstatic->fetch($obj->fk_bank);
+				$accountstatic->id = $obj->bid;
+				$accountstatic->ref = $obj->bref;
+				$accountstatic->label = $obj->blabel;
+				$accountstatic->number = $obj->bnumber;
+				$accountstatic->iban = $obj->iban;
+				$accountstatic->bic = $obj->bic;
+				$accountstatic->currency_code = $langs->trans("Currency".$obj->currency_code);
 				$accountstatic->account_number = $obj->account_number;
+				$accountstatic->clos = $obj->clos;
 
-				$accountingjournal = new AccountingJournal($db);
-				$accountingjournal->fetch($obj->fk_accountancy_journal);
+				if (isModEnabled('accounting')) {
+					$accountstatic->account_number = $obj->account_number;
 
-				$accountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
+					$accountingjournal = new AccountingJournal($db);
+					$accountingjournal->fetch($obj->fk_accountancy_journal);
+
+					$accountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
+				}
+				//$accountstatic->label = $obj->blabel;
+				print $accountstatic->getNomUrl(1);
+			} else {
+				print '&nbsp;';
 			}
-			//$accountstatic->label = $obj->blabel;
-			print $accountstatic->getNomUrl(1);
-		} else {
-			print '&nbsp;';
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		//  if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
+
+		// Amount
+		print '<td class="nowrap right"><span class="amount">'.price($obj->amount).'</span></td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+		if (!$i) {
+			$totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
+		}
+		$totalarray['val']['totalttcfield'] += $obj->amount;
+
+		print '<td class="nowrap right">'.$salstatic->LibStatut($obj->paye, 5, $obj->alreadypayed).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+
+		// Extra fields
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+		// Fields from hook
+		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		// Action column
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($object->id, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
+
+		print '</tr>'."\n";
 	}
-
-	//  if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
-
-	// Amount
-	print '<td class="nowrap right"><span class="amount">'.price($obj->amount).'</span></td>';
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
-	if (!$i) {
-		$totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
-	}
-	$totalarray['val']['totalttcfield'] += $obj->amount;
-
-	print '<td class="nowrap right">'.$salstatic->LibStatut($obj->paye, 5, $obj->alreadypayed).'</td>';
-	if (!$i) $totalarray['nbfield']++;
-
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	// Action column
-	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		$selected = 0;
-		if (in_array($object->id, $arrayofselected)) {
-			$selected = 1;
-		}
-		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
-	}
-	print '</td>';
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
-
-	print '</tr>'."\n";
-
 	$i++;
 }
 

From 7213595cef946f1c29b4516e2768586c710fe078 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Wed, 11 Jan 2023 15:19:21 +0100
Subject: [PATCH 462/816] modify kanban mode for list of salaries

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

diff --git a/htdocs/salaries/class/salary.class.php b/htdocs/salaries/class/salary.class.php
index 72a228658d8..7f9ea31cdc9 100644
--- a/htdocs/salaries/class/salary.class.php
+++ b/htdocs/salaries/class/salary.class.php
@@ -716,7 +716,7 @@ class Salary extends CommonObject
 	 */
 	public function getKanbanView($option = '')
 	{
-		global $langs, $db;
+		global $langs;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
 		$return .= '<div class="info-box info-box-sm">';
 		$return .= '<span class="info-box-icon bg-infobox-action">';

From a410100496dc54a16b4c713fff44d2e098bdba9a Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Wed, 11 Jan 2023 15:23:12 +0100
Subject: [PATCH 463/816] modify variable in class localtax

---
 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 f5cb98c1199..d2300128550 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -638,7 +638,7 @@ class Localtax extends CommonObject
 	 */
 	public function getKanbanView($option = '')
 	{
-		global $langs, $db;
+		global $langs;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
 		$return .= '<div class="info-box info-box-sm">';
 		$return .= '<span class="info-box-icon bg-infobox-action">';
@@ -650,10 +650,10 @@ class Localtax extends CommonObject
 			$return .= ' | <span class="info-box-label">'.$this->label.'</span>';
 		}
 		if (property_exists($this, 'datev')) {
-			$return .= '<br><span class="opacitymedium">'.$langs->trans("DateEnd").'</span> : <span class="info-box-label">'.dol_print_date($db->jdate($this->datev), 'day').'</span>';
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("DateEnd").'</span> : <span class="info-box-label">'.dol_print_date($this->db->jdate($this->datev), 'day').'</span>';
 		}
 		if (property_exists($this, 'datep')) {
-			$return .= '<br><span class="opacitymedium">'.$langs->trans("DatePayment", '', '', '', '', 5).'</span> : <span class="info-box-label">'.dol_print_date($db->jdate($this->datep), 'day').'</span>';
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("DatePayment", '', '', '', '', 5).'</span> : <span class="info-box-label">'.dol_print_date($this->db->jdate($this->datep), 'day').'</span>';
 		}
 		if (property_exists($this, 'amount')) {
 			$return .= '<br><span class="opacitymedium">'.$langs->trans("Amount").'</span> : <span class="info-box-label amount">'.price($this->amount).'</span>';

From cfb16cc9cd296553c5acf9141941b1e25901ed46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9=20Courtier?= <noe.courtier@scopen.fr>
Date: Wed, 11 Jan 2023 16:49:59 +0100
Subject: [PATCH 464/816] FIX: ref not available after ecmFile create()

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

diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index a451a462ea3..d6c906527f4 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -240,12 +240,9 @@ class EcmFiles extends CommonObject
 		}
 
 		// If ref not defined
-		$ref = '';
-		if (!empty($this->ref)) {
-			$ref = $this->ref;
-		} else {
+		if (empty($this->ref)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
-			$ref = dol_hash($this->filepath.'/'.$this->filename, 3);
+			$this->ref = dol_hash($this->filepath.'/'.$this->filename, 3);
 		}
 
 		$maxposition = 0;
@@ -300,7 +297,7 @@ class EcmFiles extends CommonObject
 		$sql .= 'src_object_type,';
 		$sql .= 'src_object_id';
 		$sql .= ') VALUES (';
-		$sql .= " '".$this->db->escape($ref)."', ";
+		$sql .= " '".$this->db->escape($this->ref)."', ";
 		$sql .= ' '.(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'").',';
 		$sql .= ' '.(!isset($this->share) ? 'NULL' : "'".$this->db->escape($this->share)."'").',';
 		$sql .= ' '.$this->entity.',';

From 62d33484715766b6c22ef3788327cc27d2d3052d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 11 Jan 2023 16:56:06 +0100
Subject: [PATCH 465/816] Make module Paybox deprecated

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

diff --git a/htdocs/core/modules/modPaybox.class.php b/htdocs/core/modules/modPaybox.class.php
index cf6ef512873..3df0b8f6a1d 100644
--- a/htdocs/core/modules/modPaybox.class.php
+++ b/htdocs/core/modules/modPaybox.class.php
@@ -54,7 +54,7 @@ class modPayBox extends DolibarrModules
 		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
 		$this->description = "Module to offer an online payment page by credit card with PayBox";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'dolibarr';
+		$this->version = 'dolibarr_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.

From 2eb054a170fcc4706ab42a94c0a0e569efde6d1a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 11 Jan 2023 17:06:23 +0100
Subject: [PATCH 466/816] Fix try fix function not found of qodana

---
 htdocs/api/index.php                  | 12 ++++++------
 htdocs/core/class/dolgeoip.class.php  |  6 ++++--
 htdocs/core/class/translate.class.php |  6 ++++--
 htdocs/core/lib/files.lib.php         |  6 +++---
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index ba195b82c08..4e4da2c94cc 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -389,13 +389,13 @@ if (!empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/swagger.json' &&
 $usecompression = (empty($conf->global->API_DISABLE_COMPRESSION) && !empty($_SERVER['HTTP_ACCEPT_ENCODING']));
 $foundonealgorithm = 0;
 if ($usecompression) {
-	if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'br') !== false && is_callable('brotli_compress')) {
+	if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'br') !== false && function_exists('brotli_compress')) {
 		$foundonealgorithm++;
 	}
-	if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'bz') !== false && is_callable('bzcompress')) {
+	if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'bz') !== false && function_exists('bzcompress')) {
 		$foundonealgorithm++;
 	}
-	if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false && is_callable('gzencode')) {
+	if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false && function_exists('gzencode')) {
 		$foundonealgorithm++;
 	}
 	if (!$foundonealgorithm) {
@@ -413,13 +413,13 @@ $result = $api->r->handle();
 
 if (Luracast\Restler\Defaults::$returnResponse) {
 	// We try to compress the data received data
-	if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'br') !== false && is_callable('brotli_compress') && defined('BROTLI_TEXT')) {
+	if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'br') !== false && function_exists('brotli_compress') && defined('BROTLI_TEXT')) {
 		header('Content-Encoding: br');
 		$result = brotli_compress($result, 11, constant('BROTLI_TEXT'));
-	} elseif (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'bz') !== false && is_callable('bzcompress')) {
+	} elseif (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'bz') !== false && function_exists('bzcompress')) {
 		header('Content-Encoding: bz');
 		$result = bzcompress($result, 9);
-	} elseif (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false && is_callable('gzencode')) {
+	} elseif (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false && function_exists('gzencode')) {
 		header('Content-Encoding: gzip');
 		$result = gzencode($result, 9);
 	} else {
diff --git a/htdocs/core/class/dolgeoip.class.php b/htdocs/core/class/dolgeoip.class.php
index a2eea7023d9..e5001270131 100644
--- a/htdocs/core/class/dolgeoip.class.php
+++ b/htdocs/core/class/dolgeoip.class.php
@@ -144,10 +144,12 @@ class DolGeoIP
 						return '';
 					}
 				} else {
-					if (!function_exists('geoip_country_code_by_addr_v6')) {
+					if (function_exists('geoip_country_code_by_addr_v6')) {
+						return strtolower(geoip_country_code_by_addr_v6($this->gi, $ip));
+					} elseif (function_exists('geoip_country_code_by_name_v6')) {
 						return strtolower(geoip_country_code_by_name_v6($this->gi, $ip));
 					}
-					return strtolower(geoip_country_code_by_addr_v6($this->gi, $ip));
+					return '';
 				}
 			}
 		}
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 3f2f756977d..2315428b37a 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -932,8 +932,10 @@ class Translate
 			$fonc = 'numberwords';
 			if (file_exists($newdir.'/functions_'.$fonc.'.lib.php')) {
 				include_once $newdir.'/functions_'.$fonc.'.lib.php';
-				$newnumber = numberwords_getLabelFromNumber($this, $number, $isamount);
-				break;
+				if (function_exists('numberwords_getLabelFromNumber')) {
+					$newnumber = numberwords_getLabelFromNumber($this, $number, $isamount);
+					break;
+				}
 			}
 		}
 
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index ad7d7cecfa5..207f5bafeb7 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2058,13 +2058,13 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring
 		dol_syslog("dol_compress_file mode=".$mode." inputfile=".$inputfile." outputfile=".$outputfile);
 
 		$data = implode("", file(dol_osencode($inputfile)));
-		if ($mode == 'gz') {
+		if ($mode == 'gz' && function_exists('gzencode')) {
 			$foundhandler = 1;
 			$compressdata = gzencode($data, 9);
-		} elseif ($mode == 'bz') {
+		} elseif ($mode == 'bz' && function_exists('bzcompress')) {
 			$foundhandler = 1;
 			$compressdata = bzcompress($data, 9);
-		} elseif ($mode == 'zstd') {
+		} elseif ($mode == 'zstd' && function_exists('zstd_compress')) {
 			$foundhandler = 1;
 			$compressdata = zstd_compress($data, 9);
 		} elseif ($mode == 'zip') {

From 356923b3695bd1ef773dd7789da6c04c7ea71394 Mon Sep 17 00:00:00 2001
From: atm-florian <florian.mortgat@atm-consulting.fr>
Date: Wed, 11 Jan 2023 17:31:37 +0100
Subject: [PATCH 467/816] FIX 14.0: move splitting of module:submodule string
 out of the genallowed condition

---
 htdocs/core/class/html.formfile.class.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 6fe10788c54..c1438209d5e 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -463,6 +463,15 @@ class FormFile
 			$titletoshow = ($title == 'none' ? '' : $title);
 		}
 
+		$submodulepart = $modulepart;
+
+		// modulepart = 'nameofmodule' or 'nameofmodule:NameOfObject'
+		$tmp = explode(':', $modulepart);
+		if (!empty($tmp[1])) {
+			$modulepart = $tmp[0];
+			$submodulepart = $tmp[1];
+		}
+
 		// Show table
 		if ($genallowed) {
 			$modellist = array();
@@ -662,15 +671,6 @@ class FormFile
 					$modellist = ModelePDFUserGroup::liste_modeles($this->db);
 				}
 			} else {
-				$submodulepart = $modulepart;
-
-				// modulepart = 'nameofmodule' or 'nameofmodule:NameOfObject'
-				$tmp = explode(':', $modulepart);
-				if (!empty($tmp[1])) {
-					$modulepart = $tmp[0];
-					$submodulepart = $tmp[1];
-				}
-
 				// For normalized standard modules
 				$file = dol_buildpath('/core/modules/'.$modulepart.'/modules_'.strtolower($submodulepart).'.php', 0);
 				if (file_exists($file)) {

From 87d2e86abac222b85298746eb33cb56f227c3c81 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Wed, 11 Jan 2023 17:39:46 +0100
Subject: [PATCH 468/816] kanban mode for pyment salaries list

---
 htdocs/salaries/class/paymentsalary.class.php |  35 +++
 htdocs/salaries/payments.php                  | 247 ++++++++++--------
 2 files changed, 176 insertions(+), 106 deletions(-)

diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index 029e5732f9b..b855462b527 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -707,4 +707,39 @@ class PaymentSalary extends CommonObject
 
 		return $result;
 	}
+
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $langs, $db;
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
+		if (property_exists($this, 'fk_bank')) {
+			$return .= ' |  <span class="info-box-label">'.$this->fk_bank.'</span>';
+		}
+		if (property_exists($this, 'fk_user_author')) {
+			$return .= '<br><span class="info-box-status">'.$this->fk_user_author.'</span>';
+		}
+
+		if (property_exists($this, 'fk_typepayment')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("PaymentMode").'</span> : <span class="info-box-label">'.$this->fk_typepayment.'</span>';
+		}
+		if (property_exists($this, 'amount')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("Amount").'</span> : <span class="info-box-label amount">'.price($this->amount).'</span>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
index 8fcc7183dae..6fb41b1b38a 100644
--- a/htdocs/salaries/payments.php
+++ b/htdocs/salaries/payments.php
@@ -45,6 +45,8 @@ $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'bomlist'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$mode       = GETPOST('mode', 'alpha'); // mode view for result
+
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
@@ -316,6 +318,9 @@ llxHeader('', $title, $help_url);
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
+if (!empty($mode)) {
+	$param .= '&mode='.urlencode($mode);
+}
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 	$param .= '&contextpage='.urlencode($contextpage);
 }
@@ -385,11 +390,16 @@ print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
+
 
 $url = DOL_URL_ROOT.'/salaries/card.php?action=create';
 if (!empty($socid)) {
 	$url .= '&socid='.$socid;
 }
+$newcardbutton  = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
 $newcardbutton = dolGetButtonTitle($langs->trans('NewSalaryPayment'), '', 'fa fa-plus-circle', $url, '', $user->rights->salaries->write);
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_payment', 0, $newcardbutton, '', $limit, 0, 0, 1);
@@ -532,8 +542,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
 
-	// Show here line of result
-	print '<tr class="oddeven">';
+
 
 	$userstatic->id = $obj->uid;
 	$userstatic->lastname = $obj->lastname;
@@ -549,136 +558,162 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 
 	$paymentsalstatic->id = $obj->rowid;
 	$paymentsalstatic->ref = $obj->rowid;
+	$paymentsalstatic->amount = $obj->amount;
+	$paymentsalstatic->fk_typepayment = $obj->payment_code;
+	$paymentsalstatic->datec = $obj->dateep;
+	$paymentsalstatic->datep = $obj->datep;
 
-	// Ref
-	print "<td>".$paymentsalstatic->getNomUrl(1)."</td>\n";
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
+	$accountlinestatic->id = $obj->fk_bank;
+	$accountlinestatic->ref = $obj->fk_bank;
+	$paymentsalstatic->fk_bank = $accountlinestatic->getNomUrl(1);
+	$paymentsalstatic->fk_user_author = $userstatic->getNomUrl(1);
 
-	// Ref salary
-	print "<td>".$salstatic->getNomUrl(1)."</td>\n";
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
 
-	// Label payment
-	print "<td>".dol_trunc($obj->label, 40)."</td>\n";
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
 
-	// Date end period
-	print '<td class="center">'.dol_print_date($db->jdate($obj->dateep), 'day')."</td>\n";
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr><td colspan="12">';
+			print '<div class="box-flex-container">';
+		}
+		// Output Kanban
 
-	// Date payment
-	print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
+		print $paymentsalstatic->getKanbanView('');
+		if ($i == (min($num, $limit) - 1)) {
+			print '</div>';
+			print '</td></tr>';
+		}
+	} else {
+		// Show here line of result
+		print '<tr class="oddeven">';
+		// Ref
+		print "<td>".$paymentsalstatic->getNomUrl(1)."</td>\n";
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
-	// Date value
-	/*print '<td class="center">'.dol_print_date($db->jdate($obj->datev), 'day')."</td>\n";
-	if (!$i) $totalarray['nbfield']++;*/
+		// Ref salary
+		print "<td>".$salstatic->getNomUrl(1)."</td>\n";
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
-	// Employee
-	print "<td>".$userstatic->getNomUrl(1)."</td>\n";
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
+		// Label payment
+		print "<td>".dol_trunc($obj->label, 40)."</td>\n";
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
-	// Type
-	print '<td>';
-	print $langs->trans("PaymentTypeShort".$obj->payment_code);
-	print '</td>';
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
+		// Date end period
+		print '<td class="center">'.dol_print_date($db->jdate($obj->dateep), 'day')."</td>\n";
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
-	// Chq number
-	print '<td>'.$obj->num_payment.'</td>';
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
+		// Date payment
+		print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
-	// Account
-	if (isModEnabled("banque")) {
-		// Bank transaction
+		// Date value
+		/*print '<td class="center">'.dol_print_date($db->jdate($obj->datev), 'day')."</td>\n";
+		if (!$i) $totalarray['nbfield']++;*/
+
+		// Employee
+		print "<td>".$userstatic->getNomUrl(1)."</td>\n";
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+
+		// Type
 		print '<td>';
-		$accountlinestatic->id = $obj->fk_bank;
-		print $accountlinestatic->getNomUrl(1);
+		print $langs->trans("PaymentTypeShort".$obj->payment_code);
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 
-		print '<td>';
-		if ($obj->fk_bank > 0) {
-			//$accountstatic->fetch($obj->fk_bank);
-			$accountstatic->id = $obj->bid;
-			$accountstatic->ref = $obj->bref;
-			$accountstatic->number = $obj->bnumber;
-			$accountstatic->iban = $obj->iban;
-			$accountstatic->bic = $obj->bic;
-			$accountstatic->currency_code = $langs->trans("Currency".$obj->currency_code);
-			$accountstatic->clos = $obj->clos;
+		// Chq number
+		print '<td>'.$obj->num_payment.'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
-			if (isModEnabled('accounting')) {
-				$accountstatic->account_number = $obj->account_number;
-
-				$accountingjournal = new AccountingJournal($db);
-				$accountingjournal->fetch($obj->fk_accountancy_journal);
-
-				$accountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
+		// Account
+		if (isModEnabled("banque")) {
+			// Bank transaction
+			print '<td>';
+			$accountlinestatic->id = $obj->fk_bank;
+			print $accountlinestatic->getNomUrl(1);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
 			}
-			$accountstatic->label = $obj->blabel;
-			if ($accountstatic->id > 0) {
-				print $accountstatic->getNomUrl(1);
+
+			print '<td>';
+			if ($obj->fk_bank > 0) {
+				//$accountstatic->fetch($obj->fk_bank);
+				$accountstatic->id = $obj->bid;
+				$accountstatic->ref = $obj->bref;
+				$accountstatic->number = $obj->bnumber;
+				$accountstatic->iban = $obj->iban;
+				$accountstatic->bic = $obj->bic;
+				$accountstatic->currency_code = $langs->trans("Currency".$obj->currency_code);
+				$accountstatic->clos = $obj->clos;
+
+				if (isModEnabled('accounting')) {
+					$accountstatic->account_number = $obj->account_number;
+
+					$accountingjournal = new AccountingJournal($db);
+					$accountingjournal->fetch($obj->fk_accountancy_journal);
+
+					$accountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
+				}
+				$accountstatic->label = $obj->blabel;
+				if ($accountstatic->id > 0) {
+					print $accountstatic->getNomUrl(1);
+				}
+			} else {
+				print '&nbsp;';
 			}
-		} else {
-			print '&nbsp;';
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Amount
+		print '<td class="nowrap right"><span class="amount">'.price($obj->amount).'</span></td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+		if (!$i) {
+			$totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
+		}
+		$totalarray['val']['totalttcfield'] += $obj->amount;
+
+		// Extra fields
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+		// Fields from hook
+		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		// Action column
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($object->id, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
-	}
 
-	// Amount
-	print '<td class="nowrap right"><span class="amount">'.price($obj->amount).'</span></td>';
-	if (!$i) {
-		$totalarray['nbfield']++;
+		print '</tr>'."\n";
 	}
-	if (!$i) {
-		$totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
-	}
-	$totalarray['val']['totalttcfield'] += $obj->amount;
-
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	// Action column
-	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		$selected = 0;
-		if (in_array($object->id, $arrayofselected)) {
-			$selected = 1;
-		}
-		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
-	}
-	print '</td>';
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
-
-	print '</tr>'."\n";
-
 	$i++;
 }
 

From 45725a1e9743d1840c9589982fce04be4bf3008c Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 11 Jan 2023 17:58:26 +0100
Subject: [PATCH 469/816] fix: display True volume in PDF

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

diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index 17999e59e4c..97be43da689 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -832,7 +832,7 @@ class pdf_espadon extends ModelePdfExpedition
 		$totalToShip = $tmparray['toship'];
 		// Set trueVolume and volume_units not currently stored into database
 		if ($object->trueWidth && $object->trueHeight && $object->trueDepth) {
-			$object->trueVolume = price(($object->trueWidth * $object->trueHeight * $object->trueDepth), 0, $outputlangs, 0, 0);
+			$object->trueVolume = $object->trueWidth * $object->trueHeight * $object->trueDepth;
 			$object->volume_units = $object->size_units * 3;
 		}
 

From 0935094385db55f242302918f0964c6b735b5a33 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Wed, 11 Jan 2023 18:22:46 +0100
Subject: [PATCH 470/816] kanban mode for list of loan

---
 htdocs/loan/class/loan.class.php | 35 ++++++++++++++++++
 htdocs/loan/list.php             | 62 +++++++++++++++++++++++---------
 2 files changed, 80 insertions(+), 17 deletions(-)

diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index 1c6913035e8..6dd0f5fe92b 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -721,4 +721,39 @@ class Loan extends CommonObject
 			return -1;
 		}
 	}
+
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $langs;
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
+		if (property_exists($this, 'capital')) {
+			$return .= ' | <span class="opacitymedium">'.$langs->trans("Amount").'</span> : <span class="info-box-label amount">'.price($this->capital).'</span>';
+		}
+		if (property_exists($this, 'datestart')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("DateStart").'</span> : <span class="info-box-label">'.dol_print_date($this->db->jdate($this->datestart), 'day').'</span>';
+		}
+		if (property_exists($this, 'dateend')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("DateEnd").'</span> : <span class="info-box-label">'.dol_print_date($this->db->jdate($this->dateend), 'day').'</span>';
+		}
+
+		if (method_exists($this, 'LibStatut')) {
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->LibStatut($this->totalpaid, 5, $this->alreadypaid).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php
index 1324876a98c..5acd2532bef 100644
--- a/htdocs/loan/list.php
+++ b/htdocs/loan/list.php
@@ -66,6 +66,8 @@ $search_amount = GETPOST('search_amount', 'alpha');
 
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'loanlist'; // To manage different context of search
 $optioncss = GETPOST('optioncss', 'alpha');
+$mode      = GETPOST('mode', 'alpha');  // mode view result
+
 
 
 /*
@@ -171,6 +173,9 @@ if ($resql) {
 	$i = 0;
 
 	$param = '';
+	if (!empty($mode)) {
+		$param .= '&mode='.urlencode($mode);
+	}
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 		$param .= '&contextpage='.urlencode($contextpage);
 	}
@@ -194,7 +199,10 @@ if ($resql) {
 	if (!empty($socid)) {
 		$url .= '&socid='.$socid;
 	}
-	$newcardbutton = dolGetButtonTitle($langs->trans('NewLoan'), '', 'fa fa-plus-circle', $url, '', $user->rights->loan->write);
+	$newcardbutton  = '';
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('NewLoan'), '', 'fa fa-plus-circle', $url, '', $user->rights->loan->write);
 
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
 	if ($optioncss != '') {
@@ -206,6 +214,8 @@ if ($resql) {
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+	print '<input type="hidden" name="mode" value="'.$mode.'">';
+
 
 	print_barre_liste($langs->trans("Loans"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'money-bill-alt', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -256,31 +266,49 @@ if ($resql) {
 		$loan_static->label = $obj->label;
 		$loan_static->paid = $obj->paid;
 
-		print '<tr class="oddeven">';
 
-		// Ref
-		print '<td>'.$loan_static->getNomUrl(1).'</td>';
+		if ($mode == 'kanban') {
+			if ($i == 0) {
+				print '<tr><td colspan="12">';
+				print '<div class="box-flex-container">';
+			}
+			// Output Kanban
+			$loan_static->datestart= $obj->datestart;
+			$loan_static->dateend = $obj->dateend;
+			$loan_static->capital = $obj->capital;
+			$loan_static->totalpaid = $obj->paid;
 
-		// Label
-		print '<td>'.dol_trunc($obj->label, 42).'</td>';
+			print $loan_static->getKanbanView('');
+			if ($i == (min($num, $limit) - 1)) {
+				print '</div>';
+				print '</td></tr>';
+			}
+		} else {
+			print '<tr class="oddeven">';
 
-		// Capital
-		print '<td class="right maxwidth100"><span class="amount">'.price($obj->capital).'</span></td>';
+			// Ref
+			print '<td>'.$loan_static->getNomUrl(1).'</td>';
 
-		// Date start
-		print '<td class="center width100">'.dol_print_date($db->jdate($obj->datestart), 'day').'</td>';
+			// Label
+			print '<td>'.dol_trunc($obj->label, 42).'</td>';
 
-		// Date end
-		print '<td class="center width100">'.dol_print_date($db->jdate($obj->dateend), 'day').'</td>';
+			// Capital
+			print '<td class="right maxwidth100"><span class="amount">'.price($obj->capital).'</span></td>';
 
-		print '<td class="right nowrap">';
-		print $loan_static->LibStatut($obj->paid, 5, $obj->alreadypaid);
-		print '</td>';
+			// Date start
+			print '<td class="center width100">'.dol_print_date($db->jdate($obj->datestart), 'day').'</td>';
 
-		print '<td></td>';
+			// Date end
+			print '<td class="center width100">'.dol_print_date($db->jdate($obj->dateend), 'day').'</td>';
 
-		print "</tr>\n";
+			print '<td class="right nowrap">';
+			print $loan_static->LibStatut($obj->paid, 5, $obj->alreadypaid);
+			print '</td>';
 
+			print '<td></td>';
+
+			print "</tr>\n";
+		}
 		$i++;
 	}
 

From 7cd1ea4962c46a65913c210d9952da1285de559d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 11 Jan 2023 20:37:29 +0100
Subject: [PATCH 471/816] Fix phpcs

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

diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
index 84e146c0bd2..5a5ccb08bf6 100644
--- a/htdocs/salaries/payments.php
+++ b/htdocs/salaries/payments.php
@@ -592,12 +592,11 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			$totalarray['nbfield']++;
 		}
 
-	// Date payment
-	print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'dayhour', 'tzuserrel')."</td>\n";
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
-
+		// Date payment
+		print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'dayhour', 'tzuserrel')."</td>\n";
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
 		// Ref salary
 		print "<td>".$salstatic->getNomUrl(1)."</td>\n";

From 4afc21ecb3bad84f1cddafbda7cf9cb8277693f6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 11 Jan 2023 20:39:09 +0100
Subject: [PATCH 472/816] Update dict.php

---
 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 e5c9dcb3127..1bf360dccf7 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -2510,11 +2510,11 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			print '</td>';
 		} elseif ($value == 'block_if_negative') {
 			print '<td>';
-			print $form->selectyesno("block_if_negative", (!empty($obj->{$value}) ? $obj->{$value}:''), 1);
+			print $form->selectyesno("block_if_negative", (empty($obj->block_if_negative) ? '' : $obj->block_if_negative), 1);
 			print '</td>';
 		} elseif ($value == 'type_duration') {
 			print '<td>';
-			print $form->selectTypeDuration('', (!empty($obj->{$value}) ? $obj->{$value}:''), array('i','h'));
+			print $form->selectTypeDuration('', empty($obj->type_duration) ? '' : $obj->type_duration), array('i','h'));
 			print '</td>';
 		} else {
 			$fieldValue = isset($obj->{$value}) ? $obj->{$value}: '';

From 71ea83d19e1886f81836d2d79c71aadcf20e5cad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 11 Jan 2023 20:40:15 +0100
Subject: [PATCH 473/816] Update dict.php

---
 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 1bf360dccf7..4919e377c9c 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -2514,7 +2514,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			print '</td>';
 		} elseif ($value == 'type_duration') {
 			print '<td>';
-			print $form->selectTypeDuration('', empty($obj->type_duration) ? '' : $obj->type_duration), array('i','h'));
+			print $form->selectTypeDuration('', (empty($obj->type_duration) ? '' : $obj->type_duration), array('i','h'));
 			print '</td>';
 		} else {
 			$fieldValue = isset($obj->{$value}) ? $obj->{$value}: '';

From 008c74a6bedadc91d0739816cef12dea3dba84a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 11 Jan 2023 20:51:33 +0100
Subject: [PATCH 474/816] Update html.formticket.class.php

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

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index a397433979b..be515a2abf3 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -50,7 +50,6 @@ class FormTicket
 
 	/**
 	 * @var string	The track_id of the ticket. Used also for the $keytoavoidconflict to name session vars to upload files.
-	 * @deprecated
 	 */
 	public $track_id;
 

From 0303dff199543c3a3b4d5083afc861213fc93a89 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 11 Jan 2023 20:51:55 +0100
Subject: [PATCH 475/816] Merge

---
 .../class/companybankaccount.class.php        | 61 +++++++++++++------
 htdocs/societe/paymentmodes.php               |  4 +-
 2 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 26305bb0013..26a6169dbe6 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -35,6 +35,17 @@ class CompanyBankAccount extends Account
 {
 	public $socid;
 
+	/**
+	 * @var string ID to identify managed object
+	 */
+	public $element = 'societe_rib';
+
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'societe_rib';
+
+	/** @var bool $default_rib  1 = this object is the third party's default bank information */
 	public $default_rib;
 
 	/**
@@ -64,6 +75,13 @@ class CompanyBankAccount extends Account
 	 */
 	public $datem;
 
+	/**
+	 * @var string TRIGGER_PREFIX  Dolibarr 16.0 and above use the prefix to prevent the creation of inconsistently
+	 *                             named triggers
+	 * @see CommonObject::call_trigger()
+	 */
+	const TRIGGER_PREFIX = 'COMPANY_RIB';
+
 
 	/**
 	 *  Constructor
@@ -86,7 +104,7 @@ class CompanyBankAccount extends Account
 	 *
 	 * @param   User   $user		User
 	 * @param   int    $notrigger   1=Disable triggers
-	 * @return	int					<0 if KO, >= 0 if OK
+	 * @return	int					<0 if KO, > 0 if OK (ID of newly created company bank account information)
 	 */
 	public function create(User $user = null, $notrigger = 0)
 	{
@@ -97,6 +115,7 @@ class CompanyBankAccount extends Account
 		// Check paramaters
 		if (empty($this->socid)) {
 			$this->error = 'BadValueForParameter';
+			$this->errors[] = $this->error;
 			return -1;
 		}
 
@@ -114,6 +133,9 @@ class CompanyBankAccount extends Account
 			}
 		}
 
+
+		$this->db->begin();
+
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_rib (fk_soc, type, datec)";
 		$sql .= " VALUES (".((int) $this->socid).", 'ban', '".$this->db->idate($now)."')";
 		$resql = $this->db->query($sql);
@@ -128,19 +150,20 @@ class CompanyBankAccount extends Account
 						$error++;
 					}
 					// End call triggers
-
-					if (!$error) {
-						return $this->id;
-					} else {
-						return 0;
-					}
-				} else {
-					return 1;
 				}
 			}
 		} else {
+			$error++;
 			$this->error = $this->db->lasterror();
-			return 0;
+			$this->errors[] = $this->error;
+		}
+
+		if (!$error) {
+			$this->db->commit();
+			return $this->id;
+		} else {
+			$this->db->rollback();
+			return -1;
 		}
 	}
 
@@ -168,6 +191,8 @@ class CompanyBankAccount extends Account
 			$this->owner_address = dol_trunc($this->owner_address, 254, 'right', 'UTF-8', 1);
 		}
 
+		$this->db->begin();
+
 		$sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET";
 		$sql .= " bank = '".$this->db->escape($this->bank)."'";
 		$sql .= ",code_banque='".$this->db->escape($this->code_banque)."'";
@@ -203,20 +228,22 @@ class CompanyBankAccount extends Account
 					$error++;
 				}
 				// End call triggers
-				if (!$error) {
-					return 1;
-				} else {
-					return -1;
-				}
-			} else {
-				return 1;
 			}
 		} else {
+			$error++;
 			if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 				$this->error = $langs->trans('ErrorDuplicateField');
 			} else {
 				$this->error = $this->db->lasterror();
 			}
+			$this->errors[] = $this->error;
+		}
+
+		if (!$error) {
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
 			return -1;
 		}
 	}
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 6869e80bd87..744d2763b71 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -183,8 +183,10 @@ if (empty($reshook)) {
 			$companybankaccount->stripe_card_ref = GETPOST('stripe_card_ref', 'alpha');
 
 			$result = $companybankaccount->update($user);
-			if (!$result) {
+			if ($result <= 0) {
+				// Display error message and get back to edit mode
 				setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
+				$action = 'edit';
 			} else {
 				// If this account is the default bank account, we disable others
 				if ($companybankaccount->default_rib) {

From e4c5fee8df10824a36e9fc71c7bfe7dfc4f41e9c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 11 Jan 2023 21:04:30 +0100
Subject: [PATCH 476/816] Fix hardcoded link. Fix from #23463

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

diff --git a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
index 192a39c9b06..e2e9fb5f899 100644
--- a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
@@ -46,7 +46,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	?>
 	<tr class="<?php echo $trclass; ?>">
 		<td><?php echo $langs->trans("SupplierOrder"); ?></td>
-		<td><a href="<?php echo DOL_URL_ROOT.'/fourn/commande/card.php?id='.$objectlink->id ?>"><?php echo img_object($langs->trans("ShowOrder"), "order").' '.$objectlink->ref; ?></a></td>
+		<td><?php print $objectlink->getNomUrl(1); ?></td>
 		<td class="left"><?php echo $objectlink->ref_supplier; ?></td>
 		<td class="center"><?php echo dol_print_date($objectlink->date, 'day'); ?></td>
 		<td class="right"><?php

From 4a40039f565c67d5baa7e1df9776f2aa03a54143 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20NASSIET?= <sebastien.nassiet@comaite.com>
Date: Wed, 11 Jan 2023 21:06:55 +0100
Subject: [PATCH 477/816] correction bug selection contact dans emailing

---
 .../core/modules/mailings/contacts1.modules.php | 17 ++++++++++-------
 .../modules/mailings/thirdparties.modules.php   | 13 +++++++------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index 38a82907124..09595b61376 100644
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -122,7 +122,7 @@ class mailing_contacts1 extends MailingTargets
 	 */
 	public function formFilter()
 	{
-		global $langs;
+		global $langs,$conf;
 
 		// Load translation files required by the page
 		$langs->loadLangs(array("commercial", "companies", "suppliers", "categories"));
@@ -307,11 +307,14 @@ class mailing_contacts1 extends MailingTargets
 
 		$s .= ajax_combobox("filter_category_supplier_contact");
 
-		// 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', 0, 0, 1, 0, 0, '', 0, 0, 0, null, 1);
+		// Choose language if multilangue active
+
+		if (@$conf->global->MAIN_MULTILANGS==1) {
+			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', 0, 0, 1, 0, 0, '', 0, 0, 0, null, 1);
+		}
 
 		return $s;
 	}
@@ -409,7 +412,7 @@ class mailing_contacts1 extends MailingTargets
 
 		// Filter on language
 		if (!empty($filter_lang)) {
-			$sql .= " AND sp.default_lang = '".$this->db->escape($filter_lang)."'";
+			$sql .= " AND sp.default_lang LIKE '".$this->db->escape($filter_lang)."%'";
 		}
 
 		// Filter on nature
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 89bc2cf2b5e..81a9bfaea51 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -316,12 +316,13 @@ class mailing_thirdparties extends MailingTargets
 		$s .= '</select>';
 		$s .= ajax_combobox("filter_status_thirdparties");
 
-		// 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 if multilangue active
+		if (@$conf->global->MAIN_MULTILANGS==1) {
+			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 b43f38c7ad67e64261acf6f8c3d77af228ba6cf0 Mon Sep 17 00:00:00 2001
From: Christian Humpel <christian.humpel@gmail.com>
Date: Sun, 8 Jan 2023 21:43:12 +0100
Subject: [PATCH 478/816] Fix: REST MO API - It's able to have a wrong value on
 the 'ref' Field

---
 htdocs/mrp/class/api_mos.class.php | 28 ++++++++++++++++++++++++++++
 htdocs/mrp/class/mo.class.php      |  1 +
 2 files changed, 29 insertions(+)

diff --git a/htdocs/mrp/class/api_mos.class.php b/htdocs/mrp/class/api_mos.class.php
index 48396025957..794ab3d5378 100644
--- a/htdocs/mrp/class/api_mos.class.php
+++ b/htdocs/mrp/class/api_mos.class.php
@@ -203,6 +203,9 @@ class Mos extends DolibarrApi
 		foreach ($request_data as $field => $value) {
 			$this->mo->$field = $value;
 		}
+
+		$this->checkRefNumbering();
+
 		if (!$this->mo->create(DolibarrApiAccess::$user)) {
 			throw new RestException(500, "Error creating MO", array_merge(array($this->mo->error), $this->mo->errors));
 		}
@@ -239,6 +242,8 @@ class Mos extends DolibarrApi
 			$this->mo->$field = $value;
 		}
 
+		$this->checkRefNumbering();
+
 		if ($this->mo->update(DolibarrApiAccess::$user) > 0) {
 			return $this->get($id);
 		} else {
@@ -723,4 +728,27 @@ class Mos extends DolibarrApi
 		}
 		return $myobject;
 	}
+
+	/**
+	 * Validate the ref field and get the next Number if it's necessary.
+	 *
+	 * @return void
+	 */
+	private function checkRefNumbering(): void
+	{
+		$ref = substr($this->mo->ref, 1, 4);
+		if ($this->mo->status > 0 && $ref == 'PROV') {
+			throw new RestException(400, "Wrong naming scheme '(PROV%)' is only allowed on 'DRAFT' status. For automatic increment use 'auto' on the 'ref' field.");
+		}
+
+		if (strtolower($this->mo->ref) == 'auto') {
+			if (empty($this->mo->id) && $this->mo->status == 0) {
+				$this->mo->ref = ''; // 'ref' will auto incremented with '(PROV' + newID + ')'
+			} else {
+				$this->mo->fetch_product();
+				$numref = $this->mo->getNextNumRef($this->mo->product);
+				$this->mo->ref = $numref;
+			}
+		}
+	}
 }
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 30d6a3660a3..13d0f67316c 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -277,6 +277,7 @@ class Mo extends CommonObject
 
 		if ($this->fk_bom > 0) {
 			// If there is a nown BOM, we force the type of MO to the type of BOM
+			include_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
 			$tmpbom = new BOM($this->db);
 			$tmpbom->fetch($this->fk_bom);
 

From 12885deb468598be223c441e3b14d4af4d5ec4f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20NASSIET?= <sebastien.nassiet@comaite.com>
Date: Wed, 11 Jan 2023 21:19:33 +0100
Subject: [PATCH 479/816] correction bug selection contact dans emailing

---
 htdocs/core/modules/mailings/contacts1.modules.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index 7406779054b..be77cf155d2 100644
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -122,7 +122,7 @@ class mailing_contacts1 extends MailingTargets
 	 */
 	public function formFilter()
 	{
-		global $langs;
+		global $langs,$conf;
 
 		// Load translation files required by the page
 		$langs->loadLangs(array("commercial", "companies", "suppliers", "categories"));
@@ -308,11 +308,12 @@ class mailing_contacts1 extends MailingTargets
 		$s .= ajax_combobox("filter_category_supplier_contact");
 
 		// 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', 0, 0, 1, 0, 0, '', 0, 0, 0, null, 1);
-
+		if (getDolGlobalInt('MAIN_MULTILANGS')) {
+			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', 0, 0, 1, 0, 0, '', 0, 0, 0, null, 1);
+		}
 		return $s;
 	}
 

From db56ef90903460c254e9d0bb742de3c15f0adb9c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 11 Jan 2023 21:32:01 +0100
Subject: [PATCH 480/816] Fix sql error

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

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index f880ac6481c..897f60e8aaa 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1168,8 +1168,10 @@ class BookKeeping extends CommonObject
 		$sql = 'SELECT';
 		$sql .= " t.numero_compte,";
 		$sql .= " t.label_compte,";
-		$sql .= " t.subledger_account,";
-		$sql .= " t.subledger_label,";
+		if (!empty($option)) {
+			$sql .= " t.subledger_account,";
+			$sql .= " t.subledger_label,";
+		}
 		$sql .= " SUM(t.debit) as debit,";
 		$sql .= " SUM(t.credit) as credit";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
@@ -1210,11 +1212,11 @@ class BookKeeping extends CommonObject
 		if (!empty($option)) {
 			$sql .= ' AND t.subledger_account IS NOT NULL';
 			$sql .= ' AND t.subledger_account != ""';
-			$sql .= ' GROUP BY t.subledger_account';
+			$sql .= ' GROUP BY t.numero_compte, t.label_compte, t.subledger_account, t.subledger_label';
 			$sortfield = 't.subledger_account'.($sortfield ? ','.$sortfield : '');
 			$sortorder = 'ASC'.($sortfield ? ','.$sortfield : '');
 		} else {
-			$sql .= ' GROUP BY t.numero_compte';
+			$sql .= ' GROUP BY t.numero_compte, t.label_compte';
 			$sortfield = 't.numero_compte'.($sortfield ? ','.$sortfield : '');
 			$sortorder = 'ASC'.($sortorder ? ','.$sortorder : '');
 		}

From 303220a88f90501ae466a88fda10938315e67cce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20NASSIET?= <sebastien.nassiet@comaite.com>
Date: Wed, 11 Jan 2023 22:51:17 +0100
Subject: [PATCH 481/816] ajout d'un hook pour ajouter des landingpage dans la
 liste de user_ihm

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

diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 3d2e3240ce3..1bd806849b6 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -215,6 +215,14 @@ if (isModEnabled('ticket')) {
 	$tmparray['ticket/list.php?mainmenu=ticket&leftmenu='] = 'Tickets';
 }
 
+// Hook for insertion new items in the List of possible landing pages
+$reshook = $hookmanager->executeHooks('addToLandingPageList',$tmparray,$object); 
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+} else if ($reshook == 0) {
+	$tmparray=$hookmanager->resArray;
+}
+
 $head = user_prepare_head($object);
 
 $title = $langs->trans("User");

From 74a5c91a48238b505dac86fbfe204ce6dc8bdc38 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 11 Jan 2023 21:59:55 +0000
Subject: [PATCH 482/816] Fixing style errors.

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

diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 1bd806849b6..81ecdca8e73 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -216,10 +216,10 @@ if (isModEnabled('ticket')) {
 }
 
 // Hook for insertion new items in the List of possible landing pages
-$reshook = $hookmanager->executeHooks('addToLandingPageList',$tmparray,$object); 
+$reshook = $hookmanager->executeHooks('addToLandingPageList', $tmparray, $object);
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-} else if ($reshook == 0) {
+} elseif ($reshook == 0) {
 	$tmparray=$hookmanager->resArray;
 }
 

From 968c50d6f9281ba0705c6e88367580e3cc0b0104 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Thu, 12 Jan 2023 09:49:12 +0100
Subject: [PATCH 483/816] FIX wrong stock list with multicompany and without
 stock sharing

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

diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index 79498562210..626d4e81ee2 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -141,7 +141,6 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // N
 $sql .= $hookmanager->resPrint;
 $sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as s ON p.rowid = s.fk_product';
-$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot as e ON s.fk_entrepot = e.rowid AND e.entity IN ('.getEntity('stock').')';
 if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_units as u on p.fk_unit = u.rowid';
 }
@@ -150,6 +149,7 @@ if ($search_categ > 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."categorie_product as cp";
 }
 $sql .= " WHERE p.entity IN (".getEntity('product').")";
+$sql .= " AND EXISTS (SELECT e.rowid FROM ".MAIN_DB_PREFIX."entrepot as e WHERE e.rowid = s.fk_entrepot AND e.entity IN (".getEntity('stock')."))";
 if ($search_categ > 0) {
 	$sql .= " AND p.rowid = cp.fk_product"; // Join for the needed table to filter by categ
 }

From 272f131b070a82ded90ab8fcb4131cd17070066a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9=20Cendrier?= <noe.cendrier@altairis.fr>
Date: Thu, 12 Jan 2023 10:18:47 +0100
Subject: [PATCH 484/816] do not let closed inventories reset stock with URL

---
 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 fd82300fdda..cbe5d782082 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -118,7 +118,7 @@ if (empty($reshook)) {
 	}
 
 	// Close inventory by recording the stock movements
-	if ($action == 'update' && !empty($user->rights->stock->mouvement->creer)) {
+	if ($action == 'update' && !empty($user->rights->stock->mouvement->creer) && $object->status == $object::STATUS_VALIDATED) {
 		$stockmovment = new MouvementStock($db);
 		$stockmovment->setOrigin($object->element, $object->id);
 

From f251e92eaa54ad11559f3a9eab604aa9f2accf41 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 12 Jan 2023 10:10:28 +0100
Subject: [PATCH 485/816] Fix warning

---
 htdocs/admin/modulehelp.php                   | 5 ++++-
 htdocs/core/modules/DolibarrModules.class.php | 4 ++--
 htdocs/public/members/new.php                 | 3 ---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index 9a0c34aea2b..1af4b25bb27 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -498,7 +498,10 @@ if ($mode == 'feature') {
 	if (isset($objMod->boxes) && is_array($objMod->boxes) && count($objMod->boxes)) {
 		$i = 0;
 		foreach ($objMod->boxes as $val) {
-			$text .= ($i ? ', ' : '').($val['file'] ? $val['file'] : $val[0]);
+			$boxstring = (empty($val['file']) ? (empty($val[0]) ? '' : $val[0]) : $val['file']);
+			if ($boxstring) {
+				$text .= ($i ? ', ' : '').$boxstring;
+			}
 			$i++;
 		}
 	} else {
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index f88a05bd12b..96c8d14da31 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -976,8 +976,8 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 					$tmp = json_decode($obj->note, true);
 				}
 				return array(
-					'authorid' => $tmp['authorid'],
-					'ip' => $tmp['ip'],
+					'authorid' => empty($tmp['authorid']) ? '' : $tmp['authorid'],
+					'ip' => empty($tmp['ip']) ? '' : $tmp['ip'],
 					'lastactivationdate' => $this->db->jdate($obj->tms),
 					'lastactivationversion' => (!empty($tmp['lastactivationversion']) ? $tmp['lastactivationversion'] : 'unknown'),
 				);
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index b37cb15d9c0..7c3e5754b23 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -46,9 +46,6 @@ if (!defined('NOLOGIN')) {
 if (!defined('NOCSRFCHECK')) {
 	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
 }
-if (!defined('NOIPCHECK')) {
-	define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
-}
 if (!defined('NOBROWSERNOTIF')) {
 	define('NOBROWSERNOTIF', '1');
 }

From 2093be9895b56ac4042c09cbdd40b9e911bfc7fd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 12 Jan 2023 11:34:28 +0100
Subject: [PATCH 486/816] New add file .idea/php.xml for qodana

---
 .idea/php.xml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .idea/php.xml

diff --git a/.idea/php.xml b/.idea/php.xml
new file mode 100644
index 00000000000..52e0bf0ae03
--- /dev/null
+++ b/.idea/php.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="7.0">
+    <component name="PhpProjectSharedConfiguration" php_language_level="7.0" />
+</project>
+

From 1ed1ff953f618c4de5fa30a7ef8103d33d172aad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 12 Jan 2023 11:40:24 +0100
Subject: [PATCH 487/816] Fix .gitignore

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 55a4c417ce7..e9603bd2d8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,6 @@ default.properties
 /.pydevproject
 /.vscode
 .DS_Store
-.idea
 *.iml
 *.orig
 Thumbs.db

From 366abff4f9956281628ad7feeba0db9976381772 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 12 Jan 2023 11:43:10 +0100
Subject: [PATCH 488/816] Avoid qodana error email

---
 qodana.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qodana.yaml b/qodana.yaml
index 89cc459fdfa..44da591f9de 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -1,6 +1,6 @@
 version: "1.0"
 linter: jetbrains/qodana-php:2022.3-eap
-failThreshold: 0
+failThreshold: 20000
 profile:
   name: qodana.recommended
 exclude:

From 1e36b45791634e6668ccd3fe80efc502081544ac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 12 Jan 2023 11:58:32 +0100
Subject: [PATCH 489/816] Fix missing entity

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

diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 40c8fcf4292..1dc632bf13d 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -227,7 +227,7 @@ $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as ps on p.rowid = ps.fk_pro
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot as e on ps.fk_entrepot = e.rowid'; // Link on unique key
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_batch as pb on pb.fk_product_stock = ps.rowid'; // Detail for each lot on each warehouse
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_lot as pl on pl.fk_product = p.rowid AND pl.batch = pb.batch'; // Link on unique key
-$sql .= " WHERE p.entity IN (".getEntity('product').")";
+$sql .= " WHERE p.entity IN (".getEntity('product').") AND e.entity IN (".getEntity('stock').")";
 if (!empty($search_categ) && $search_categ != '-1') {
 	$sql .= " AND ";
 	if ($search_categ == -2) {

From efe1d913a7e3b470bfcff39722b87d79be2257bc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 12 Jan 2023 12:06:02 +0100
Subject: [PATCH 490/816] Fix MAIN_CHECKBOX_LEFT_COLUMN

---
 htdocs/product/reassort.php    | 36 ++++++++++++++++++++++++++++------
 htdocs/product/reassortlot.php | 25 +++++++++++++++++++++--
 2 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index fb74b4ed297..b91ae62f663 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -363,6 +363,13 @@ if ($resql) {
 
 	// Fields title search
 	print '<tr class="liste_titre_filter">';
+	// Action column
+	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print '<td class="liste_titre maxwidthsearch">';
+		$searchpicto = $form->showFilterAndCheckAddButtons(0);
+		print $searchpicto;
+		print '</td>';
+	}
 	print '<td class="liste_titre">';
 	print '<input class="flat" type="text" name="sref" size="6" value="'.$sref.'">';
 	print '</td>';
@@ -391,14 +398,20 @@ if ($resql) {
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	print '<td class="liste_titre maxwidthsearch">';
-	$searchpicto = $form->showFilterAndCheckAddButtons(0);
-	print $searchpicto;
-	print '</td>';
+	if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print '<td class="liste_titre maxwidthsearch">';
+		$searchpicto = $form->showFilterAndCheckAddButtons(0);
+		print $searchpicto;
+		print '</td>';
+	}
 	print '</tr>';
 
 	//Line for column titles
 	print "<tr class=\"liste_titre\">";
+	// Action column
+	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print_liste_field_titre('');
+	}
 	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.ref", '', $param, "", $sortfield, $sortorder);
 	print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "p.label", '', $param, "", $sortfield, $sortorder);
 	if (isModEnabled("service") && $type == 1) {
@@ -429,7 +442,10 @@ if ($resql) {
 	$parameters = array('param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
 	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	print_liste_field_titre('');
+	// Action column
+	if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print_liste_field_titre('');
+	}
 	print "</tr>\n";
 
 	while ($i < min($num, $limit)) {
@@ -440,6 +456,10 @@ if ($resql) {
 		$product->load_stock();
 
 		print '<tr>';
+		// Action column
+		if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+			print '<td></td>';
+		}
 		print '<td class="nowrap">';
 		print $product->getNomUrl(1, '', 16);
 		//if ($objp->stock_theorique < $objp->seuil_stock_alerte) print ' '.img_warning($langs->trans("StockTooLow"));
@@ -504,7 +524,11 @@ if ($resql) {
 		$parameters = array('obj'=>$objp);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $product); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
-		print '<td></td>';
+		// Action column
+		if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+			print '<td></td>';
+		}
+
 		print "</tr>\n";
 		$i++;
 	}
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 1dc632bf13d..c07f0785e2c 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -514,6 +514,13 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre_filter">';
+// Action column
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 print '<td class="liste_titre">';
 print '<input class="flat" type="text" name="sref" size="6" value="'.$sref.'">';
 print '</td>';
@@ -571,6 +578,10 @@ $totalarray['nbfield'] = 0;
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+// Action column
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print_liste_field_titre('');
+}
 print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.ref", '', $param, "", $sortfield, $sortorder);
 print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "p.label", '', $param, "", $sortfield, $sortorder);
 if (isModEnabled("service") && $type == 1) {
@@ -591,7 +602,9 @@ print_liste_field_titre("PhysicalStock", $_SERVER["PHP_SELF"], "stock_physique",
 print_liste_field_titre('');
 print_liste_field_titre("ProductStatusOnSell", $_SERVER["PHP_SELF"], "p.tosell", "", $param, '', $sortfield, $sortorder, 'right ');
 print_liste_field_titre("ProductStatusOnBuy", $_SERVER["PHP_SELF"], "p.tobuy", "", $param, '', $sortfield, $sortorder, 'right ');
-print_liste_field_titre('');
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print_liste_field_titre('');
+}
 print "</tr>\n";
 
 $product_static = new Product($db);
@@ -648,6 +661,11 @@ while ($i < $imaxinloop) {
 
 	print '<tr>';
 
+	// Action column
+	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print '<td></td>';
+	}
+
 	// Ref
 	print '<td class="nowrap">';
 	print $product_static->getNomUrl(1, '', 16);
@@ -711,7 +729,10 @@ while ($i < $imaxinloop) {
 
 	print '<td class="right nowrap">'.$product_static->LibStatut($objp->tobuy, 5, 1).'</td>';
 
-	print '<td></td>';
+	// Action column
+	if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print '<td></td>';
+	}
 
 	print "</tr>\n";
 	$i++;

From 24651aaa6c060ebaf1d7ad407713a6343c92aaaa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 12 Jan 2023 12:41:02 +0100
Subject: [PATCH 491/816] FIX #22731 #23524

---
 htdocs/commande/list.php | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index ed00efdf10a..eb8b824ef3e 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -51,6 +51,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 +59,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'));
@@ -103,6 +105,7 @@ $search_remove_btn = GETPOST('button_removefilter', 'alpha');
 $search_project_ref = GETPOST('search_project_ref', 'alpha');
 $search_project = GETPOST('search_project', 'alpha');
 $search_shippable = GETPOST('search_shippable', 'aZ09');
+
 $search_fk_cond_reglement = GETPOST("search_fk_cond_reglement", 'int');
 $search_fk_shipping_method = GETPOST("search_fk_shipping_method", 'int');
 $search_fk_mode_reglement = GETPOST("search_fk_mode_reglement", 'int');
@@ -803,7 +806,7 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 }
 // Add fields from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
@@ -836,7 +839,7 @@ if ($search_user > 0) {
 
 // Add table from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
 $sql .= ' WHERE c.fk_soc = s.rowid';
@@ -1197,7 +1200,7 @@ if ($resql) {
 
 	// Add $param from hooks
 	$parameters = array();
-	$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
+	$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	$param .= $hookmanager->resPrint;
 
 	// List of mass actions available
@@ -1364,7 +1367,7 @@ if ($resql) {
 		$moreforfilter .= '</div>';
 	}
 	$parameters = array();
-	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) {
 		$moreforfilter .= $hookmanager->resPrint;
 	} else {
@@ -1575,7 +1578,7 @@ if ($resql) {
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 	// Fields from hook
 	$parameters = array('arrayfields'=>$arrayfields);
-	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
 	if (!empty($arrayfields['c.datec']['checked'])) {
@@ -1769,7 +1772,7 @@ if ($resql) {
 		'sortorder' => $sortorder,
 		'totalarray' => &$totalarray,
 	);
-	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	if (!empty($arrayfields['c.datec']['checked'])) {
 		print_liste_field_titre($arrayfields['c.datec']['label'], $_SERVER["PHP_SELF"], "c.date_creation", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
@@ -1825,8 +1828,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);
 
@@ -2063,7 +2068,7 @@ if ($resql) {
 		}
 		// Amount HT
 		if (!empty($arrayfields['c.total_ht']['checked'])) {
-			  print '<td class="nowrap right"><span class="amount">'.price($obj->total_ht)."</span></td>\n";
+			print '<td class="nowrap right"><span class="amount">'.price($obj->total_ht)."</span></td>\n";
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
@@ -2247,7 +2252,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 {
@@ -2260,7 +2265,7 @@ if ($resql) {
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
 		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 
 		// Date creation
@@ -2479,7 +2484,7 @@ if ($resql) {
 	$db->free($resql);
 
 	$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-	$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
+	$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
 	print '</table>'."\n";

From 3c7092a114e8151d0c3fe69ad7b1515b53ea771c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 12 Jan 2023 12:49:40 +0100
Subject: [PATCH 492/816] Doxygen

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

diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index a0d0dd2758e..2cc15a3dd42 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -36,7 +36,7 @@ class FormAdmin
 	/**
 	 *  Constructor
 	 *
-	 *  @param      DoliDB      $db      Database handler
+	 *  @param      DoliDB|null      $db      Database handler
 	 */
 	public function __construct($db)
 	{

From 4fdf9302694fd39fbe5d496cc6590aa4869319d2 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 12 Jan 2023 12:49:45 +0100
Subject: [PATCH 493/816] make PDF custom volume work as it work on
 expedition/card.php

---
 .../core/modules/expedition/doc/pdf_espadon.modules.php  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index 97be43da689..fd5c2ee1980 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -846,12 +846,13 @@ class pdf_espadon extends ModelePdfExpedition
 			$totalWeighttoshow = showDimensionInBestUnit($object->trueWeight, $object->weight_units, "weight", $outputlangs);
 		}
 		if ($object->trueVolume) {
-			$totalVolumetoshow = showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs);
+			if ($object->volume_units < 50) {
+				$totalVolumetoshow = showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs);
+			} else {
+				$totalVolumetoshow =  price($object->trueVolume, 0, $outputlangs, 0, 0).' '.measuringUnitString(0, "volume", $object->volume_units);
+			}
 		}
 
-
-
-
 		if ($this->getColumnStatus('desc')) {
 			$this->printStdColumnContent($pdf, $tab2_top, 'desc', $outputlangs->transnoentities("Total"));
 		}

From 8c1ce7873f9d0d1d99d3004f5af9335380541489 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 12 Jan 2023 13:02:04 +0100
Subject: [PATCH 494/816] standardize code

---
 htdocs/fichinter/class/fichinter.class.php | 28 +++++++-------
 htdocs/reception/class/reception.class.php | 44 +++++++++++-----------
 2 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 12159f29433..01533698b1c 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -749,25 +749,25 @@ class Fichinter extends CommonObject
 	{
 		// phpcs:enable
 		// Init/load array of translation of status
-		if (empty($this->statuts) || empty($this->statuts_short) || empty($this->statuts_logo)) {
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			$langs->load("fichinter");
 
-			$this->statuts[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
-			$this->statuts[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
-			$this->statuts[self::STATUS_BILLED] = $langs->transnoentitiesnoconv('StatusInterInvoiced');
-			$this->statuts[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Done');
-			$this->statuts_short[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
-			$this->statuts_short[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
-			$this->statuts_short[self::STATUS_BILLED] = $langs->transnoentitiesnoconv('StatusInterInvoiced');
-			$this->statuts_short[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Done');
-			$this->statuts_logo[self::STATUS_DRAFT] = 'status0';
-			$this->statuts_logo[self::STATUS_VALIDATED] = 'status1';
-			$this->statuts_logo[self::STATUS_BILLED] = 'status6';
-			$this->statuts_logo[self::STATUS_CLOSED] = 'status6';
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
+			$this->labelStatus[self::STATUS_BILLED] = $langs->transnoentitiesnoconv('StatusInterInvoiced');
+			$this->labelStatus[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Done');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
+			$this->labelStatusShort[self::STATUS_BILLED] = $langs->transnoentitiesnoconv('StatusInterInvoiced');
+			$this->labelStatusShort[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Done');
 		}
 
-		return dolGetStatus($this->statuts[$status], $this->statuts_short[$status], '', $this->statuts_logo[$status], $mode);
+		$statuscode = 'status'.$status;
+		if ($status == self::STATUS_BILLED || $status == self::STATUS_CLOSED) {
+			$statuscode = 'status6';
+		}
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statuscode, $mode);
 	}
 
 	/**
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index 03ed28a2200..e9a89691c88 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -140,27 +140,6 @@ class Reception extends CommonObject
 	public function __construct($db)
 	{
 		$this->db = $db;
-
-		// List of long language codes for status
-		$this->statuts = array();
-		$this->statuts[-1] = 'StatusReceptionCanceled';
-		$this->statuts[0]  = 'StatusReceptionDraft';
-		// product to receive if stock increase is on close or already received if stock increase is on validation
-		$this->statuts[1]  = 'StatusReceptionValidated';
-		if (getDolGlobalInt("STOCK_CALCULATE_ON_RECEPTION")) {
-			$this->statuts[1]  = 'StatusReceptionValidatedReceived';
-		}
-		if (getDolGlobalInt("STOCK_CALCULATE_ON_RECEPTION_CLOSE")) {
-			$this->statuts[1]  = 'StatusReceptionValidatedToReceive';
-		}
-		$this->statuts[2]  = 'StatusReceptionProcessed';
-
-		// List of short language codes for status
-		$this->statuts_short = array();
-		$this->statuts_short[-1] = 'StatusReceptionCanceledShort';
-		$this->statuts_short[0]  = 'StatusReceptionDraftShort';
-		$this->statuts_short[1]  = 'StatusReceptionValidatedShort';
-		$this->statuts_short[2]  = 'StatusReceptionProcessedShort';
 	}
 
 	/**
@@ -1317,8 +1296,27 @@ class Reception extends CommonObject
 		// phpcs:enable
 		global $langs;
 
-		$labelStatus = $langs->transnoentitiesnoconv($this->statuts[$status]);
-		$labelStatusShort = $langs->transnoentitiesnoconv($this->statuts_short[$status]);
+		// List of long language codes for status
+		$this->labelStatus[-1] = 'StatusReceptionCanceled';
+		$this->labelStatus[0]  = 'StatusReceptionDraft';
+		// product to receive if stock increase is on close or already received if stock increase is on validation
+		$this->labelStatus[1]  = 'StatusReceptionValidated';
+		if (getDolGlobalInt("STOCK_CALCULATE_ON_RECEPTION")) {
+			$this->labelStatus[1]  = 'StatusReceptionValidatedReceived';
+		}
+		if (getDolGlobalInt("STOCK_CALCULATE_ON_RECEPTION_CLOSE")) {
+			$this->labelStatus[1]  = 'StatusReceptionValidatedToReceive';
+		}
+		$this->labelStatus[2]  = 'StatusReceptionProcessed';
+
+		// List of short language codes for status
+		$this->labelStatusShort[-1] = 'StatusReceptionCanceledShort';
+		$this->labelStatusShort[0]  = 'StatusReceptionDraftShort';
+		$this->labelStatusShort[1]  = 'StatusReceptionValidatedShort';
+		$this->labelStatusShort[2]  = 'StatusReceptionProcessedShort';
+
+		$labelStatus = $langs->transnoentitiesnoconv($this->labelStatus[$status]);
+		$labelStatusShort = $langs->transnoentitiesnoconv($this->labelStatusShort[$status]);
 
 		$statusType = 'status'.$status;
 		if ($status == self::STATUS_VALIDATED) {

From 924679515970789c67d9443e3a2b3c50ffa20f3c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 12 Jan 2023 12:47:57 +0100
Subject: [PATCH 495/816] Fix warning

---
 htdocs/core/class/utils.class.php            | 3 +++
 htdocs/core/modules/action/rapport.class.php | 5 +++++
 htdocs/modulebuilder/index.php               | 2 +-
 htdocs/public/recruitment/index.php          | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index f8096ed84e9..16e000e7f59 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -34,6 +34,9 @@ class Utils
 	 */
 	public $db;
 
+	public $error;
+	public $errors;
+
 	public $output; // Used by Cron method to return message
 	public $result; // Used by Cron method to return data
 
diff --git a/htdocs/core/modules/action/rapport.class.php b/htdocs/core/modules/action/rapport.class.php
index 8c0964b1378..d91b748d7d5 100644
--- a/htdocs/core/modules/action/rapport.class.php
+++ b/htdocs/core/modules/action/rapport.class.php
@@ -40,6 +40,11 @@ class CommActionRapport
 	 */
 	public $db;
 
+	public $error;
+
+	public $errors;
+
+
 	/**
 	 * @var string description
 	 */
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index a6f3431bd2e..f871d916aa7 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -4461,7 +4461,7 @@ if ($module == 'initmodule') {
 				print '</a>';
 				print '</strong>';
 				print ' <span class="opacitymedium">('.$langs->trans("GeneratedOn").' '.dol_print_date(dol_filemtime($outputfiledocpdf), 'dayhour').')</span>';
-				print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.urlencode($tab).'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&token='.newToken().'&format='.$format.'&file='.urlencode($outputfiledocpdfrel).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
+				print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.urlencode($tab).'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&token='.newToken().'&format='.$format.'&file='.urlencode($outputfiledocrelpdf).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
 			}
 			print '</strong><br>';
 
diff --git a/htdocs/public/recruitment/index.php b/htdocs/public/recruitment/index.php
index 23a180b9a7b..4f82139656c 100644
--- a/htdocs/public/recruitment/index.php
+++ b/htdocs/public/recruitment/index.php
@@ -252,7 +252,7 @@ if (is_array($results)) {
 				}
 			}
 			print '<b class="wordbreak">';
-			print $tmpuser->getFullName(-1);
+			print $tmpuser->getFullName($langs);
 			print ' &nbsp; '.dol_print_email($emailforcontact, 0, 0, 1, 0, 0, 'envelope');
 			print '</b>';
 			print '</b><br>';

From c50c553999834427c38e0cad55e172f7a9387a0b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 12 Jan 2023 14:40:00 +0100
Subject: [PATCH 496/816] NEW Save date to invalidate other session into user
 table

---
 htdocs/install/mysql/migration/17.0.0-18.0.0.sql |  3 +++
 htdocs/install/mysql/tables/llx_user.sql         |  1 +
 htdocs/user/class/user.class.php                 | 10 +++++++---
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
index 84022422fba..376d89861f2 100644
--- a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
+++ b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
@@ -56,3 +56,6 @@ ALTER TABLE llx_payment_salary MODIFY COLUMN datep datetime;
 INSERT INTO llx_c_tva(rowid,fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (1179, 117, 'I-28'  , 28,   0, '0',   0, '0', 0, 'IGST',      1);
 INSERT INTO llx_c_tva(rowid,fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (1176, 117, 'C+S-18',  0,   9, '1',   9, '1', 0, 'CGST+SGST - Same state sales', 1);
 
+
+ALTER TABLE llx_user ADD COLUMN flagdelsessionsbefore datetime DEFAULT NULL;
+
diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql
index ca0c7bc818d..a10f8489bcb 100644
--- a/htdocs/install/mysql/tables/llx_user.sql
+++ b/htdocs/install/mysql/tables/llx_user.sql
@@ -84,6 +84,7 @@ create table llx_user
   datelastpassvalidation  datetime,				                    -- last date we change password or we made a disconnect all
   datestartvalidity       datetime,
   dateendvalidity         datetime,
+  flagdelsessionsbefore   datetime DEFAULT NULL,					-- set this to a date if we need to launch an external process to invalidate all sessions for the same login created before this date 
   iplastlogin             varchar(250),
   ippreviouslogin         varchar(250),
   egroupware_id           integer,
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 74093af63c6..65a7b7d7842 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1776,9 +1776,9 @@ class User extends CommonObject
 				}
 			}
 
-			if ($result > 0 && $member->fk_soc) {	// If member is linked to a thirdparty
+			if ($result > 0 && $member->socid) {	// If member is linked to a thirdparty
 				$sql = "UPDATE ".$this->db->prefix()."user";
-				$sql .= " SET fk_soc=".((int) $member->fk_soc);
+				$sql .= " SET fk_soc=".((int) $member->socid);
 				$sql .= " WHERE rowid=".((int) $this->id);
 
 				dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
@@ -2243,9 +2243,10 @@ class User extends CommonObject
 	 *	@param	int		$notrigger				1=Does not launch triggers
 	 *	@param	int		$nosyncmember	        Do not synchronize linked member
 	 *  @param	int		$passwordalreadycrypted 0=Value is cleartext password, 1=Value is crypted value.
+	 *  @param	int		$flagdelsessionsbefore  1=Save also the current date to ask to invalidate all other session before this date.
 	 *  @return string 			          		If OK return clear password, 0 if no change (warning, you may retreive 1 instead of 0 even if password was same), < 0 if error
 	 */
-	public function setPassword($user, $password = '', $changelater = 0, $notrigger = 0, $nosyncmember = 0, $passwordalreadycrypted = 0)
+	public function setPassword($user, $password = '', $changelater = 0, $notrigger = 0, $nosyncmember = 0, $passwordalreadycrypted = 0, $flagdelsessionsbefore = 1)
 	{
 		global $conf, $langs;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
@@ -2297,6 +2298,9 @@ class User extends CommonObject
 			$sql = "UPDATE ".$this->db->prefix()."user";
 			$sql .= " SET pass_crypted = '".$this->db->escape($password_crypted)."',";
 			$sql .= " pass_temp = null";
+			if (empty($flagdelsessionsbefore)) {
+				$sql .= ", flagdelsessionsbefore = '".$this->db->idate(dol_now() - 5, 'gmt')."'";
+			}
 			if (!empty($conf->global->DATABASE_PWD_ENCRYPTED)) {
 				$sql .= ", pass = null";
 			} else {

From 440d72ba9de2f151f6ab21a87db28057eb7f6c1b Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Thu, 12 Jan 2023 15:19:39 +0100
Subject: [PATCH 497/816] kanban mode for list of various payment

---
 .../bank/class/paymentvarious.class.php       |  37 ++
 htdocs/compta/bank/various_payment/list.php   | 324 ++++++++++--------
 2 files changed, 214 insertions(+), 147 deletions(-)

diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index 3d07c280559..857b49d1576 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -768,4 +768,41 @@ class PaymentVarious extends CommonObject
 		}
 		return 0;
 	}
+
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $langs;
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
+		if (property_exists($this, 'fk_bank')) {
+			$return .= ' | <span class="info-box-status ">'.$this->fk_bank.'</span>';
+		}
+		if (property_exists($this, 'datep')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("Date").'</span> : <span class="info-box-label">'.dol_print_date($this->db->jdate($this->datep), 'day').'</span>';
+		}
+		if (property_exists($this, 'type_payment') && !empty($this->type_payment)) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("Payment", $this->type_payment).'</span> : <span class="info-box-label">'.$this->type_payment.'</span>';
+		}
+		if (property_exists($this, 'accountancy_code')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("Account").'</span> : <span class="info-box-label" title="'.$this->accountancy_code.'">'.$this->accountancy_code.'</span>';
+		}
+		if (property_exists($this, 'amount')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("Debit").'</span> : <span class="info-box-label amount">'.price($this->amount).'</span>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index 0721aeb7ef0..9cd43b01924 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -45,6 +45,7 @@ if ($user->socid) {
 }
 
 $optioncss = GETPOST('optioncss', 'alpha');
+$mode      = GETPOST('mode', 'alpha');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $search_ref = GETPOST('search_ref', 'int');
@@ -312,6 +313,9 @@ if ($resql) {
 	$total = 0;
 
 	$param = '';
+	if (!empty($mode)) {
+		$param .= '&mode='.urlencode($mode);
+	}
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 		$param .= '&contextpage='.urlencode($contextpage);
 	}
@@ -362,7 +366,10 @@ if ($resql) {
 	if (!empty($socid)) {
 		$url .= '&socid='.urlencode($socid);
 	}
-	$newcardbutton = dolGetButtonTitle($langs->trans('MenuNewVariousPayment'), '', 'fa fa-plus-circle', $url, '', $user->rights->banque->modifier);
+	$newcardbutton  = '';
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('MenuNewVariousPayment'), '', 'fa fa-plus-circle', $url, '', $user->rights->banque->modifier);
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 
@@ -375,6 +382,8 @@ if ($resql) {
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+	print '<input type="hidden" name="mode" value="'.$mode.'">';
+
 
 	print_barre_liste($langs->trans("MenuVariousPayment"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'object_payment', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -568,166 +577,187 @@ if ($resql) {
 		$variousstatic->id = $obj->rowid;
 		$variousstatic->ref = $obj->rowid;
 		$variousstatic->label = $obj->label;
+		$variousstatic->datep = $obj->datep;
+		$variousstatic->type_payment = $obj->payment_code;
+		$bankline->fetch($obj->fk_bank);
+		$variousstatic->fk_bank = $bankline->getNomUrl(1);
+		$variousstatic->amount = $obj->amount;
 
-		print '<tr class="oddeven">';
+		$accountingaccount->fetch('', $obj->accountancy_code, 1);
+		$variousstatic->accountancy_code = $accountingaccount->getNomUrl(0, 0, 1, $obj->accountingaccount, 1);
 
-		// No
-		if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
-			print '<td>'.(($offset * $limit) + $i).'</td>';
-		}
-
-		// Ref
-		if ($arrayfields['ref']['checked']) {
-			print '<td>'.$variousstatic->getNomUrl(1)."</td>";
-			if (!$i) {
-				$totalarray['nbfield']++;
+		if ($mode == 'kanban') {
+			if ($i == 0) {
+				print '<tr><td colspan="12">';
+				print '<div class="box-flex-container">';
 			}
-		}
+			// Output Kanban
 
-		// Label payment
-		if ($arrayfields['label']['checked']) {
-			print '<td class="tdoverflowmax150" title="'.$variousstatic->label.'">'.$variousstatic->label."</td>";
-			if (!$i) {
-				$totalarray['nbfield']++;
+			print $variousstatic->getKanbanView('');
+			if ($i == (min($num, $limit) - 1)) {
+				print '</div>';
+				print '</td></tr>';
 			}
-		}
+		} else {
+			print '<tr class="oddeven">';
 
-		// Date payment
-		if ($arrayfields['datep']['checked']) {
-			print '<td class="center">'.dol_print_date($obj->datep, 'day')."</td>";
-			if (!$i) {
-				$totalarray['nbfield']++;
+			// No
+			if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+				print '<td>'.(($offset * $limit) + $i).'</td>';
 			}
-		}
 
-
-		// Date value
-		if ($arrayfields['datev']['checked']) {
-			print '<td class="center">'.dol_print_date($obj->datev, 'day')."</td>";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Type
-		if ($arrayfields['type']['checked']) {
-			print '<td class="center">';
-			if ($obj->payment_code) {
-				print $langs->trans("PaymentTypeShort".$obj->payment_code);
-				print ' ';
-			}
-			print $obj->num_payment;
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Project
-		if ($arrayfields['project']['checked']) {
-			print '<td class="nowraponall">';
-			if ($obj->fk_project > 0) {
-				$proj->fetch($obj->fk_project);
-				print $proj->getNomUrl(1);
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Bank account
-		if ($arrayfields['bank']['checked']) {
-			print '<td class="nowraponall">';
-			if ($obj->bid > 0) {
-				$accountstatic->id = $obj->bid;
-				$accountstatic->ref = $obj->bref;
-				$accountstatic->number = $obj->bnumber;
-
-				if (isModEnabled('accounting')) {
-					$accountstatic->account_number = $obj->bank_account_number;
-					$accountingjournal->fetch($obj->accountancy_journal);
-					$accountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
+			// Ref
+			if ($arrayfields['ref']['checked']) {
+				print '<td>'.$variousstatic->getNomUrl(1)."</td>";
+				if (!$i) {
+					$totalarray['nbfield']++;
 				}
-
-				$accountstatic->label = $obj->blabel;
-				print $accountstatic->getNomUrl(1);
-			} else {
-				print '&nbsp;';
 			}
-			print '</td>';
+
+			// Label payment
+			if ($arrayfields['label']['checked']) {
+				print '<td class="tdoverflowmax150" title="'.$variousstatic->label.'">'.$variousstatic->label."</td>";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Date payment
+			if ($arrayfields['datep']['checked']) {
+				print '<td class="center">'.dol_print_date($obj->datep, 'day')."</td>";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+
+			// Date value
+			if ($arrayfields['datev']['checked']) {
+				print '<td class="center">'.dol_print_date($obj->datev, 'day')."</td>";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Type
+			if ($arrayfields['type']['checked']) {
+				print '<td class="center">';
+				if ($obj->payment_code) {
+					print $langs->trans("PaymentTypeShort".$obj->payment_code);
+					print ' ';
+				}
+				print $obj->num_payment;
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Project
+			if ($arrayfields['project']['checked']) {
+				print '<td class="nowraponall">';
+				if ($obj->fk_project > 0) {
+					$proj->fetch($obj->fk_project);
+					print $proj->getNomUrl(1);
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Bank account
+			if ($arrayfields['bank']['checked']) {
+				print '<td class="nowraponall">';
+				if ($obj->bid > 0) {
+					$accountstatic->id = $obj->bid;
+					$accountstatic->ref = $obj->bref;
+					$accountstatic->number = $obj->bnumber;
+
+					if (isModEnabled('accounting')) {
+						$accountstatic->account_number = $obj->bank_account_number;
+						$accountingjournal->fetch($obj->accountancy_journal);
+						$accountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
+					}
+
+					$accountstatic->label = $obj->blabel;
+					print $accountstatic->getNomUrl(1);
+				} else {
+					print '&nbsp;';
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Bank entry
+			if ($arrayfields['entry']['checked']) {
+				$bankline->fetch($obj->fk_bank);
+				print '<td>'.$bankline->getNomUrl(1).'</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Accounting account
+			if (!empty($arrayfields['account']['checked'])) {
+				$accountingaccount->fetch('', $obj->accountancy_code, 1);
+
+				print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->accountancy_code.' '.$accountingaccount->label).'">'.$accountingaccount->getNomUrl(0, 1, 1, '', 1).'</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Accounting subledger account
+			if (!empty($arrayfields['subledger']['checked'])) {
+				print '<td class="tdoverflowmax150">'.length_accounta($obj->subledger_account).'</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			// Debit
+			if ($arrayfields['debit']['checked']) {
+				print '<td class="nowrap right">';
+				if ($obj->sens == 0) {
+					print '<span class="amount">'.price($obj->amount).'</span>';
+					$totalarray['val']['total_deb'] += $obj->amount;
+				}
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'total_deb';
+				}
+				print '</td>';
+			}
+
+			// Credit
+			if ($arrayfields['credit']['checked']) {
+				print '<td class="nowrap right">';
+				if ($obj->sens == 1) {
+					print '<span class="amount">'.price($obj->amount).'</span>';
+					$totalarray['val']['total_cred'] += $obj->amount;
+				}
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'total_cred';
+				}
+				print '</td>';
+			}
+
+			print '<td></td>';
+
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
+
+			print '</tr>'."\n";
 		}
-
-		// Bank entry
-		if ($arrayfields['entry']['checked']) {
-			$bankline->fetch($obj->fk_bank);
-			print '<td>'.$bankline->getNomUrl(1).'</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Accounting account
-		if (!empty($arrayfields['account']['checked'])) {
-			$accountingaccount->fetch('', $obj->accountancy_code, 1);
-
-			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->accountancy_code.' '.$accountingaccount->label).'">'.$accountingaccount->getNomUrl(0, 1, 1, '', 1).'</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Accounting subledger account
-		if (!empty($arrayfields['subledger']['checked'])) {
-			print '<td class="tdoverflowmax150">'.length_accounta($obj->subledger_account).'</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Debit
-		if ($arrayfields['debit']['checked']) {
-			print '<td class="nowrap right">';
-			if ($obj->sens == 0) {
-				print '<span class="amount">'.price($obj->amount).'</span>';
-				$totalarray['val']['total_deb'] += $obj->amount;
-			}
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'total_deb';
-			}
-			print '</td>';
-		}
-
-		// Credit
-		if ($arrayfields['credit']['checked']) {
-			print '<td class="nowrap right">';
-			if ($obj->sens == 1) {
-				print '<span class="amount">'.price($obj->amount).'</span>';
-				$totalarray['val']['total_cred'] += $obj->amount;
-			}
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'total_cred';
-			}
-			print '</td>';
-		}
-
-		print '<td></td>';
-
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-
-		print '</tr>'."\n";
-
 		$i++;
 	}
 

From a68df8e9f573751eff25ca66ee4e3b1d630d7318 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Thu, 12 Jan 2023 16:16:23 +0100
Subject: [PATCH 498/816] kanban mode for list of banks

---
 htdocs/compta/bank/class/account.class.php |  33 ++
 htdocs/compta/bank/list.php                | 429 +++++++++++----------
 2 files changed, 258 insertions(+), 204 deletions(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index a73fd2b5f2c..5332150dfb4 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1748,6 +1748,39 @@ class Account extends CommonObject
 			return false;
 		}
 	}
+
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $langs;
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>';
+
+		if (property_exists($this, 'type_lib')) {
+			$return .= '<br><span class="info-box-label opacitymedium" title="'.$this->type_lib[$this->type].'">'.substr($this->type_lib[$this->type], 0, 24).'...</span>';
+		}
+		if (method_exists($this, 'solde')) {
+			$return .= '<br><a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?id='.$this->id.'">';
+			$return .= '<span class="opacitymedium">'.$langs->trans("Balance").'</span> : <span class="amount">'.price($this->solde(1), 0, $langs, 1, -1, -1, $this->currency_code).'</span>';
+		}
+		if (method_exists($this, 'getLibStatut')) {
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
 
 
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 38b666cc2ef..8efe9451b64 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -52,6 +52,7 @@ $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'bankaccountlist'; // To manage different context of search
+$mode = GETPOST('mode', 'alpha');
 
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
@@ -305,6 +306,9 @@ llxHeader('', $title, $help_url);
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
+if (!empty($mode)) {
+	$param .= '&mode='.urlencode($mode);
+}
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 	$param .= '&contextpage='.urlencode($contextpage);
 }
@@ -365,8 +369,13 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="search_status" value="'.$search_status.'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
 
-$newcardbutton = dolGetButtonTitle($langs->trans('NewFinancialAccount'), '', 'fa fa-plus-circle', 'card.php?action=create', '', $user->rights->banque->configurer);
+
+$newcardbutton  = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('NewFinancialAccount'), '', 'fa fa-plus-circle', 'card.php?action=create', '', $user->rights->banque->configurer);
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'bank_account', 0, $newcardbutton, '', $limit, 1);
 
@@ -584,224 +593,236 @@ foreach ($accounts as $key => $type) {
 		$lastcurrencycode = $objecttmp->currency_code;
 	}
 
-	print '<tr class="oddeven">';
-	// Action column
-	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print '<td class="nowrap center">';
-		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($objecttmp->id, $arrayofselected)) {
-				$selected = 1;
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr><td colspan="12">';
+			print '<div class="box-flex-container">';
+		}
+		// Output Kanban
+		print $objecttmp->getKanbanView('');
+		if ($i == (min($num, $limit) - 1)) {
+			print '</div>';
+			print '</td></tr>';
+		}
+	} else {
+		print '<tr class="oddeven">';
+		// Action column
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($objecttmp->id, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$objecttmp->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$objecttmp->id.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
-			print '<input id="cb'.$objecttmp->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$objecttmp->id.'"'.($selected ? ' checked="checked"' : '').'>';
+			print '</td>';
 		}
-		print '</td>';
-	}
-	// Ref
-	if (!empty($arrayfields['b.ref']['checked'])) {
-		print '<td class="nowraponall">'.$objecttmp->getNomUrl(1).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Label
-	if (!empty($arrayfields['b.label']['checked'])) {
-		print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($objecttmp->label).'">'.dol_escape_htmltag($objecttmp->label).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Account type
-	if (!empty($arrayfields['accountype']['checked'])) {
-		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($objecttmp->type_lib[$objecttmp->type]).'">';
-		print $objecttmp->type_lib[$objecttmp->type];
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Number
-	if (!empty($arrayfields['b.number']['checked'])) {
-		print '<td>'.dol_escape_htmltag($objecttmp->number).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Account number
-	if (!empty($arrayfields['b.account_number']['checked'])) {
-		print '<td class="tdoverflowmax250">';
-		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).'">';
-			print $accountingaccount->getNomUrl(0, 1, 1, '', 0);
-			print '</span>';
-		} else {
-			print '<span title="'.dol_escape_htmltag($objecttmp->account_number).'">'.$objecttmp->account_number.'</span>';
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Accountancy journal
-	if (!empty($arrayfields['b.fk_accountancy_journal']['checked'])) {
-		print '<td class="tdoverflowmax125">';
-		if (isModEnabled('accounting')) {
-			if (empty($objecttmp->fk_accountancy_journal)) {
-				print img_warning($langs->trans("Mandatory"));
-			} else {
-				$accountingjournal = new AccountingJournal($db);
-				$accountingjournal->fetch($objecttmp->fk_accountancy_journal);
-				print $accountingjournal->getNomUrl(0, 1, 1, '', 1);
+		// Ref
+		if (!empty($arrayfields['b.ref']['checked'])) {
+			print '<td class="nowraponall">'.$objecttmp->getNomUrl(1).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
 			}
-		} else {
-			print '';
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Currency
-	if (!empty($arrayfields['b.currency_code']['checked'])) {
-		print '<td class="center nowraponall">';
-		print $objecttmp->currency_code;
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Transactions to reconcile
-	if (!empty($arrayfields['toreconcile']['checked'])) {
-		$conciliate = $objecttmp->canBeConciliated();
-
-		$labeltoshow = '';
-		if ($conciliate == -2) {
-			$labeltoshow = $langs->trans("CashAccount");
-		} elseif ($conciliate == -3) {
-			$labeltoshow = $langs->trans("Closed");
-		} elseif (empty($objecttmp->rappro)) {
-			$labeltoshow = $langs->trans("ConciliationDisabled");
 		}
 
-		print '<td class="center tdoverflowmax125"'.($labeltoshow ? ' title="'.dol_escape_htmltag($labeltoshow).'"' : '').'>';
-		if ($conciliate == -2) {
-			print '<span class="opacitymedium">'.$langs->trans("CashAccount").'</span>';
-		} elseif ($conciliate == -3) {
-			print '<span class="opacitymedium">'.$langs->trans("Closed").'</span>';
-		} elseif (empty($objecttmp->rappro)) {
-			print '<span class="opacitymedium">'.$langs->trans("ConciliationDisabled").'</span>';
-		} else {
-			$result = $objecttmp->load_board($user, $objecttmp->id);
-			if (is_numeric($result) && $result < 0) {
-				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-			} else {
-				print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&sortorder=asc,asc,asc&id='.$objecttmp->id.'&search_account='.$objecttmp->id.'&search_conciliated=0&contextpage=banktransactionlist">';
-				print '<span class="badge badge-info classfortooltip" title="'.dol_htmlentities($langs->trans("TransactionsToConciliate")).'">';
-				print $result->nbtodo;
+		// Label
+		if (!empty($arrayfields['b.label']['checked'])) {
+			print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($objecttmp->label).'">'.dol_escape_htmltag($objecttmp->label).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Account type
+		if (!empty($arrayfields['accountype']['checked'])) {
+			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($objecttmp->type_lib[$objecttmp->type]).'">';
+			print $objecttmp->type_lib[$objecttmp->type];
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Number
+		if (!empty($arrayfields['b.number']['checked'])) {
+			print '<td>'.dol_escape_htmltag($objecttmp->number).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Account number
+		if (!empty($arrayfields['b.account_number']['checked'])) {
+			print '<td class="tdoverflowmax250">';
+			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).'">';
+				print $accountingaccount->getNomUrl(0, 1, 1, '', 0);
 				print '</span>';
-				print '</a>';
-				if ($result->nbtodolate) {
-					print '<span title="'.dol_htmlentities($langs->trans("Late")).'" class="classfortooltip badge badge-danger marginleftonlyshort">';
-					print '<i class="fa fa-exclamation-triangle"></i> '.$result->nbtodolate;
+			} else {
+				print '<span title="'.dol_escape_htmltag($objecttmp->account_number).'">'.$objecttmp->account_number.'</span>';
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Accountancy journal
+		if (!empty($arrayfields['b.fk_accountancy_journal']['checked'])) {
+			print '<td class="tdoverflowmax125">';
+			if (isModEnabled('accounting')) {
+				if (empty($objecttmp->fk_accountancy_journal)) {
+					print img_warning($langs->trans("Mandatory"));
+				} else {
+					$accountingjournal = new AccountingJournal($db);
+					$accountingjournal->fetch($objecttmp->fk_accountancy_journal);
+					print $accountingjournal->getNomUrl(0, 1, 1, '', 1);
+				}
+			} else {
+				print '';
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Currency
+		if (!empty($arrayfields['b.currency_code']['checked'])) {
+			print '<td class="center nowraponall">';
+			print $objecttmp->currency_code;
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Transactions to reconcile
+		if (!empty($arrayfields['toreconcile']['checked'])) {
+			$conciliate = $objecttmp->canBeConciliated();
+
+			$labeltoshow = '';
+			if ($conciliate == -2) {
+				$labeltoshow = $langs->trans("CashAccount");
+			} elseif ($conciliate == -3) {
+				$labeltoshow = $langs->trans("Closed");
+			} elseif (empty($objecttmp->rappro)) {
+				$labeltoshow = $langs->trans("ConciliationDisabled");
+			}
+
+			print '<td class="center tdoverflowmax125"'.($labeltoshow ? ' title="'.dol_escape_htmltag($labeltoshow).'"' : '').'>';
+			if ($conciliate == -2) {
+				print '<span class="opacitymedium">'.$langs->trans("CashAccount").'</span>';
+			} elseif ($conciliate == -3) {
+				print '<span class="opacitymedium">'.$langs->trans("Closed").'</span>';
+			} elseif (empty($objecttmp->rappro)) {
+				print '<span class="opacitymedium">'.$langs->trans("ConciliationDisabled").'</span>';
+			} else {
+				$result = $objecttmp->load_board($user, $objecttmp->id);
+				if (is_numeric($result) && $result < 0) {
+					setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+				} else {
+					print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&sortorder=asc,asc,asc&id='.$objecttmp->id.'&search_account='.$objecttmp->id.'&search_conciliated=0&contextpage=banktransactionlist">';
+					print '<span class="badge badge-info classfortooltip" title="'.dol_htmlentities($langs->trans("TransactionsToConciliate")).'">';
+					print $result->nbtodo;
 					print '</span>';
+					print '</a>';
+					if ($result->nbtodolate) {
+						print '<span title="'.dol_htmlentities($langs->trans("Late")).'" class="classfortooltip badge badge-danger marginleftonlyshort">';
+						print '<i class="fa fa-exclamation-triangle"></i> '.$result->nbtodolate;
+						print '</span>';
+					}
 				}
 			}
-		}
 
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Extra fields
-	if (is_array($objecttmp->array_options)) {
-		$obj = new stdClass();
-		foreach ($objecttmp->array_options as $k => $v) {
-			$obj->$k = $v;
-		}
-	}
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $objecttmp, $action); // Note that $action and $objecttmpect may have been modified by hook
-	print $hookmanager->resPrint;
-	// Date creation
-	if (!empty($arrayfields['b.datec']['checked'])) {
-		print '<td class="center nowraponall">';
-		print dol_print_date($objecttmp->date_creation, 'dayhour');
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Date modification
-	if (!empty($arrayfields['b.tms']['checked'])) {
-		print '<td class="center nowraponall">';
-		print dol_print_date($objecttmp->date_update, 'dayhour');
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Status
-	if (!empty($arrayfields['b.clos']['checked'])) {
-		print '<td class="center">'.$objecttmp->getLibStatut(5).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Balance
-	if (!empty($arrayfields['balance']['checked'])) {
-		print '<td class="nowraponall right">';
-		print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?id='.$objecttmp->id.'">';
-		print '<span class="amount">'.price($solde, 0, $langs, 1, -1, -1, $objecttmp->currency_code).'</span>';
-		print '</a>';
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-		if (!$i) {
-			$totalarray['pos'][$totalarray['nbfield']] = 'balance';
-		}
-		$totalarray['val']['balance'] += $solde;
-	}
-
-	// Action column
-	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print '<td class="nowrap center">';
-		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($objecttmp->id, $arrayofselected)) {
-				$selected = 1;
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
 			}
-			print '<input id="cb'.$objecttmp->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$objecttmp->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
-		print '</td>';
-	}
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
 
-	print '</tr>';
+		// Extra fields
+		if (is_array($objecttmp->array_options)) {
+			$obj = new stdClass();
+			foreach ($objecttmp->array_options as $k => $v) {
+				$obj->$k = $v;
+			}
+		}
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+		// Fields from hook
+		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $objecttmp, $action); // Note that $action and $objecttmpect may have been modified by hook
+		print $hookmanager->resPrint;
+		// Date creation
+		if (!empty($arrayfields['b.datec']['checked'])) {
+			print '<td class="center nowraponall">';
+			print dol_print_date($objecttmp->date_creation, 'dayhour');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Date modification
+		if (!empty($arrayfields['b.tms']['checked'])) {
+			print '<td class="center nowraponall">';
+			print dol_print_date($objecttmp->date_update, 'dayhour');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
 
-	if (empty($total[$objecttmp->currency_code])) {
-		$total[$objecttmp->currency_code] = $solde;
-	} else {
-		$total[$objecttmp->currency_code] += $solde;
+		// Status
+		if (!empty($arrayfields['b.clos']['checked'])) {
+			print '<td class="center">'.$objecttmp->getLibStatut(5).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Balance
+		if (!empty($arrayfields['balance']['checked'])) {
+			print '<td class="nowraponall right">';
+			print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?id='.$objecttmp->id.'">';
+			print '<span class="amount">'.price($solde, 0, $langs, 1, -1, -1, $objecttmp->currency_code).'</span>';
+			print '</a>';
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'balance';
+			}
+			$totalarray['val']['balance'] += $solde;
+		}
+
+		// Action column
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($objecttmp->id, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$objecttmp->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$objecttmp->id.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+		}
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+
+		print '</tr>';
+
+		if (empty($total[$objecttmp->currency_code])) {
+			$total[$objecttmp->currency_code] = $solde;
+		} else {
+			$total[$objecttmp->currency_code] += $solde;
+		}
 	}
-
 	$i++;
 }
 

From 551daa5ca1806e0ac4d272a10a787ebf1b326a33 Mon Sep 17 00:00:00 2001
From: hystepik <lucas.marcouiller@gmail.com>
Date: Thu, 12 Jan 2023 16:26:39 +0100
Subject: [PATCH 499/816] New : Add reload of modules in configuration

---
 htdocs/admin/modules.php      | 54 +++++++++++++++++++++++++++++++++++
 htdocs/core/lib/admin.lib.php | 15 ++++++----
 htdocs/langs/en_US/admin.lang |  2 ++
 3 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index e93b5a58e96..db019bd262a 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -282,10 +282,39 @@ if ($action == 'set' && $user->admin) {
 	}
 	header("Location: ".$_SERVER["PHP_SELF"]."?mode=".$mode.$param.($page_y ? '&page_y='.$page_y : ''));
 	exit;
+} elseif (getDolGlobalInt("MAIN_FEATURES_LEVEL") > 1 && $action == 'reload' && $user->admin && GETPOST('confirm') == 'yes') {
+	$result = unActivateModule($value, 0);
+	dolibarr_set_const($db, "MAIN_IHM_PARAMS_REV", (int) $conf->global->MAIN_IHM_PARAMS_REV + 1, 'chaine', 0, '', $conf->entity);
+	if ($result) {
+		setEventMessages($result, null, 'errors');
+		header("Location: ".$_SERVER["PHP_SELF"]."?mode=".$mode.$param.($page_y ? '&page_y='.$page_y : ''));
+	}
+	$resarray = activateModule($value, 0, 1);
+	dolibarr_set_const($db, "MAIN_IHM_PARAMS_REV", (int) $conf->global->MAIN_IHM_PARAMS_REV + 1, 'chaine', 0, '', $conf->entity);
+	if (!empty($resarray['errors'])) {
+		setEventMessages('', $resarray['errors'], 'errors');
+	} else {
+		if ($resarray['nbperms'] > 0) {
+			$tmpsql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."user WHERE admin <> 1";
+			$resqltmp = $db->query($tmpsql);
+			if ($resqltmp) {
+				$obj = $db->fetch_object($resqltmp);
+				if ($obj && $obj->nb > 1) {
+					$msg = $langs->trans('ModuleEnabledAdminMustCheckRights');
+					setEventMessages($msg, null, 'warnings');
+				}
+			} else {
+				dol_print_error($db);
+			}
+		}
+	}
+	header("Location: ".$_SERVER["PHP_SELF"]."?mode=".$mode.$param.($page_y ? '&page_y='.$page_y : ''));
+	exit;
 }
 
 
 
+
 /*
  * View
  */
@@ -464,6 +493,19 @@ if ($action == 'reset_confirm' && $user->admin) {
 	}
 }
 
+if ($action == 'reload_confirm' && $user->admin) {
+	if (!empty($modules[$value])) {
+		$objMod = $modules[$value];
+
+		if (!empty($objMod->langfiles)) {
+			$langs->loadLangs($objMod->langfiles);
+		}
+
+		$form = new Form($db);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?value='.$value.'&mode='.$mode.$param, $langs->trans('ConfirmReload'), $langs->trans(GETPOST('confirm_message_code')), 'reload', '', 'no', 1);
+	}
+}
+
 print $formconfirm;
 
 asort($orders);
@@ -802,10 +844,22 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 					$codeenabledisable .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;token='.newToken().'&amp;module_position='.$module_position.'&amp;action=reset_confirm&amp;confirm_message_code='.urlencode($objMod->warnings_unactivation[$mysoc->country_code]).'&amp;value='.$modName.'&amp;mode='.$mode.$param.'">';
 					$codeenabledisable .= img_picto($langs->trans("Activated"), 'switch_on');
 					$codeenabledisable .= '</a>';
+					if (getDolGlobalInt("MAIN_FEATURES_LEVEL") > 1) {
+						$codeenabledisable .= '&nbsp;';
+						$codeenabledisable .= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;token='.newToken().'&amp;module_position='.$module_position.'&amp;action=reload_confirm&amp;value='.$modName.'&amp;mode='.$mode.'&amp;confirm=yes'.$param.'">';
+						$codeenabledisable .= img_picto($langs->trans("Reload"), 'refresh', 'class="fa-15"');
+						$codeenabledisable .= '</a>';
+					}
 				} else {
 					$codeenabledisable .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;token='.newToken().'&amp;module_position='.$module_position.'&amp;action=reset&amp;value='.$modName.'&amp;mode='.$mode.'&amp;confirm=yes'.$param.'">';
 					$codeenabledisable .= img_picto($langs->trans("Activated"), 'switch_on');
 					$codeenabledisable .= '</a>';
+					if (getDolGlobalInt("MAIN_FEATURES_LEVEL") > 1) {
+						$codeenabledisable .= '&nbsp;';
+						$codeenabledisable .= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;token='.newToken().'&amp;module_position='.$module_position.'&amp;action=reload&amp;value='.$modName.'&amp;mode='.$mode.'&amp;confirm=yes'.$param.'">';
+						$codeenabledisable .= img_picto($langs->trans("Reload"), 'refresh', 'class="fa-15"');
+						$codeenabledisable .= '</a>';
+					}
 				}
 			}
 
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 71bcc082961..92895793082 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1084,11 +1084,12 @@ function purgeSessions($mysessionid)
 /**
  *  Enable a module
  *
- *  @param      string		$value      Name of module to activate
- *  @param      int			$withdeps   Activate/Disable also all dependencies
- *  @return     array      			    array('nbmodules'=>nb modules activated with success, 'errors=>array of error messages, 'nbperms'=>Nb permission added);
+ *  @param      string		$value      			Name of module to activate
+ *  @param      int			$withdeps  				Activate/Disable also all dependencies
+ * 	@param		int			$noconfverification		Remove verification of $conf variable for module
+ *  @return     array      			    			array('nbmodules'=>nb modules activated with success, 'errors=>array of error messages, 'nbperms'=>Nb permission added);
  */
-function activateModule($value, $withdeps = 1)
+function activateModule($value, $withdeps = 1, $noconfverification = 0)
 {
 	global $db, $langs, $conf, $mysoc;
 
@@ -1144,8 +1145,10 @@ function activateModule($value, $withdeps = 1)
 	}
 
 	$const_name = $objMod->const_name;
-	if (!empty($conf->global->$const_name)) {
-		return $ret;
+	if ($noconfverification == 0) {
+		if (!empty($conf->global->$const_name)) {
+			return $ret;
+		}
 	}
 
 	$result = $objMod->init(); // Enable module
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 421ba4f6fa2..34bae07fc37 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2357,3 +2357,5 @@ AllowExternalDownload=Allow external download (without login, using a shared lin
 DeadlineDayVATSubmission=Deadline day for vat submission on the next month
 MaxNumberOfAttachementOnForms=Max number of joinded files in a form
 IfDefinedUseAValueBeetween=If defined, use a value between %s and %s
+Reload=Reload
+ConfirmReload=Confirm module reload
\ No newline at end of file

From 8a5423b464df64b3c825efc47901f2ec1c61342d Mon Sep 17 00:00:00 2001
From: hystepik <lucas.marcouiller@gmail.com>
Date: Thu, 12 Jan 2023 16:29:58 +0100
Subject: [PATCH 500/816] add newline end of file

---
 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 34bae07fc37..cfe01784bea 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2358,4 +2358,4 @@ DeadlineDayVATSubmission=Deadline day for vat submission on the next month
 MaxNumberOfAttachementOnForms=Max number of joinded files in a form
 IfDefinedUseAValueBeetween=If defined, use a value between %s and %s
 Reload=Reload
-ConfirmReload=Confirm module reload
\ No newline at end of file
+ConfirmReload=Confirm module reload

From 23f89c9134640099ca5fa02bea86dff01864b392 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 12 Jan 2023 17:59:19 +0100
Subject: [PATCH 501/816] Missing photo

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

diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 17addfa22f4..d2344f378a0 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -458,7 +458,7 @@ if (isModEnabled("banque")) {
 // Amount
 print '<td class="liste_titre right"><input name="search_amount" class="flat" type="text" size="8" value="'.$db->escape($search_amount).'"></td>';
 
-//Status
+// Status
 print '<td class="liste_titre right parentonrightofpage">';
 $liststatus = array('0' => $langs->trans("Unpaid"), '1' => $langs->trans("Paid"));
 print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
@@ -538,7 +538,8 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	$userstatic->login = $obj->login;
 	$userstatic->email = $obj->email;
 	$userstatic->socid = $obj->fk_soc;
-	$userstatic->statut = $obj->status;
+	$userstatic->statut = $obj->status;		// deprecated
+	$userstatic->status = $obj->status;
 
 	$salstatic->id = $obj->rowid;
 	$salstatic->ref = $obj->rowid;
@@ -590,7 +591,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		}
 
 		// Employee
-		print '<td class="tdoverflowmax150">'.$userstatic->getNomUrl(1)."</td>\n";
+		print '<td class="tdoverflowmax150">'.$userstatic->getNomUrl(-1)."</td>\n";
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -637,7 +638,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			}
 		}
 
-		//  if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
+		// if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
 
 		// Amount
 		print '<td class="nowrap right"><span class="amount">'.price($obj->amount).'</span></td>';

From 3ae453136b1d6cbf4011e5d2509ff538cfa252ed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 12 Jan 2023 18:06:26 +0100
Subject: [PATCH 502/816] Fix error

---
 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 c9f1eb76b41..1e153109140 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -4196,7 +4196,7 @@ function migrate_delete_old_dir($db, $langs, $conf)
 	}
 
 	foreach ($filetodeletearray as $filetodelete) {
-		//print '<b>'.$filetodelete."</b><br>\n";
+		$result = 1;
 		if (file_exists($filetodelete)) {
 			$result = dol_delete_dir_recursive($filetodelete);
 		}

From dac735dc4be9984266df767ff6de606afb2f6b20 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 12 Jan 2023 18:11:10 +0100
Subject: [PATCH 503/816] Fix missing photo

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

diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index d2344f378a0..fbbac2a2f3b 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -224,7 +224,7 @@ $now = dol_now();
 $help_url = '';
 $title = $langs->trans('Salaries');
 
-$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.admin, u.salary as current_salary, u.fk_soc as fk_soc, u.statut as status,";
+$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.admin, u.photo, u.salary as current_salary, u.fk_soc as fk_soc, u.statut as status,";
 $sql .= " s.rowid, s.fk_account, s.paye, s.fk_user, s.amount, s.salary, s.label, s.datesp, s.dateep, s.fk_typepayment as paymenttype, ";
 $sql .= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel, ba.iban_prefix as iban, ba.bic, ba.currency_code, ba.clos,";
 $sql .= " pst.code as payment_code,";
@@ -540,6 +540,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	$userstatic->socid = $obj->fk_soc;
 	$userstatic->statut = $obj->status;		// deprecated
 	$userstatic->status = $obj->status;
+	$userstatic->photo = $obj->photo;
 
 	$salstatic->id = $obj->rowid;
 	$salstatic->ref = $obj->rowid;

From 7124a59110b4c9c3fd60a449d3c367281461b2eb Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Thu, 12 Jan 2023 18:28:57 +0100
Subject: [PATCH 504/816] kanban mode for list of prelevement orders

---
 .../class/bonprelevement.class.php            | 34 +++++++++++++
 htdocs/compta/prelevement/orders_list.php     | 49 ++++++++++++++-----
 2 files changed, 70 insertions(+), 13 deletions(-)

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 959630a5538..e8e511f8c87 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -2397,4 +2397,38 @@ class BonPrelevement extends CommonObject
 		 */
 		return 0;
 	}
+
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $langs;
+
+
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
+
+		if (property_exists($this, 'date_echeance')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("Date").'</span> : <span class="info-box-label">'.dol_print_date($this->db->jdate($this->date_echeance), 'day').'</span>';
+		}
+		if (property_exists($this, 'total')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("Amount").'</span> : <span class="amount">'.price($this->total).'</span>';
+		}
+		if (method_exists($this, 'LibStatut')) {
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->LibStatut($this->statut, 5).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
diff --git a/htdocs/compta/prelevement/orders_list.php b/htdocs/compta/prelevement/orders_list.php
index 01ef33eea9d..bead580ab31 100644
--- a/htdocs/compta/prelevement/orders_list.php
+++ b/htdocs/compta/prelevement/orders_list.php
@@ -54,6 +54,8 @@ if (!$sortfield) {
 }
 
 $optioncss = GETPOST('optioncss', 'alpha');
+$mode = GETPOST('mode', 'alpha');
+
 
 // Get supervariables
 $statut = GETPOST('statut', 'int');
@@ -147,6 +149,9 @@ if ($result) {
 	$i = 0;
 
 	$param = '';
+	if (!empty($mode)) {
+		$param .= '&mode='.urlencode($mode);
+	}
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 		$param .= '&contextpage='.urlencode($contextpage);
 	}
@@ -161,6 +166,8 @@ if ($result) {
 	$selectedfields = '';
 
 	$newcardbutton = '';
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
 	if ($usercancreate) {
 		$newcardbutton .= dolGetButtonTitle($langs->trans('NewStandingOrder'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/prelevement/create.php?type='.urlencode($type));
 	}
@@ -176,6 +183,8 @@ if ($result) {
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+	print '<input type="hidden" name="mode" value="'.$mode.'">';
+
 	if ($type != '') {
 		print '<input type="hidden" name="type" value="'.$type.'">';
 	}
@@ -220,27 +229,41 @@ if ($result) {
 
 			$directdebitorder->id = $obj->rowid;
 			$directdebitorder->ref = $obj->ref;
-			$directdebitorder->datec = $obj->datec;
-			$directdebitorder->amount = $obj->amount;
+			$directdebitorder->date_echeance = $obj->datec;
+			$directdebitorder->total = $obj->amount;
 			$directdebitorder->statut = $obj->statut;
 
-			print '<tr class="oddeven">';
+			if ($mode == 'kanban') {
+				if ($i == 0) {
+					print '<tr><td colspan="12">';
+					print '<div class="box-flex-container">';
+				}
+				// Output Kanban
 
-			print '<td>';
-			print $directdebitorder->getNomUrl(1);
-			print "</td>\n";
+				print $directdebitorder->getKanbanView('');
+				if ($i == (min($num, $limit) - 1)) {
+					print '</div>';
+					print '</td></tr>';
+				}
+			} else {
+				print '<tr class="oddeven">';
 
-			print '<td class="center">'.dol_print_date($db->jdate($obj->datec), 'day')."</td>\n";
+				print '<td>';
+				print $directdebitorder->getNomUrl(1);
+				print "</td>\n";
 
-			print '<td class="right"><span class="amount">'.price($obj->amount)."</span></td>\n";
+				print '<td class="center">'.dol_print_date($db->jdate($obj->datec), 'day')."</td>\n";
 
-			print '<td class="right">';
-			print $bon->LibStatut($obj->statut, 5);
-			print '</td>';
+				print '<td class="right"><span class="amount">'.price($obj->amount)."</span></td>\n";
 
-			print '<td class="right"></td>'."\n";
+				print '<td class="right">';
+				print $bon->LibStatut($obj->statut, 5);
+				print '</td>';
 
-			print "</tr>\n";
+				print '<td class="right"></td>'."\n";
+
+				print "</tr>\n";
+			}
 			$i++;
 		}
 	} else {

From 68370083985e998642eba61b7e15d925a0423582 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Thu, 12 Jan 2023 18:53:27 +0100
Subject: [PATCH 505/816] kanban view for ligne prelevement

---
 htdocs/compta/prelevement/list.php | 117 +++++++++++++++++------------
 1 file changed, 71 insertions(+), 46 deletions(-)

diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index 4906313cad1..8d9489bbec7 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -43,6 +43,7 @@ $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'directdebitcredittransferlinelist'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$mode       = GETPOST('mode', 'alpha');
 
 $type = GETPOST('type', 'aZ09');
 
@@ -188,12 +189,18 @@ if ($result) {
 
 	$param = "&amp;statut=".urlencode($statut);
 	$param .= "&amp;search_bon=".urlencode($search_bon);
+	if (!empty($mode)) {
+		$param .= '&mode='.urlencode($mode);
+	}
 	if ($type == 'bank-transfer') {
 		$param .= '&amp;type=bank-transfer';
 	}
 	if ($limit > 0 && $limit != $conf->liste_limit) {
 		$param .= '&limit='.urlencode($limit);
 	}
+	$newcardbutton = '';
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
 
 	print"\n<!-- debut table -->\n";
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
@@ -206,6 +213,8 @@ if ($result) {
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+	print '<input type="hidden" name="mode" value="'.$mode.'">';
+
 	if ($type != '') {
 		print '<input type="hidden" name="type" value="'.$type.'">';
 	}
@@ -214,7 +223,7 @@ if ($result) {
 	if ($type == 'bank-transfer') {
 		$title = $langs->trans("CreditTransferLines");
 	}
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'generic', 0, '', '', $limit, 0, 0, 1);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'generic', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 	$moreforfilter = '';
 
@@ -262,61 +271,77 @@ if ($result) {
 			$bon->id = $obj->rowid;
 			$bon->ref = $obj->ref;
 			$bon->statut = $obj->status;
+			$bon->date_echeance = $obj->datec;
+			$bon->total = $obj->amount;
 
 			$company->id = $obj->socid;
 			$company->name = $obj->name;
 			$company->email = $obj->email;
 			$company->code_client = $obj->code_client;
 
-			print '<tr class="oddeven">';
+			if ($mode == 'kanban') {
+				if ($i == 0) {
+					print '<tr><td colspan="12">';
+					print '<div class="box-flex-container">';
+				}
+				// Output Kanban
 
-			print '<td>';
-			print $bon->getNomUrl(1);
-			print "</td>\n";
+				print $bon->getKanbanView('');
+				if ($i == (min($num, $limit) - 1)) {
+					print '</div>';
+					print '</td></tr>';
+				}
+			} else {
+				print '<tr class="oddeven">';
 
-			print '<td>';
-			print $line->LibStatut($obj->statut_ligne, 2);
-			print "&nbsp;";
-			print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/line.php?id='.$obj->rowid_ligne.'">';
-			print substr('000000'.$obj->rowid_ligne, -6);
-			print '</a></td>';
+				print '<td>';
+				print $bon->getNomUrl(1);
+				print "</td>\n";
 
-			print '<td>';
-			$link_to_bill = '/compta/facture/card.php?facid=';
-			$link_title = 'Invoice';
-			$link_picto = 'bill';
-			if ($type == 'bank-transfer') {
-				$link_to_bill = '/fourn/facture/card.php?facid=';
-				$link_title = 'SupplierInvoice';
-				$link_picto = 'supplier_invoice';
+				print '<td>';
+				print $line->LibStatut($obj->statut_ligne, 2);
+				print "&nbsp;";
+				print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/line.php?id='.$obj->rowid_ligne.'">';
+				print substr('000000'.$obj->rowid_ligne, -6);
+				print '</a></td>';
+
+				print '<td>';
+				$link_to_bill = '/compta/facture/card.php?facid=';
+				$link_title = 'Invoice';
+				$link_picto = 'bill';
+				if ($type == 'bank-transfer') {
+					$link_to_bill = '/fourn/facture/card.php?facid=';
+					$link_title = 'SupplierInvoice';
+					$link_picto = 'supplier_invoice';
+				}
+				print '<a href="'.DOL_URL_ROOT.$link_to_bill.$obj->facid.'">';
+				print img_object($langs->trans($link_title), $link_picto);
+				print '&nbsp;'.$obj->invoiceref."</td>\n";
+				print '</a>';
+				print '</td>';
+
+				print '<td>';
+				print $company->getNomUrl(1);
+				print "</td>\n";
+
+
+				print '<td class="center">';
+				$link_to_tab = '/comm/card.php?socid=';
+				$link_code = $obj->code_client;
+				if ($type == 'bank-transfer') {
+					$link_to_tab = '/fourn/card.php?socid=';
+					$link_code = $obj->code_fournisseur;
+				}
+				print '<a href="'.DOL_URL_ROOT.$link_to_tab.$company->id.'">'.$link_code."</a></td>\n";
+
+				print '<td class="center">'.dol_print_date($db->jdate($obj->datec), 'day')."</td>\n";
+
+				print '<td class="right"><span class="amount">'.price($obj->amount)."</span></td>\n";
+
+				print '<td>&nbsp;</td>';
+
+				print "</tr>\n";
 			}
-			print '<a href="'.DOL_URL_ROOT.$link_to_bill.$obj->facid.'">';
-			print img_object($langs->trans($link_title), $link_picto);
-			print '&nbsp;'.$obj->invoiceref."</td>\n";
-			print '</a>';
-			print '</td>';
-
-			print '<td>';
-			print $company->getNomUrl(1);
-			print "</td>\n";
-
-
-			print '<td class="center">';
-			$link_to_tab = '/comm/card.php?socid=';
-			$link_code = $obj->code_client;
-			if ($type == 'bank-transfer') {
-				$link_to_tab = '/fourn/card.php?socid=';
-				$link_code = $obj->code_fournisseur;
-			}
-			print '<a href="'.DOL_URL_ROOT.$link_to_tab.$company->id.'">'.$link_code."</a></td>\n";
-
-			print '<td class="center">'.dol_print_date($db->jdate($obj->datec), 'day')."</td>\n";
-
-			print '<td class="right"><span class="amount">'.price($obj->amount)."</span></td>\n";
-
-			print '<td>&nbsp;</td>';
-
-			print "</tr>\n";
 			$i++;
 		}
 	} else {

From 468b8bcab38e0b0ec6bc5f8226bc0758c776c405 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20NASSIET?= <sebastien.nassiet@comaite.com>
Date: Thu, 12 Jan 2023 19:26:55 +0100
Subject: [PATCH 506/816] correction bug si pas reponse sur le hook

---
 htdocs/user/param_ihm.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 81ecdca8e73..2f8f4ae24ad 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -216,11 +216,13 @@ if (isModEnabled('ticket')) {
 }
 
 // Hook for insertion new items in the List of possible landing pages
-$reshook = $hookmanager->executeHooks('addToLandingPageList', $tmparray, $object);
-if ($reshook < 0) {
-	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-} elseif ($reshook == 0) {
-	$tmparray=$hookmanager->resArray;
+$reshook = $hookmanager->executeHooks('addToLandingPageList',$tmparray,$object); 
+if (!empty($reshook)) {
+	if ($reshook < 0) {
+		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	} else if ($reshook == 0) {
+		$tmparray=$hookmanager->resArray;
+	}
 }
 
 $head = user_prepare_head($object);

From c8055715447465066a6a2855fb0958d08d0b8277 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20NASSIET?= <sebastien.nassiet@comaite.com>
Date: Thu, 12 Jan 2023 19:35:49 +0100
Subject: [PATCH 507/816] correction bug si pas reponse sur le hook

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

diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 2f8f4ae24ad..4ee2c318f5e 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -217,14 +217,15 @@ if (isModEnabled('ticket')) {
 
 // Hook for insertion new items in the List of possible landing pages
 $reshook = $hookmanager->executeHooks('addToLandingPageList',$tmparray,$object); 
-if (!empty($reshook)) {
-	if ($reshook < 0) {
-		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	} else if ($reshook == 0) {
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+} else if ($reshook === 0) {
+	if (count($hookmanager->resArray)!==0) {
 		$tmparray=$hookmanager->resArray;
 	}
 }
 
+
 $head = user_prepare_head($object);
 
 $title = $langs->trans("User");

From 2f80f873eae389a27dd9851b02b1fdeebf8ae624 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 12 Jan 2023 18:36:33 +0000
Subject: [PATCH 508/816] Fixing style errors.

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

diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 4ee2c318f5e..da8eebacaac 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -216,10 +216,10 @@ if (isModEnabled('ticket')) {
 }
 
 // Hook for insertion new items in the List of possible landing pages
-$reshook = $hookmanager->executeHooks('addToLandingPageList',$tmparray,$object); 
+$reshook = $hookmanager->executeHooks('addToLandingPageList', $tmparray, $object);
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-} else if ($reshook === 0) {
+} elseif ($reshook === 0) {
 	if (count($hookmanager->resArray)!==0) {
 		$tmparray=$hookmanager->resArray;
 	}

From ca8188ee90140d0fb9ee4ab38e53f6b0618d130f Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Thu, 12 Jan 2023 19:48:32 +0100
Subject: [PATCH 509/816] kanban mode for list of payment cheque

---
 .../cheque/class/remisecheque.class.php       | 39 ++++++++
 htdocs/compta/paiement/cheque/list.php        | 91 +++++++++++++------
 2 files changed, 100 insertions(+), 30 deletions(-)

diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index e193939cdd6..1e4e7d05a7d 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -1020,4 +1020,43 @@ class RemiseCheque extends CommonObject
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
+
+		/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $langs;
+
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>';
+
+		if (property_exists($this, 'date_bordereau')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("DateCreation").'</span> : <span class="info-box-label">'.dol_print_date($this->db->jdate($this->date_bordereau), 'day').'</span>';
+		}
+		if (property_exists($this, 'nbcheque')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("Cheque", '', '', '', '', 5).'</span> : <span class="info-box-label">'.$this->nbcheque.'</span>';
+		}
+		if (property_exists($this, 'account_id')) {
+			$return .= ' | <span class="info-box-label">'.$this->account_id.'</span>';
+		}
+		if (method_exists($this, 'LibStatut')) {
+			$return .= '<br><div style="display:inline-block" class="info-box-status margintoponly">'.$this->LibStatut($this->statut, 5).'</div>';
+		}
+		if (property_exists($this, 'amount')) {
+			$return .= ' |   <div style="display:inline-block"><span class="opacitymedium">'.$langs->trans("Amount").'</span> : <span class="amount">'.price($this->amount).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 054ef800586..38db4fca14b 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -44,6 +44,7 @@ $result = restrictedArea($user, 'banque', '', '');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_account = GETPOST('search_account', 'int');
 $search_amount = GETPOST('search_amount', 'alpha');
+$mode = GETPOST('mode', 'alpha');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
@@ -149,6 +150,9 @@ if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 	$param = '';
+	if (!empty($mode)) {
+		$param .= '&mode='.urlencode($mode);
+	}
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 		$param .= '&contextpage='.$contextpage;
 	}
@@ -160,7 +164,10 @@ if ($resql) {
 	if (!empty($socid)) {
 		$url .= '&socid='.$socid;
 	}
-	$newcardbutton = dolGetButtonTitle($langs->trans('NewCheckDeposit'), '', 'fa fa-plus-circle', $url, '', $user->rights->banque->cheque);
+	$newcardbutton  = '';
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('NewCheckDeposit'), '', 'fa fa-plus-circle', $url, '', $user->rights->banque->cheque);
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	if ($optioncss != '') {
@@ -172,6 +179,8 @@ if ($resql) {
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="mode" value="'.$mode.'">';
+
 
 	print_barre_liste($langs->trans("MenuChequeDeposits"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'bank_account', 0, $newcardbutton, '', $limit);
 
@@ -220,42 +229,64 @@ if ($resql) {
 		while ($i < min($num, $limit)) {
 			$objp = $db->fetch_object($resql);
 
-			print '<tr class="oddeven">';
-
-			// Num ref cheque
-			print '<td>';
 			$checkdepositstatic->id = $objp->rowid;
 			$checkdepositstatic->ref = ($objp->ref ? $objp->ref : $objp->rowid);
 			$checkdepositstatic->statut = $objp->statut;
-			print $checkdepositstatic->getNomUrl(1);
-			print '</td>';
+			$checkdepositstatic->nbcheque = $objp->nbcheque;
+			$checkdepositstatic->amount = $objp->amount;
+			$checkdepositstatic->date_bordereau = $objp->date_bordereau;
 
-			// Date
-			print '<td class="center">'.dol_print_date($db->jdate($objp->date_bordereau), 'day').'</td>'; // TODO Use date hour
+			$account = new Account($db);
+			$account->fetch($objp->bid);
+			$checkdepositstatic->account_id = $account->getNomUrl(1);
 
-			// Bank
-			print '<td>';
-			if ($objp->bid) {
-				print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"), 'account').' '.$objp->label.'</a>';
+			if ($mode == 'kanban') {
+				if ($i == 0) {
+					print '<tr><td colspan="12">';
+					print '<div class="box-flex-container">';
+				}
+				// Output Kanban
+				print $checkdepositstatic->getKanbanView('');
+				if ($i == (min($num, $limit) - 1)) {
+					print '</div>';
+					print '</td></tr>';
+				}
 			} else {
-				print '&nbsp;';
+				print '<tr class="oddeven">';
+
+				// Num ref cheque
+				print '<td>';
+
+				print $checkdepositstatic->getNomUrl(1);
+				print '</td>';
+
+				// Date
+				print '<td class="center">'.dol_print_date($db->jdate($objp->date_bordereau), 'day').'</td>'; // TODO Use date hour
+
+				// Bank
+				print '<td>';
+				if ($objp->bid) {
+					print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"), 'account').' '.$objp->label.'</a>';
+				} else {
+					print '&nbsp;';
+				}
+				print '</td>';
+
+				// Number of cheques
+				print '<td class="right">'.$objp->nbcheque.'</td>';
+
+				// Amount
+				print '<td class="right"><span class="amount">'.price($objp->amount).'</span></td>';
+
+				// Statut
+				print '<td class="right">';
+				print $checkdepositstatic->LibStatut($objp->statut, 5);
+				print '</td>';
+
+				print '<td></td>';
+
+				print "</tr>\n";
 			}
-			print '</td>';
-
-			// Number of cheques
-			print '<td class="right">'.$objp->nbcheque.'</td>';
-
-			// Amount
-			print '<td class="right"><span class="amount">'.price($objp->amount).'</span></td>';
-
-			// Statut
-			print '<td class="right">';
-			print $checkdepositstatic->LibStatut($objp->statut, 5);
-			print '</td>';
-
-			print '<td></td>';
-
-			print "</tr>\n";
 			$i++;
 		}
 	} else {

From 1b81cce3bb0a1886bfa820d4944cdd62547677a5 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Thu, 12 Jan 2023 20:46:49 +0100
Subject: [PATCH 510/816] kanban mode for list of cashcontrol

---
 .../compta/cashcontrol/cashcontrol_list.php   | 157 ++++++++++--------
 .../cashcontrol/class/cashcontrol.class.php   |  32 ++++
 2 files changed, 124 insertions(+), 65 deletions(-)

diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index 7d433282367..b4c20a824ba 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -41,7 +41,7 @@ $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'cashcontrol'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
-
+$mode       = GETPOST('mode', 'alpha');  // for mode view result
 $id = GETPOST('id', 'int');
 
 // Load variable for pagination
@@ -344,6 +344,9 @@ $param = '';
 if (!empty($mode)) {
 	$param .= '&mode='.urlencode($mode);
 }
+if (!empty($mode)) {
+	$param .= '&mode='.urlencode($mode);
+}
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 	$param .= '&contextpage='.urlencode($contextpage);
 }
@@ -399,10 +402,13 @@ print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 $permforcashfence = 1;
-
-$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/cashcontrol/cashcontrol_card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permforcashfence);
+$newcardbutton  = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/cashcontrol/cashcontrol_card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permforcashfence);
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'cash-register', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -552,81 +558,102 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
 
-	// Show here line of result
-	$j = 0;
-	print '<tr data-rowid="'.$object->id.'" class="oddeven">';
-	foreach ($object->fields as $key => $val) {
-		$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
-		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'center';
-		} elseif ($key == 'status') {
-			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	// show kanban result
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr><td colspan="12">';
+			print '<div class="box-flex-container">';
 		}
+		// Output Kanban
+		//var_dump($obj->posmodule);exit;
+		$object->posmodule = $obj->posmodule;
+		$object->cash = $obj->cash;
+		$object->opening = $obj->opening;
+		$object->year_close = $obj->year_close;
+		$object->cheque = $obj->cheque;
 
-		if (in_array($val['type'], array('timestamp'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-		} elseif ($key == 'ref') {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+
+		print $object->getKanbanView('');
+		if ($i == (min($num, $limit) - 1)) {
+			print '</div>';
+			print '</td></tr>';
 		}
+	} else {
+		// Show here line of result
+		$j = 0;
+		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
+		foreach ($object->fields as $key => $val) {
+			$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
+			if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'center';
+			} elseif ($key == 'status') {
+				$cssforfield .= ($cssforfield ? ' ' : '').'center';
+			}
 
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'right';
-		}
-		//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
+			if (in_array($val['type'], array('timestamp'))) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+			} elseif ($key == 'ref') {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+			}
 
-		if (!empty($arrayfields['t.'.$key]['checked'])) {
-			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '');
-			if (preg_match('/tdoverflow/', $cssforfield)) {
-				print ' title="'.dol_escape_htmltag($object->$key).'"';
+			if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'right';
 			}
-			print '>';
-			if ($key == 'status') {
-				print $object->getLibStatut(5);
-			} elseif ($key == 'rowid') {
-				print $object->showOutputField($val, $key, $object->id, '');
-			} else {
-				print $object->showOutputField($val, $key, $object->$key, '');
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
+			//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
+
+			if (!empty($arrayfields['t.'.$key]['checked'])) {
+				print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '');
+				if (preg_match('/tdoverflow/', $cssforfield)) {
+					print ' title="'.dol_escape_htmltag($object->$key).'"';
+				}
+				print '>';
+				if ($key == 'status') {
+					print $object->getLibStatut(5);
+				} elseif ($key == 'rowid') {
+					print $object->showOutputField($val, $key, $object->id, '');
+				} else {
+					print $object->showOutputField($val, $key, $object->$key, '');
+				}
+				print '</td>';
 				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+					$totalarray['nbfield']++;
 				}
-				if (!isset($totalarray['val'])) {
-					$totalarray['val'] = array();
+				if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
+					if (!$i) {
+						$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+					}
+					if (!isset($totalarray['val'])) {
+						$totalarray['val'] = array();
+					}
+					if (!isset($totalarray['val']['t.'.$key])) {
+						$totalarray['val']['t.'.$key] = 0;
+					}
+					$totalarray['val']['t.'.$key] += $object->$key;
 				}
-				if (!isset($totalarray['val']['t.'.$key])) {
-					$totalarray['val']['t.'.$key] = 0;
-				}
-				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
-	}
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	// Action column
-	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		$selected = 0;
-		if (in_array($object->id, $arrayofselected)) {
-			$selected = 1;
+		// Extra fields
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+		// Fields from hook
+		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		// Action column
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($object->id, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
 		}
-		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
-	}
-	print '</td>';
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
-
-	print '</tr>'."\n";
 
+		print '</tr>'."\n";
+	}
 	$i++;
 }
 
diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
index bc45f3b417d..01bebc35f5d 100644
--- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php
+++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
@@ -469,4 +469,36 @@ class CashControl extends CommonObject
 
 		return $result;
 	}
+
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $langs;
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		//var_dump($this->fields['rowid']);exit;
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1, 1) : $this->ref).'</span>';
+		if (property_exists($this, 'posmodule')) {
+			$return .= '<br><span class="opacitymedium">'.substr($langs->trans("Module/Application"), 0, 12).'</span> : <span class="info-box-label">'.$this->posmodule.'</span>';
+		}
+		if (property_exists($this, 'year_close')) {
+			$return .= '<br><span class="info-box-label opacitymedium" >'.$langs->trans("Year").'</span> : <span>'.$this->year_close.'</span>';
+		}
+		if (method_exists($this, 'getLibStatut')) {
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }

From 256bd27c3307a0d5728856d90ad9b16d1c64bd50 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 12 Jan 2023 21:59:34 +0100
Subject: [PATCH 511/816] Fix delete website

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

diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php
index 3c348d71a12..aa2ee58853c 100644
--- a/htdocs/admin/website.php
+++ b/htdocs/admin/website.php
@@ -614,7 +614,7 @@ if ($id) {
 
 					// Active
 					print '<td align="center" class="nowrap">';
-					print '<a class="reposition" href="'.$url.'action='.$acts[($obj->status ? 1 : 0)].'">'.$actl[($obj->status ? 1 : 0)].'</a>';
+					print '<a class="reposition" href="'.$url.'action='.$acts[($obj->status ? 1 : 0)].'&token='.newToken().'">'.$actl[($obj->status ? 1 : 0)].'</a>';
 					print "</td>";
 
 					// Modify link

From 5bbfdbb77507372220dc3ee27163bc47ed357cb4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 12 Jan 2023 22:11:13 +0100
Subject: [PATCH 512/816] NEW Show counter of access of website in website list

---
 htdocs/admin/website.php                      | 49 ++++++++++++++-----
 htdocs/core/lib/website.lib.php               |  9 +++-
 .../install/mysql/migration/17.0.0-18.0.0.sql |  2 +
 .../mysql/tables/llx_website-website.sql      |  7 +--
 htdocs/langs/en_US/main.lang                  |  1 +
 htdocs/langs/en_US/website.lang               |  2 +
 6 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php
index 3c348d71a12..28909470701 100644
--- a/htdocs/admin/website.php
+++ b/htdocs/admin/website.php
@@ -84,7 +84,7 @@ $tablib[1] = "Websites";
 
 // Requests to extract data
 $tabsql = array();
-$tabsql[1] = "SELECT f.rowid as rowid, f.entity, f.ref, f.description, f.virtualhost, f.position, f.status, f.date_creation FROM ".MAIN_DB_PREFIX.'website as f WHERE f.entity IN ('.getEntity('website').')';
+$tabsql[1] = "SELECT f.rowid as rowid, f.entity, f.ref, f.description, f.virtualhost, f.position, f.status, f.date_creation, f.lastaccess, f.pageviews_previous_month, f.pageviews_total FROM ".MAIN_DB_PREFIX.'website as f WHERE f.entity IN ('.getEntity('website').')';
 
 // Criteria to sort dictionaries
 $tabsqlsort = array();
@@ -92,7 +92,7 @@ $tabsqlsort[1] = "ref ASC";
 
 // Nom des champs en resultat de select pour affichage du dictionnaire
 $tabfield = array();
-$tabfield[1] = "ref,description,virtualhost,position,date_creation";
+$tabfield[1] = "ref,description,virtualhost,position,date_creation,lastaccess,pageviews_previous_month,pageviews_total";
 
 // Nom des champs d'edition pour modification d'un enregistrement
 $tabfieldvalue = array();
@@ -186,7 +186,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 			$sql .= $tabrowid[$id].",";
 		}
 		$sql .= $tabfieldinsert[$id];
-		$sql .= ",status)";
+		$sql .= ", status, date_creation)";
 		$sql .= " VALUES(";
 
 		// List of values
@@ -211,7 +211,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 			}
 			$i++;
 		}
-		$sql .= ",1)";
+		$sql .= ", 1, '".$db->idate(dol_now())."')";
 
 		dol_syslog("actionadd", LOG_DEBUG);
 		$result = $db->query($sql);
@@ -441,12 +441,10 @@ if ($id) {
 
 	// Form to add a new line
 	if ($tabname[$id]) {
-		$fieldlist = explode(',', $tabfield[$id]);
-
 		// Line for title
 		print '<tr class="liste_titre">';
 		foreach ($fieldlist as $field => $value) {
-			if ($fieldlist[$field] == 'date_creation') {
+			if (in_array($fieldlist[$field], array('date_creation', 'lastaccess', 'pageviews_previous_month', 'pageviews_month', 'pageviews_total'))) {
 				continue;
 			}
 
@@ -522,6 +520,7 @@ if ($id) {
 			print '<input type="hidden" name="page" value="'.$page.'">';
 			print '<input type="hidden" name="rowid" value="'.$rowid.'">';
 
+			print '<div class="div-table-responsive">';
 			print '<table class="noborder centpercent">';
 
 			// Title of lines
@@ -533,6 +532,10 @@ if ($id) {
 				$align = "left";
 				$sortable = 1;
 				$valuetoshow = '';
+				if (in_array($fieldlist[$field], array('pageviews_total', 'pageviews_previous_month'))) {
+					$align = 'right';
+				}
+
 				/*
 				$tmparray=getLabelOfField($fieldlist[$field]);
 				$showfield=$tmp['showfield'];
@@ -554,14 +557,24 @@ if ($id) {
 				if ($fieldlist[$field] == 'date_creation') {
 					$valuetoshow = $langs->trans("DateCreation");
 				}
+				if ($fieldlist[$field] == 'lastaccess') {
+					$valuetoshow = $langs->trans("LastAccess");
+				}
+				if ($fieldlist[$field] == 'pageviews_previous_month') {
+					$valuetoshow = $langs->trans("PagesViewedPreviousMonth");
+				}
+				if ($fieldlist[$field] == 'pageviews_total') {
+					$valuetoshow = $langs->trans("PagesViewedTotal");
+				}
 
 				// Affiche nom du champ
 				if ($showfield) {
-					print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), "", "align=".$align, $sortfield, $sortorder);
+					print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), "", '', $sortfield, $sortorder, $align.' ');
 				}
 			}
 
-			print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "status", ($page ? 'page='.$page.'&' : ''), "", 'align="center"', $sortfield, $sortorder);
+			// Status
+			print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "status", ($page ? 'page='.$page.'&' : ''), "", '', $sortfield, $sortorder, 'center ');
 			print getTitleFieldOfList('');
 			print getTitleFieldOfList('');
 			print '</tr>';
@@ -581,8 +594,9 @@ if ($id) {
 						fieldListWebsites($fieldlist, $obj, $tabname[$id], 'edit');
 					}
 
-					print '<td colspan="3" class="right"><a name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'">&nbsp;</a><input type="submit" class="button button-edit" name="actionmodify" value="'.$langs->trans("Modify").'">';
-					print '&nbsp;<input type="submit" class="button button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
+					print '<td colspan="7" class="right"><a name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'">&nbsp;</a>';
+					print '<input type="submit" class="button button-edit small" name="actionmodify" value="'.$langs->trans("Modify").'">';
+					print '&nbsp;<input type="submit" class="button button-cancel small" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
 				} else {
 					$tmpaction = 'view';
 					$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
@@ -593,13 +607,16 @@ if ($id) {
 					if (empty($reshook)) {
 						foreach ($fieldlist as $field => $value) {
 							$showfield = 1;
-							$align = "left";
 							$fieldname = $fieldlist[$field];
+							$align = "left";
+							if (in_array($fieldname, array('pageviews_total', 'pageviews_previous_month'))) {
+								$align = 'right';
+							}
 							$valuetoshow = $obj->$fieldname;
 
 							// Show value for field
 							if ($showfield) {
-								print '<td align="'.$align.'">'.$valuetoshow.'</td>';
+								print '<td class="'.$align.'">'.$valuetoshow.'</td>';
 							}
 						}
 					}
@@ -612,6 +629,7 @@ if ($id) {
 
 					$url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(!empty($obj->rowid) ? $obj->rowid : (!empty($obj->code) ? $obj->code : '')).'&amp;code='.(!empty($obj->code) ?urlencode($obj->code) : '').'&amp;';
 
+
 					// Active
 					print '<td align="center" class="nowrap">';
 					print '<a class="reposition" href="'.$url.'action='.$acts[($obj->status ? 1 : 0)].'">'.$actl[($obj->status ? 1 : 0)].'</a>';
@@ -633,6 +651,7 @@ if ($id) {
 			}
 
 			print '</table>';
+			print '</div>';
 
 			print '</form>';
 		}
@@ -668,6 +687,10 @@ function fieldListWebsites($fieldlist, $obj = '', $tabname = '', $context = '')
 	$formadmin = new FormAdmin($db);
 
 	foreach ($fieldlist as $field => $value) {
+		if (in_array($fieldlist[$field], array('lastaccess', 'pageviews_previous_month', 'pageviews_month', 'pageviews_total'))) {
+			continue;
+		}
+
 		$fieldname = $fieldlist[$field];
 
 		if ($fieldlist[$field] == 'lang') {
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 32a6d9d962a..de5779a3f51 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -438,7 +438,14 @@ function dolWebsiteIncrementCounter($websiteid, $websitepagetype, $websitepageid
 		if (in_array($websitepagetype, array('blogpost', 'page'))) {
 			global $db;
 
-			$sql = "UPDATE ".$db->prefix()."website SET pageviews_total = pageviews_total + 1, lastaccess = '".$db->idate(dol_now())."'";
+			$tmpnow = dol_getdate(dol_now('gmt'), true, 'gmt');
+
+			$sql = "UPDATE ".$db->prefix()."website SET ";
+			$sql .= " pageviews_total = pageviews_total + 1,";
+			$sql .= " pageviews_month = pageviews_month + 1,";
+			// if last access was done during previous month, we save pageview_month into pageviews_previous_month
+			$sql .= " pageviews_previous_month = ".$db->ifsql("lastaccess < '".$db->idate(dol_mktime(0, 0, 0, $tmpnow['month'], 1, $tmpnow['year'], 'gmt', 0), 'gmt')."'", 'pageviews_month', 'pageviews_previous_month').",";
+			$sql .= " lastaccess = '".$db->idate(dol_now('gmt'), 'gmt')."'";
 			$sql .= " WHERE rowid = ".((int) $websiteid);
 			$resql = $db->query($sql);
 			if (! $resql) {
diff --git a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
index 376d89861f2..d8e1b4c12c9 100644
--- a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
+++ b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
@@ -59,3 +59,5 @@ INSERT INTO llx_c_tva(rowid,fk_pays,code,taux,localtax1,localtax1_type,localtax2
 
 ALTER TABLE llx_user ADD COLUMN flagdelsessionsbefore datetime DEFAULT NULL;
 
+ALTER TABLE llx_website ADD COLUMN pageviews_previous_month BIGINT UNSIGNED DEFAULT 0;
+
diff --git a/htdocs/install/mysql/tables/llx_website-website.sql b/htdocs/install/mysql/tables/llx_website-website.sql
index 0df6ccf8ef3..8ac580919aa 100644
--- a/htdocs/install/mysql/tables/llx_website-website.sql
+++ b/htdocs/install/mysql/tables/llx_website-website.sql
@@ -36,9 +36,10 @@ CREATE TABLE llx_website
     fk_user_modif integer,
     date_creation datetime,
     position      integer DEFAULT 0,
-    lastaccess    datetime NULL,
-    pageviews_month BIGINT UNSIGNED DEFAULT 0,
-    pageviews_total BIGINT UNSIGNED DEFAULT 0,
+    lastaccess    datetime NULL,						-- updated at each page access
+    pageviews_previous_month BIGINT UNSIGNED DEFAULT 0,		
+    pageviews_month BIGINT UNSIGNED DEFAULT 0,			-- increased by 1 at each page access, saved into pageviews_previous_month when on different month than lastaccess 
+    pageviews_total BIGINT UNSIGNED DEFAULT 0,			-- increased by 1 at each page access, no reset
 	tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     import_key    varchar(14)      -- import key	
 ) ENGINE=innodb;
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 2473659a5c7..bdd0ef2bd0d 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1216,3 +1216,4 @@ NoSpecificContactAddress=No specific contact or address
 NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
 HideOnVCard=Hide %s
 AddToContacts=Add address to my contacts
+LastAccess=Last access
\ No newline at end of file
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 742e3afff67..7b2cc90f7ac 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -155,3 +155,5 @@ WebpageMustBeDisabled=The web page must have the status "%s"
 SetWebsiteOnlineBefore=When website is offline, all pages are offline. Change status of website first.
 Booking=Booking
 Reservation=Reservation
+PagesViewedPreviousMonth=Pages viewed (previous month)
+PagesViewedTotal=Pages viewed (total)
\ No newline at end of file

From 22720b652ca6d50a1939fb98d5d2d314201f98e6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 12 Jan 2023 22:28:08 +0100
Subject: [PATCH 513/816] Fix phpcs

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

diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index deeecc3af6f..9b790050571 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -766,11 +766,11 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 if ($search_all) {
 	$param .= '&search_all='.urlencode($search_all);
 }
-	if ($search_date_start) {
-		$param .= buildParamDate('search_date_start', null, '', 'tzserver');
+if ($search_date_start) {
+	$param .= buildParamDate('search_date_start', null, '', 'tzserver');
 }
-	if ($search_date_end) {
-		$param .= buildParamDate('search_date_end', null, '', 'tzserver');
+if ($search_date_end) {
+	$param .= buildParamDate('search_date_end', null, '', 'tzserver');
 }
 if ($search_datelimit_startday) {
 	$param .= '&search_datelimit_startday='.urlencode($search_datelimit_startday);

From c52fab09e608d7eede0ece3f314304db147234d8 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Fri, 13 Jan 2023 09:01:31 +0100
Subject: [PATCH 514/816] FIX re-open supplier order should not be allowed when
 there is a reception.

---
 htdocs/fourn/commande/card.php | 46 ++++++++++++++++++++--------------
 htdocs/langs/en_US/orders.lang |  1 +
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 644469a257d..ffb2e834db7 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2440,6 +2440,19 @@ if ($action == 'create') {
 			if (empty($reshook)) {
 				$object->fetchObjectLinked(); // Links are used to show or not button, so we load them now.
 
+				// check if reception
+				$hasreception = 0;
+				if ($conf->reception->enabled) {
+					if (!empty($object->linkedObjects['reception'])) {
+						foreach ($object->linkedObjects['reception'] as $element) {
+							if ($element->statut >= 0) {
+								$hasreception = 1;
+								break;
+							}
+						}
+					}
+				}
+
 				// Validate
 				if ($object->statut == 0 && $num > 0) {
 					if ($usercanvalidate) {
@@ -2515,17 +2528,21 @@ if ($action == 'create') {
 				// Reopen
 				if (in_array($object->statut, array(CommandeFournisseur::STATUS_ACCEPTED))) {
 					$buttonshown = 0;
-					if (!$buttonshown && $usercanapprove) {
-						if (empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER_ONLY)
-							|| (!empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER_ONLY) && $user->id == $object->user_approve_id)) {
-							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("Disapprove").'</a>';
-							$buttonshown++;
+					if ($hasreception) {
+						print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("ReceptionExist").'">'.$langs->trans("Disapprove").'</a>';
+					} else {
+						if (!$buttonshown && $usercanapprove) {
+							if (empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER_ONLY)
+								|| (!empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER_ONLY) && $user->id == $object->user_approve_id)) {
+								print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("Disapprove").'</a>';
+								$buttonshown++;
+							}
 						}
-					}
-					if (!$buttonshown && $usercanapprovesecond && !empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED)) {
-						if (empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER2_ONLY)
-							|| (!empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER2_ONLY) && $user->id == $object->user_approve_id2)) {
-							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("Disapprove").'</a>';
+						if (!$buttonshown && $usercanapprovesecond && !empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED)) {
+							if (empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER2_ONLY)
+								|| (!empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER2_ONLY) && $user->id == $object->user_approve_id2)) {
+								print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("Disapprove").'</a>';
+							}
 						}
 					}
 				}
@@ -2536,19 +2553,10 @@ if ($action == 'create') {
 				}
 
 				// Ship
-				$hasreception = 0;
 				if (isModEnabled('stock') && (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE))) {
 					$labelofbutton = $langs->trans('ReceiveProducts');
 					if ($conf->reception->enabled) {
 						$labelofbutton = $langs->trans("CreateReception");
-						if (!empty($object->linkedObjects['reception'])) {
-							foreach ($object->linkedObjects['reception'] as $element) {
-								if ($element->statut >= 0) {
-									$hasreception = 1;
-									break;
-								}
-							}
-						}
 					}
 
 					if (in_array($object->statut, array(3, 4, 5))) {
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index f988cd62f19..0accaadfa62 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -204,3 +204,4 @@ StatusSupplierOrderApproved=Approved
 StatusSupplierOrderRefused=Refused
 StatusSupplierOrderReceivedPartially=Partially received
 StatusSupplierOrderReceivedAll=All products received
+NeedAtLeastOneInvoice = There has to be at least one Invoice

From 534cb8f0a045552448006d957238565de7bc06c2 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 13 Jan 2023 09:55:57 +0100
Subject: [PATCH 515/816] fix: token for scan inventory

---
 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 3d0dea9e3b7..cd27c09aaa0 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -609,7 +609,7 @@ if ($object->id > 0) {
 			if ($permissiontoadd) {
 				// Link to launch scan tool
 				if (!empty($conf->barcode->enabled) || !empty($conf->productbatch->enabled)) {
-					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>';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=updatebyscaning&token='.currentToken().'" class="marginrightonly paddingright marginleftonly paddingleft">'.img_picto('', 'barcode', 'class="paddingrightonly"').$langs->trans("UpdateByScaning").'</a>';
 				}
 
 				// Link to autofill

From 59a541ab8e43c413dbb5e6a0e6bc0eb42cfd0dfa Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 13 Jan 2023 10:33:48 +0100
Subject: [PATCH 516/816] NEW: Add SQL contraint on product_stock table to
 allow only exsting product and warehouse#23543

---
 .../install/mysql/migration/17.0.0-18.0.0.sql | 36 +++++++++++++++++++
 .../mysql/tables/llx_product_stock.key.sql    |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 htdocs/install/mysql/migration/17.0.0-18.0.0.sql

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

From a06a5d0f65e47010263b4d3aa5825ece10dc35e2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 13 Jan 2023 11:09:06 +0100
Subject: [PATCH 517/816] Fix lang file not loaded

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

diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index fcaa40e1fde..71d1604df4e 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -66,6 +66,8 @@ if (empty($conf->global->MAILING_LIMIT_SENDBYCLI))
 	$conf->global->MAILING_LIMIT_SENDBYCLI = 0;
 }
 
+$langs->loadLangs(array("main", "mails"));
+
 
 /*
  * Main

From 336ac00ae382c803d3cb5824443d6b5d347dc918 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Fri, 13 Jan 2023 11:40:50 +0100
Subject: [PATCH 518/816] kanban mode for list of jobs

---
 htdocs/hrm/class/job.class.php |  31 +++++++
 htdocs/hrm/job_list.php        | 153 ++++++++++++++++++++-------------
 2 files changed, 123 insertions(+), 61 deletions(-)

diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index 93950979a1a..a013bb57a36 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -1054,6 +1054,37 @@ class Job extends CommonObject
 
 		return $error;
 	}
+
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $selected, $langs;
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
+		$return .= '<input style="float:right;" id="cb'.$this->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		if (property_exists($this, 'deplacement')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("Type").'</span>';
+			$return .= ' : <span class="info-box-label ">'.$this->fields['deplacement']['arrayofkeyval'][$this->deplacement].'</span>';
+		}
+		if (property_exists($this, 'description') && !(empty($this->description))) {
+			$return .= '<br><span class="info-box-label opacitymedium">'.$langs->trans("Description").'</span> : ';
+			$return .= '<br><span class="info-box-label ">'.(strlen($this->description) > 30 ? dol_substr($this->description, 0, 25).'...' : $this->description).'</span>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
 
 
diff --git a/htdocs/hrm/job_list.php b/htdocs/hrm/job_list.php
index ed0fb480a3a..6e97c0d0483 100644
--- a/htdocs/hrm/job_list.php
+++ b/htdocs/hrm/job_list.php
@@ -52,6 +52,7 @@ $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'joblist'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$mode        = GETPOST('mode', 'alpha'); // for view result with other mode
 
 $id = GETPOST('id', 'int');
 
@@ -362,6 +363,9 @@ llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', '');
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
+if (!empty($mode)) {
+	$param .= '&mode='.urlencode($mode);
+}
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 	$param .= '&contextpage='.urlencode($contextpage);
 }
@@ -413,8 +417,13 @@ print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
 
-$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/job_card.php', 1).'?action=create', '', $permissiontoadd);
+
+$newcardbutton = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/job_card.php', 1).'?action=create', '', $permissiontoadd);
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -561,78 +570,100 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
 
-	// Show here line of result
-	print '<tr class="oddeven">';
-	foreach ($object->fields as $key => $val) {
-		$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
-		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'center';
-		} elseif ($key == 'status') {
-			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr><td colspan="12">';
+			print '<div class="box-flex-container">';
 		}
+		// Output Kanban
 
-		if (in_array($val['type'], array('timestamp'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-		} elseif ($key == 'ref') {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-		}
+		$object->deplacement = $obj->deplacement;
+		$object->description = $obj->description;
 
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'right';
-		}
-		//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
-
-		if (!empty($arrayfields['t.'.$key]['checked'])) {
-			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
-			if ($key == 'status') {
-				print $object->getLibStatut(5);
-			} elseif ($key == 'rowid') {
-				print $object->showOutputField($val, $key, $object->id, '');
-			} elseif ($key == 'label') {
-				print $object->getNomUrl(1);
-			} else {
-				print $object->showOutputField($val, $key, $object->$key, '');
+		if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($object->id, $arrayofselected)) {
+				$selected = 1;
 			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
+			print $object->getKanbanView('');
+		}
+		if ($i == (min($num, $limit) - 1)) {
+			print '</div>';
+			print '</td></tr>';
+		}
+	} else {
+		// Show here line of result
+		print '<tr class="oddeven">';
+		foreach ($object->fields as $key => $val) {
+			$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
+			if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'center';
+			} elseif ($key == 'status') {
+				$cssforfield .= ($cssforfield ? ' ' : '').'center';
 			}
-			if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
+
+			if (in_array($val['type'], array('timestamp'))) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+			} elseif ($key == 'ref') {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+			}
+
+			if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'right';
+			}
+			//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
+
+			if (!empty($arrayfields['t.'.$key]['checked'])) {
+				print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
+				if ($key == 'status') {
+					print $object->getLibStatut(5);
+				} elseif ($key == 'rowid') {
+					print $object->showOutputField($val, $key, $object->id, '');
+				} elseif ($key == 'label') {
+					print $object->getNomUrl(1);
+				} else {
+					print $object->showOutputField($val, $key, $object->$key, '');
+				}
+				print '</td>';
 				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+					$totalarray['nbfield']++;
 				}
-				if (!isset($totalarray['val'])) {
-					$totalarray['val'] = array();
+				if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
+					if (!$i) {
+						$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+					}
+					if (!isset($totalarray['val'])) {
+						$totalarray['val'] = array();
+					}
+					if (!isset($totalarray['val']['t.'.$key])) {
+						$totalarray['val']['t.'.$key] = 0;
+					}
+					$totalarray['val']['t.'.$key] += $object->$key;
 				}
-				if (!isset($totalarray['val']['t.'.$key])) {
-					$totalarray['val']['t.'.$key] = 0;
-				}
-				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
-	}
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	// Action column
-	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		$selected = 0;
-		if (in_array($object->id, $arrayofselected)) {
-			$selected = 1;
+		// Extra fields
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+		// Fields from hook
+		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		// Action column
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($object->id, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
 		}
-		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
-	}
-	print '</td>';
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
-
-	print '</tr>'."\n";
 
+		print '</tr>'."\n";
+	}
 	$i++;
 }
 

From a5fba0fd09db765f91d11f00e07a01a2dbb70f94 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Fri, 13 Jan 2023 12:10:22 +0100
Subject: [PATCH 519/816] kanban for position list

---
 htdocs/hrm/class/position.class.php | 35 +++++++++++++++++++++++++++++
 htdocs/hrm/position_list.php        | 18 +++++++++++++--
 2 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index 98b5fd89be9..9d4f71d24fd 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -1118,6 +1118,41 @@ class Position extends CommonObject
 
 		return $error;
 	}
+
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $selected, $langs;
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
+		$return .= '<input style="float:right;" id="cb'.$this->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		if (property_exists($this, 'fk_user') && !(empty($this->fk_user))) {
+			$return .= '<br><span class="info-box-label opacitymedium">'.$langs->trans("Employee").'</span> : ';
+			$return .= '<span class="info-box-label ">'.$this->fk_user.'</span>';
+		}
+		if (property_exists($this, 'fk_job') && !(empty($this->fk_job))) {
+			$return .= '<br><span class="info-box-label opacitymedium">'.$langs->trans("Job").'</span> : ';
+			$return .= '<span class="info-box-label ">'.$this->fk_job.'</span>';
+		}
+		if (property_exists($this, 'date_start') && property_exists($this, 'date_end')) {
+			$return .= '<br><div class ="margintoponly"><span class="info-box-label ">'.dol_print_date($this->db->jdate($this->date_start), 'day').'</span>';
+			$return .= ' - <span class="info-box-label ">'.dol_print_date($this->db->jdate($this->date_end), 'day').'</span></div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
 
 
diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php
index 40cb706b5df..5dc33859219 100644
--- a/htdocs/hrm/position_list.php
+++ b/htdocs/hrm/position_list.php
@@ -426,7 +426,10 @@ print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
-$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/position.php', 1).'?action=create', '', $permissiontoadd);
+$newcardbutton = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/position.php', 1).'?action=create', '', $permissiontoadd);
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -602,12 +605,23 @@ while ($i < $imaxinloop) {
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
 
+
 	if ($mode == 'kanban') {
 		if ($i == 0) {
 			print '<tr><td colspan="'.$savnbfield.'">';
 			print '<div class="box-flex-container">';
 		}
-		// Output Kanban
+		// get info needed
+
+		$object->date_start = $obj->date_start;
+		$object->date_end = $obj->date_end;
+		$job = new job($db);
+		$job->fetch($obj->fk_job);
+		$object->fk_job = $job->getNomUrl();
+		$userstatic = new User($db);
+		$userstatic->fetch($obj->fk_user);
+		$object->fk_user = $userstatic->getNomUrl(1);
+		// output kanban
 		print $object->getKanbanView('');
 		if ($i == ($imaxinloop - 1)) {
 			print '</div>';

From 8eb89e0ad14015ec4080042db82581cdf026bcf4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 13 Jan 2023 12:14:20 +0100
Subject: [PATCH 520/816] Remove merged feature with too many pb: 1=Not yet
 implemented everywhere. 2=Seems a duplicate info with the picto warning when
 late (so in past not done) 3=Is also a duplicate with the existing css
 event-future, event-past, event-current 4=It overwrites to choice done by the
 theme 5=Implementation is wrong, it must use css and not #background

Use CSS instead
---
 htdocs/admin/agenda_other.php     | 82 ++-----------------------------
 htdocs/admin/agenda_reminder.php  |  1 -
 htdocs/comm/action/index.php      |  1 +
 htdocs/comm/action/list.php       | 21 ++++----
 htdocs/core/lib/functions.lib.php |  2 +-
 htdocs/langs/en_US/admin.lang     |  1 +
 htdocs/theme/eldy/global.inc.php  |  4 ++
 7 files changed, 20 insertions(+), 92 deletions(-)

diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 8916433707d..aef46db26ef 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -113,33 +113,6 @@ if ($action == 'set') {
 	} else {
 		setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 	}
-} elseif ($action == 'setcolors') {
-	$event_color = preg_replace('/[^0-9a-f#]/i', '', (string) GETPOST('event_past_color', 'alphanohtml'));
-	$res = dolibarr_set_const($db, 'AGENDA_EVENT_PAST_COLOR', $event_color, 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) {
-		$error++;
-		$errors[] = $db->lasterror();
-	}
-
-	$event_color = preg_replace('/[^0-9a-f#]/i', '', (string) GETPOST('event_current_color', 'alphanohtml'));
-	$res = dolibarr_set_const($db, 'AGENDA_EVENT_CURRENT_COLOR', $event_color, 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) {
-		$error++;
-		$errors[] = $db->lasterror();
-	}
-
-	$event_color = preg_replace('/[^0-9a-f#]/i', '', (string) GETPOST('event_future_color', 'alphanohtml'));
-	$res = dolibarr_set_const($db, 'AGENDA_EVENT_FUTURE_COLOR', $event_color, 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) {
-		$error++;
-		$errors[] = $db->lasterror();
-	}
-
-	if ($error) {
-		setEventMessages('', $errors, 'errors');
-	} else {
-		setEventMessage($langs->trans('SetupSaved'));
-	}
 } elseif ($action == 'specimen') {  // For orders
 	$modele = GETPOST('module', 'alpha');
 
@@ -226,8 +199,6 @@ print dol_get_fiche_head($head, 'other', $langs->trans("Agenda"), -1, 'action');
  *  Miscellaneous
  */
 
-print load_fiche_titre($langs->trans('Miscellaneous'), '', '');
-
 // Define array def of models
 $def = array();
 
@@ -339,8 +310,11 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
 		}
 	}
 	print '</table><br>';
+
+	print load_fiche_titre($langs->trans('MiscellaneousOptions'), '', '');
 }
 
+
 print '<form action="'.$_SERVER["PHP_SELF"].'" name="agenda">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="set">';
@@ -431,56 +405,6 @@ print $form->buttonsSaveCancel("Save", '');
 print '</form>';
 
 
-/*
- * User interface (colors)
- */
-
-print load_fiche_titre($langs->trans('UserInterface'), '', '');
-
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-$formother = new FormOther($db);
-
-print '<form action="'.$_SERVER["PHP_SELF"].'" name="form_colors">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="setcolors">';
-
-print '<table class="noborder allwidth">'."\n";
-print '<tr class="liste_titre">'."\n";
-print '<td>'.$langs->trans("Parameters").'</td>'."\n";
-print '<td class="center">&nbsp;</td>'."\n";
-print '<td class="right">'.$langs->trans("Value").'</td>'."\n";
-print '</tr>'."\n";
-
-// AGENDA_EVENT_PAST_COLOR
-print '<tr class="oddeven">'."\n";
-print '<td>'.$langs->trans('AGENDA_EVENT_PAST_COLOR').'</td>'."\n";
-print '<td class="center">&nbsp;</td>'."\n";
-print '<td class="right">'."\n";
-print $formother->selectColor($conf->global->AGENDA_EVENT_PAST_COLOR, 'event_past_color');
-print '</td></tr>'."\n";
-// AGENDA_EVENT_CURRENT_COLOR
-print '<tr class="oddeven">'."\n";
-print '<td>'.$langs->trans('AGENDA_EVENT_CURRENT_COLOR').'</td>'."\n";
-print '<td class="center">&nbsp;</td>'."\n";
-print '<td class="right">'."\n";
-print $formother->selectColor($conf->global->AGENDA_EVENT_CURRENT_COLOR, 'event_current_color');
-print '</td></tr>'."\n";
-// AGENDA_EVENT_FUTURE_COLOR
-print '<tr class="oddeven">'."\n";
-print '<td>'.$langs->trans('AGENDA_EVENT_FUTURE_COLOR').'</td>'."\n";
-print '<td class="center">&nbsp;</td>'."\n";
-print '<td class="right">'."\n";
-print $formother->selectColor($conf->global->AGENDA_EVENT_FUTURE_COLOR, 'event_future_color');
-print '</td></tr>'."\n";
-
-print '</table>';
-
-print $form->buttonsSaveCancel("Save", '');
-
-print '</form>';
-
-print "<br>";
-
 print dol_get_fiche_end();
 
 // End of page
diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php
index 76c717b669d..42967b4f275 100644
--- a/htdocs/admin/agenda_reminder.php
+++ b/htdocs/admin/agenda_reminder.php
@@ -150,7 +150,6 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_valu
 print load_fiche_titre($langs->trans("AgendaSetup"), $linkback, 'title_setup');
 
 
-
 $head = agenda_prepare_head();
 
 print dol_get_fiche_head($head, 'reminders', $langs->trans("Agenda"), -1, 'action');
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 5b51d48392b..3460355a803 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -299,6 +299,7 @@ if (empty($user->conf->AGENDA_DISABLE_EXT)) {
 		$enabled = 'AGENDA_EXT_ENABLED_'.$user->id.'_'.$i;
 		$default = 'AGENDA_EXT_ACTIVEBYDEFAULT_'.$user->id.'_'.$i;
 		$buggedfile = 'AGENDA_EXT_BUGGEDFILE_'.$user->id.'_'.$i;
+
 		if (getDolUserString($source) && getDolUserString($name)) {
 			// Note: $conf->global->buggedfile can be empty or 'uselocalandtznodaylight' or 'uselocalandtzdaylight'
 			$listofextcals[] = array(
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index dd137690e47..5abd2d3f101 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -951,14 +951,15 @@ while ($i < $imaxinloop) {
 		$event_owner_style .= 'border-left: #' . $cache_user_list[$obj->fk_user_action]->color . ' 5px solid;';
 	}
 
-	// get event style for start date
+	// get event style for start and end date
 	$event_more_class = '';
-	$event_start_date_style = '';
+	$event_start_date_css = '';
+	$event_end_date_css = '';
 	$event_start_date_time = $actionstatic->datep;
 	if ($event_start_date_time > $now) {
 		// future event
 		$event_more_class = 'event-future';
-		$event_start_date_color = $conf->global->AGENDA_EVENT_FUTURE_COLOR;
+		$event_start_date_css = $event_end_date_css = $event_more_class;
 	} else {
 		if ($obj->fulldayevent == 1) {
 			$today_start_date_time = $today_start_time;
@@ -971,20 +972,16 @@ while ($i < $imaxinloop) {
 		if ($event_end_date_time != null && $event_end_date_time < $today_start_date_time) {
 			// past event
 			$event_more_class = 'event-past';
-			$event_start_date_color = $conf->global->AGENDA_EVENT_PAST_COLOR;
 		} elseif ($event_end_date_time == null && $event_start_date_time < $today_start_date_time) {
 			// past event
 			$event_more_class = 'event-past';
-			$event_start_date_color = $conf->global->AGENDA_EVENT_PAST_COLOR;
 		} else {
 			// current event
 			$event_more_class = 'event-current';
-			$event_start_date_color = $conf->global->AGENDA_EVENT_CURRENT_COLOR;
 		}
+		$event_start_date_css = $event_end_date_css = $event_more_class;
 	}
-	if ($event_start_date_color != '') {
-		$event_start_date_style .= 'background: #' . $event_start_date_color . ';';
-	}
+	$event_start_date_css = $event_end_date_css = $event_more_class;
 
 	print '<tr class="oddeven' . ($event_more_class != '' ? ' '.$event_more_class : '') . '">';
 	// Action column
@@ -1065,13 +1062,14 @@ while ($i < $imaxinloop) {
 
 	// Start date
 	if (!empty($arrayfields['a.datep']['checked'])) {
-		print '<td class="center nowraponall"' . ($event_start_date_style != '' ? ' style="'.$event_start_date_style.'"' : '') . '>';
+		print '<td class="center nowraponall'.($event_start_date_css ? ' '.$event_start_date_css : '').'"><span>';
 		if (empty($obj->fulldayevent)) {
 			print dol_print_date($db->jdate($obj->dp), $formatToUse, 'tzuserrel');
 		} else {
 			$tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
 			print dol_print_date($db->jdate($obj->dp), $formatToUse, ($tzforfullday ? $tzforfullday : 'tzuserrel'));
 		}
+		print '</span>';
 		$late = 0;
 		if ($actionstatic->hasDelay() && $actionstatic->percentage >= 0 && $actionstatic->percentage < 100 ) {
 			$late = 1;
@@ -1084,13 +1082,14 @@ while ($i < $imaxinloop) {
 
 	// End date
 	if (!empty($arrayfields['a.datep2']['checked'])) {
-		print '<td class="center nowraponall">';
+		print '<td class="center nowraponall'.($event_end_date_css ? ' '.$event_end_date_css : '').'"><span>';
 		if (empty($obj->fulldayevent)) {
 			print dol_print_date($db->jdate($obj->dp2), $formatToUse, 'tzuserrel');
 		} else {
 			$tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
 			print dol_print_date($db->jdate($obj->dp2), $formatToUse, ($tzforfullday ? $tzforfullday : 'tzuserrel'));
 		}
+		print '</span>';
 		print '</td>';
 	}
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8920445508a..ab96f650b6f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -116,7 +116,7 @@ function getDolUserString($key, $default = '', $tmpuser = null)
 	}
 
 	// return $conf->global->$key ?? $default;
-	return (string) (empty($tmpuser->conf->$key) ? $default : $$tmpuser->conf->$key);
+	return (string) (empty($tmpuser->conf->$key) ? $default : $tmpuser->conf->$key);
 }
 
 /**
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 6cc135e3b2c..db11289d299 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1272,6 +1272,7 @@ TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b>
 GeneratedPasswordDesc=Choose the method to be used for auto-generated passwords.
 DictionaryDesc=Insert all reference data. You can add your values to the default.
 ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting only.
+MiscellaneousOptions=Miscellaneous options
 MiscellaneousDesc=All other security related parameters are defined here.
 LimitsSetup=Limits/Precision setup
 LimitsDesc=You can define limits, precisions and optimizations used by Dolibarr here
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index b9e35e1e9ea..0ba59834d71 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -5428,6 +5428,10 @@ td.cal_other_month {
 	opacity: 0.8;
 }
 
+td.event-past span  {
+	opacity: 0.5;
+}
+
 
 
 /* ============================================================================== */

From 04ce79191fb24085c27969e5bbe60e5096340970 Mon Sep 17 00:00:00 2001
From: hystepik <lucas.marcouiller@gmail.com>
Date: Fri, 13 Jan 2023 12:18:58 +0100
Subject: [PATCH 521/816] Fix #23531 : fix update bom line

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

diff --git a/htdocs/core/modules/modBom.class.php b/htdocs/core/modules/modBom.class.php
index 2e92d3baeaf..d6b9e7a6ff3 100644
--- a/htdocs/core/modules/modBom.class.php
+++ b/htdocs/core/modules/modBom.class.php
@@ -422,7 +422,7 @@ class modBom extends DolibarrModules
 
 		$this->import_fieldshidden_array[$r] = array('extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'bom_bomline');
 		$this->import_regex_array[$r] = array();
-		$this->import_updatekeys_array[$r] = array('bd.fk_bom' => 'BOM Id');
+		$this->import_updatekeys_array[$r] = array('bd.fk_bom' => 'BOM Id', 'bd.fk_product' => 'ProductRef');
 		$this->import_convertvalue_array[$r] = array(
 			'bd.fk_bom' => array(
 				'rule'    => 'fetchidfromref',

From 354b94abce48f77fad507376d8f6b803b2c9ac84 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 13 Jan 2023 12:24:28 +0100
Subject: [PATCH 522/816] Merge manually #23539

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

diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index f0738f0e420..c7c90b90229 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -545,6 +545,8 @@ if ($action == "dosign" && empty($cancel)) {
 		$("#signbutton").attr("disabled",false);
 		if(!$._data($("#signbutton")[0], "events")){
 			$("#signbutton").on("click",function(){
+				console.log("We click on button sign");
+				$("#signbutton").val(\''.dol_escape_js($langs->transnoentities('PleaseBePatient')).'\');
 				var signature = $("#signature").jSignature("getData", "image");
 				$.ajax({
 					type: "POST",

From a42c879ac5589381ab83bcfcb14a54c67d9d4282 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Fri, 13 Jan 2023 12:25:44 +0100
Subject: [PATCH 523/816] modify colspan

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

diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php
index 5dc33859219..201be040d20 100644
--- a/htdocs/hrm/position_list.php
+++ b/htdocs/hrm/position_list.php
@@ -608,7 +608,7 @@ while ($i < $imaxinloop) {
 
 	if ($mode == 'kanban') {
 		if ($i == 0) {
-			print '<tr><td colspan="'.$savnbfield.'">';
+			print '<tr><td colspan="12">';
 			print '<div class="box-flex-container">';
 		}
 		// get info needed

From d823971151a1145659a9920464664d973e3b4381 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Fri, 13 Jan 2023 12:31:40 +0100
Subject: [PATCH 524/816] kanban for evaluation list

---
 htdocs/hrm/class/evaluation.class.php |  35 ++++++
 htdocs/hrm/evaluation_list.php        | 151 ++++++++++++++++----------
 2 files changed, 129 insertions(+), 57 deletions(-)

diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index 4a41f1c8e0e..5a628725f95 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -1055,4 +1055,39 @@ class Evaluation extends CommonObject
 
 		return $error;
 	}
+
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $selected, $langs;
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
+		$return .= '<input style="float:right;" id="cb'.$this->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		if (property_exists($this, 'fk_user') && !(empty($this->fk_user))) {
+			$return .= '<br><span class="info-box-label opacitymedium">'.$langs->trans("Employee").'</span> : ';
+			$return .= '<span class="info-box-label ">'.$this->fk_user.'</span>';
+		}
+		if (property_exists($this, 'fk_job') && !(empty($this->fk_job))) {
+			$return .= '<br><span class="info-box-label opacitymedium">'.$langs->trans("Job").'</span> : ';
+			$return .= '<span class="info-box-label ">'.$this->fk_job.'</span>';
+		}
+
+		if (method_exists($this, 'getLibStatut')) {
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+		}
+		$return .= '</span>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
diff --git a/htdocs/hrm/evaluation_list.php b/htdocs/hrm/evaluation_list.php
index dea398ad6a6..999d6d0d44e 100644
--- a/htdocs/hrm/evaluation_list.php
+++ b/htdocs/hrm/evaluation_list.php
@@ -52,6 +52,7 @@ $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'evaluationlist'; // To manage different context of search
 $backtopage  = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss   = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$mode        = GETPOST('mode', 'alpha'); // for mode view result
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
@@ -369,6 +370,9 @@ llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', '');
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
+if (!empty($mode)) {
+	$param .= '&mode='.urlencode($mode);
+}
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 	$param .= '&contextpage='.urlencode($contextpage);
 }
@@ -420,8 +424,12 @@ print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
 
-$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/evaluation_card.php', 1).'?action=create', '', $permissiontoadd);
+$newcardbutton = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/evaluation_card.php', 1).'?action=create', '', $permissiontoadd);
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -568,75 +576,104 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
 
-	// Show here line of result
-	print '<tr class="oddeven">';
-	foreach ($object->fields as $key => $val) {
-		$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
-		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'center';
-		} elseif ($key == 'status') {
-			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr><td colspan="'.$savnbfield.'">';
+			print '<div class="box-flex-container">';
 		}
+		// Output Kanban
+		$object->date_eval = $obj->date_eval;
 
-		if (in_array($val['type'], array('timestamp'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-		} elseif ($key == 'ref') {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-		}
+		$job = new job($db);
+		$job->fetch($obj->fk_job);
+		$object->fk_job = $job->getNomUrl();
 
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'right';
-		}
-		//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
+		$userstatic = new User($db);
+		$userstatic->fetch($obj->fk_user);
+		$object->fk_user = $userstatic->getNomUrl(1);
 
-		if (!empty($arrayfields['t.'.$key]['checked'])) {
-			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
-			if ($key == 'status') {
-				print $object->getLibStatut(5);
-			} elseif ($key == 'rowid') {
-				print $object->showOutputField($val, $key, $object->id, '');
-			} else {
-				print $object->showOutputField($val, $key, $object->$key, '');
+		if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($object->id, $arrayofselected)) {
+				$selected = 1;
 			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
+			print $object->getKanbanView('');
+		}
+		if ($i == ($imaxinloop - 1)) {
+			print '</div>';
+			print '</td></tr>';
+		}
+	} else {
+		// Show here line of result
+		print '<tr class="oddeven">';
+		foreach ($object->fields as $key => $val) {
+			$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
+			if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'center';
+			} elseif ($key == 'status') {
+				$cssforfield .= ($cssforfield ? ' ' : '').'center';
 			}
-			if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
+
+			if (in_array($val['type'], array('timestamp'))) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+			} elseif ($key == 'ref') {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+			}
+
+			if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'right';
+			}
+			//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
+
+			if (!empty($arrayfields['t.'.$key]['checked'])) {
+				print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
+				if ($key == 'status') {
+					print $object->getLibStatut(5);
+				} elseif ($key == 'rowid') {
+					print $object->showOutputField($val, $key, $object->id, '');
+				} else {
+					print $object->showOutputField($val, $key, $object->$key, '');
+				}
+				print '</td>';
 				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+					$totalarray['nbfield']++;
 				}
-				if (!isset($totalarray['val'])) {
-					$totalarray['val'] = array();
+				if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
+					if (!$i) {
+						$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+					}
+					if (!isset($totalarray['val'])) {
+						$totalarray['val'] = array();
+					}
+					if (!isset($totalarray['val']['t.'.$key])) {
+						$totalarray['val']['t.'.$key] = 0;
+					}
+					$totalarray['val']['t.'.$key] += $object->$key;
 				}
-				if (!isset($totalarray['val']['t.'.$key])) {
-					$totalarray['val']['t.'.$key] = 0;
-				}
-				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
-	}
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	// Action column
-	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		$selected = 0;
-		if (in_array($object->id, $arrayofselected)) {
-			$selected = 1;
+		// Extra fields
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+		// Fields from hook
+		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		// Action column
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($object->id, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
 		}
-		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
-	}
-	print '</td>';
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
 
-	print '</tr>'."\n";
+		print '</tr>'."\n";
+	}
 
 	$i++;
 }

From 19b77e3dcda2e862afe82cc2a7b13eac97bf9b58 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Fri, 13 Jan 2023 12:33:25 +0100
Subject: [PATCH 525/816] modify checkbox action

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

diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php
index 201be040d20..7a6f7fcc417 100644
--- a/htdocs/hrm/position_list.php
+++ b/htdocs/hrm/position_list.php
@@ -622,7 +622,13 @@ while ($i < $imaxinloop) {
 		$userstatic->fetch($obj->fk_user);
 		$object->fk_user = $userstatic->getNomUrl(1);
 		// output kanban
-		print $object->getKanbanView('');
+		if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($object->id, $arrayofselected)) {
+				$selected = 1;
+			}
+			print $object->getKanbanView('');
+		}
 		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';

From 2d3f7d949e56f88896637afde42afb444aa2e4a5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 13 Jan 2023 12:53:56 +0100
Subject: [PATCH 526/816] Fix warnings

---
 htdocs/compta/resultat/result.php | 128 ++++++++++++++++++++++--------
 1 file changed, 97 insertions(+), 31 deletions(-)

diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index 8615e595200..94a957a5c40 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -335,7 +335,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 
 				// Previous Fiscal year (N-1)
 				foreach ($sommes as $code => $det) {
-					$vars[$code] = $det['NP'];
+					$vars[$code] = empty($det['NP']) ? 0 : $det['NP'];
 				}
 
 				$result = strtr($formula, $vars);
@@ -355,12 +355,16 @@ if ($modecompta == 'CREANCES-DETTES') {
 
 				// Year N
 				$code = $cat['code']; // code of categorie ('VTE', 'MAR', ...)
-				$sommes[$code]['NP'] += $r;
+				if (empty($sommes[$code]['NP'])) {
+					$sommes[$code]['NP'] = $r;
+				} else {
+					$sommes[$code]['NP'] += $r;
+				}
 
 				// Current fiscal year (N)
 				if (is_array($sommes) && !empty($sommes)) {
 					foreach ($sommes as $code => $det) {
-						$vars[$code] = $det['N'];
+						$vars[$code] = empty($det['N']) ? 0 : $det['N'];
 					}
 				}
 
@@ -371,13 +375,17 @@ if ($modecompta == 'CREANCES-DETTES') {
 				$r = dol_eval($result, 1, 1, '1');
 
 				print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
-				$sommes[$code]['N'] += $r;
+				if (empty($sommes[$code]['N'])) {
+					$sommes[$code]['N'] = $r;
+				} else {
+					$sommes[$code]['N'] += $r;
+				}
 
 				// Detail by month
 				foreach ($months as $k => $v) {
 					if (($k + 1) >= $date_startmonth) {
 						foreach ($sommes as $code => $det) {
-							$vars[$code] = $det['M'][$k];
+							$vars[$code] = empty($det['M'][$k]) ? 0 : $det['M'][$k];
 						}
 						$result = strtr($formula, $vars);
 						$result = str_replace('--', '+', $result);
@@ -386,14 +394,18 @@ if ($modecompta == 'CREANCES-DETTES') {
 						$r = dol_eval($result, 1, 1, '1');
 
 						print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
-						$sommes[$code]['M'][$k] += $r;
+						if (empty($sommes[$code]['M'][$k])) {
+							$sommes[$code]['M'][$k] = $r;
+						} else {
+							$sommes[$code]['M'][$k] += $r;
+						}
 					}
 				}
 
 				foreach ($months as $k => $v) {
 					if (($k + 1) < $date_startmonth) {
 						foreach ($sommes as $code => $det) {
-							$vars[$code] = $det['M'][$k];
+							$vars[$code] = empty($det['M'][$k]) ? 0 : $det['M'][$k];
 						}
 						$result = strtr($formula, $vars);
 						$result = str_replace('--', '+', $result);
@@ -402,7 +414,11 @@ if ($modecompta == 'CREANCES-DETTES') {
 						$r = dol_eval($result, 1, 1, '1');
 
 						print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
-						$sommes[$code]['M'][$k] += $r;
+						if (empty($sommes[$code]['M'][$k])) {
+							$sommes[$code]['M'][$k] = $r;
+						} else {
+							$sommes[$code]['M'][$k] += $r;
+						}
 					}
 				}
 
@@ -429,14 +445,14 @@ if ($modecompta == 'CREANCES-DETTES') {
 
 				$arrayofaccountforfilter = array();
 				foreach ($cpts as $i => $cpt) {    // Loop on each account.
-					if (!is_null($cpt['account_number'])) {
+					if (isset($cpt['account_number'])) {
 						$arrayofaccountforfilter[] = $cpt['account_number'];
 					}
 				}
 
 				// N-1
 				if (!empty($arrayofaccountforfilter)) {
-					$return = $AccCat->getSumDebitCredit($arrayofaccountforfilter, $date_start_previous, $date_end_previous, $cat['dc'] ? $cat['dc'] : 0);
+					$return = $AccCat->getSumDebitCredit($arrayofaccountforfilter, $date_start_previous, $date_end_previous, empty($cat['dc']) ? 0 : $cat['dc']);
 					if ($return < 0) {
 						setEventMessages(null, $AccCat->errors, 'errors');
 						$resultNP = 0;
@@ -444,8 +460,16 @@ if ($modecompta == 'CREANCES-DETTES') {
 						foreach ($cpts as $i => $cpt) {    // Loop on each account found
 							$resultNP = empty($AccCat->sdcperaccount[$cpt['account_number']]) ? 0 : $AccCat->sdcperaccount[$cpt['account_number']];
 
-							$totCat['NP'] += $resultNP;
-							$sommes[$code]['NP'] += $resultNP;
+							if (empty($totCat['NP'])) {
+								$totCat['NP'] = $resultNP;
+							} else {
+								$totCat['NP'] += $resultNP;
+							}
+							if (empty($sommes[$code]['NP'])) {
+								$sommes[$code]['NP'] = $resultNP;
+							} else {
+								$sommes[$code]['NP'] += $resultNP;
+							}
 							$totPerAccount[$cpt['account_number']]['NP'] = $resultNP;
 						}
 					}
@@ -467,23 +491,47 @@ if ($modecompta == 'CREANCES-DETTES') {
 						}
 
 						//var_dump($monthtoprocess.'_'.$yeartoprocess);
-						$return = $AccCat->getSumDebitCredit($cpt['account_number'], $date_start, $date_end, $cat['dc'] ? $cat['dc'] : 0, 'nofilter', $monthtoprocess, $yeartoprocess);
-						if ($return < 0) {
-							setEventMessages(null, $AccCat->errors, 'errors');
-							$resultM = 0;
+						if (isset($cpt['account_number'])) {
+							$return = $AccCat->getSumDebitCredit($cpt['account_number'], $date_start, $date_end, empty($cat['dc']) ? 0 : $cat['dc'], 'nofilter', $monthtoprocess, $yeartoprocess);
+							if ($return < 0) {
+								setEventMessages(null, $AccCat->errors, 'errors');
+								$resultM = 0;
+							} else {
+								$resultM = $AccCat->sdc;
+							}
 						} else {
-							$resultM = $AccCat->sdc;
+							$resultM = 0;
+						}
+						if (empty($totCat['M'][$k])) {
+							$totCat['M'][$k] = $resultM;
+						} else {
+							$totCat['M'][$k] += $resultM;
+						}
+						if (empty($sommes[$code]['M'][$k])) {
+							$sommes[$code]['M'][$k] = $resultM;
+						} else {
+							$sommes[$code]['M'][$k] += $resultM;
+						}
+						if (isset($cpt['account_number'])) {
+							$totPerAccount[$cpt['account_number']]['M'][$k] = $resultM;
 						}
-						$totCat['M'][$k] += $resultM;
-						$sommes[$code]['M'][$k] += $resultM;
-						$totPerAccount[$cpt['account_number']]['M'][$k] = $resultM;
 
 						$resultN += $resultM;
 					}
 
-					$totCat['N'] += $resultN;
-					$sommes[$code]['N'] += $resultN;
-					$totPerAccount[$cpt['account_number']]['N'] = $resultN;
+					if (empty($totCat)) {
+						$totCat['N'] = $resultN;
+					} else {
+						$totCat['N'] += $resultN;
+					}
+					if (empty($sommes[$code]['N'])) {
+						$sommes[$code]['N'] = $resultN;
+					} else {
+						$sommes[$code]['N'] += $resultN;
+					}
+					if (isset($cpt['account_number'])) {
+						$totPerAccount[$cpt['account_number']]['N'] = $resultN;
+					}
 				}
 
 
@@ -543,16 +591,26 @@ if ($modecompta == 'CREANCES-DETTES') {
 				// Loop on detail of all accounts to output the detail
 				if ($showaccountdetail != 'no') {
 					foreach ($cpts as $i => $cpt) {
-						$resultNP = $totPerAccount[$cpt['account_number']]['NP'];
-						$resultN = $totPerAccount[$cpt['account_number']]['N'];
+						if (isset($cpt['account_number'])) {
+							$resultNP = $totPerAccount[$cpt['account_number']]['NP'];
+							$resultN = $totPerAccount[$cpt['account_number']]['N'];
+						} else {
+							$resultNP = 0;
+							$resultN = 0;
+						}
 
 						if ($showaccountdetail == 'all' || $resultN != 0) {
 							print '<tr>';
 							print '<td></td>';
-							print '<td class="tdoverflowmax250">';
-							print ' &nbsp; &nbsp; '.length_accountg($cpt['account_number']);
-							print ' - ';
-							print $cpt['account_label'];
+
+							if (isset($cpt['account_number'])) {
+								$labeldetail = ' &nbsp; &nbsp; '.length_accountg($cpt['account_number']).' - '.$cpt['account_label'];
+							} else {
+								$labeldetail = '-';
+							}
+
+							print '<td class="tdoverflowmax250" title="'.dol_escape_htmltag($labeldetail).'">';
+							print dol_escape_htmltag($labeldetail);
 							print '</td>';
 							print '<td class="right"><span class="amount">'.price($resultNP).'</span></td>';
 							print '<td class="right"><span class="amount">'.price($resultN).'</span></td>';
@@ -560,13 +618,21 @@ if ($modecompta == 'CREANCES-DETTES') {
 							// Make one call for each month
 							foreach ($months as $k => $v) {
 								if (($k + 1) >= $date_startmonth) {
-									$resultM = $totPerAccount[$cpt['account_number']]['M'][$k];
+									if (isset($cpt['account_number'])) {
+										$resultM = $totPerAccount[$cpt['account_number']]['M'][$k];
+									} else {
+										$resultM = 0;
+									}
 									print '<td class="right"><span class="amount">'.price($resultM).'</span></td>';
 								}
 							}
 							foreach ($months as $k => $v) {
 								if (($k + 1) < $date_startmonth) {
-									$resultM = $totPerAccount[$cpt['account_number']]['M'][$k];
+									if (isset($cpt['account_number'])) {
+										$resultM = empty($totPerAccount[$cpt['account_number']]['M'][$k]) ? 0 : $totPerAccount[$cpt['account_number']]['M'][$k];
+									} else {
+										$resultM = 0;
+									}
 									print '<td class="right"><span class="amount">'.price($resultM).'</span></td>';
 								}
 							}

From fdfe27b5df3c6bf729d9003084c337f2e84c0072 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 13 Jan 2023 12:55:08 +0100
Subject: [PATCH 527/816] Doc

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

diff --git a/ChangeLog b/ChangeLog
index f752894b4d2..3f30b2a2f99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ English Dolibarr ChangeLog
 
 ***** ChangeLog for 18.0.0 compared to 17.0.0 *****
 
+NEW: PHP 8.2 compatibility:
+
+
 WARNING:
 
 Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:

From 276bca95d340bc0dd3fefe8b33a5739c1122aa9a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 13 Jan 2023 13:28:40 +0100
Subject: [PATCH 528/816] CSS

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

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index db019bd262a..714d8fc7a0a 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -847,7 +847,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 					if (getDolGlobalInt("MAIN_FEATURES_LEVEL") > 1) {
 						$codeenabledisable .= '&nbsp;';
 						$codeenabledisable .= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;token='.newToken().'&amp;module_position='.$module_position.'&amp;action=reload_confirm&amp;value='.$modName.'&amp;mode='.$mode.'&amp;confirm=yes'.$param.'">';
-						$codeenabledisable .= img_picto($langs->trans("Reload"), 'refresh', 'class="fa-15"');
+						$codeenabledisable .= img_picto($langs->trans("Reload"), 'refresh', 'class="opacitymedium"');
 						$codeenabledisable .= '</a>';
 					}
 				} else {
@@ -857,7 +857,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 					if (getDolGlobalInt("MAIN_FEATURES_LEVEL") > 1) {
 						$codeenabledisable .= '&nbsp;';
 						$codeenabledisable .= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;token='.newToken().'&amp;module_position='.$module_position.'&amp;action=reload&amp;value='.$modName.'&amp;mode='.$mode.'&amp;confirm=yes'.$param.'">';
-						$codeenabledisable .= img_picto($langs->trans("Reload"), 'refresh', 'class="fa-15"');
+						$codeenabledisable .= img_picto($langs->trans("Reload"), 'refresh', 'class="opacitymedium"');
 						$codeenabledisable .= '</a>';
 					}
 				}

From 5fc9e093eb9a51741b80c8eec6413bc0f50171b3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 13 Jan 2023 14:09:54 +0100
Subject: [PATCH 529/816] css

---
 htdocs/admin/modules.php                      | 18 ++++++++++--------
 htdocs/core/modules/DolibarrModules.class.php |  4 ++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 714d8fc7a0a..ccda604d35d 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -776,15 +776,17 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 		// Version (with picto warning or not)
 		$version = $objMod->getVersion(0);
 		$versiontrans = '';
+		$warningstring = '';
 		if (preg_match('/development/i', $version)) {
-			$versiontrans .= img_warning($langs->trans("Development"), '', 'floatleft paddingright');
+			$warningstring = $langs->trans("Development");
 		}
 		if (preg_match('/experimental/i', $version)) {
-			$versiontrans .= img_warning($langs->trans("Experimental"), '', 'floatleft paddingright');
+			$warningstring = $langs->trans("Experimental");
 		}
 		if (preg_match('/deprecated/i', $version)) {
-			$versiontrans .= img_warning($langs->trans("Deprecated"), '', 'floatleft paddingright');
+			$warningstring = $langs->trans("Deprecated");
 		}
+
 		if ($objMod->isCoreOrExternalModule() == 'external' || preg_match('/development|experimental|deprecated/i', $version)) {
 			$versiontrans .= $objMod->getVersion(1);
 		}
@@ -842,7 +844,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 			} else {
 				if (!empty($objMod->warnings_unactivation[$mysoc->country_code]) && method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) {
 					$codeenabledisable .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;token='.newToken().'&amp;module_position='.$module_position.'&amp;action=reset_confirm&amp;confirm_message_code='.urlencode($objMod->warnings_unactivation[$mysoc->country_code]).'&amp;value='.$modName.'&amp;mode='.$mode.$param.'">';
-					$codeenabledisable .= img_picto($langs->trans("Activated"), 'switch_on');
+					$codeenabledisable .= img_picto($langs->trans("Activated").($warningstring ? ' '.$warningstring : ''), 'switch_on');
 					$codeenabledisable .= '</a>';
 					if (getDolGlobalInt("MAIN_FEATURES_LEVEL") > 1) {
 						$codeenabledisable .= '&nbsp;';
@@ -852,7 +854,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 					}
 				} else {
 					$codeenabledisable .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;token='.newToken().'&amp;module_position='.$module_position.'&amp;action=reset&amp;value='.$modName.'&amp;mode='.$mode.'&amp;confirm=yes'.$param.'">';
-					$codeenabledisable .= img_picto($langs->trans("Activated"), 'switch_on');
+					$codeenabledisable .= img_picto($langs->trans("Activated").($warningstring ? ' '.$warningstring : ''), 'switch_on');
 					$codeenabledisable .= '</a>';
 					if (getDolGlobalInt("MAIN_FEATURES_LEVEL") > 1) {
 						$codeenabledisable .= '&nbsp;';
@@ -961,7 +963,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 			// Output Kanban
 			print $objMod->getKanbanView($codeenabledisable, $codetoconfig);
 		} else {
-			print '<tr class="oddeven">'."\n";
+			print '<tr class="oddeven'.($warningstring ? ' info-box-content-warning' : '').'">'."\n";
 			if (!empty($conf->global->MAIN_MODULES_SHOW_LINENUMBERS)) {
 				print '<td class="width50">'.$linenum.'</td>';
 			}
@@ -995,7 +997,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 			print '</td>';
 
 			// Version
-			print '<td class="center nowrap" width="120px">';
+			print '<td class="center nowrap" width="150px" title="'.dol_escape_htmltag(dol_string_nohtmltag($versiontrans)).'">';
 			if ($objMod->needUpdate) {
 				$versionTitle = $langs->trans('ModuleUpdateAvailable').' : '.$objMod->lastVersion;
 				print '<span class="badge badge-warning classfortooltip" title="'.dol_escape_htmltag($versionTitle).'">'.$versiontrans.'</span>';
@@ -1005,7 +1007,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 			print "</td>\n";
 
 			// Link enable/disable
-			print '<td class="center valignmiddle" width="60px">';
+			print '<td class="center valignmiddle left" width="60px">';
 			print $codeenabledisable;
 			print "</td>\n";
 
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 4027fb0cbf2..f4b3b3eef1f 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -792,8 +792,8 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	 * For 'experimental' modules, gives 'experimental' translation
 	 * For 'dolibarr' modules, gives Dolibarr version
 	 *
-	 * @param  int $translated 1=Special version keys are translated, 0=Special version keys are not translated
-	 * @return string                  Module version
+	 * @param  int 		$translated 		1=Special version keys are translated, 0=Special version keys are not translated
+	 * @return string               		Module version
 	 */
 	public function getVersion($translated = 1)
 	{

From 147e3ff945a31a5e04dab6a085fb4aa32f0a7605 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Fri, 13 Jan 2023 14:13:52 +0100
Subject: [PATCH 530/816] kanban for list of holidays

---
 htdocs/holiday/class/holiday.class.php |  37 ++++
 htdocs/holiday/list.php                | 284 ++++++++++++++-----------
 htdocs/theme/eldy/info-box.inc.php     |   5 +
 3 files changed, 200 insertions(+), 126 deletions(-)

diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 9b3f0a1ce16..e8f56659de9 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -2419,4 +2419,41 @@ class Holiday extends CommonObject
 			return -1;
 		}
 	}
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $langs, $selected;
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
+		if (property_exists($this, 'fk_user') && !empty($this->id)) {
+			$return .= '| <span class="info-box-label">'.$this->fk_user.'</span>';
+			$return .= '<input class="fright" id="cb'.$this->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
+		if (property_exists($this, 'fk_type')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("Type").'</span> : ';
+			$return .= '<span class="info_box-label">'.$langs->trans($this->getTypes(1, -1)[$this->fk_type]['code']).'</span>';
+		}
+		if (property_exists($this, 'date_debut') && property_exists($this, 'date_fin')) {
+			$return .= '<br><span class="info-box-label">'.dol_print_date($this->date_debut, 'day').'</span>';
+			$return .= ' <span class="opacitymedium">'.$langs->trans("To").'</span> ';
+			$return .= '<span class="info-box-label">'.dol_print_date($this->date_fin, 'day').'</span>';
+		}
+		if (method_exists($this, 'getLibStatut')) {
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 564fb8a2a96..b16fbaf8c16 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -52,6 +52,7 @@ $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') : 'holidaylist'; // To manage different context of search
+$mode        = GETPOST('mode', 'alpha'); // for switch mode view result
 
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
@@ -394,6 +395,9 @@ if ($resql) {
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
 	$param = '';
+	if (!empty($mode)) {
+		$param .= '&mode='.urlencode($mode);
+	}
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 		$param .= '&contextpage='.urlencode($contextpage);
 	}
@@ -476,6 +480,8 @@ if ($resql) {
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="mode" value="'.$mode.'">';
+
 	if ($id > 0) {
 		print '<input type="hidden" name="id" value="'.$id.'">';
 	}
@@ -519,7 +525,11 @@ if ($resql) {
 	} else {
 		$title = $langs->trans("ListeCP");
 
-		$newcardbutton = dolGetButtonTitle($langs->trans('MenuAddCP'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/holiday/card.php?action=create', '', $user->rights->holiday->write);
+
+		$newcardbutton = '';
+		$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+		$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+		$newcardbutton .= dolGetButtonTitle($langs->trans('MenuAddCP'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/holiday/card.php?action=create', '', $user->rights->holiday->write);
 
 		print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_hrm', 0, $newcardbutton, '', $limit, 0, 0, 1);
 	}
@@ -787,7 +797,8 @@ if ($resql) {
 			$holidaystatic->id = $obj->rowid;
 			$holidaystatic->ref = ($obj->ref ? $obj->ref : $obj->rowid);
 			$holidaystatic->statut = $obj->status;
-			$holidaystatic->date_debut = $db->jdate($obj->date_debut);
+			$holidaystatic->date_debut = $obj->date_debut;
+			$holidaystatic->date_fin = $obj->date_fin;
 
 			// User
 			$userstatic->id = $obj->fk_user;
@@ -815,139 +826,160 @@ if ($resql) {
 			$starthalfday = ($obj->halfday == -1 || $obj->halfday == 2) ? 'afternoon' : 'morning';
 			$endhalfday = ($obj->halfday == 1 || $obj->halfday == 2) ? 'morning' : 'afternoon';
 
-			print '<tr class="oddeven">';
-			// Action column
-			if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-				print '<td class="nowrap center">';
-				if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			if ($mode == 'kanban') {
+				if ($i == 0) {
+					print '<tr><td colspan="12">';
+					print '<div class="box-flex-container">';
+				}
+
+				$holidaystatic->fk_type = $holidaystatic->getTypes(1, -1)[$obj->fk_type]['rowid'];
+				$holidaystatic->fk_user = $userstatic->getNomUrl(1);
+				// Output Kanban
+				if ($massactionbutton || $massaction) {
 					$selected = 0;
-					if (in_array($obj->rowid, $arrayofselected)) {
+					if (in_array($object->id, $arrayofselected)) {
 						$selected = 1;
 					}
-					print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+					print $holidaystatic->getKanbanView('');
 				}
-				print '</td>';
-			}
-			if (!empty($arrayfields['cp.ref']['checked'])) {
-				print '<td class="nowraponall">';
-				print $holidaystatic->getNomUrl(1, 1);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
+				if ($i == (min($num, $limit) - 1)) {
+					print '</div>';
+					print '</td></tr>';
 				}
-			}
-			if (!empty($arrayfields['cp.fk_user']['checked'])) {
-				print '<td class="tdoverflowmax125">'.$userstatic->getNomUrl(-1, 'leave').'</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			if (!empty($arrayfields['cp.fk_validator']['checked'])) {
-				print '<td class="tdoverflowmax125">'.$approbatorstatic->getNomUrl(-1).'</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			if (!empty($arrayfields['cp.fk_type']['checked'])) {
-				$labeltypeleavetoshow = ($langs->trans($typeleaves[$obj->fk_type]['code']) != $typeleaves[$obj->fk_type]['code'] ? $langs->trans($typeleaves[$obj->fk_type]['code']) : $typeleaves[$obj->fk_type]['label']);
-				$labeltypeleavetoshow = empty($typeleaves[$obj->fk_type]['label']) ? $langs->trans("TypeWasDisabledOrRemoved", $obj->fk_type) : $labeltypeleavetoshow;
-
-				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($labeltypeleavetoshow).'">';
-				print $labeltypeleavetoshow;
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			if (!empty($arrayfields['duration']['checked'])) {
-				print '<td class="right">';
-				$nbopenedday = num_open_day($db->jdate($obj->date_debut, 1), $db->jdate($obj->date_fin, 1), 0, 1, $obj->halfday);	// user jdate(..., 1) because num_open_day need UTC dates
-				$totalduration += $nbopenedday;
-				print $nbopenedday;
-				//print ' '.$langs->trans('DurationDays');
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			if (!empty($arrayfields['cp.date_debut']['checked'])) {
-				print '<td class="center">';
-				print dol_print_date($db->jdate($obj->date_debut), 'day');
-				print ' <span class="opacitymedium nowraponall">('.$langs->trans($listhalfday[$starthalfday]).')</span>';
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			if (!empty($arrayfields['cp.date_fin']['checked'])) {
-				print '<td class="center">';
-				print dol_print_date($db->jdate($obj->date_fin), 'day');
-				print ' <span class="opacitymedium nowraponall">('.$langs->trans($listhalfday[$endhalfday]).')</span>';
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Date validation
-			if (!empty($arrayfields['cp.date_valid']['checked'])) {		// date_valid is both date_valid but also date_approval
-				print '<td class="center" title="'.dol_print_date($db->jdate($obj->date_valid), 'dayhour').'">';
-				print dol_print_date($db->jdate($obj->date_valid), 'day');
-				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
-			}
-			// Date approval
-			if (!empty($arrayfields['cp.date_approval']['checked'])) {
-				print '<td class="center" title="'.dol_print_date($db->jdate($obj->date_approval), 'dayhour').'">';
-				print dol_print_date($db->jdate($obj->date_approval), 'day');
-				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
-			}
-
-			// Extra fields
-			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-			// Fields from hook
-			$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
-			print $hookmanager->resPrint;
-
-			// Date creation
-			if (!empty($arrayfields['cp.date_create']['checked'])) {
-				print '<td style="text-align: center;">'.dol_print_date($date, 'dayhour').'</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			if (!empty($arrayfields['cp.tms']['checked'])) {
-				print '<td style="text-align: center;">'.dol_print_date($date_modif, 'dayhour').'</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			if (!empty($arrayfields['cp.statut']['checked'])) {
-				print '<td class="right nowrap">'.$holidaystatic->getLibStatut(5).'</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Action column
-			if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-				print '<td class="nowrap center">';
-				if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-					$selected = 0;
-					if (in_array($obj->rowid, $arrayofselected)) {
-						$selected = 1;
+			} else {
+				print '<tr class="oddeven">';
+				// Action column
+				if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+					print '<td class="nowrap center">';
+					if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+						$selected = 0;
+						if (in_array($obj->rowid, $arrayofselected)) {
+							$selected = 1;
+						}
+						print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 					}
-					print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+					print '</td>';
 				}
-				print '</td>';
-			}
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
+				if (!empty($arrayfields['cp.ref']['checked'])) {
+					print '<td class="nowraponall">';
+					print $holidaystatic->getNomUrl(1, 1);
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				if (!empty($arrayfields['cp.fk_user']['checked'])) {
+					print '<td class="tdoverflowmax125">'.$userstatic->getNomUrl(-1, 'leave').'</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				if (!empty($arrayfields['cp.fk_validator']['checked'])) {
+					print '<td class="tdoverflowmax125">'.$approbatorstatic->getNomUrl(-1).'</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				if (!empty($arrayfields['cp.fk_type']['checked'])) {
+					$labeltypeleavetoshow = ($langs->trans($typeleaves[$obj->fk_type]['code']) != $typeleaves[$obj->fk_type]['code'] ? $langs->trans($typeleaves[$obj->fk_type]['code']) : $typeleaves[$obj->fk_type]['label']);
+					$labeltypeleavetoshow = empty($typeleaves[$obj->fk_type]['label']) ? $langs->trans("TypeWasDisabledOrRemoved", $obj->fk_type) : $labeltypeleavetoshow;
 
-			print '</tr>'."\n";
+					print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($labeltypeleavetoshow).'">';
+					print $labeltypeleavetoshow;
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				if (!empty($arrayfields['duration']['checked'])) {
+					print '<td class="right">';
+					$nbopenedday = num_open_day($db->jdate($obj->date_debut, 1), $db->jdate($obj->date_fin, 1), 0, 1, $obj->halfday);	// user jdate(..., 1) because num_open_day need UTC dates
+					$totalduration += $nbopenedday;
+					print $nbopenedday;
+					//print ' '.$langs->trans('DurationDays');
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				if (!empty($arrayfields['cp.date_debut']['checked'])) {
+					print '<td class="center">';
+					print dol_print_date($db->jdate($obj->date_debut), 'day');
+					print ' <span class="opacitymedium nowraponall">('.$langs->trans($listhalfday[$starthalfday]).')</span>';
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				if (!empty($arrayfields['cp.date_fin']['checked'])) {
+					print '<td class="center">';
+					print dol_print_date($db->jdate($obj->date_fin), 'day');
+					print ' <span class="opacitymedium nowraponall">('.$langs->trans($listhalfday[$endhalfday]).')</span>';
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				// Date validation
+				if (!empty($arrayfields['cp.date_valid']['checked'])) {		// date_valid is both date_valid but also date_approval
+					print '<td class="center" title="'.dol_print_date($db->jdate($obj->date_valid), 'dayhour').'">';
+					print dol_print_date($db->jdate($obj->date_valid), 'day');
+					print '</td>';
+					if (!$i) $totalarray['nbfield']++;
+				}
+				// Date approval
+				if (!empty($arrayfields['cp.date_approval']['checked'])) {
+					print '<td class="center" title="'.dol_print_date($db->jdate($obj->date_approval), 'dayhour').'">';
+					print dol_print_date($db->jdate($obj->date_approval), 'day');
+					print '</td>';
+					if (!$i) $totalarray['nbfield']++;
+				}
 
+				// Extra fields
+				include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+				// Fields from hook
+				$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+				$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+				print $hookmanager->resPrint;
+
+				// Date creation
+				if (!empty($arrayfields['cp.date_create']['checked'])) {
+					print '<td style="text-align: center;">'.dol_print_date($date, 'dayhour').'</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				if (!empty($arrayfields['cp.tms']['checked'])) {
+					print '<td style="text-align: center;">'.dol_print_date($date_modif, 'dayhour').'</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				if (!empty($arrayfields['cp.statut']['checked'])) {
+					print '<td class="right nowrap">'.$holidaystatic->getLibStatut(5).'</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+
+				// Action column
+				if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+					print '<td class="nowrap center">';
+					if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+						$selected = 0;
+						if (in_array($obj->rowid, $arrayofselected)) {
+							$selected = 1;
+						}
+						print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+					}
+					print '</td>';
+				}
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+
+				print '</tr>'."\n";
+			}
 			$i++;
 		}
 
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index f35516ad58e..5c010e21e26 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -492,6 +492,11 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
 	max-width: 350px;
 }
 
+/**for make a checkbox in the right of the box in mode kanban */
+.fright {
+	float:right;
+}
+
 @media only screen and (max-width: 1740px) {
 	.info-box-module {
 		min-width: 315px;

From ee7bcc3d129bac92a35ad37563e2cad677f7c502 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Fri, 13 Jan 2023 14:16:22 +0100
Subject: [PATCH 531/816] modify style for checkbox

---
 htdocs/hrm/class/evaluation.class.php | 2 +-
 htdocs/theme/eldy/info-box.inc.php    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index 5a628725f95..c410ae8bd8f 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -1072,7 +1072,7 @@ class Evaluation extends CommonObject
 		$return .= '</span>';
 		$return .= '<div class="info-box-content">';
 		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
-		$return .= '<input style="float:right;" id="cb'.$this->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		$return .= '<input class="fright" id="cb'.$this->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		if (property_exists($this, 'fk_user') && !(empty($this->fk_user))) {
 			$return .= '<br><span class="info-box-label opacitymedium">'.$langs->trans("Employee").'</span> : ';
 			$return .= '<span class="info-box-label ">'.$this->fk_user.'</span>';
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index f35516ad58e..f13bd8c6c26 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -492,6 +492,10 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
 	max-width: 350px;
 }
 
+/**for make a checkbox in the right of the box in mode kanban */
+.fright {
+	float:right;
+}
 @media only screen and (max-width: 1740px) {
 	.info-box-module {
 		min-width: 315px;

From 0ee90877aa0f20caeefe92614d474f6fc34d4f2e Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Fri, 13 Jan 2023 14:17:49 +0100
Subject: [PATCH 532/816] modify style for checkbox

---
 htdocs/hrm/class/position.class.php | 2 +-
 htdocs/theme/eldy/info-box.inc.php  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index 9d4f71d24fd..2f4a127999a 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -1135,7 +1135,7 @@ class Position extends CommonObject
 		$return .= '</span>';
 		$return .= '<div class="info-box-content">';
 		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
-		$return .= '<input style="float:right;" id="cb'.$this->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		$return .= '<input class="fright" id="cb'.$this->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		if (property_exists($this, 'fk_user') && !(empty($this->fk_user))) {
 			$return .= '<br><span class="info-box-label opacitymedium">'.$langs->trans("Employee").'</span> : ';
 			$return .= '<span class="info-box-label ">'.$this->fk_user.'</span>';
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index f35516ad58e..9c1f3b443ef 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -491,7 +491,10 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
 	min-width: 350px;
 	max-width: 350px;
 }
-
+/**for make a checkbox in the right of the box in mode kanban */
+.fright {
+	float:right;
+}
 @media only screen and (max-width: 1740px) {
 	.info-box-module {
 		min-width: 315px;

From 313608b6273d4e4134c2561a05f147f791e9f110 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Fri, 13 Jan 2023 14:19:14 +0100
Subject: [PATCH 533/816] modify style for checkbox

---
 htdocs/hrm/class/job.class.php     | 2 +-
 htdocs/theme/eldy/info-box.inc.php | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index a013bb57a36..85845e557ab 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -1071,7 +1071,7 @@ class Job extends CommonObject
 		$return .= '</span>';
 		$return .= '<div class="info-box-content">';
 		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
-		$return .= '<input style="float:right;" id="cb'.$this->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		$return .= '<input class="fright" id="cb'.$this->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		if (property_exists($this, 'deplacement')) {
 			$return .= '<br><span class="opacitymedium">'.$langs->trans("Type").'</span>';
 			$return .= ' : <span class="info-box-label ">'.$this->fields['deplacement']['arrayofkeyval'][$this->deplacement].'</span>';
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index f35516ad58e..f13bd8c6c26 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -492,6 +492,10 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
 	max-width: 350px;
 }
 
+/**for make a checkbox in the right of the box in mode kanban */
+.fright {
+	float:right;
+}
 @media only screen and (max-width: 1740px) {
 	.info-box-module {
 		min-width: 315px;

From 782594ba5622e46dc8092ec79661440d3e77b2a1 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Fri, 13 Jan 2023 14:27:19 +0100
Subject: [PATCH 534/816] fix problem style

---
 htdocs/compta/cashcontrol/cashcontrol_list.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index b4c20a824ba..a1e5dae0c91 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -344,9 +344,6 @@ $param = '';
 if (!empty($mode)) {
 	$param .= '&mode='.urlencode($mode);
 }
-if (!empty($mode)) {
-	$param .= '&mode='.urlencode($mode);
-}
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 	$param .= '&contextpage='.urlencode($contextpage);
 }
@@ -405,6 +402,7 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 $permforcashfence = 1;
+
 $newcardbutton  = '';
 $newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
 $newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
@@ -564,8 +562,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			print '<tr><td colspan="12">';
 			print '<div class="box-flex-container">';
 		}
-		// Output Kanban
-		//var_dump($obj->posmodule);exit;
+
 		$object->posmodule = $obj->posmodule;
 		$object->cash = $obj->cash;
 		$object->opening = $obj->opening;

From fcd82c93f2dd2a5e69577048fdf48f48da4ca941 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Fri, 13 Jan 2023 16:58:55 +0100
Subject: [PATCH 535/816] fix total days for both view

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

diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index b16fbaf8c16..cef7375a4b6 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -826,6 +826,9 @@ if ($resql) {
 			$starthalfday = ($obj->halfday == -1 || $obj->halfday == 2) ? 'afternoon' : 'morning';
 			$endhalfday = ($obj->halfday == 1 || $obj->halfday == 2) ? 'morning' : 'afternoon';
 
+			$nbopenedday = num_open_day($db->jdate($obj->date_debut, 1), $db->jdate($obj->date_fin, 1), 0, 1, $obj->halfday);	// user jdate(..., 1) because num_open_day need UTC dates
+			$totalduration += $nbopenedday;
+
 			if ($mode == 'kanban') {
 				if ($i == 0) {
 					print '<tr><td colspan="12">';

From 97061a9a922bd9f75d67f7187943391502893105 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 13 Jan 2023 17:17:23 +0100
Subject: [PATCH 536/816] NEW Use a cache file for external RSS in calendar

---
 htdocs/comm/action/class/ical.class.php | 35 ++++++++++++++++++++-----
 htdocs/comm/action/index.php            | 16 ++++++++---
 htdocs/core/lib/date.lib.php            |  1 +
 htdocs/core/lib/functions.lib.php       | 16 +++++++++++
 4 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php
index badd5db5c98..26db2cd5e6e 100644
--- a/htdocs/comm/action/class/ical.class.php
+++ b/htdocs/comm/action/class/ical.class.php
@@ -54,8 +54,8 @@ class ICal
 	/**
 	 *  Read text file, icalender text file
 	 *
-	 *  @param  string  $file       File
-	 *  @return string
+	 *  @param  string  		$file       File
+	 *  @return string|null					Content of remote file read or null if error
 	 */
 	public function read_file($file)
 	{
@@ -65,7 +65,7 @@ class ICal
 
 		$tmpresult = getURLContent($file, 'GET');
 		if ($tmpresult['http_code'] != 200) {
-			$file_text = '';
+			$file_text = null;
 			$this->error = 'Error: '.$tmpresult['http_code'].' '.$tmpresult['content'];
 		} else {
 			$file_text = preg_replace("/[\r\n]{1,} /", "", $tmpresult['content']);
@@ -102,17 +102,40 @@ class ICal
 	/**
 	 * Translate Calendar
 	 *
-	 * @param	string 	$uri	Url
+	 * @param	string	 	$uri			Url
+	 * @param	string		$usecachefile	Full path of a cache file to use a cache file
+	 * @param	string		$delaycache		Delay in seconds for cache (by default 3600 secondes)
 	 * @return	array|string
 	 */
-	public function parse($uri)
+	public function parse($uri, $usecachefile = '', $delaycache = 3600)
 	{
 		$this->cal = array(); // new empty array
 
 		$this->event_count = -1;
+		$this->file_text = null;
+
+		// Save file into a cache
+		if ($usecachefile) {
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+			$datefile = dol_filemtime($usecachefile);
+			$now = dol_now('gmt');
+			//print $datefile.' '.$now.' ...';
+			if ($datefile && $datefile > ($now - $delaycache)) {
+				// We reuse the cache file
+				$this->file_text = file_get_contents($usecachefile);
+			}
+		}
 
 		// read FILE text
-		$this->file_text = $this->read_file($uri);
+		if (is_null($this->file_text)) {
+			$this->file_text = $this->read_file($uri);
+
+			if ($usecachefile && !is_null($this->file_text)) {
+				// Save the file content into cache file
+				file_put_contents($usecachefile, $this->file_text, LOCK_EX);
+				dolChmod($usecachefile);
+			}
+		}
 
 		$this->file_text = preg_split("[\n]", $this->file_text);
 
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 3460355a803..b4e11125aee 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -49,6 +49,7 @@ if (empty($conf->global->AGENDA_EXT_NB)) {
 	$conf->global->AGENDA_EXT_NB = 5;
 }
 $MAXAGENDA = $conf->global->AGENDA_EXT_NB;
+$DELAYFORCACHE = 300;	// 300 seconds
 
 $disabledefaultvalues = GETPOST('disabledefaultvalues', 'int');
 
@@ -615,7 +616,7 @@ if (!empty($conf->use_javascript_ajax)) {	// If javascript on
 				$default = '';
 			}
 
-			$s .= '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_ext'.$htmlname.'" name="check_ext'.$htmlname.'" value="1" '.$default.'> <label for="check_ext'.$htmlname.'">'.dol_escape_htmltag($val['name']).'</label> &nbsp; </div>';
+			$s .= '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_ext'.$htmlname.'" name="check_ext'.$htmlname.'" value="1" '.$default.'> <label for="check_ext'.$htmlname.'" title="'.dol_escape_htmltag($langs->trans("Cache").' '.round($DELAYFORCACHE / 60).'mn').'">'.dol_escape_htmltag($val['name']).'</label> &nbsp; </div>';
 		}
 	}
 
@@ -1010,9 +1011,13 @@ if ($mode == 'show_day') {
 	// Request only leaves for the current selected day
 	$sql .= " AND '".$db->escape($year)."-".$db->escape($month)."-".$db->escape($day)."' BETWEEN x.date_debut AND x.date_fin";	// date_debut and date_fin are date without time
 } elseif ($mode == 'show_week') {
-	// TODO: Add filter to reduce database request
+	// Restrict on current month (we get more, but we will filter later)
+	$sql .= " AND date_debut < '".dol_get_last_day($year, $month)."'";
+	$sql .= " AND date_fin >= '".dol_get_first_day($year, $month)."'";
 } elseif ($mode == 'show_month') {
-	// TODO: Add filter to reduce database request
+	// Restrict on current month
+	$sql .= " AND date_debut <= '".dol_get_last_day($year, $month)."'";
+	$sql .= " AND date_fin >= '".dol_get_first_day($year, $month)."'";
 }
 
 $resql = $db->query($sql);
@@ -1083,8 +1088,11 @@ if (count($listofextcals)) {
 		$colorcal = $extcal['color'];
 		$buggedfile = $extcal['buggedfile'];
 
+		$pathforcachefile = dol_sanitizePathName($conf->user->dir_temp).'/'.dol_sanitizeFileName('extcal_'.$namecal.'_user'.$user->id).'.cache';
+		//var_dump($pathforcachefile);exit;
+
 		$ical = new ICal();
-		$ical->parse($url);
+		$ical->parse($url, $pathforcachefile, $DELAYFORCACHE);
 
 		// After this $ical->cal['VEVENT'] contains array of events, $ical->cal['DAYLIGHT'] contains daylight info, $ical->cal['STANDARD'] contains non daylight info, ...
 		//var_dump($ical->cal); exit;
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 03223a7b65a..773cb6a1a97 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -117,6 +117,7 @@ function getServerTimeZoneInt($refgmtdate = 'now')
  *  @param      int			$duration_unit      Unit of added delay (d, m, y, w, h, i)
  *  @param      int         $ruleforendofmonth  Change the behavior of PHP over data-interval, 0 or 1
  *  @return     int      			        	New timestamp
+ *  @see convertSecondToTime(), convertTimeToSeconds()
  */
 function dol_time_plus_duree($time, $duration_value, $duration_unit, $ruleforendofmonth = 0)
 {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ab96f650b6f..278f70507bb 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6844,6 +6844,22 @@ function dol_mkdir($dir, $dataroot = '', $newmask = '')
 }
 
 
+/**
+ *	Change mod of a file
+ *
+ *  @param	string		$filepath		Full file path
+ *	@return void
+ */
+function dolChmod($filepath)
+{
+	global $conf;
+
+	if (!empty($conf->global->MAIN_UMASK)) {
+		@chmod($filepath, octdec($conf->global->MAIN_UMASK));
+	}
+}
+
+
 /**
  *	Return picto saying a field is required
  *

From 669beb50d25f810bf410bd1311e4e499c21747aa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 13 Jan 2023 19:07:57 +0100
Subject: [PATCH 537/816] Better navigation bar for calendars

---
 htdocs/comm/action/index.php     | 28 ++++++++++++++--------------
 htdocs/comm/action/list.php      |  2 +-
 htdocs/comm/action/pertype.php   |  7 +++++--
 htdocs/comm/action/peruser.php   |  7 +++++--
 htdocs/theme/eldy/global.inc.php | 13 +++++++++++++
 htdocs/theme/md/style.css.php    |  2 ++
 6 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index b4e11125aee..8ec011f5e9d 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -429,36 +429,33 @@ if ($mode == 'show_day' || $mode == 'show_week' || $mode == 'show_month') {
 }
 
 // Show navigation bar
+$nav = '';
+$nav .= '<div class="navselectiondate inline-block nowraponall">';
 if (empty($mode) || $mode == 'show_month') {
-	$nav = "<a href=\"?year=".$prev_year."&month=".$prev_month.$param."\"><i class=\"fa fa-chevron-left\"></i></a> &nbsp;\n";
+	$nav .= "<a href=\"?year=".$prev_year."&month=".$prev_month.$param."\"><i class=\"fa fa-chevron-left\"></i></a> &nbsp;\n";
 	$nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $month, 1, $year), "%b %Y");
 	$nav .= " </span>\n";
 	$nav .= " &nbsp; <a href=\"?year=".$next_year."&month=".$next_month.$param."\"><i class=\"fa fa-chevron-right\"></i></a>\n";
-	if (empty($conf->dol_optimize_smallscreen)) {
-		$nav .= " &nbsp; <a href=\"?year=".$nowyear."&month=".$nowmonth.$param."\">".$langs->trans("Today")."</a> ";
-	}
 	$picto = 'calendar';
 }
 if ($mode == 'show_week') {
-	$nav = "<a href=\"?year=".$prev_year."&month=".$prev_month."&day=".$prev_day.$param."\"><i class=\"fa fa-chevron-left\" title=\"".dol_escape_htmltag($langs->trans("Previous"))."\"></i></a> &nbsp;\n";
-	$nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y").", ".$langs->trans("Week")." ".$week;
+	$nav .= "<a href=\"?year=".$prev_year."&month=".$prev_month."&day=".$prev_day.$param."\"><i class=\"fa fa-chevron-left\" title=\"".dol_escape_htmltag($langs->trans("Previous"))."\"></i></a> &nbsp;\n";
+	$nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y").", ".$langs->trans("WeekShort")." ".$week;
 	$nav .= " </span>\n";
 	$nav .= " &nbsp; <a href=\"?year=".$next_year."&month=".$next_month."&day=".$next_day.$param."\"><i class=\"fa fa-chevron-right\" title=\"".dol_escape_htmltag($langs->trans("Next"))."\"></i></a>\n";
-	if (empty($conf->dol_optimize_smallscreen)) {
-		$nav .= " &nbsp; <a href=\"?year=".$nowyear."&month=".$nowmonth."&day=".$nowday.$param."\">".$langs->trans("Today")."</a> ";
-	}
 	$picto = 'calendarweek';
 }
 if ($mode == 'show_day') {
-	$nav = "<a href=\"?year=".$prev_year."&month=".$prev_month."&day=".$prev_day.$param."\"><i class=\"fa fa-chevron-left\"></i></a> &nbsp;\n";
+	$nav .= "<a href=\"?year=".$prev_year."&month=".$prev_month."&day=".$prev_day.$param."\"><i class=\"fa fa-chevron-left\"></i></a> &nbsp;\n";
 	$nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $month, $day, $year), "daytextshort");
 	$nav .= " </span>\n";
 	$nav .= " &nbsp; <a href=\"?year=".$next_year."&month=".$next_month."&day=".$next_day.$param."\"><i class=\"fa fa-chevron-right\"></i></a>\n";
-	if (empty($conf->dol_optimize_smallscreen)) {
-		$nav .= " &nbsp; <a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a> ";
-	}
 	$picto = 'calendarday';
 }
+if (empty($conf->dol_optimize_smallscreen)) {
+	$nav .= ' &nbsp; <a href="?year='.$nowyear.'&month='.$nowmonth.'&day='.$nowday.$param.'" class="datenowlink">'.$langs->trans("Today").'</a> ';
+}
+$nav .= '</div>';
 
 $nav .= $form->selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0);
 //$nav .= ' <input type="submit" class="button button-save" name="submitdateselect" value="'.$langs->trans("Refresh").'">';
@@ -497,7 +494,8 @@ print '<input type="hidden" name="mode" value="'.$mode.'">';
 //print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, $listofextcals, $actioncode, $usergroup, '', $resourceid);
 //print dol_get_fiche_end();
 
-$viewmode = '';
+$viewmode = '<div class="navmode inline-block">';
+
 $viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/list.php?mode=show_list&restore_lastsearch_values=1'.$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
 $viewmode .= img_picto($langs->trans("List"), 'object_calendarlist', 'class="imgforviewmode pictoactionview block"');
@@ -537,6 +535,8 @@ if (empty($reshook)) {
 	$viewmode = $hookmanager->resPrint;
 }
 
+$viewmode .= '</div>';
+
 $viewmode .= '<span class="marginrightonly"></span>';	// To add a space before the navigation tools
 
 
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 5abd2d3f101..ab2037d5f76 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -600,7 +600,7 @@ $num = $db->num_rows($resql);
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 // Local calendar
-$newtitle = '<div class="nowrap clear inline-block minheight30 margintoponly">';
+$newtitle = '<div class="nowrap clear inline-block minheight30">';
 $newtitle .= '<input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> '.$langs->trans("LocalAgenda").' &nbsp; ';
 $newtitle .= '</div>';
 //$newtitle=$langs->trans($title);
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index ce33d0f40b2..c13de5fb183 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -368,12 +368,15 @@ $max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year, 'gmt'));
 $tmpday = $first_day;
 $picto = 'calendarweek';
 
-$nav = "<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\">".img_previous($langs->trans("Previous"))."</a>\n";
+// Show navigation bar
+$nav = '<div class="navselectiondate inline-block nowraponall">';
+$nav .= "<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\">".img_previous($langs->trans("Previous"))."</a>\n";
 $nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y")."</span> \n";
 $nav .= "<a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\">".img_next($langs->trans("Next"))."</a>\n";
 if (empty($conf->dol_optimize_smallscreen)) {
-	$nav .= " &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
+	$nav .= " &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param.'" class="datenowlink">'.$langs->trans("Today")."</a>)";
 }
+$nav .= '</div>';
 
 $nav .= $form->selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0);
 $nav .= ' <button type="submit" class="liste_titre button_search" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index bd35fc16e7d..0ee3b6db4a1 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -363,13 +363,16 @@ $max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year, 'gmt'));
 $tmpday = $first_day;
 $picto = 'calendarweek';
 
-$nav = "<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\"><i class=\"fa fa-chevron-left\" title=\"".dol_escape_htmltag($langs->trans("Previous"))."\"></i></a> &nbsp; \n";
+// Show navigation bar
+$nav = '<div class="navselectiondate inline-block nowraponall">';
+$nav .= "<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\"><i class=\"fa fa-chevron-left\" title=\"".dol_escape_htmltag($langs->trans("Previous"))."\"></i></a> &nbsp; \n";
 $nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y").", ".$langs->trans("Week")." ".$week;
 $nav .= " </span>\n";
 $nav .= " &nbsp; <a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\"><i class=\"fa fa-chevron-right\" title=\"".dol_escape_htmltag($langs->trans("Next"))."\"></i></a>\n";
 if (empty($conf->dol_optimize_smallscreen)) {
-	$nav .= " &nbsp; <a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a> ";
+	$nav .= " &nbsp; <a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param.'" class="datenowlink">'.$langs->trans("Today").'</a> ';
 }
+$nav .= '</div>';
 $nav .= $form->selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0);
 $nav .= ' <button type="submit" class="liste_titre button_search" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';
 
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 0ba59834d71..061af67d2b5 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1432,6 +1432,9 @@ select.flat.selectlimit {
 .tablelistofcalendars {
 	margin-top: 25px !important;
 }
+.navselectiondate {
+	width: 250px;
+}
 
 /* Styles for amount on card */
 table.paymenttable td.amountpaymentcomplete, table.paymenttable td.amountremaintopay, table.paymenttable td.amountremaintopayback {
@@ -1604,6 +1607,7 @@ table[summary="list_of_modules"] .fa-cog {
 	.minwidth100 { min-width: 100px; }
 	.minwidth150 { min-width: 150px; }
 	.minwidth200 { min-width: 200px; }
+	.minwidth250 { min-width: 250px; }
 	.minwidth300 { min-width: 300px; }
 	.minwidth400 { min-width: 400px; }
 	.minwidth500 { min-width: 500px; }
@@ -1626,6 +1630,7 @@ table[summary="list_of_modules"] .fa-cog {
 .width125 { width: 125px; }
 .width150 { width: 150px; }
 .width200 { width: 200px; }
+.width250 { width: 250px; }
 .width300 { width: 300px; }
 .width400 { width: 400px; }
 .width500 { width: 500px; }
@@ -7532,6 +7537,14 @@ div.clipboardCPValue.hidewithsize {
 {
 	.imgopensurveywizard, .imgautosize { width:95%; height: auto; }
 
+	.fiche > .listactionsfilter .table-fiche-title .col-title .titre {
+		display: none;
+	}
+
+	.navselectiondate {
+		width: 220px;
+	}
+
 	#tooltip {
 		position: absolute;
 		width: <?php print dol_size(350, 'width'); ?>px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 39f6858570a..afc43936695 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1824,6 +1824,7 @@ tr.nobottom td {
 	.minwidth100 { min-width: 100px; }
 	.minwidth150 { min-width: 150px; }
 	.minwidth200 { min-width: 200px; }
+	.minwidth250 { min-width: 250px; }
 	.minwidth300 { min-width: 300px; }
 	.minwidth400 { min-width: 400px; }
 	.minwidth500 { min-width: 500px; }
@@ -1847,6 +1848,7 @@ tr.nobottom td {
 .width125 { width: 125px; }
 .width150 { width: 150px; }
 .width200 { width: 200px; }
+.width250 { width: 250px; }
 .width300 { width: 300px; }
 .width400 { width: 400px; }
 .width500 { width: 500px; }

From 8efb2e8f8867bf0aa2a207daa370667bdb4f6338 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 13 Jan 2023 19:44:35 +0100
Subject: [PATCH 538/816] Fix placeholder of status combo

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

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index ccda604d35d..6e0d90499d4 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -589,6 +589,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 	$moreforfilter .= '<div class="divsearchfield paddingtop paddingbottom valignmiddle inline-block">';
 	$moreforfilter .= $form->selectarray('search_nature', $arrayofnatures, dol_escape_htmltag($search_nature), $langs->trans('Origin'), 0, 0, '', 0, 0, 0, '', 'maxwidth250', 1);
 	$moreforfilter .= '</div>';
+
 	if (getDolGlobalInt('MAIN_FEATURES_LEVEL')) {
 		$array_version = array('stable'=>$langs->transnoentitiesnoconv("Stable"));
 		if ($conf->global->MAIN_FEATURES_LEVEL < 0) {
@@ -601,11 +602,12 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 			$array_version['development'] = $langs->trans("Development");
 		}
 		$moreforfilter .= '<div class="divsearchfield paddingtop paddingbottom valignmiddle inline-block">';
-		$moreforfilter .= $form->selectarray('search_version', $array_version, $search_version, $langs->trans('Version'), 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1);
+		$moreforfilter .= $form->selectarray('search_version', $array_version, $search_version, $langs->transnoentitiesnoconv('Version'), 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1);
 		$moreforfilter .= '</div>';
 	}
+	$array_status = array('active'=>$langs->transnoentitiesnoconv("Enabled"), 'disabled'=>$langs->transnoentitiesnoconv("Disabled"));
 	$moreforfilter .= '<div class="divsearchfield paddingtop paddingbottom valignmiddle inline-block">';
-	$moreforfilter .= $form->selectarray('search_status', array('active'=>$langs->transnoentitiesnoconv("Enabled"), 'disabled'=>$langs->transnoentitiesnoconv("Disabled")), $search_status, $langs->trans('Status'), 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1);
+	$moreforfilter .= $form->selectarray('search_status', $array_status, $search_status, $langs->transnoentitiesnoconv('Status'), 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1);
 	$moreforfilter .= '</div>';
 	$moreforfilter .= ' ';
 	$moreforfilter .= '<div class="divsearchfield valignmiddle inline-block">';

From 00415dfe54a9fe505ef89ebc5846aca2461aa3a9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 13 Jan 2023 19:53:31 +0100
Subject: [PATCH 539/816] css

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

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 061af67d2b5..bef2e6e7800 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -2012,11 +2012,12 @@ td.showDragHandle {
 	z-index: 1005;
 }
 <?php } ?>
-<?php if (!empty($conf->global->THEME_DARKMODEENABLED)) {  ?>
-.side-nav-vert {
-	border-bottom: 1px solid #888;
+
+@media screen and (prefers-color-scheme: dark) {
+	.side-nav-vert {
+		border-bottom: 1px solid #888;
+	}
 }
-<?php } ?>
 
 .side-nav {
 	/*display: block;

From 1bd63b36d305f59a81b067e48387c003f8891022 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 13 Jan 2023 19:57:14 +0100
Subject: [PATCH 540/816] Trans

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

diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index e022c7cb09f..7200ffb3d70 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -312,8 +312,8 @@ CustomerRelativeDiscountShort=Relative discount
 CustomerAbsoluteDiscountShort=Absolute discount
 CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
 CompanyHasNoRelativeDiscount=This customer has no relative discount by default
-HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this vendor
-HasNoRelativeDiscountFromSupplier=No default relative discount from this vendor
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> with this vendor
+HasNoRelativeDiscountFromSupplier=No default relative discount with this vendor
 CompanyHasAbsoluteDiscount=This customer has discounts available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discounts available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s

From 317b49917aa7192abc9ae375f807e96731f95292 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20NASSIET?= <sebastien.nassiet@comaite.com>
Date: Fri, 13 Jan 2023 23:06:44 +0100
Subject: [PATCH 541/816] correctif hook

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

diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index da8eebacaac..136da34e1bd 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -219,13 +219,12 @@ if (isModEnabled('ticket')) {
 $reshook = $hookmanager->executeHooks('addToLandingPageList', $tmparray, $object);
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-} elseif ($reshook === 0) {
-	if (count($hookmanager->resArray)!==0) {
-		$tmparray=$hookmanager->resArray;
-	}
+} elseif ($reshook > 0) {
+	$tmparray=$hookmanager->resArray;
+} elseif ($reshook == 0) {
+	$tmparray=array_merge($tmparray, $hookmanager->resArray);
 }
 
-
 $head = user_prepare_head($object);
 
 $title = $langs->trans("User");

From b11a6a1741b53a8283fdb25eea4fe47cf2d64d06 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 14 Jan 2023 02:22:52 +0100
Subject: [PATCH 542/816] Fix link to download a file must contains
 &output=file

---
 htdocs/hrm/skill_tab.php        |  5 ++++-
 htdocs/user/agenda_extsites.php |  5 ++++-
 htdocs/user/bank.php            |  5 ++++-
 htdocs/user/card.php            |  2 +-
 htdocs/user/clicktodial.php     |  5 ++++-
 htdocs/user/document.php        |  5 ++++-
 htdocs/user/info.php            |  5 ++++-
 htdocs/user/note.php            |  5 ++++-
 htdocs/user/notify/card.php     |  5 ++++-
 htdocs/user/param_ihm.php       |  5 ++++-
 htdocs/user/perms.php           |  5 ++++-
 htdocs/user/virtualcard.php     | 11 ++++-------
 12 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/htdocs/hrm/skill_tab.php b/htdocs/hrm/skill_tab.php
index b30484de54f..ce238b6caf4 100644
--- a/htdocs/hrm/skill_tab.php
+++ b/htdocs/hrm/skill_tab.php
@@ -226,10 +226,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	} else {
 		$linkback = '<a href="' . $listLink . '?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
-		$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid">';
+		$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file" class="refid">';
 		$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 		$morehtmlref .= '</a>';
 
+		$urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id);
+		$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->trans("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
+
 		dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref, '&objecttype='.$objecttype);
 	}
 
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index 4891480cc2d..13948dc841e 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -170,10 +170,13 @@ 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>';
 }
 
-$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid">';
+$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file" class="refid">';
 $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 $morehtmlref .= '</a>';
 
+$urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id);
+$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->trans("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
+
 dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin, 'rowid', 'ref', $morehtmlref);
 
 
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index fb795ecc6e4..3d94d23f682 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -350,10 +350,13 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 	}
 
-	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid">';
+	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file" class="refid">';
 	$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 	$morehtmlref .= '</a>';
 
+	$urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id);
+	$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->trans("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
+
 	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin, 'rowid', 'ref', $morehtmlref);
 
 	print '<div class="fichecenter"><div class="fichehalfleft">';
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index e7d001b1041..0d0c3e9f8dc 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1432,7 +1432,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 		if ($action != 'edit') {
 			print dol_get_fiche_head($head, 'user', $title, -1, 'user');
 
-			$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid" rel="noopener">';
+			$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file" class="refid" rel="noopener">';
 			$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard").' ('.$langs->trans("AddToContacts").')', 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 			$morehtmlref .= '</a>';
 
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index 562ab081ab8..985bf978074 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -106,10 +106,13 @@ if ($id > 0) {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 	}
 
-	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid">';
+	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file" class="refid">';
 	$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 	$morehtmlref .= '</a>';
 
+	$urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id);
+	$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->trans("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
+
 	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin, 'rowid', 'ref', $morehtmlref);
 
 	print '<div class="fichecenter">';
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index b607cff7f3e..1a18cde92cc 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -152,10 +152,13 @@ if ($object->id) {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 	}
 
-	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid">';
+	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file" class="refid">';
 	$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 	$morehtmlref .= '</a>';
 
+	$urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id);
+	$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->trans("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
+
 	dol_banner_tab($object, 'id', $linkback, $user->hasRight("user", "user", "read") || $user->admin, 'rowid', 'ref', $morehtmlref);
 
 	print '<div class="fichecenter">';
diff --git a/htdocs/user/info.php b/htdocs/user/info.php
index 3f5d1aea604..4a49fddf5c2 100644
--- a/htdocs/user/info.php
+++ b/htdocs/user/info.php
@@ -80,10 +80,13 @@ 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>';
 }
 
-$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid">';
+$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file" class="refid">';
 $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 $morehtmlref .= '</a>';
 
+$urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id);
+$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->trans("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
+
 dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin, 'rowid', 'ref', $morehtmlref);
 
 
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index 4b64a15d217..d189226d575 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -94,10 +94,13 @@ if ($id) {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 	}
 
-	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid">';
+	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file" class="refid">';
 	$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 	$morehtmlref .= '</a>';
 
+	$urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id);
+	$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->trans("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
+
 	dol_banner_tab($object, 'id', $linkback, $user->hasRight("user", "user", "read") || $user->admin, 'rowid', 'ref', $morehtmlref);
 
 	print '<div class="underbanner clearboth"></div>';
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index e20d7be3d9a..e0c01ba5d58 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -155,10 +155,13 @@ if ($result > 0) {
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid">';
+	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file" class="refid">';
 	$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 	$morehtmlref .= '</a>';
 
+	$urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id);
+	$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->trans("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
+
 	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin, 'rowid', 'ref', $morehtmlref, '', 0, '', '', 0, '');
 
 	print '<div class="fichecenter">';
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 3d2e3240ce3..b4a03fa700e 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -343,10 +343,13 @@ if ($action == 'edit') {
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid">';
+	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file" class="refid">';
 	$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 	$morehtmlref .= '</a>';
 
+	$urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id);
+	$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->trans("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
+
 	dol_banner_tab($object, 'id', $linkback, $user->hasRight("user", "user", "read") || $user->admin, 'rowid', 'ref', $morehtmlref);
 
 	print '<div class="fichecenter">';
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index a65762b6183..22acb8ca7d9 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -255,10 +255,13 @@ 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>';
 }
 
-$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid">';
+$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file" class="refid">';
 $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 $morehtmlref .= '</a>';
 
+$urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id);
+$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->trans("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
+
 dol_banner_tab($object, 'id', $linkback, $user->hasRight("user", "user", "read") || $user->admin, 'rowid', 'ref', $morehtmlref);
 
 
diff --git a/htdocs/user/virtualcard.php b/htdocs/user/virtualcard.php
index c2de7e17b06..ed3fbf7beb3 100644
--- a/htdocs/user/virtualcard.php
+++ b/htdocs/user/virtualcard.php
@@ -114,10 +114,13 @@ 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>';
 }
 
-$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid">';
+$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file" class="refid">';
 $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 $morehtmlref .= '</a>';
 
+$urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id);
+$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->trans("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
+
 //dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin, 'rowid', 'ref', $morehtmlref);
 
 
@@ -126,12 +129,6 @@ print '<div class="fichecenter">';
 print '<br>';
 
 /*
- print '<span class="opacitymedium">'.$langs->trans("VCard").'</span><br>';
-
-print '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid" rel="noopener">';
-print img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
-print '</a>';
-
 
 print '<hr>';
 //print '<div class="underbanner clearboth"></div>';

From b4702aee2454c75e6ef442a8fa34fa71cf138717 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 14 Jan 2023 02:31:53 +0100
Subject: [PATCH 543/816] Fix warning

---
 htdocs/core/class/vcard.class.php | 4 ++--
 htdocs/user/card.php              | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php
index 0e9372360e6..e7eb318e476 100644
--- a/htdocs/core/class/vcard.class.php
+++ b/htdocs/core/class/vcard.class.php
@@ -465,9 +465,9 @@ class vCard
 			$this->setTitle($object->job);
 		}
 
-		// For user, type=home
+		// For user, $object->url is not defined
 		// For contact, $object->url is not defined
-		if ($object->url) {
+		if (!empty($object->url)) {
 			$this->setURL($object->url, "");
 		}
 
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 0d0c3e9f8dc..2e2534621b1 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -2464,6 +2464,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 
 			// Country
 			print '<tr><td>'.$form->editfieldkey('Country', 'selectcounty_id', '', $object, 0).'</td><td>';
+			print img_picto('', 'country', 'class="pictofixedwidth"');
 			if ($caneditfield) {
 				print $form->select_country((GETPOST('country_id') != '' ?GETPOST('country_id') : $object->country_id), 'country_id');
 				if ($user->admin) {

From 09a0d579cebac0d7ee231856ffc42df2a5d1d90f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 14 Jan 2023 02:40:44 +0100
Subject: [PATCH 544/816] Fix delete group of a user

---
 htdocs/user/card.php             | 1 +
 htdocs/user/class/user.class.php | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 2e2534621b1..e995fc03001 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -375,6 +375,7 @@ if (empty($reshook)) {
 			$editgroup->oldcopy = clone $editgroup;
 
 			$object->fetch($id);
+
 			if ($action == 'addgroup') {
 				$result = $object->SetInGroup($group, $editgroup->entity);
 			}
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 65a7b7d7842..9e208ff3e37 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2651,7 +2651,11 @@ class User extends CommonObject
 		$sql = "DELETE FROM ".$this->db->prefix()."usergroup_user";
 		$sql .= " WHERE fk_user  = ".((int) $this->id);
 		$sql .= " AND fk_usergroup = ".((int) $group);
-		$sql .= " AND entity = ".((int) $entity);
+		if (empty($entity)) {
+			$sql .= " AND entity IN (0, 1)";	// group may be in entity 0 (so $entity=0) and link with user into entity 1.
+		} else {
+			$sql .= " AND entity = ".((int) $entity);
+		}
 
 		$result = $this->db->query($sql);
 		if ($result) {

From 0afcec9f43ddf8e196ecb7f437ba575dac4ca43e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 14 Jan 2023 02:51:58 +0100
Subject: [PATCH 545/816] Clean code

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index b2c76218a5d..9fec72e2e86 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -3208,7 +3208,6 @@ function printSearchForm($urlaction, $urlobject, $title, $htmlmorecss, $htmlinpu
 	$ret = '';
 	$ret .= '<form action="'.$urlaction.'" method="post" class="searchform nowraponall tagtr">';
 	$ret .= '<input type="hidden" name="token" value="'.newToken().'">';
-	$ret .= '<input type="hidden" name="mode" value="search">';
 	$ret .= '<input type="hidden" name="savelogin" value="'.dol_escape_htmltag($user->login).'">';
 	if ($showtitlebefore) {
 		$ret .= '<div class="tagtd left">'.$title.'</div> ';

From 704191b4d8bd3238cc29e2ab07f84e0f5d88e128 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 14 Jan 2023 03:06:27 +0100
Subject: [PATCH 546/816] Try to fix name of download file

---
 htdocs/user/card.php  | 2 +-
 htdocs/user/vcard.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index e995fc03001..9ea05b69805 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1433,7 +1433,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 		if ($action != 'edit') {
 			print dol_get_fiche_head($head, 'user', $title, -1, 'user');
 
-			$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file" class="refid" rel="noopener">';
+			$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file&file='.urlencode($object->getFullName($langs).'.vcf').'" class="refid" rel="noopener">';
 			$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard").' ('.$langs->trans("AddToContacts").')', 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 			$morehtmlref .= '</a>';
 
diff --git a/htdocs/user/vcard.php b/htdocs/user/vcard.php
index 576d2b90a5b..695cd0e556e 100644
--- a/htdocs/user/vcard.php
+++ b/htdocs/user/vcard.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004      	Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010 	Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2023 	Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 	Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2020		Tobias Sekan		<tobias.sekan@startmail.com>
  * Copyright (C) 2021-2022 	Anthony Berton		<anthony.berton@bb2a.fr>

From 35eeb4a3c0e840f11f25eefb213d8f574ecafe33 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 14 Jan 2023 03:15:46 +0100
Subject: [PATCH 547/816] Fix download link

---
 htdocs/hrm/skill_tab.php        | 2 +-
 htdocs/user/agenda_extsites.php | 2 +-
 htdocs/user/bank.php            | 2 +-
 htdocs/user/card.php            | 2 +-
 htdocs/user/clicktodial.php     | 2 +-
 htdocs/user/document.php        | 2 +-
 htdocs/user/info.php            | 2 +-
 htdocs/user/note.php            | 2 +-
 htdocs/user/notify/card.php     | 2 +-
 htdocs/user/param_ihm.php       | 2 +-
 htdocs/user/perms.php           | 2 +-
 htdocs/user/virtualcard.php     | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/hrm/skill_tab.php b/htdocs/hrm/skill_tab.php
index ce238b6caf4..705b4fc200e 100644
--- a/htdocs/hrm/skill_tab.php
+++ b/htdocs/hrm/skill_tab.php
@@ -226,7 +226,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	} else {
 		$linkback = '<a href="' . $listLink . '?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
-		$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file" class="refid">';
+		$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file&file='.urlencode(dol_sanitizeFileName($object->getFullName($langs).'.vcf')).'" class="refid" rel="noopener">';
 		$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 		$morehtmlref .= '</a>';
 
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index 13948dc841e..3b9ebd007f6 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -170,7 +170,7 @@ 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>';
 }
 
-$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file" class="refid">';
+$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file&file='.urlencode(dol_sanitizeFileName($object->getFullName($langs).'.vcf')).'" class="refid" rel="noopener">';
 $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 $morehtmlref .= '</a>';
 
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 3d94d23f682..7040add3950 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -350,7 +350,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 	}
 
-	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file" class="refid">';
+	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file&file='.urlencode(dol_sanitizeFileName($object->getFullName($langs).'.vcf')).'" class="refid" rel="noopener">';
 	$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 	$morehtmlref .= '</a>';
 
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 9ea05b69805..67ea2174322 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1433,7 +1433,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 		if ($action != 'edit') {
 			print dol_get_fiche_head($head, 'user', $title, -1, 'user');
 
-			$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file&file='.urlencode($object->getFullName($langs).'.vcf').'" class="refid" rel="noopener">';
+			$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file&file='.urlencode(dol_sanitizeFileName($object->getFullName($langs).'.vcf')).'" class="refid" rel="noopener" rel="noopener">';
 			$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard").' ('.$langs->trans("AddToContacts").')', 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 			$morehtmlref .= '</a>';
 
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index 985bf978074..d2f9452bac5 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -106,7 +106,7 @@ if ($id > 0) {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 	}
 
-	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file" class="refid">';
+	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file&file='.urlencode(dol_sanitizeFileName($object->getFullName($langs).'.vcf')).'" class="refid" rel="noopener">';
 	$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 	$morehtmlref .= '</a>';
 
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 1a18cde92cc..f99eb9982a2 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -152,7 +152,7 @@ if ($object->id) {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 	}
 
-	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file" class="refid">';
+	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file&file='.urlencode(dol_sanitizeFileName($object->getFullName($langs).'.vcf')).'" class="refid" rel="noopener">';
 	$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 	$morehtmlref .= '</a>';
 
diff --git a/htdocs/user/info.php b/htdocs/user/info.php
index 4a49fddf5c2..7804579edd5 100644
--- a/htdocs/user/info.php
+++ b/htdocs/user/info.php
@@ -80,7 +80,7 @@ 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>';
 }
 
-$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file" class="refid">';
+$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file&file='.urlencode(dol_sanitizeFileName($object->getFullName($langs).'.vcf')).'" class="refid" rel="noopener">';
 $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 $morehtmlref .= '</a>';
 
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index d189226d575..b3ee9398374 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -94,7 +94,7 @@ if ($id) {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 	}
 
-	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file" class="refid">';
+	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file&file='.urlencode(dol_sanitizeFileName($object->getFullName($langs).'.vcf')).'" class="refid" rel="noopener">';
 	$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 	$morehtmlref .= '</a>';
 
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index e0c01ba5d58..e63269d5fa6 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -155,7 +155,7 @@ if ($result > 0) {
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file" class="refid">';
+	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file&file='.urlencode(dol_sanitizeFileName($object->getFullName($langs).'.vcf')).'" class="refid" rel="noopener">';
 	$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 	$morehtmlref .= '</a>';
 
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index b4a03fa700e..ee0f1d13914 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -343,7 +343,7 @@ if ($action == 'edit') {
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file" class="refid">';
+	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file&file='.urlencode(dol_sanitizeFileName($object->getFullName($langs).'.vcf')).'" class="refid" rel="noopener">';
 	$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 	$morehtmlref .= '</a>';
 
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 22acb8ca7d9..23265513730 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -255,7 +255,7 @@ 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>';
 }
 
-$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file" class="refid">';
+$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file&file='.urlencode(dol_sanitizeFileName($object->getFullName($langs).'.vcf')).'" class="refid" rel="noopener">';
 $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 $morehtmlref .= '</a>';
 
diff --git a/htdocs/user/virtualcard.php b/htdocs/user/virtualcard.php
index ed3fbf7beb3..7e13950747c 100644
--- a/htdocs/user/virtualcard.php
+++ b/htdocs/user/virtualcard.php
@@ -114,7 +114,7 @@ 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>';
 }
 
-$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file" class="refid">';
+$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file&file='.urlencode(dol_sanitizeFileName($object->getFullName($langs).'.vcf')).'" class="refid" rel="noopener">';
 $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 $morehtmlref .= '</a>';
 

From 79ecc945e9b1351b0364f64a9eb8cfe5780ab2bc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 14 Jan 2023 11:43:47 +0100
Subject: [PATCH 548/816] Fix warning

---
 htdocs/bookmarks/list.php                       |  1 +
 htdocs/core/menus/standard/eldy_menu.php        |  2 +-
 htdocs/core/search_page.php                     |  4 ++--
 htdocs/modulebuilder/template/myobject_list.php | 10 +++++-----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 9434cf031a2..2500d40e25d 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -37,6 +37,7 @@ $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'bookmarklist'; // To manage different context of search
 $id = GETPOST("id", 'int');
 $optioncss = GETPOST('optioncss', 'alpha');
+$mode = GETPOST('mode', 'aZ09');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index bbcd0cacf25..596e1e4cc3f 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -204,7 +204,7 @@ class MenuManager
 					//if ($tmpmainmenu=='accountancy') {
 					//var_dump($submenu->liste); exit;
 					//}
-					$nexturl = dol_buildpath($submenu->liste[0]['url'], 1);
+					$nexturl = dol_buildpath(empty($submenu->liste[0]['url']) ? '' : $submenu->liste[0]['url'], 1);
 
 					$canonrelurl = preg_replace('/\?.*$/', '', $relurl);
 					$canonnexturl = preg_replace('/\?.*$/', '', $nexturl);
diff --git a/htdocs/core/search_page.php b/htdocs/core/search_page.php
index 4f6911497e4..2e5cad17c58 100644
--- a/htdocs/core/search_page.php
+++ b/htdocs/core/search_page.php
@@ -109,8 +109,8 @@ if ($conf->use_javascript_ajax && 1 == 2) {   // select2 is not best with smartp
 		$keysearch = 'search_all';
 
 		$accesskey = '';
-		if (!$accesskeyalreadyassigned[$val['label'][0]]) {
-			$accesskey = $val['label'][0];
+		if (empty($accesskeyalreadyassigned[$val['label'][0]])) {
+			$accesskey = $val['label'][0];	// First char of string
 			$accesskeyalreadyassigned[$accesskey] = $accesskey;
 		}
 
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 29c9205b1f0..1135f6d9498 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -87,7 +87,7 @@ require_once __DIR__.'/class/myobject.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("mymodule@mymodule", "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 'create'/'add', 'edit'/'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
 $show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
@@ -96,7 +96,7 @@ $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
-$mode       = GETPOST('mode', 'aZ');
+$mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
@@ -182,9 +182,9 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 // Set $enablepermissioncheck to 1 to enable a minimum low level of checks
 $enablepermissioncheck = 0;
 if ($enablepermissioncheck) {
-	$permissiontoread = $user->rights->mymodule->myobject->read;
-	$permissiontoadd = $user->rights->mymodule->myobject->write;
-	$permissiontodelete = $user->rights->mymodule->myobject->delete;
+	$permissiontoread = $user->hasRight('mymodule', 'myobject', 'read');
+	$permissiontoadd = $user->hasRight('mymodule', 'myobject', 'write');
+	$permissiontodelete = $user->hasRight('mymodule', 'myobject', 'delete');
 } else {
 	$permissiontoread = 1;
 	$permissiontoadd = 1;

From b7c56f5680c74a33809b9999a1ad02d1742c447b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 14 Jan 2023 11:54:05 +0100
Subject: [PATCH 549/816] Fix warning

---
 htdocs/bookmarks/card.php |  8 +++++---
 htdocs/bookmarks/list.php | 10 ++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index 5b22b8918d9..245161ed253 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -188,7 +188,8 @@ if ($action == 'create') {
 
 	// Visibility / Owner
 	print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
-	print img_picto('', 'user').' '.$form->select_dolusers(GETPOSTISSET('userid') ? GETPOST('userid', 'int') : $user->id, 'userid', 0, '', 0, ($user->admin ? '' : array($user->id)), '', 0, 0, 0, '', ($user->admin) ? 1 : 0, '', 'maxwidth300 widthcentpercentminusx');
+	print img_picto('', 'user', 'class="pictofixedwidth"');
+	print $form->select_dolusers(GETPOSTISSET('userid') ? GETPOST('userid', 'int') : $user->id, 'userid', 0, '', 0, ($user->admin ? '' : array($user->id)), '', 0, 0, 0, '', ($user->admin) ? 1 : 0, '', 'maxwidth300 widthcentpercentminusx');
 	print '</td><td class="hideonsmartphone"></td></tr>';
 
 	// Position
@@ -282,12 +283,13 @@ if ($id > 0 && !preg_match('/^add/i', $action)) {
 	// Visibility / owner
 	print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
 	if ($action == 'edit' && $user->admin) {
-		print img_picto('', 'user').' '.$form->select_dolusers(GETPOSTISSET('userid') ? GETPOST('userid', 'int') : ($object->fk_user ? $object->fk_user : ''), 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300 widthcentpercentminusx');
+		print img_picto('', 'user', 'class="pictofixedwidth"');
+		print $form->select_dolusers(GETPOSTISSET('userid') ? GETPOST('userid', 'int') : ($object->fk_user ? $object->fk_user : ''), 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300 widthcentpercentminusx');
 	} else {
 		if ($object->fk_user > 0) {
 			$fuser = new User($db);
 			$fuser->fetch($object->fk_user);
-			print $fuser->getNomUrl(1);
+			print $fuser->getNomUrl(-1);
 		} else {
 			print '<span class="opacitymedium">'.$langs->trans("Everybody").'</span>';
 		}
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 2500d40e25d..2adef615a70 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -212,8 +212,6 @@ print_liste_field_titre("Position", $_SERVER["PHP_SELF"], "b.position", "", $par
 print_liste_field_titre('');
 print "</tr>\n";
 
-$cacheOfUsers = array();
-
 $i = 0;
 while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($resql);
@@ -268,13 +266,13 @@ while ($i < min($num, $limit)) {
 	// Author
 	print '<td class="center">';
 	if ($obj->fk_user) {
-		if (empty($cacheOfUsers[$obj->fk_user])) {
+		if (empty($conf->cache['users'][$obj->fk_user])) {
 			$tmpuser = new User($db);
 			$tmpuser->fetch($obj->fk_user);
-			$cacheOfUsers[$obj->fk_user] = $tmpuser;
+			$conf->cache['users'][$obj->fk_user] = $tmpuser;
 		}
-		$tmpuser = $cacheOfUsers[$obj->fk_user];
-		print $tmpuser->getNomUrl(1);
+		$tmpuser = $conf->cache['users'][$obj->fk_user];
+		print $tmpuser->getNomUrl(-1);
 	} else {
 		print '<span class="opacitymedium">'.$langs->trans("Everybody").'</span>';
 		if (!$user->admin) {

From e4515f01c04763794b3789e5fadcfcf16bf81b9d Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sat, 14 Jan 2023 11:56:41 +0100
Subject: [PATCH 550/816] Fix php 8 warnings

---
 htdocs/core/lib/ticket.lib.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index 5d0d691228e..2c218421543 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -91,7 +91,7 @@ function ticket_prepare_head($object)
 	$head[$h][2] = 'tabTicket';
 	$h++;
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && empty($user->socid) && isModEnabled("societe")) {
+	if (!getDolGlobalInt('MAIN_DISABLE_CONTACTS_TAB') && empty($user->socid) && isModEnabled("societe")) {
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][0] = DOL_URL_ROOT.'/ticket/contact.php?track_id='.$object->track_id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
@@ -166,7 +166,7 @@ function showDirectPublicLink($object)
 	}
 
 	$out = '';
-	if (empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) {
+	if (!getDolGlobalInt('TICKET_ENABLE_PUBLIC_INTERFACE')) {
 		$langs->load('errors');
 		$out .= '<span class="opacitymedium">'.$langs->trans("ErrorPublicInterfaceNotEnabled").'</span>';
 	} else {
@@ -223,9 +223,9 @@ function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $
 	print '<div class="center">';
 
 	// Define urllogo
-	if (!empty($conf->global->TICKET_SHOW_COMPANY_LOGO) || !empty($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC)) {
+	if (getDolGlobalInt('TICKET_SHOW_COMPANY_LOGO') || getDolGlobalString('TICKET_PUBLIC_INTERFACE_TOPIC')) {
 		// Print logo
-		if (!empty($conf->global->TICKET_SHOW_COMPANY_LOGO)) {
+		if (getDolGlobalInt('TICKET_SHOW_COMPANY_LOGO')) {
 			$urllogo = DOL_URL_ROOT.'/theme/common/login_logo.png';
 
 			if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
@@ -239,28 +239,28 @@ function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $
 	}
 
 	// Output html code for logo
-	if ($urllogo || !empty($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC)) {
+	if ($urllogo || getDolGlobalInt('TICKET_PUBLIC_INTERFACE_TOPIC')) {
 		print '<div class="backgreypublicpayment">';
 		print '<div class="logopublicpayment">';
 		if ($urllogo) {
-			print '<a href="'.($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE : dol_buildpath('/public/ticket/index.php?entity='.$conf->entity, 1)).'">';
+			print '<a href="'.(getDolGlobalInt('TICKET_URL_PUBLIC_INTERFACE') ? getDolGlobalInt('TICKET_URL_PUBLIC_INTERFACE') : dol_buildpath('/public/ticket/index.php?entity='.$conf->entity, 1)).'">';
 			print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
 			print '>';
 			print '</a>';
 		}
-		if (!empty($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC)) {
-			print '<div class="clearboth"></div><strong>'.($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC ? $conf->global->TICKET_PUBLIC_INTERFACE_TOPIC : $langs->trans("TicketSystem")).'</strong>';
+		if (getDolGlobalInt('TICKET_PUBLIC_INTERFACE_TOPIC')) {
+			print '<div class="clearboth"></div><strong>'.(getDolGlobalString('TICKET_PUBLIC_INTERFACE_TOPIC') ? getDolGlobalString('TICKET_PUBLIC_INTERFACE_TOPIC') : $langs->trans("TicketSystem")).'</strong>';
 		}
 		print '</div>';
-		if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+		if (!getDolGlobalInt('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 src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 		}
 		print '</div>';
 	}
 
-	if (!empty($conf->global->TICKET_IMAGE_PUBLIC_INTERFACE)) {
+	if (getDolGlobalInt('TICKET_IMAGE_PUBLIC_INTERFACE')) {
 		print '<div class="backimagepublicticket">';
-		print '<img id="idTICKET_IMAGE_PUBLIC_INTERFACE" src="'.$conf->global->TICKET_IMAGE_PUBLIC_INTERFACE.'">';
+		print '<img id="idTICKET_IMAGE_PUBLIC_INTERFACE" src="'.getDolGlobalString('TICKET_IMAGE_PUBLIC_INTERFACE').'">';
 		print '</div>';
 	}
 

From 236b3aa9e89d2049c186d16d79f0612be21a7476 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 14 Jan 2023 12:28:44 +0100
Subject: [PATCH 551/816] Revert default type of hooks. Default is now
 'addreplace' hooks (and exception become 'output' hooks, that become
 deprecated).

---
 ChangeLog                                     |   5 +-
 htdocs/core/class/hookmanager.class.php       | 116 ++++++------------
 htdocs/document.php                           |   5 +-
 htdocs/main.inc.php                           |   6 +-
 htdocs/mrp/index.php                          |   3 +-
 .../variants/class/ProductAttribute.class.php |   2 +-
 .../productattributevalueline_edit.tpl.php    |   2 +-
 htdocs/webhook/target_card.php                |   4 +-
 8 files changed, 54 insertions(+), 89 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3f30b2a2f99..1a3e96b18ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,8 +11,9 @@ NEW: PHP 8.2 compatibility:
 WARNING:
 
 Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
-* The deprecated method escapeunderscore() of database handlers has been removed. You must use escapeforlike instead.
-* The method nb_expedition() has been renamed into countNbOfShipments() 
+* The deprecated method "escapeunderscore()" of database handlers has been removed. You must use "escapeforlike()" instead.
+* The method "nb_expedition()" has been renamed into "countNbOfShipments()" 
+* Revert default type of hooks. Default is now 'addreplace' hooks (and exception become 'output' hooks, that become deprecated).
 
 
 
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 0659240c8c7..7a6af7b88ec 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -162,84 +162,44 @@ class HookManager
 		//dol_syslog(get_class($this).'::executeHooks method='.$method." action=".$action." context=".$parameters['context']);
 
 		// Define type of hook ('output' or 'addreplace').
-		// TODO Remove hooks with type 'output' (exemple getNomUrl). All hooks must be converted into 'addreplace' hooks.
-		$hooktype = 'output';
-		if (in_array(
-			$method,
-			array(
-				'addCalendarChoice',
-				'addCalendarView',
-				'addMoreActionsButtons',
-				'addMoreMassActions',
-				'addSearchEntry',
-				'addStatisticLine',
-				'addSectionECMAuto',
-				'checkSecureAccess',
-				'createDictionaryFieldlist',
-				'editDictionaryFieldlist',
-				'getFormMail',
-				'deleteFile',
-				'doActions',
-				'doMassActions',
-				'formatEvent',
-				'formConfirm',
-				'formCreateThirdpartyOptions',
-				'formObjectOptions',
-				'formattachOptions',
-				'formBuilddocLineOptions',
-				'formatNotificationMessage',
-				'formConfirm',
-				'getAccessForbiddenMessage',
-				'getDirList',
-				'hookGetEntity',
-				'getFormMail',
-				'getFormatedCustomerRef',
-				'getFormatedSupplierRef',
-				'getIdProfUrl',
-				'getInputIdProf',
-				'isPaymentOK',
-				'llxFooter',
-				'menuDropdownQuickaddItems',
-				'menuLeftMenuItems',
-				'moveUploadedFile',
-				'moreHtmlStatus',
-				'pdf_build_address',
-				'pdf_writelinedesc',
-				'pdf_getlinenum',
-				'pdf_getlineref',
-				'pdf_getlineref_supplier',
-				'pdf_getlinevatrate',
-				'pdf_getlineupexcltax',
-				'pdf_getlineupwithtax',
-				'pdf_getlineqty',
-				'pdf_getlineqty_asked',
-				'pdf_getlineqty_shipped',
-				'pdf_getlineqty_keeptoship',
-				'pdf_getlineunit',
-				'pdf_getlineremisepercent',
-				'pdf_getlineprogress',
-				'pdf_getlinetotalexcltax',
-				'pdf_getlinetotalwithtax',
-				'paymentsupplierinvoices',
-				'printAddress',
-				'printEmail',
-				'printSearchForm',
-				'printTabsHead',
-				'printObjectLine',
-				'printObjectSubLine',
-				'restrictedArea',
-				'sendMail',
-				'sendMailAfter',
-				'showOptionals',
-				'showLinkToObjectBlock',
-				'setContentSecurityPolicy',
-				'setHtmlTitle',
-				'completeTabsHead',
-				'formDolBanner',
-				'displayMarginInfos',
-				)
-		)) {
-			$hooktype = 'addreplace';
+		$hooktype = 'addreplace';
+		// TODO Remove hooks with type 'output' (exemple createFrom). All hooks must be converted into 'addreplace' hooks.
+		if (!in_array($method, array(
+			'createFrom',
+			'dashboardMembers',
+			'dashboardEmailings',
+			'dashboardPropals',
+			'dashboardPropals',
+			'dashboardCommercials',
+			'dashboardOrders',
+			'dashboardSpecialBills',
+			'dashboardAccountancy',
+			'dashboardContracts',
+			'dashboardDonation',
+			'dashboardWarehouseSendings',
+			'dashboardExpenseReport',
+			'dashboardInterventions',
+			'dashboardOrdersSuppliers',
+			'dashboardHRM',
+			'dashboardMRP',
+			'dashboardOpensurvey',
+			'dashboardWarehouse',
+			'dashboardProductServices',
+			'dashboardActivities',
+			'dashboardProjects',
+			'dashboardWarehouseReceptions',
+			'dashboardThirdparties',
+			'dashboardSupplierProposal',
+			'dashboardTickets',
+			'dashboardUsersGroups',
+			'insertExtraHeader',
+			'insertExtraFooter',
+			'printLeftBlock',
+			'formAddObjectLine',
+			'formBuilddocOption',
+			'showSocinfoOnPrint'
+		))) {
+			$hooktype = 'output';
 		}
 
 		// Init return properties
diff --git a/htdocs/document.php b/htdocs/document.php
index 4f6652fafda..eccf49de0be 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -286,9 +286,10 @@ $hookmanager->initHooks(array('document'));
 $parameters = array('ecmfile' => $ecmfile, 'modulepart' => $modulepart, 'original_file' => $original_file,
 	'entity' => $entity, 'refname' => $refname, 'fullpath_original_file' => $fullpath_original_file,
 	'filename' => $filename, 'fullpath_original_file_osencoded' => $fullpath_original_file_osencoded);
-$reshook = $hookmanager->executeHooks('downloadDocument', $parameters); // Note that $action and $object may have been
+$object = new stdClass();
+$reshook = $hookmanager->executeHooks('downloadDocument', $parameters, $object, $action); // Note that $action and $object may have been
 if ($reshook < 0) {
-	$errors = $hookmanager->error.(is_array($hookmanager->errors) ? (!empty($hookmanager->error) ? ', ' : '').join($separator, $hookmanager->errors) : '');
+	$errors = $hookmanager->error.(is_array($hookmanager->errors) ? (!empty($hookmanager->error) ? ', ' : '').join(', ', $hookmanager->errors) : '');
 	dol_syslog("document.php - Errors when executing the hook 'downloadDocument' : ".$errors);
 	print "ErrorDownloadDocumentHooks: ".$errors;
 	exit;
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 9fec72e2e86..549c72157a6 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2603,11 +2603,11 @@ function printDropdownQuickadd()
 	$parameters = array();
 	$hook_items = $items;
 	$reshook = $hookmanager->executeHooks('menuDropdownQuickaddItems', $parameters, $hook_items); // Note that $action and $object may have been modified by some hooks
-	if (is_numeric($reshook) && !empty($hookmanager->results) && is_array($hookmanager->results)) {
+	if (is_numeric($reshook) && !empty($hookmanager->resArray) && is_array($hookmanager->resArray)) {
 		if ($reshook == 0) {
-			$items['items'] = array_merge($items['items'], $hookmanager->results); // add
+			$items['items'] = array_merge($items['items'], $hookmanager->resArray); // add
 		} else {
-			$items = $hookmanager->results; // replace
+			$items = $hookmanager->resArray; // replace
 		}
 
 		// Sort menu items by 'position' value
diff --git a/htdocs/mrp/index.php b/htdocs/mrp/index.php
index d7929ce1422..835a06cc7c6 100644
--- a/htdocs/mrp/index.php
+++ b/htdocs/mrp/index.php
@@ -249,11 +249,12 @@ if ($resql) {
 
 print '</div></div>';
 
+$object = new stdClass();
 $parameters = array(
 	//'type' => $type,
 	'user' => $user,
 );
-$reshook = $hookmanager->executeHooks('dashboardMRP', $parameters);
+$reshook = $hookmanager->executeHooks('dashboardMRP', $parameters, $object);
 
 // End of page
 llxFooter();
diff --git a/htdocs/variants/class/ProductAttribute.class.php b/htdocs/variants/class/ProductAttribute.class.php
index f89adcce0f8..74ff3fe238c 100644
--- a/htdocs/variants/class/ProductAttribute.class.php
+++ b/htdocs/variants/class/ProductAttribute.class.php
@@ -919,7 +919,7 @@ class ProductAttribute extends CommonObject
 			$parameters = array('rowid' => $rowid, 'position' => $position);
 			$action = '';
 			$reshook = $hookmanager->executeHooks('afterPositionOfAttributeUpdate', $parameters, $this, $action);
-			return 1;
+			return ($reshook >= 0 ? 1 : -1);
 		}
 	}
 
diff --git a/htdocs/variants/tpl/productattributevalueline_edit.tpl.php b/htdocs/variants/tpl/productattributevalueline_edit.tpl.php
index 3b842962258..60fc81c7418 100644
--- a/htdocs/variants/tpl/productattributevalueline_edit.tpl.php
+++ b/htdocs/variants/tpl/productattributevalueline_edit.tpl.php
@@ -54,7 +54,7 @@ $coldisplay++;
 		<input type="text" name="line_ref" id="line_ref" class="flat" value="<?php echo (GETPOSTISSET("line_ref") ? GETPOST("line_ref", 'alpha', 2) : $line->ref); ?>">
 		<?php
 		if (is_object($hookmanager)) {
-			$parameters = array('line'=>$line);
+			$parameters = array('line' => $line);
 			$reshook = $hookmanager->executeHooks('formEditProductOptions', $parameters, $object, $action);
 			if (!empty($hookmanager->resPrint)) {
 				print $hookmanager->resPrint;
diff --git a/htdocs/webhook/target_card.php b/htdocs/webhook/target_card.php
index 83f2008703f..a35f04d0138 100644
--- a/htdocs/webhook/target_card.php
+++ b/htdocs/webhook/target_card.php
@@ -430,7 +430,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 				$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 ($reshook < 0) {
+					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				}
 				if (empty($reshook))
 					$object->formAddObjectLine(1, $mysoc, $soc);
 			}

From f0f3deb6198130d6e8a150021db0a6422534acbe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 14 Jan 2023 13:06:13 +0100
Subject: [PATCH 552/816] Debug v17

---
 htdocs/compta/bank/class/account.class.php  |  6 +-
 htdocs/user/bank.php                        | 89 +++++++--------------
 htdocs/user/class/userbankaccount.class.php | 61 +++++++++++++-
 htdocs/user/notify/card.php                 |  6 +-
 4 files changed, 95 insertions(+), 67 deletions(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 4aea92a510e..74db4005126 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1077,8 +1077,6 @@ class Account extends CommonObject
 	 */
 	public function delete(User $user = null)
 	{
-		global $conf;
-
 		$error = 0;
 
 		$this->db->begin();
@@ -1096,8 +1094,8 @@ class Account extends CommonObject
 		}
 
 		if (!$error) {
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_account";
-			$sql .= " WHERE rowid = ".((int) $this->rowid);
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$result = $this->db->query($sql);
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index fb795ecc6e4..1552ff94d82 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -25,7 +25,7 @@
 /**
  *	    \file       htdocs/user/bank.php
  *      \ingroup    HRM
- *		\brief      Tab for HRM
+ *		\brief      Tab for HR and bank
  */
 
 // Load Dolibarr environment
@@ -79,7 +79,6 @@ if (empty($account->userid)) {
 	$account->userid = $object->id;
 }
 
-
 // Define value to know what current user can do on users
 $canadduser = (!empty($user->admin) || $user->rights->user->user->creer || $user->rights->hrm->write_personal_information->write);
 $canreaduser = (!empty($user->admin) || $user->rights->user->user->lire || $user->rights->hrm->read_personal_information->read);
@@ -143,49 +142,6 @@ if ($action == 'add' && !$cancel && $permissiontoaddbankaccount) {
 if ($action == 'update' && !$cancel && $permissiontoaddbankaccount) {
 	$account->userid = $object->id;
 
-	/*
-	if ($action == 'update' && !$cancel)
-	{
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-		if ($canedituser)    // Case we can edit all field
-		{
-			$error = 0;
-
-			if (!$error)
-			{
-				$objectuser->fetch($id);
-
-				$objectuser->oldcopy = dol_clone($objectuser);
-
-				$db->begin();
-
-				$objectuser->default_range = GETPOST('default_range');
-				$objectuser->default_c_exp_tax_cat = GETPOST('default_c_exp_tax_cat');
-
-				if (!$error) {
-					$ret = $objectuser->update($user);
-					if ($ret < 0) {
-						$error++;
-						if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-							$langs->load("errors");
-							setEventMessages($langs->trans("ErrorLoginAlreadyExists", $objectuser->login), null, 'errors');
-						} else {
-							setEventMessages($objectuser->error, $objectuser->errors, 'errors');
-						}
-					}
-				}
-
-				if (!$error && !count($objectuser->errors)) {
-					setEventMessages($langs->trans("UserModified"), null, 'mesgs');
-					$db->commit();
-				} else {
-					$db->rollback();
-				}
-			}
-		}
-	}*/
-
 	$account->bank            = GETPOST('bank', 'alpha');
 	$account->label           = GETPOST('label', 'alpha');
 	$account->courant         = GETPOST('courant', 'alpha');
@@ -214,6 +170,18 @@ if ($action == 'update' && !$cancel && $permissiontoaddbankaccount) {
 	}
 }
 
+if ($action == 'delete_confirmed' && !$cancel && $permissiontoaddbankaccount) {
+	$result = $account->delete($user);
+	if ($result < 0) {
+		setEventMessages($account->error, $account->errors, 'errors');
+	} else {
+		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
+		header("Location: ".DOL_URL_ROOT.'/user/bank.php?id='.$object->id);
+		exit;
+	}
+	$action = '';
+}
+
 // update birth
 if ($action == 'setbirth' && $canadduser && !$cancel) {
 	$object->birth = dol_mktime(0, 0, 0, GETPOST('birthmonth', 'int'), GETPOST('birthday', 'int'), GETPOST('birthyear', 'int'));
@@ -819,32 +787,32 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 	if ($account->id > 0) {
 		print '<tr class="oddeven">';
 		// Label
-		print '<td>'.$account->label.'</td>';
+		print '<td>'.dol_escape_htmltag($account->label).'</td>';
 		// Bank name
-		print '<td>'.$account->bank.'</td>';
+		print '<td>'.dol_escape_htmltag($account->bank).'</td>';
 		// Account number
 		print '<td>';
-		$string = '';
+		$stringescaped = '';
 		foreach ($account->getFieldsToShow() as $val) {
 			if ($val == 'BankCode') {
-				$string .= $account->code_banque.' ';
+				$stringescaped .= dol_escape_htmltag($account->code_banque).' ';
 			} elseif ($val == 'BankAccountNumber') {
-				$string .= $account->number.' ';
+				$stringescaped .= dol_escape_htmltag($account->number).' ';
 			} elseif ($val == 'DeskCode') {
-				$string .= $account->code_guichet.' ';
+				$stringescaped .= dol_escape_htmltag($account->code_guichet).' ';
 			} elseif ($val == 'BankAccountNumberKey') {
-				$string .= $account->cle_rib.' ';
+				$stringescaped .= dol_escape_htmltag($account->cle_rib).' ';
 			}
 		}
 		if (!empty($account->label) && $account->number) {
 			if (!checkBanForAccount($account)) {
-				$string .= ' '.img_picto($langs->trans("ValueIsNotValid"), 'warning');
+				$stringescaped .= ' '.img_picto($langs->trans("ValueIsNotValid"), 'warning');
 			} else {
-				$string .= ' '.img_picto($langs->trans("ValueIsValid"), 'info');
+				$stringescaped .= ' '.img_picto($langs->trans("ValueIsValid"), 'info');
 			}
 		}
 
-		print $string;
+		print $stringescaped;
 		print '</td>';
 		// IBAN
 		print '<td>'.getIbanHumanReadable($account);
@@ -855,7 +823,8 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		}
 		print '</td>';
 		// BIC
-		print '<td>'.$account->bic;
+		print '<td>';
+		print dol_escape_htmltag($account->bic);
 		if (!empty($account->bic)) {
 			if (!checkSwiftForAccount($account)) {
 				print ' '.img_picto($langs->trans("SwiftNotValid"), 'warning');
@@ -869,9 +838,13 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		// Edit/Delete
 		print '<td class="right nowraponall">';
 		if ($permissiontoaddbankaccount) {
-			print '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&bankid='.$account->id.'&action=edit&token='.newToken().'">';
+			print '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&bankid='.$account->id.'&action=edit&token='.newToken().'">';
 			print img_picto($langs->trans("Modify"), 'edit');
 			print '</a>';
+
+			print '<a class="editfielda marginleftonly marginrightonly reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&bankid='.$account->id.'&action=delete_confirmed&token='.newToken().'">';
+			print img_picto($langs->trans("Delete"), 'delete');
+			print '</a>';
 		}
 		print '</td>';
 
@@ -880,7 +853,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 
 
 	if ($account->id == 0) {
-		$colspan = 6;
+		$colspan = 7;
 		print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoBANRecord").'</span></td></tr>';
 	}
 
diff --git a/htdocs/user/class/userbankaccount.class.php b/htdocs/user/class/userbankaccount.class.php
index 6e9cc8e52af..857f60d55e5 100644
--- a/htdocs/user/class/userbankaccount.class.php
+++ b/htdocs/user/class/userbankaccount.class.php
@@ -117,8 +117,6 @@ class UserBankAccount extends Account
 	 */
 	public function update(User $user = null, $notrigger = 0)
 	{
-		global $conf;
-
 		if (!$this->id) {
 			$this->create();
 		}
@@ -193,7 +191,7 @@ class UserBankAccount extends Account
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
-				$this->userid = $obj->fk_soc;
+				$this->userid = $obj->fk_user;
 				$this->bank = $obj->bank;
 				$this->code_banque = $obj->code_banque;
 				$this->code_guichet = $obj->code_guichet;
@@ -226,6 +224,63 @@ class UserBankAccount extends Account
 		}
 	}
 
+	/**
+	 *  Delete user bank account from database
+	 *
+	 *	@param	User	$user	User deleting
+	 *  @return int             <0 if KO, >0 if OK
+	 */
+	public function delete(User $user = null)
+	{
+		$error = 0;
+
+		$this->db->begin();
+
+		// Delete link between tag and bank account
+		/*
+		if (!$error) {
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_account";
+			$sql .= " WHERE fk_account = ".((int) $this->id);
+
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$error++;
+				$this->error = "Error ".$this->db->lasterror();
+			}
+		}
+		*/
+
+		if (!$error) {
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " WHERE rowid = ".((int) $this->id);
+
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+			$result = $this->db->query($sql);
+			if ($result) {
+				// Remove extrafields
+				/*
+				if (!$error) {
+					$result = $this->deleteExtraFields();
+					if ($result < 0) {
+						$error++;
+						dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
+					}
+				}*/
+			} else {
+				$error++;
+				$this->error = "Error ".$this->db->lasterror();
+			}
+		}
+
+		if (!$error) {
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
 	/**
 	 * Return RIB
 	 *
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index e20d7be3d9a..f55a42ca159 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -332,7 +332,8 @@ if ($result > 0) {
 				$userstatic->email = $obj->email;
 				$userstatic->statut = $obj->status;
 
-				print '<tr class="oddeven"><td>'.$userstatic->getNomUrl(1);
+				print '<tr class="oddeven">';
+				print '<td>'.$userstatic->getNomUrl(1);
 				if ($obj->type == 'email') {
 					if (isValidEmail($obj->email)) {
 						print ' &lt;'.$obj->email.'&gt;';
@@ -359,8 +360,9 @@ if ($result > 0) {
 				$i++;
 			}
 			$db->free($resql);
+		} else {
+			print '<tr><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 		}
-
 		// List of notifications enabled for fixed email
 		/*
 		foreach($conf->global as $key => $val) {

From f9158c9a0201b23906458fd881f1bf2056f178f1 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sat, 14 Jan 2023 14:47:58 +0100
Subject: [PATCH 553/816] Fix php 8 warnings

---
 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 744d2763b71..de2c45381cb 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2013       Peter Fontaine       <contact@peterfontaine.fr>
  * Copyright (C) 2015-2016  Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2017       Ferran Marcet        <fmarcet@2byte.es>
- * Copyright (C) 2018-2021  Thibault FOUCART     <support@ptibogxiv.net>
+ * Copyright (C) 2018-2023  Thibault FOUCART     <support@ptibogxiv.net>
  * Copyright (C) 2021       Alexandre Spangaro   <aspangaro@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -1378,7 +1378,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 
 		if (is_array($currencybalance)) {
 			foreach ($currencybalance as $cpt) {
-				print '<tr><td>'.$langs->trans("Currency".strtoupper($cpt['currency'])).'</td><td>'.price($cpt['available'], 0, '', 1, - 1, - 1, strtoupper($cpt['currency'])).'</td><td>'.price($cpt->pending, 0, '', 1, - 1, - 1, strtoupper($cpt['currency'])).'</td><td>'.price($cpt['available'] + $cpt->pending, 0, '', 1, - 1, - 1, strtoupper($cpt['currency'])).'</td></tr>';
+				print '<tr><td>'.$langs->trans("Currency".strtoupper($cpt['currency'])).'</td><td>'.price($cpt['available'], 0, '', 1, - 1, - 1, strtoupper($cpt['currency'])).'</td><td>'.price(isset($cpt->pending)?$cpt->pending:0, 0, '', 1, - 1, - 1, strtoupper($cpt['currency'])).'</td><td>'.price($cpt['available'] + (isset($cpt->pending)?$cpt->pending:0), 0, '', 1, - 1, - 1, strtoupper($cpt['currency'])).'</td></tr>';
 			}
 		}
 

From 3e273d40042a7fd9f3769a25da155566d9dbc238 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 14 Jan 2023 15:11:15 +0100
Subject: [PATCH 554/816] Debug v17

---
 htdocs/accountancy/expensereport/list.php     |   1 -
 htdocs/accountancy/journal/bankjournal.php    |  12 +-
 htdocs/compta/accounting-files.php            |   5 +
 htdocs/compta/stats/byratecountry.php         |   4 +-
 htdocs/compta/stats/casoc.php                 |  14 +-
 htdocs/compta/stats/index.php                 |  12 +-
 .../class/conferenceorbooth.class.php         |  10 +-
 .../conferenceorbooth_list.php                | 204 ++++++++++++------
 htdocs/holiday/list.php                       |  23 +-
 htdocs/holiday/month_report.php               |  75 ++++---
 htdocs/hrm/class/establishment.class.php      |  31 +--
 .../knowledgerecord_list.php                  |   2 +-
 .../modulebuilder/template/myobject_list.php  |   1 +
 .../recruitmentcandidature_agenda.php         |   1 +
 .../recruitmentjobposition_agenda.php         |   9 +-
 htdocs/user/agenda_extsites.php               |  30 +++
 htdocs/user/perms.php                         |  17 ++
 17 files changed, 311 insertions(+), 140 deletions(-)

diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 9cfbd940875..25b86a8d527 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -443,7 +443,6 @@ if ($result) {
 		$expensereport_static->id = $objp->erid;
 
 		$userstatic->id = $objp->userid;
-		$userstatic->ref = $objp->label;
 		$userstatic->login = $objp->login;
 		$userstatic->statut = $objp->statut;
 		$userstatic->email = $objp->email;
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 699002395ab..c23392cada0 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -349,7 +349,11 @@ if ($result) {
 					$societestatic->email = $tabcompany[$obj->rowid]['email'];
 					$tabpay[$obj->rowid]["soclib"] = $societestatic->getNomUrl(1, '', 30);
 					if ($compta_soc) {
-						$tabtp[$obj->rowid][$compta_soc] += $amounttouse;
+						if (empty($tabtp[$obj->rowid][$compta_soc])) {
+							$tabtp[$obj->rowid][$compta_soc] = $amounttouse;
+						} else {
+							$tabtp[$obj->rowid][$compta_soc] += $amounttouse;
+						}
 					}
 				} elseif ($links[$key]['type'] == 'user') {
 					$userstatic->id = $links[$key]['url_id'];
@@ -510,7 +514,11 @@ if ($result) {
 			}
 		}
 
-		$tabbq[$obj->rowid][$compta_bank] += $amounttouse;
+		if (empty($tabbq[$obj->rowid][$compta_bank])) {
+			$tabbq[$obj->rowid][$compta_bank] = $amounttouse;
+		} else {
+			$tabbq[$obj->rowid][$compta_bank] += $amounttouse;
+		}
 
 		// If no links were found to know the amount on thirdparty, we try to guess it.
 		// This may happens on bank entries without the links lines to 'company'.
diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 2f2f5816ae1..af8d626eba1 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -376,6 +376,9 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 							$nofile['country_code'] = $objd->country_code;
 							$nofile['vatnum'] = $objd->vatnum;
 							$nofile['sens'] = $objd->sens;
+							$nofile['currency'] = $objd->currency;
+							$nofile['link'] = '';
+							$nofile['name'] = '';
 
 							$filesarray[$nofile['item'].'_'.$nofile['id']] = $nofile;
 						} else {
@@ -396,6 +399,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 								$file['country_code'] = $objd->country_code;
 								$file['vatnum'] = $objd->vatnum;
 								$file['sens'] = $objd->sens;
+								$file['currency'] = $objd->currency;
 
 								// Save record into array (only the first time it is found)
 								if (empty($filesarray[$file['item'].'_'.$file['id']])) {
@@ -415,6 +419,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 									'relpathnamelang' => $langs->trans($file['item']).'/'.$file['name'],
 									'modulepart' => $modulepart,
 									'subdir' => $subdir,
+									'currency' => $file['currency']
 								);
 								//var_dump($file['item'].'_'.$file['id']);
 								//var_dump($filesarray[$file['item'].'_'.$file['id']]['files']);
diff --git a/htdocs/compta/stats/byratecountry.php b/htdocs/compta/stats/byratecountry.php
index fb8ad4de1a5..b9dd6c7429d 100644
--- a/htdocs/compta/stats/byratecountry.php
+++ b/htdocs/compta/stats/byratecountry.php
@@ -461,9 +461,9 @@ if ($modecompta == 'CREANCES-DETTES') {
 				$j -= 12;
 			}
 			$monthj = 'month'.str_pad($j, 2, '0', STR_PAD_LEFT);
-			print '<td class="right" width="6%">'.price($totalpermonth[$j]).'</td>';
+			print '<td class="right" width="6%">'.price(empty($totalpermonth[$j]) ? 0 : $totalpermonth[$j]).'</td>';
 		}
-		print '<td class="right" width="6%"><b>'.price($totalpermonth['total']).'</b></td>';
+		print '<td class="right" width="6%"><b>'.price(empty($totalpermonth['total']) ? 0 : $totalpermonth['total']).'</b></td>';
 		print '</tr>';
 	} else {
 		print $db->lasterror(); // Show last sql error
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index d24e5a5452a..b499ca17c71 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -406,12 +406,16 @@ if ($modecompta == "RECETTES-DEPENSES") {
 		while ($i < $num) {
 			$obj = $db->fetch_object($result);
 
-			$amount[$obj->rowid] += $obj->amount_ttc;
+			if (empty($amount[$obj->socid])) {
+				$amount[$obj->socid] = $obj->amount_ttc;
+			} else {
+				$amount[$obj->socid] += $obj->amount_ttc;
+			}
 
-			$name[$obj->rowid] = $obj->name;
-			$address_zip[$obj->rowid] = $obj->zip;
-			$address_town[$obj->rowid] = $obj->town;
-			$address_pays[$obj->rowid] = getCountry($obj->fk_pays);
+			$name[$obj->socid] = $obj->name;
+			$address_zip[$obj->socid] = '';
+			$address_town[$obj->socid] = '';
+			$address_pays[$obj->socid] = 0;
 
 			$catotal += $obj->amount_ttc;
 
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index 058fba33177..7d70bc10527 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -577,7 +577,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++) {
 		// Montant total HT
 		if ($total_ht[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear))) {
 			print '<td class="nowrap right">';
-			print ($total_ht[$annee] ?price($total_ht[$annee]) : "0");
+			print (empty($total_ht[$annee]) ? '0' : price($total_ht[$annee]));
 			print "</td>";
 		} else {
 			print '<td>&nbsp;</td>';
@@ -587,7 +587,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++) {
 	// Total amount
 	if (!empty($total[$annee]) || ($annee >= $minyear && $annee <= max($nowyear, $maxyear))) {
 		print '<td class="nowrap right">';
-		print ($total[$annee] ?price($total[$annee]) : "0");
+		print (empty($total[$annee]) ? '0' : price($total[$annee]));
 		print "</td>";
 	} else {
 		print '<td>&nbsp;</td>';
@@ -595,19 +595,19 @@ for ($annee = $year_start; $annee <= $year_end; $annee++) {
 
 	// Pourcentage total
 	if ($annee > $minyear && $annee <= max($nowyear, $maxyear)) {
-		if ($total[$annee - 1] && $total[$annee]) {
+		if (!empty($total[$annee - 1]) && !empty($total[$annee])) {
 			$percent = (round(($total[$annee] - $total[$annee - 1]) / $total[$annee - 1], 4) * 100);
 			print '<td class="nowrap borderrightlight right">';
 			print ($percent >= 0 ? "+$percent" : "$percent").'%';
 			print '</td>';
 		}
-		if ($total[$annee - 1] && !$total[$annee]) {
+		if (!empty($total[$annee - 1]) && empty($total[$annee])) {
 			print '<td class="borderrightlight right">-100%</td>';
 		}
-		if (!$total[$annee - 1] && $total[$annee]) {
+		if (empty($total[$annee - 1]) && !empty($total[$annee])) {
 			print '<td class="borderrightlight right">+'.$langs->trans('Inf').'%</td>';
 		}
-		if (!$total[$annee - 1] && !$total[$annee]) {
+		if (empty($total[$annee - 1]) && empty($total[$annee])) {
 			print '<td class="borderrightlight right">+0%</td>';
 		}
 	} else {
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 556443a25e8..db0928efc7d 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -104,12 +104,12 @@ class ConferenceOrBooth extends ActionComm
 	 */
 	public $fields = array(
 		'id' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
-		'ref' => array('type'=>'integer', 'label'=>'Ref', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>2, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', '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'),
+		'ref' => array('type'=>'integer', 'label'=>'Ref', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>2, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'csslist'=>'left', 'comment'=>"Id"),
+		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'csslist'=>'tdoverflowmax125', 'help'=>"OrganizationEvenLabelName", 'showoncombobox'=>'1', 'autofocusoncreate'=>1),
+		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'help'=>"OrganizationEventLinkToThirdParty", 'picto'=>'company', 'css'=>'tdoverflowmax150 maxwidth500', 'csslist'=>'width100'),
+		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1:t.usage_organize_event=1', 'label'=>'Project', 'enabled'=>"isModEnabled('project')", 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'picto'=>'project', 'css'=>'tdoverflowmax150 maxwidth500', 'csslist'=>'width100'),
 		'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'),
+		'fk_action' => array('type'=>'sellist:c_actioncomm:libelle:id::module LIKE (\'%@eventorganization\')', 'label'=>'Format', 'enabled'=>'1', 'position'=>60, 'notnull'=>1, 'visible'=>1, 'css'=>'width100'),
 		'datep' => array('type'=>'datetime', 'label'=>'DateStart', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>1, 'showoncombobox'=>'2',),
 		'datep2' => array('type'=>'datetime', 'label'=>'DateEnd', 'enabled'=>'1', 'position'=>71, 'notnull'=>0, 'visible'=>1, 'showoncombobox'=>'3',),
 		'datec' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index dd7bfd93a47..1dd77122384 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -25,17 +25,14 @@
 
 // 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.'/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;
@@ -56,6 +53,7 @@ $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'conferenceorboothlist'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
 $id = GETPOST('id', 'int');
 $projectid = GETPOST('projectid', 'int');
@@ -67,8 +65,9 @@ $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	// If $page is not defined, or '' or -1 or if we click on clear filters
 	$page = 0;
-}     // If $page is not defined, or '' or -1 or if we click on clear filters
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -120,11 +119,11 @@ $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$visible = (int) dol_eval($val['visible'], 1, 1, '1');
+		$visible = (int) dol_eval($val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
+			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
@@ -235,9 +234,11 @@ if (empty($reshook)) {
 $form = new Form($db);
 $now = dol_now();
 
-$title = $langs->trans('ListOfConferencesOrBooths');
 //$help_url="EN:Module_ConferenceOrBooth|FR:Module_ConferenceOrBooth_FR|ES:Módulo_ConferenceOrBooth";
 $help_url = '';
+$title = $langs->trans('ListOfConferencesOrBooths');
+$morejs = array();
+$morecss = array();
 
 if ($projectid > 0 || $projectref) {
 	$project = new Project($db);
@@ -524,9 +525,13 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
+//$sql .= ", COUNT(rc.rowid) as anotherfield";
+
+$sqlfields = $sql; // $sql fields to remove for count total
+
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.id = ef.fk_object)";
+if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 }
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."c_actioncomm as cact ON cact.id=t.fk_action AND cact.module LIKE '%@eventorganization'";
 // Add table from hooks
@@ -554,17 +559,17 @@ foreach ($search as $key => $val) {
 			$mode_search = 2;
 		}
 		if ($search[$key] != '') {
-			$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+			$sql .= natural_search("t.".$db->escape($key), $search[$key], (($key == 'status') ? 2 : $mode_search));
 		}
 	} else {
 		if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
 			$columnName = preg_replace('/(_dtstart|_dtend)$/', '', $key);
 			if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
 				if (preg_match('/_dtstart$/', $key)) {
-					$sql .= " AND t.".$columnName." >= '".$db->idate($search[$key])."'";
+					$sql .= " AND t.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
 				}
 				if (preg_match('/_dtend$/', $key)) {
-					$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
+					$sql .= " AND t.".$db->escape($columnName)." <= '".$db->idate($search[$key])."'";
 				}
 			}
 		}
@@ -582,35 +587,42 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
-$sql .= $db->order($sortfield, $sortorder);
-
 // Count total nb of records
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-	$resql = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($resql);
-	if (($page * $limit) > $nbtotalofrecords) {	// if total of record found is smaller than page * limit, goto and load page 0
+	/* The fast and low memory method to get and count full list converts the sql into a sql count */
+	$sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
+	$sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount);
+	$resql = $db->query($sqlforcount);
+	if ($resql) {
+		$objforcount = $db->fetch_object($resql);
+		$nbtotalofrecords = $objforcount->nbtotalofrecords;
+	} else {
+		dol_print_error($db);
+	}
+
+	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
+	$db->free($resql);
 }
-// if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
-if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit))) {
-	$num = $nbtotalofrecords;
-} else {
-	if ($limit) {
-		$sql .= $db->plimit($limit + 1, $offset);
-	}
 
-	$resql = $db->query($sql);
-	if (!$resql) {
-		dol_print_error($db);
-		exit;
-	}
+// Complete request and execute it with limit
+$sql .= $db->order($sortfield, $sortorder);
 
-	$num = $db->num_rows($resql);
+if ($limit) {
+	$sql .= $db->plimit($limit + 1, $offset);
 }
 
+$resql = $db->query($sql);
+if (!$resql) {
+	dol_print_error($db);
+	exit;
+}
+
+$num = $db->num_rows($resql);
+
 // Direct jump if only one record found
 if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
@@ -622,6 +634,9 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
+if (!empty($mode)) {
+	$param .= '&mode='.urlencode($mode);
+}
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 	$param .= '&contextpage='.urlencode($contextpage);
 }
@@ -629,11 +644,17 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.urlencode($limit);
 }
 foreach ($search as $key => $val) {
-	if (is_array($search[$key]) && count($search[$key])) {
+	if (is_array($search[$key])) {
 		foreach ($search[$key] as $skey) {
-			$param .= '&search_'.$key.'[]='.urlencode($skey);
+			if ($skey != '') {
+				$param .= '&search_'.$key.'[]='.urlencode($skey);
+			}
 		}
-	} else {
+	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
+		$param .= '&search_'.$key.'month='.((int) GETPOST('search_'.$key.'month', 'int'));
+		$param .= '&search_'.$key.'day='.((int) GETPOST('search_'.$key.'day', 'int'));
+		$param .= '&search_'.$key.'year='.((int) GETPOST('search_'.$key.'year', 'int'));
+	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
 }
@@ -655,7 +676,7 @@ $arrayofmassactions = array(
 	'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail").' ('.$langs->trans("ToSpeakers").')',
 	//'presend_attendees'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail").' - '.$langs->trans("Attendees"),
 );
-if ($permissiontodelete) {
+if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
@@ -672,8 +693,11 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 print '<input type="hidden" name="page_y" value="">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
+
 
 $title = $langs->trans("EventOrganizationConfOrBoothes");
 
@@ -683,7 +707,7 @@ print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sort
 
 
 // Add code for pre mass action (confirmation or email presend form)
-$topicmail = $projectstatic->title;
+$topicmail = '';
 $modelmail = "conferenceorbooth";
 $objecttmp = new ConferenceOrBooth($db);
 $trackid = 'conferenceorbooth_'.$object->id;
@@ -692,10 +716,13 @@ 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 = '';
@@ -718,7 +745,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 
@@ -729,9 +756,15 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+// Action column
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 foreach ($object->fields as $key => $val) {
-	$searchkey = (empty($search[$key]) ? '' : $search[$key]);
-
+	$searchkey = empty($search[$key]) ? '' : $search[$key];
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
@@ -739,17 +772,15 @@ foreach ($object->fields as $key => $val) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'rowid' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $searchkey, $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
-		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:')=== 0)) {
-			print $object->showInputField($val, $key, $searchkey, '', '', 'search_', 'maxwidth125', 1);
-		} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($searchkey).'">';
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100'.($key == 'status' ? ' search_status onrightofpage' : ''), 1);
+		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
+			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', $cssforfield.' maxwidth250', 1);
 		} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
 			print '<div class="nowrap">';
 			print $form->selectDate($search[$key.'_dtstart'] ? $search[$key.'_dtstart'] : '', "search_".$key."_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
@@ -757,6 +788,12 @@ foreach ($object->fields as $key => $val) {
 			print '<div class="nowrap">';
 			print $form->selectDate($search[$key.'_dtend'] ? $search[$key.'_dtend'] : '', "search_".$key."_dtend", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 			print '</div>';
+		} elseif ($key == 'lang') {
+			require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+			$formadmin = new FormAdmin($db);
+			print $formadmin->select_language($search[$key], 'search_lang', 0, null, 1, 0, 0, 'minwidth150 maxwidth200', 2);
+		} else {
+			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 		}
 		print '</td>';
 	}
@@ -769,16 +806,23 @@ $parameters = array('arrayfields'=>$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-print '<td class="liste_titre maxwidthsearch">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 print '</tr>'."\n";
 
+$totalarray = array();
+$totalarray['nbfield'] = 0;
 
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
 foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
@@ -787,27 +831,32 @@ foreach ($object->fields as $key => $val) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'ref')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'rowid' && $key != 'ref' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
+	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
+		$totalarray['nbfield']++;
 	}
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
+$totalarray['nbfield']++;
 print '</tr>'."\n";
 
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
-if (!empty($extrafields->attributes[$object->table_element]['computed']) && is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
+if (isset($extrafields->attributes[$object->table_element]['computed']) && is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
 	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val) {
 		if (preg_match('/\$object/', $val)) {
 			$needToFetchEachLine++; // There is at least one compute field that use $object
@@ -819,8 +868,11 @@ if (!empty($extrafields->attributes[$object->table_element]['computed']) && is_a
 // Loop on record
 // --------------------------------------------------------------------
 $i = 0;
+$savnbfield = $totalarray['nbfield'];
 $totalarray = array();
-while ($i < ($limit ? min($num, $limit) : $num)) {
+$totalarray['nbfield'] = 0;
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
 		break; // Should not happen
@@ -830,10 +882,22 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	$object->setVarsFromFetchObj($obj);
 
 	// Show here line of result
-	print '<tr class="oddeven">';
-	$totalarray['nbfield'] = 0;
+	$j = 0;
+	print '<tr data-rowid="'.$object->id.'" class="oddeven">';
+	// Action column
+	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($object->id, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
+		print '</td>';
+	}
 	foreach ($object->fields as $key => $val) {
-		$cssforfield = (empty($val['css']) ? '' : $val['css']);
+		$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'center';
 		} elseif ($key == 'status') {
@@ -843,7 +907,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		if (in_array($val['type'], array('timestamp'))) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 		} elseif ($key == 'ref') {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap left';
+			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 		}
 
 		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'ref', 'status'))) {
@@ -852,7 +916,11 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
 
 		if (!empty($arrayfields['t.'.$key]['checked'])) {
-			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
+			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '');
+			if (preg_match('/tdoverflow/', $cssforfield)) {
+				print ' title="'.dol_escape_htmltag($object->$key).'"';
+			}
+			print '>';
 			if ($key == 'status') {
 				print $object->getLibStatut(5);
 			} elseif ($key == 'ref') {
@@ -885,15 +953,17 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Action column
-	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		$selected = 0;
-		if (in_array($object->id, $arrayofselected)) {
-			$selected = 1;
+	if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($object->id, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
-		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		print '</td>';
 	}
-	print '</td>';
 	if (!$i) {
 		$totalarray['nbfield']++;
 	}
@@ -921,7 +991,7 @@ if ($num == 0) {
 $db->free($resql);
 
 $parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
 print '</table>'."\n";
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 564fb8a2a96..dedfed07157 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -827,6 +827,9 @@ if ($resql) {
 					print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 				}
 				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			if (!empty($arrayfields['cp.ref']['checked'])) {
 				print '<td class="nowraponall">';
@@ -849,8 +852,11 @@ if ($resql) {
 				}
 			}
 			if (!empty($arrayfields['cp.fk_type']['checked'])) {
-				$labeltypeleavetoshow = ($langs->trans($typeleaves[$obj->fk_type]['code']) != $typeleaves[$obj->fk_type]['code'] ? $langs->trans($typeleaves[$obj->fk_type]['code']) : $typeleaves[$obj->fk_type]['label']);
-				$labeltypeleavetoshow = empty($typeleaves[$obj->fk_type]['label']) ? $langs->trans("TypeWasDisabledOrRemoved", $obj->fk_type) : $labeltypeleavetoshow;
+				if (empty($typeleaves[$obj->fk_type])) {
+					$labeltypeleavetoshow = $langs->trans("TypeWasDisabledOrRemoved", $obj->fk_type);
+				} else {
+					$labeltypeleavetoshow = ($langs->trans($typeleaves[$obj->fk_type]['code']) != $typeleaves[$obj->fk_type]['code'] ? $langs->trans($typeleaves[$obj->fk_type]['code']) : $typeleaves[$obj->fk_type]['label']);
+				}
 
 				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($labeltypeleavetoshow).'">';
 				print $labeltypeleavetoshow;
@@ -941,9 +947,9 @@ if ($resql) {
 					print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 				}
 				print '</td>';
-			}
-			if (!$i) {
-				$totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			print '</tr>'."\n";
@@ -954,6 +960,9 @@ if ($resql) {
 		// Add a line for total if there is a total to show
 		if (!empty($arrayfields['duration']['checked'])) {
 			print '<tr class="total">';
+			if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+				print '<td></td>';
+			}
 			foreach ($arrayfields as $key => $val) {
 				if (!empty($val['checked'])) {
 					if ($key == 'duration') {
@@ -964,7 +973,9 @@ if ($resql) {
 				}
 			}
 			// status
-			print '<td></td>';
+			if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+				print '<td></td>';
+			}
 			print '</tr>';
 		}
 	}
diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index a1a23715126..fe2d33ff78a 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -227,27 +227,34 @@ print '<br>';
 $moreforfilter = '';
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = '';
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
-print '<table class="noborder centpercent">';
+print '<table class="tagtable nobottomiftotal liste">';
 
-print '<tr class="liste_titre">';
+print '<tr class="liste_titre_filter">';
+
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<th class="wrapcolumntitle center maxwidthsearch liste_titre">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</th>';
+}
 
 // Filter: Ref
 if (!empty($arrayfields['cp.ref']['checked'])) {
-	print '<td class="liste_titre">';
+	print '<th class="liste_titre">';
 	print '<input class="flat maxwidth100" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
-	print '</td>';
+	print '</th>';
 }
 
 // Filter: Employee
 if (!empty($arrayfields['cp.fk_user']['checked'])) {
-	print '<td class="liste_titre">';
+	print '<th class="liste_titre">';
 	print $form->select_dolusers($search_employee, "search_employee", 1, null, 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth100');
-	print '</td>';
+	print '</th>';
 }
 
 // Filter: Type
@@ -259,45 +266,50 @@ if (!empty($arrayfields['cp.fk_type']['checked'])) {
 		$arraytypeleaves[$val['rowid']] = $labeltoshow;
 	}
 
-	print '<td class="liste_titre">';
+	print '<th class="liste_titre">';
 	print $form->selectarray('search_type', $arraytypeleaves, $search_type, 1, 0, 0, '', 0, 0, 0, '', '', 1);
-	print '</td>';
+	print '</th>';
 }
 
 if (!empty($arrayfields['cp.date_debut']['checked'])) {
-	print '<td class="liste_titre"></td>';
+	print '<th class="liste_titre"></th>';
 }
 if (!empty($arrayfields['cp.date_fin']['checked'])) {
-	print '<td class="liste_titre"></td>';
+	print '<th class="liste_titre"></th>';
 }
 if (!empty($arrayfields['used_days']['checked'])) {
-	print '<td class="liste_titre"></td>';
+	print '<th class="liste_titre"></th>';
 }
 if (!empty($arrayfields['date_start_month']['checked'])) {
-	print '<td class="liste_titre"></td>';
+	print '<th class="liste_titre"></th>';
 }
 if (!empty($arrayfields['date_end_month']['checked'])) {
-	print '<td class="liste_titre"></td>';
+	print '<th class="liste_titre"></th>';
 }
 if (!empty($arrayfields['used_days_month']['checked'])) {
-	print '<td class="liste_titre"></td>';
+	print '<th class="liste_titre"></th>';
 }
 
 // Filter: Description
 if (!empty($arrayfields['cp.description']['checked'])) {
-	print '<td class="liste_titre">';
+	print '<th class="liste_titre">';
 	print '<input type="text" class="maxwidth100" name="search_description" value="'.$search_description.'">';
-	print '</td>';
+	print '</th>';
 }
-
 // Action column
-print '<td class="liste_titre maxwidthsearch">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<th class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</th>';
+}
 print '</tr>';
 
 print '<tr class="liste_titre">';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
 if (!empty($arrayfields['cp.ref']['checked'])) {
 	print_liste_field_titre($arrayfields['cp.ref']['label'], $_SERVER["PHP_SELF"], 'cp.ref', '', '', '', $sortfield, $sortorder);
 }
@@ -331,11 +343,14 @@ if (!empty($arrayfields['used_days_month']['checked'])) {
 if (!empty($arrayfields['cp.description']['checked'])) {
 	print_liste_field_titre($arrayfields['cp.description']['label'], $_SERVER["PHP_SELF"], 'cp.description', '', '', '', $sortfield, $sortorder);
 }
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+// Action column
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
 print '</tr>';
 
 if ($num == 0) {
-	print '<tr><td colspan="11" class="opacitymedium">'.$langs->trans('None').'</td></tr>';
+	print '<tr><td colspan="11"><span class="opacitymedium">'.$langs->trans('None').'</span></td></tr>';
 } else {
 	while ($obj = $db->fetch_object($resql)) {
 		$user = new User($db);
@@ -385,6 +400,10 @@ if ($num == 0) {
 		$holidaystatic->ref = $obj->ref;
 
 		print '<tr class="oddeven">';
+		// Action column
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td></td>';
+		}
 
 		if (!empty($arrayfields['cp.ref']['checked'])) {
 			print '<td class="nowraponall">'.$holidaystatic->getNomUrl(1, 1).'</td>';
@@ -430,8 +449,10 @@ if ($num == 0) {
 		if (!empty($arrayfields['cp.description']['checked'])) {
 			print '<td class="maxwidth300 small">'.dolGetFirstLineOfText(dol_string_nohtmltag($obj->description, 1)).'</td>';
 		}
-
-		print '<td></td>';
+		// Action column
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td></td>';
+		}
 		print '</tr>';
 	}
 }
diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index 6a37ba1e929..05bd8d47cf8 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -285,7 +285,7 @@ class Establishment extends CommonObject
 	 * Load an object from database
 	 *
 	 * @param	int		$id		Id of record to load
-	 * @return	int				<0 if KO, >0 if OK
+	 * @return	int				<0 if KO, >=0 if OK
 	 */
 	public function fetch($id)
 	{
@@ -299,21 +299,24 @@ class Establishment extends CommonObject
 		$result = $this->db->query($sql);
 		if ($result) {
 			$obj = $this->db->fetch_object($result);
+			if ($obj) {
+				$this->id = $obj->rowid;
+				$this->ref			= $obj->ref;
+				$this->label		= $obj->label;
+				$this->address = $obj->address;
+				$this->zip			= $obj->zip;
+				$this->town			= $obj->town;
+				$this->status = $obj->status;
+				$this->entity = $obj->entity;
 
-			$this->id = $obj->rowid;
-			$this->ref			= $obj->ref;
-			$this->label		= $obj->label;
-			$this->address = $obj->address;
-			$this->zip			= $obj->zip;
-			$this->town			= $obj->town;
-			$this->status = $obj->status;
-			$this->entity = $obj->entity;
+				$this->country_id   = $obj->country_id;
+				$this->country_code = $obj->country_code;
+				$this->country      = $obj->country;
 
-			$this->country_id   = $obj->country_id;
-			$this->country_code = $obj->country_code;
-			$this->country      = $obj->country;
-
-			return 1;
+				return 1;
+			} else {
+				return 0;
+			}
 		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index dffd3d63d7b..cafb5776cf7 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -501,7 +501,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 1135f6d9498..95442195ff9 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -492,6 +492,7 @@ print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="page_y" value="">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 
diff --git a/htdocs/recruitment/recruitmentcandidature_agenda.php b/htdocs/recruitment/recruitmentcandidature_agenda.php
index 04118f55572..3648b8ca13b 100644
--- a/htdocs/recruitment/recruitmentcandidature_agenda.php
+++ b/htdocs/recruitment/recruitmentcandidature_agenda.php
@@ -41,6 +41,7 @@ $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 $socid = GETPOST('socid', 'int');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // To manage different context of search
 
 if (GETPOST('actioncode', 'array')) {
 	$actioncode = GETPOST('actioncode', 'array', 3);
diff --git a/htdocs/recruitment/recruitmentjobposition_agenda.php b/htdocs/recruitment/recruitmentjobposition_agenda.php
index f2f4d37484b..fab164dcd2f 100644
--- a/htdocs/recruitment/recruitmentjobposition_agenda.php
+++ b/htdocs/recruitment/recruitmentjobposition_agenda.php
@@ -40,6 +40,7 @@ $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // To manage different context of search
 
 if (GETPOST('actioncode', 'array')) {
 	$actioncode = GETPOST('actioncode', 'array', 3);
@@ -79,7 +80,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->recruitment->multidir_output[$object->entity]."/".$object->id;
+	$upload_dir = $conf->recruitment->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id;
 }
 
 $permissiontoadd = $user->rights->recruitment->recruitmentjobposition->write; // Used by the include of actions_addupdatedelete.inc.php
@@ -163,11 +164,11 @@ if ($object->id > 0) {
 				$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 .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1);
 				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 				$morehtmlref .= '</form>';
 			} else {
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, 0, $object->fk_project, 'none', 0, 0, 0, 1);
 			}
 		} else {
 			if (!empty($object->fk_project)) {
@@ -228,7 +229,7 @@ if ($object->id > 0) {
 	print '</div>';
 
 	if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
-		$param = '&id='.$object->id.'&socid='.$socid;
+		$param = '&id='.$object->id;
 		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 			$param .= '&contextpage='.urlencode($contextpage);
 		}
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index 4891480cc2d..c2b58c4e2a0 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -176,8 +176,38 @@ $morehtmlref .= '</a>';
 
 dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin, 'rowid', 'ref', $morehtmlref);
 
+print '<div class="fichecenter">';
 
 print '<div class="underbanner clearboth"></div>';
+print '<table class="border tableforfield centpercent">';
+
+// Login
+print '<tr><td id="anchorforperms" class="titlefield">'.$langs->trans("Login").'</td>';
+if (!empty($object->ldap_sid) && $object->statut == 0) {
+	print '<td class="error">';
+	print $langs->trans("LoginAccountDisableInDolibarr");
+	print '</td>';
+} else {
+	print '<td>';
+	$addadmin = '';
+	if (property_exists($object, 'admin')) {
+		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"');
+		}
+	}
+	print showValueWithClipboardCPButton($object->login).$addadmin;
+	print '</td>';
+}
+print '</tr>'."\n";
+
+print '</table>';
+
+print '</div>';
+
+print dol_get_fiche_end();
+
 
 print '<br>';
 print '<span class="opacitymedium">'.$langs->trans("AgendaExtSitesDesc")."</span><br>\n";
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index a65762b6183..1cd094d882d 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -288,6 +288,23 @@ if (!empty($object->ldap_sid) && $object->statut == 0) {
 }
 print '</tr>'."\n";
 
+// Type
+print '<tr><td>';
+$text = $langs->trans("Type");
+print $form->textwithpicto($text, $langs->trans("InternalExternalDesc"));
+print '</td><td>';
+$type = $langs->trans("Internal");
+if ($object->socid > 0) {
+	$type = $langs->trans("External");
+}
+print '<span class="badgeneutral">';
+print $type;
+if ($object->ldap_sid) {
+	print ' ('.$langs->trans("DomainUser").')';
+}
+print '</span>';
+print '</td></tr>'."\n";
+
 print '</table>';
 
 print '</div>';

From fbc74cd571aa4deebbf8cac9f9d4c695452981da Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 14 Jan 2023 15:57:12 +0100
Subject: [PATCH 555/816] Fix missing doxygen doc

---
 .../DataCollector/DolConfigCollector.php      | 21 +++++++++++++++
 .../DataCollector/DolExceptionsCollector.php  | 21 +++++++++++++++
 .../class/DataCollector/DolLogsCollector.php  | 21 +++++++++++++++
 .../DataCollector/DolMemoryCollector.php      | 26 ++++++++++++++++---
 .../DataCollector/DolMessagesCollector.php    | 21 +++++++++++++++
 .../class/DataCollector/DolPhpCollector.php   | 21 +++++++++++++++
 .../class/DataCollector/DolQueryCollector.php | 21 +++++++++++++++
 .../DataCollector/DolRequestDataCollector.php | 21 +++++++++++++++
 .../DataCollector/DolTimeDataCollector.php    | 21 +++++++++++++++
 .../class/DataCollector/DolibarrCollector.php | 21 +++++++++++++++
 htdocs/debugbar/class/DebugBar.php            | 21 +++++++++++++++
 htdocs/debugbar/class/TraceableDB.php         | 21 +++++++++++++++
 12 files changed, 254 insertions(+), 3 deletions(-)

diff --git a/htdocs/debugbar/class/DataCollector/DolConfigCollector.php b/htdocs/debugbar/class/DataCollector/DolConfigCollector.php
index 715d20abcf9..0920b140dbc 100644
--- a/htdocs/debugbar/class/DataCollector/DolConfigCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolConfigCollector.php
@@ -1,4 +1,25 @@
 <?php
+/* Copyright (C) 2023	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/debugbar/class/DataCollector/DolConfigCollector.php
+ *	\brief      Class for debugbar collection
+ *	\ingroup    debugbar
+ */
 
 use \DebugBar\DataCollector\ConfigCollector;
 
diff --git a/htdocs/debugbar/class/DataCollector/DolExceptionsCollector.php b/htdocs/debugbar/class/DataCollector/DolExceptionsCollector.php
index 15d433fd050..38d2b971dde 100644
--- a/htdocs/debugbar/class/DataCollector/DolExceptionsCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolExceptionsCollector.php
@@ -1,4 +1,25 @@
 <?php
+/* Copyright (C) 2023	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/debugbar/class/DataCollector/DolexceptionsCollector.php
+ *	\brief      Class for debugbar collection
+ *	\ingroup    debugbar
+ */
 
 use \DebugBar\DataCollector\ExceptionsCollector;
 
diff --git a/htdocs/debugbar/class/DataCollector/DolLogsCollector.php b/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
index d21cdd6233f..44885296bae 100644
--- a/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
@@ -1,4 +1,25 @@
 <?php
+/* Copyright (C) 2023	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/debugbar/class/DataCollector/DolLogsCollector.php
+ *	\brief      Class for debugbar collection
+ *	\ingroup    debugbar
+ */
 
 use DebugBar\DataCollector\MessagesCollector;
 use Psr\Log\LogLevel;
diff --git a/htdocs/debugbar/class/DataCollector/DolMemoryCollector.php b/htdocs/debugbar/class/DataCollector/DolMemoryCollector.php
index b52ac8ff8c4..3372e89c2b6 100644
--- a/htdocs/debugbar/class/DataCollector/DolMemoryCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolMemoryCollector.php
@@ -1,17 +1,37 @@
 <?php
+/* Copyright (C) 2023	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/debugbar/class/DataCollector/DolMemoryCollector.php
+ *	\brief      Class for debugbar collection
+ *	\ingroup    debugbar
+ */
 
 use \DebugBar\DataCollector\MemoryCollector;
 
 /**
  * DolMemoryCollector class
  */
-
 class DolMemoryCollector extends MemoryCollector
 {
 	/**
 	 *	Return value of indicator
 	 *
-	 *  @return void
+	 *  @return array
 	 */
 	public function collect()
 	{
@@ -28,7 +48,7 @@ class DolMemoryCollector extends MemoryCollector
 	/**
 	 *	Return widget settings
 	 *
-	 *  @return void
+	 *  @return array
 	 */
 	public function getWidgets()
 	{
diff --git a/htdocs/debugbar/class/DataCollector/DolMessagesCollector.php b/htdocs/debugbar/class/DataCollector/DolMessagesCollector.php
index 1fcf60c8ba6..733009e77c6 100644
--- a/htdocs/debugbar/class/DataCollector/DolMessagesCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolMessagesCollector.php
@@ -1,4 +1,25 @@
 <?php
+/* Copyright (C) 2023	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/debugbar/class/DataCollector/DolMessagesCollector.php
+ *	\brief      Class for debugbar collection
+ *	\ingroup    debugbar
+ */
 
 use \DebugBar\DataCollector\MessagesCollector;
 
diff --git a/htdocs/debugbar/class/DataCollector/DolPhpCollector.php b/htdocs/debugbar/class/DataCollector/DolPhpCollector.php
index 3d6536bd258..bca2b2a7071 100644
--- a/htdocs/debugbar/class/DataCollector/DolPhpCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolPhpCollector.php
@@ -1,4 +1,25 @@
 <?php
+/* Copyright (C) 2023	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/debugbar/class/DataCollector/DolPhpCollector.php
+ *	\brief      Class for debugbar collection
+ *	\ingroup    debugbar
+ */
 
 use DebugBar\DataCollector\DataCollector;
 use DebugBar\DataCollector\Renderable;
diff --git a/htdocs/debugbar/class/DataCollector/DolQueryCollector.php b/htdocs/debugbar/class/DataCollector/DolQueryCollector.php
index ca5aa284dd2..8cc55e34df9 100644
--- a/htdocs/debugbar/class/DataCollector/DolQueryCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolQueryCollector.php
@@ -1,4 +1,25 @@
 <?php
+/* Copyright (C) 2023	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/debugbar/class/DataCollector/DolQueryCollector.php
+ *	\brief      Class for debugbar collection
+ *	\ingroup    debugbar
+ */
 
 use DebugBar\DataCollector\AssetProvider;
 use DebugBar\DataCollector\DataCollector;
diff --git a/htdocs/debugbar/class/DataCollector/DolRequestDataCollector.php b/htdocs/debugbar/class/DataCollector/DolRequestDataCollector.php
index 938643802d5..4ddcac9af7c 100644
--- a/htdocs/debugbar/class/DataCollector/DolRequestDataCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolRequestDataCollector.php
@@ -1,4 +1,25 @@
 <?php
+/* Copyright (C) 2023	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/debugbar/class/DataCollector/DolRequestDataCollector.php
+ *	\brief      Class for debugbar collection
+ *	\ingroup    debugbar
+ */
 
 use \DebugBar\DataCollector\RequestDataCollector;
 
diff --git a/htdocs/debugbar/class/DataCollector/DolTimeDataCollector.php b/htdocs/debugbar/class/DataCollector/DolTimeDataCollector.php
index ed5e979d539..d16622d329f 100644
--- a/htdocs/debugbar/class/DataCollector/DolTimeDataCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolTimeDataCollector.php
@@ -1,4 +1,25 @@
 <?php
+/* Copyright (C) 2023	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/debugbar/class/DataCollector/DolTimeDataCollector.php
+ *	\brief      Class for debugbar collection
+ *	\ingroup    debugbar
+ */
 
 use \DebugBar\DataCollector\TimeDataCollector;
 
diff --git a/htdocs/debugbar/class/DataCollector/DolibarrCollector.php b/htdocs/debugbar/class/DataCollector/DolibarrCollector.php
index 3193fe26176..11cedbe2b93 100644
--- a/htdocs/debugbar/class/DataCollector/DolibarrCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolibarrCollector.php
@@ -1,4 +1,25 @@
 <?php
+/* Copyright (C) 2023	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/debugbar/class/DataCollector/DolibarrCollector.php
+ *	\brief      Class for debugbar collection
+ *	\ingroup    debugbar
+ */
 
 use DebugBar\DataCollector\AssetProvider;
 use DebugBar\DataCollector\DataCollector;
diff --git a/htdocs/debugbar/class/DebugBar.php b/htdocs/debugbar/class/DebugBar.php
index bf797e638f7..6181ad7cd60 100644
--- a/htdocs/debugbar/class/DebugBar.php
+++ b/htdocs/debugbar/class/DebugBar.php
@@ -1,4 +1,25 @@
 <?php
+/* Copyright (C) 2023	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/debugbar/class/DebugBar.php
+ *	\brief      Class for debugbar
+ *	\ingroup    debugbar
+ */
 
 dol_include_once('/debugbar/class/autoloader.php');
 
diff --git a/htdocs/debugbar/class/TraceableDB.php b/htdocs/debugbar/class/TraceableDB.php
index 9f0a83fae3c..8e28b0c59bd 100644
--- a/htdocs/debugbar/class/TraceableDB.php
+++ b/htdocs/debugbar/class/TraceableDB.php
@@ -1,4 +1,25 @@
 <?php
+/* Copyright (C) 2023	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/debugbar/class/DataCollector/TraceableDB.php
+ *	\brief      Class for debugbar DB
+ *	\ingroup    debugbar
+ */
 
 require_once DOL_DOCUMENT_ROOT.'/core/db/DoliDB.class.php';
 

From 7aba21dd3e194ef49ed7dfee466856b345717085 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sat, 14 Jan 2023 17:05:45 +0100
Subject: [PATCH 556/816] Update list.php

---
 htdocs/adherents/list.php | 67 +++++++++++++++++++++++++++++++++------
 1 file changed, 57 insertions(+), 10 deletions(-)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index b9cbb252144..39a4d993221 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -73,7 +73,7 @@ $search_categ = GETPOST("search_categ", 'int');
 $search_filter = GETPOST("search_filter", 'alpha');
 $search_status = GETPOST("search_status", 'intcomma');
 $search_morphy = GETPOST("search_morphy", 'alpha');
-$search_import_key  = trim(GETPOST("search_import_key", "alpha"));
+$search_import_key  = trim(GETPOST("search_import_key", 'alpha'));
 $catid        = GETPOST("catid", 'int');
 $optioncss = GETPOST('optioncss', 'alpha');
 $socid = GETPOST('socid', 'int');
@@ -141,6 +141,7 @@ $fieldstosearchall = array(
 if ($db->type == 'pgsql') {
 	unset($fieldstosearchall['d.rowid']);
 }
+
 $arrayfields = array(
 	'd.ref'=>array('label'=>"Ref", 'checked'=>1),
 	'd.civility'=>array('label'=>"Civility", 'checked'=>0),
@@ -169,6 +170,7 @@ $arrayfields = array(
 	'd.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
 	'd.import_key'=>array('label'=>"ImportId", 'checked'=>0, 'position'=>1100),
 );
+
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
@@ -317,7 +319,11 @@ $formother = new FormOther($db);
 $membertypestatic = new AdherentType($db);
 $memberstatic = new Adherent($db);
 
-$title = $langs->trans("Members");
+// Page Header
+$title = $langs->trans("Members")." - ".$langs->trans("List");;
+$help_url = 'EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros|DE:Modul_Mitglieder';
+llxHeader('', $title, $help_url);
+
 
 $now = dol_now();
 
@@ -335,12 +341,14 @@ $sql .= " s.nom,";
 $sql .= " ".$db->ifsql("d.societe IS NULL", "s.nom", "d.societe")." as companyname,";
 $sql .= " t.libelle as type, t.subscription,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
+
 // 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
@@ -349,13 +357,16 @@ $sql = preg_replace('/,\s*$/', '', $sql);
 
 $sqlfields = $sql; // $sql fields to remove for count total
 
-$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
+// SQL Aliase adherent
+$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";  // maybe better to use ad (adh) instead od 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)";
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = d.country)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = d.state_id)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on (s.rowid = d.fk_soc)";
+
+// SQL Aliase adherent_type
 $sql .= ", ".MAIN_DB_PREFIX."adherent_type as t";
 $sql .= " WHERE d.fk_adherent_type = t.rowid";
 
@@ -525,8 +536,6 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 	exit;
 }
 
-$help_url = 'EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros';
-llxHeader('', $title, $help_url);
 
 if ($search_type > 0) {
 	$membertype = new AdherentType($db);
@@ -534,6 +543,7 @@ if ($search_type > 0) {
 	$title .= " (".$membertype->label.")";
 }
 
+// $parameters
 $param = '';
 if (!empty($mode)) {
 	$param .= '&mode='.urlencode($mode);
@@ -613,6 +623,7 @@ if ($search_type > 0) {
 if ($optioncss != '') {
 	$param .= '&optioncss='.urlencode($optioncss);
 }
+
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -705,6 +716,7 @@ print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" :
 
 // Line for filters fields
 print '<tr class="liste_titre_filter">';
+
 // Action column
 if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
 	print '<td class="liste_titre middle">';
@@ -712,6 +724,7 @@ if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
 	print $searchpicto;
 	print '</td>';
 }
+
 // Line numbering
 if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
 	print '<td class="liste_titre">&nbsp;</td>';
@@ -723,32 +736,45 @@ if (!empty($arrayfields['d.ref']['checked'])) {
 	print '<input class="flat maxwidth75imp" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
 	print '</td>';
 }
+
+// Civility
 if (!empty($arrayfields['d.civility']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth50imp" type="text" name="search_civility" value="'.dol_escape_htmltag($search_civility).'"></td>';
 }
+
+// First Name
 if (!empty($arrayfields['d.firstname']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_firstname" value="'.dol_escape_htmltag($search_firstname).'"></td>';
 }
+
+// Last Name
 if (!empty($arrayfields['d.lastname']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_lastname" value="'.dol_escape_htmltag($search_lastname).'"></td>';
 }
+
+// Gender
 if (!empty($arrayfields['d.gender']['checked'])) {
 	print '<td class="liste_titre">';
 	$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"), 'other'=>$langs->trans("Genderother"));
 	print $form->selectarray('search_gender', $arraygender, $search_gender, 1);
 	print '</td>';
 }
+
+// Company
 if (!empty($arrayfields['d.company']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_company" value="'.dol_escape_htmltag($search_company).'"></td>';
 }
+
+// Login
 if (!empty($arrayfields['d.login']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'"></td>';
 }
+
 // Nature
 if (!empty($arrayfields['d.morphy']['checked'])) {
 	print '<td class="liste_titre center">';
@@ -756,6 +782,8 @@ if (!empty($arrayfields['d.morphy']['checked'])) {
 	print $form->selectarray('search_morphy', $arraymorphy, $search_morphy, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
 	print '</td>';
 }
+
+// Member Type
 if (!empty($arrayfields['t.libelle']['checked'])) {
 	print '</td>';
 }
@@ -766,51 +794,62 @@ if (!empty($arrayfields['t.libelle']['checked'])) {
 	print '</td>';
 }
 
+// Address - Street
 if (!empty($arrayfields['d.address']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_address" value="'.dol_escape_htmltag($search_address).'"></td>';
 }
 
+// ZIP
 if (!empty($arrayfields['d.zip']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth50imp" type="text" name="search_zip" value="'.dol_escape_htmltag($search_zip).'"></td>';
 }
+
+// Town/City
 if (!empty($arrayfields['d.town']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_town" value="'.dol_escape_htmltag($search_town).'"></td>';
 }
-// State
+
+// State / County / Departement
 if (!empty($arrayfields['state.nom']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring maxwidth75imp" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
 	print '</td>';
 }
+
 // Country
 if (!empty($arrayfields['country.code_iso']['checked'])) {
 	print '<td class="liste_titre center">';
 	print $form->select_country($search_country, 'search_country', '', 0, 'minwidth100imp maxwidth100');
 	print '</td>';
 }
+
 // Phone pro
 if (!empty($arrayfields['d.phone']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_phone" value="'.dol_escape_htmltag($search_phone).'"></td>';
 }
+
 // Phone perso
 if (!empty($arrayfields['d.phone_perso']['checked'])) {
 	print '<td class="liste_titre left">';
-	print '<input class="flat maxwidth50" type="text" name="search_phone_perso" value="'.dol_escape_htmltag($search_phone_perso).'"></td>';
+	print '<input class="flat maxwidth75imp" type="text" name="search_phone_perso" value="'.dol_escape_htmltag($search_phone_perso).'"></td>';
 }
+
 // Phone mobile
 if (!empty($arrayfields['d.phone_mobile']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_phone_mobile" value="'.dol_escape_htmltag($search_phone_mobile).'"></td>';
 }
+
 // Email
 if (!empty($arrayfields['d.email']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_email" value="'.dol_escape_htmltag($search_email).'"></td>';
 }
+
 // End of subscription date
 if (!empty($arrayfields['d.datefin']['checked'])) {
 	print '<td class="liste_titre center">';
@@ -819,6 +858,7 @@ if (!empty($arrayfields['d.datefin']['checked'])) {
 	print $form->selectarray('search_filter', $selectarray, $search_filter);
 	print '</td>';
 }
+
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
@@ -826,21 +866,25 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 $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['d.datec']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
+
 // Birthday
 if (!empty($arrayfields['d.birth']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
+
 // Date modification
 if (!empty($arrayfields['d.tms']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
+
 // Status
 if (!empty($arrayfields['d.statut']['checked'])) {
 	print '<td class="liste_titre right parentonrightofpage">';
@@ -853,11 +897,14 @@ if (!empty($arrayfields['d.statut']['checked'])) {
 	print $form->selectarray('search_status', $liststatus, $search_status, -3, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
 	print '</td>';
 }
+
+// Import Key
 if (!empty($arrayfields['d.import_key']['checked'])) {
 	print '<td class="liste_titre center">';
 	print '<input class="flat searchstring maxwidth50" type="text" name="search_import_key" value="'.dol_escape_htmltag($search_import_key).'">';
 	print '</td>';
 }
+
 if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
 	// Action column
 	print '<td class="liste_titre middle">';
@@ -938,6 +985,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
+
 if (!empty($arrayfields['d.datec']['checked'])) {
 	print_liste_field_titre($arrayfields['d.datec']['label'], $_SERVER["PHP_SELF"], "d.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
 }
@@ -1025,14 +1073,13 @@ while ($i < min($num, $limit)) {
 			}
 			print '</td>';
 		}
-
+		// Technical ID
 		if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
 			print '<td class="center" data-key="id">'.$obj->rowid.'</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
 		}
-
 		// Ref
 		if (!empty($arrayfields['d.ref']['checked'])) {
 			print "<td>";
@@ -1142,7 +1189,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
-		// State
+		// State / County / Departement
 		if (!empty($arrayfields['state.nom']['checked'])) {
 			print "<td>".$obj->state_name."</td>\n";
 			if (!$i) {

From cb84d7797f2291824c4d62a835e81ac00e1cc1bd Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sat, 14 Jan 2023 16:06:39 +0000
Subject: [PATCH 557/816] Fixing style errors.

---
 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 39a4d993221..d06d91cbea6 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -358,7 +358,7 @@ $sql = preg_replace('/,\s*$/', '', $sql);
 $sqlfields = $sql; // $sql fields to remove for count total
 
 // SQL Aliase adherent
-$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";  // maybe better to use ad (adh) instead od d 
+$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";  // maybe better to use ad (adh) instead od 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)";
 }

From bff128a061735948435045d55893a5bcc6a0fd2a Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sat, 14 Jan 2023 17:41:29 +0100
Subject: [PATCH 558/816] Update list.php

---
 htdocs/contact/list.php | 100 +++++++++++++++++++++++++++++-----------
 1 file changed, 74 insertions(+), 26 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index a025ef81b97..1cc2d67cf93 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -101,10 +101,10 @@ $search_type = GETPOST('search_type', 'alpha');
 $search_address = GETPOST('search_address', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
 $search_town = GETPOST('search_town', 'alpha');
-$search_import_key = GETPOST("search_import_key", "alpha");
+$search_import_key = GETPOST("search_import_key", 'alpha');
 $search_country = GETPOST("search_country", 'intcomma');
 $search_roles = GETPOST("search_roles", 'array');
-$search_level = GETPOST("search_level", "array");
+$search_level = GETPOST("search_level", 'array');
 $search_stcomm = GETPOST('search_stcomm', 'int');
 
 if ($search_status === '') {
@@ -350,9 +350,14 @@ $formother = new FormOther($db);
 $formcompany = new FormCompany($db);
 $contactstatic = new Contact($db);
 
-$morejs=array();
+$morejs = array();
 $morecss = array();
 
+// Page Header
+$title = $langs->trans("Contacts")." - ".$langs->trans("List");
+$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:M&oacute;dulo_Empresas';
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');
+
 if (!empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES)) {
 	$contactstatic->loadCacheOfProspStatus();
 }
@@ -387,6 +392,7 @@ $sql .= " p.phone as phone_pro, p.phone_mobile, p.phone_perso, p.fax, p.fk_pays,
 $sql .= " p.import_key,";
 $sql .= " st.libelle as stcomm, st.picto as stcomm_picto, p.fk_stcommcontact as stcomm_id, p.fk_prospectlevel,";
 $sql .= " co.label as country, co.code as country_code";
+
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
@@ -396,13 +402,15 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 if (isModEnabled('mailing')) {
 	$sql .= ", (SELECT count(*) FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE email = p.email) as unsubscribed";
 }
-// Add fields from hooks
+
+// Add fields from hooks - ListSelect
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
 $sqlfields = $sql; // $sql fields to remove for count total
 
+// SQL Table Aliase
 $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";
 if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (p.rowid = ef.fk_object)";
@@ -413,7 +421,8 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_stcommcontact as st ON st.id = p.fk_stco
 if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 }
-// Add fields from hooks
+
+// Add fields from hooks - ListFrom
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
@@ -443,9 +452,13 @@ if ($search_priv != '0' && $search_priv != '1') {
 	}
 }
 
+
+// Search Categories
+
+ // Search Contact Categories  
 $searchCategoryContactList = $search_categ ? array($search_categ) : array();
 $searchCategoryContactOperator = 0;
-// Search for tag/category ($searchCategoryContactList is an array of ID)
+ // Search for tag/category ($searchCategoryContactList is an array of ID)
 if (!empty($searchCategoryContactList)) {
 	$searchCategoryContactSqlList = array();
 	$listofcategoryid = '';
@@ -473,9 +486,11 @@ if (!empty($searchCategoryContactList)) {
 		}
 	}
 }
+
+ // Search Customer Categories 
 $searchCategoryCustomerList = $search_categ_thirdparty ? array($search_categ_thirdparty) : array();
 $searchCategoryCustomerOperator = 0;
-// Search for tag/category ($searchCategoryCustomerList is an array of ID)
+ // Search for tag/category ($searchCategoryCustomerList is an array of ID)
 if (!empty($searchCategoryCustomerList)) {
 	$searchCategoryCustomerSqlList = array();
 	$listofcategoryid = '';
@@ -503,9 +518,11 @@ if (!empty($searchCategoryCustomerList)) {
 		}
 	}
 }
+
+ // Search Supplier Categories
 $searchCategorySupplierList = $search_categ_supplier ? array($search_categ_supplier) : array();
 $searchCategorySupplierOperator = 0;
-// Search for tag/category ($searchCategorySupplierList is an array of ID)
+ // Search for tag/category ($searchCategorySupplierList is an array of ID)
 if (!empty($searchCategorySupplierList)) {
 	$searchCategorySupplierSqlList = array();
 	$listofcategoryid = '';
@@ -600,6 +617,7 @@ if (isModEnabled('socialnetworks')) {
 	}
 }
 //print $sql;
+
 if (strlen($search_email)) {
 	$sql .= natural_search('p.email', $search_email);
 }
@@ -627,20 +645,22 @@ if ($search_status != '' && $search_status >= 0) {
 if ($search_import_key) {
 	$sql .= natural_search("p.import_key", $search_import_key);
 }
-if ($type == "o") {        // filtre sur type
+if ($type == "o") {        // filter on type
 	$sql .= " AND p.fk_soc IS NULL";
-} elseif ($type == "f") {        // filtre sur type
+} elseif ($type == "f") {        // filter on type
 	$sql .= " AND s.fournisseur = 1";
-} elseif ($type == "c") {        // filtre sur type
+} elseif ($type == "c") {        // filter on type
 	$sql .= " AND s.client IN (1, 3)";
-} elseif ($type == "p") {        // filtre sur type
+} elseif ($type == "p") {        // filter on type
 	$sql .= " AND s.client IN (2, 3)";
 }
 if (!empty($socid)) {
 	$sql .= " AND s.rowid = ".((int) $socid);
 }
+
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
+
 // Add where from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
@@ -695,8 +715,7 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && (
 	exit;
 }
 
-$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:M&oacute;dulo_Empresas';
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');
+
 
 $param = '';
 if (!empty($mode)) {
@@ -948,20 +967,25 @@ if (!empty($arrayfields['p.town']['checked'])) {
 	print '<input class="flat" type="text" name="search_town" size="5" value="'.dol_escape_htmltag($search_town).'">';
 	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']))
  {
  print '<td class="liste_titre">';
  print '<input class="flat searchstring" size="4" type="text" name="search_region" value="'.dol_escape_htmltag($search_region).'">';
  print '</td>';
- }*/
+ }
+*/
+
 // Country
 if (!empty($arrayfields['country.code_iso']['checked'])) {
 	print '<td class="liste_titre center">';
@@ -1014,7 +1038,7 @@ if (!empty($arrayfields['p.fk_soc']['checked']) || !empty($arrayfields['s.nom'][
 	print '<input class="flat" type="text" name="search_societe" size="8" value="'.dol_escape_htmltag($search_societe).'">';
 	print '</td>';
 }
-// Alias
+// Alias of ThirdParty
 if (!empty($arrayfields['s.name_alias']['checked'])) {
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat maxwidth100" type="text" name="search_societe_alias" value="'.dol_escape_htmltag($search_societe_alias).'">';
@@ -1079,7 +1103,7 @@ if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
 }
 print '</tr>';
 
-// Ligne des titres
+// Title line
 print '<tr class="liste_titre">';
 if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
@@ -1238,6 +1262,7 @@ while ($i < min($num, $limit)) {
 			}
 			print '</td>';
 		}
+		
 		// ID
 		if (!empty($arrayfields['p.rowid']['checked'])) {
 			print '<td class="tdoverflowmax50">';
@@ -1247,7 +1272,8 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
-		// Name
+		
+		// (Last) Name
 		if (!empty($arrayfields['p.lastname']['checked'])) {
 			print '<td class="middle tdoverflowmax150">';
 			print $contactstatic->getNomUrl(1);
@@ -1256,6 +1282,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
+		
 		// Firstname
 		if (!empty($arrayfields['p.firstname']['checked'])) {
 			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->firstname).'">'.dol_escape_htmltag($obj->firstname).'</td>';
@@ -1263,6 +1290,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
+		
 		// Job position
 		if (!empty($arrayfields['p.poste']['checked'])) {
 			print '<td class="tdoverflowmax100">'.dol_escape_htmltag($obj->poste).'</td>';
@@ -1270,6 +1298,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
+		
 		// Address
 		if (!empty($arrayfields['p.address']['checked'])) {
 			print '<td>'.dol_escape_htmltag($obj->address).'</td>';
@@ -1277,6 +1306,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
+		
 		// Zip
 		if (!empty($arrayfields['p.zip']['checked'])) {
 			print '<td>'.dol_escape_htmltag($obj->zip).'</td>';
@@ -1284,6 +1314,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
+		
 		// Town
 		if (!empty($arrayfields['p.town']['checked'])) {
 			print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($obj->town).'">'.dol_escape_htmltag($obj->town).'</td>';
@@ -1291,18 +1322,22 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
+		
+		/*
 		// 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']))
 		{
 			print "<td>".$obj->region_name."</td>\n";
 			if (! $i) $totalarray['nbfield']++;
 		}*/
+		
 		// Country
 		if (!empty($arrayfields['country.code_iso']['checked'])) {
 			print '<td class="center">';
@@ -1313,13 +1348,15 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
-		// Phone
+		
+		// Phone pro
 		if (!empty($arrayfields['p.phone']['checked'])) {
 			print '<td class="nowraponall tdoverflowmax150">'.dol_print_phone($obj->phone_pro, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'phone').'</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
 		}
+		
 		// Phone perso
 		if (!empty($arrayfields['p.phone_perso']['checked'])) {
 			print '<td class="nowraponall tdoverflowmax150">'.dol_print_phone($obj->phone_perso, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'phone').'</td>';
@@ -1327,6 +1364,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
+		
 		// Phone mobile
 		if (!empty($arrayfields['p.phone_mobile']['checked'])) {
 			print '<td class="nowraponall tdoverflowmax150">'.dol_print_phone($obj->phone_mobile, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'mobile').'</td>';
@@ -1334,6 +1372,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
+		
 		// Fax
 		if (!empty($arrayfields['p.fax']['checked'])) {
 			print '<td class="nowraponall tdoverflowmax150">'.dol_print_phone($obj->fax, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'fax').'</td>';
@@ -1341,6 +1380,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
+		
 		// EMail
 		if (!empty($arrayfields['p.email']['checked'])) {
 			print '<td class="nowraponall tdoverflowmax300">'.dol_print_email($obj->email, $obj->rowid, $obj->socid, 'AC_EMAIL', 18, 0, 1).'</td>';
@@ -1348,7 +1388,8 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
-		// No EMail
+		
+		// No EMail Subscription
 		if (!empty($arrayfields['unsubscribed']['checked'])) {
 			print '<td class="center">';
 			if (empty($obj->email)) {
@@ -1361,6 +1402,8 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
+		
+		// Social Networks
 		if (isModEnabled('socialnetworks')) {
 			foreach ($socialnetworks as $key => $value) {
 				if ($value['active'] && !empty($arrayfields['p.'.$key]['checked'])) {
@@ -1371,7 +1414,8 @@ while ($i < min($num, $limit)) {
 				}
 			}
 		}
-		// Company
+
+		// Company / Third Party
 		if (!empty($arrayfields['p.fk_soc']['checked']) || !empty($arrayfields['s.nom']['checked'])) {
 			print '<td class="tdoverflowmax200">';
 			if ($obj->socid) {
@@ -1404,9 +1448,9 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
-
+		
+		// Prospect Level
 		if (!empty($arrayfields['p.fk_prospectlevel']['checked'])) {
-			// Prospect level
 			print '<td class="center">';
 			print $contactstatic->getLibProspLevel();
 			print "</td>";
@@ -1415,8 +1459,8 @@ while ($i < min($num, $limit)) {
 			}
 		}
 
+		// Prospect status
 		if (!empty($arrayfields['p.fk_stcommcontact']['checked'])) {
-			// Prospect status
 			print '<td class="center nowrap"><div class="nowrap">';
 			print '<div class="inline-block">'.$contactstatic->libProspCommStatut($obj->stcomm_id, 2, $contactstatic->cacheprospectstatus[$obj->stcomm_id]['label'], $obj->stcomm_picto);
 			print '</div> - <div class="inline-block">';
@@ -1437,6 +1481,7 @@ while ($i < min($num, $limit)) {
 
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+		
 		// Fields from hook
 		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
@@ -1450,6 +1495,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
+		
 		// Date modification
 		if (!empty($arrayfields['p.tms']['checked'])) {
 			print '<td class="center nowraponall">';
@@ -1459,6 +1505,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
+		
 		// Status
 		if (!empty($arrayfields['p.statut']['checked'])) {
 			print '<td class="center">'.$contactstatic->getLibStatut(5).'</td>';
@@ -1466,6 +1513,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
+		
 		// Import key
 		if (!empty($arrayfields['p.import_key']['checked'])) {
 			print '<td class="tdoverflowmax100">';

From 35300b3dfc0b84910959113e74b2555f14804ca7 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sat, 14 Jan 2023 16:42:30 +0000
Subject: [PATCH 559/816] Fixing style errors.

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

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 1cc2d67cf93..f34c477ff71 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -455,7 +455,7 @@ if ($search_priv != '0' && $search_priv != '1') {
 
 // Search Categories
 
- // Search Contact Categories  
+ // Search Contact Categories
 $searchCategoryContactList = $search_categ ? array($search_categ) : array();
 $searchCategoryContactOperator = 0;
  // Search for tag/category ($searchCategoryContactList is an array of ID)
@@ -487,7 +487,7 @@ if (!empty($searchCategoryContactList)) {
 	}
 }
 
- // Search Customer Categories 
+ // Search Customer Categories
 $searchCategoryCustomerList = $search_categ_thirdparty ? array($search_categ_thirdparty) : array();
 $searchCategoryCustomerOperator = 0;
  // Search for tag/category ($searchCategoryCustomerList is an array of ID)
@@ -976,7 +976,7 @@ if (!empty($arrayfields['p.town']['checked'])) {
  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']))
  {
@@ -1262,7 +1262,7 @@ while ($i < min($num, $limit)) {
 			}
 			print '</td>';
 		}
-		
+
 		// ID
 		if (!empty($arrayfields['p.rowid']['checked'])) {
 			print '<td class="tdoverflowmax50">';
@@ -1272,7 +1272,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// (Last) Name
 		if (!empty($arrayfields['p.lastname']['checked'])) {
 			print '<td class="middle tdoverflowmax150">';
@@ -1282,7 +1282,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// Firstname
 		if (!empty($arrayfields['p.firstname']['checked'])) {
 			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->firstname).'">'.dol_escape_htmltag($obj->firstname).'</td>';
@@ -1290,7 +1290,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// Job position
 		if (!empty($arrayfields['p.poste']['checked'])) {
 			print '<td class="tdoverflowmax100">'.dol_escape_htmltag($obj->poste).'</td>';
@@ -1298,7 +1298,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// Address
 		if (!empty($arrayfields['p.address']['checked'])) {
 			print '<td>'.dol_escape_htmltag($obj->address).'</td>';
@@ -1306,7 +1306,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// Zip
 		if (!empty($arrayfields['p.zip']['checked'])) {
 			print '<td>'.dol_escape_htmltag($obj->zip).'</td>';
@@ -1314,7 +1314,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// Town
 		if (!empty($arrayfields['p.town']['checked'])) {
 			print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($obj->town).'">'.dol_escape_htmltag($obj->town).'</td>';
@@ -1322,7 +1322,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		/*
 		// State
 		if (!empty($arrayfields['state.nom']['checked']))
@@ -1330,14 +1330,14 @@ while ($i < min($num, $limit)) {
 			print "<td>".$obj->state_name."</td>\n";
 			if (! $i) $totalarray['nbfield']++;
 		}
-		
+
 		// Region
 		if (!empty($arrayfields['region.nom']['checked']))
 		{
 			print "<td>".$obj->region_name."</td>\n";
 			if (! $i) $totalarray['nbfield']++;
 		}*/
-		
+
 		// Country
 		if (!empty($arrayfields['country.code_iso']['checked'])) {
 			print '<td class="center">';
@@ -1348,7 +1348,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// Phone pro
 		if (!empty($arrayfields['p.phone']['checked'])) {
 			print '<td class="nowraponall tdoverflowmax150">'.dol_print_phone($obj->phone_pro, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'phone').'</td>';
@@ -1356,7 +1356,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// Phone perso
 		if (!empty($arrayfields['p.phone_perso']['checked'])) {
 			print '<td class="nowraponall tdoverflowmax150">'.dol_print_phone($obj->phone_perso, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'phone').'</td>';
@@ -1364,7 +1364,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// Phone mobile
 		if (!empty($arrayfields['p.phone_mobile']['checked'])) {
 			print '<td class="nowraponall tdoverflowmax150">'.dol_print_phone($obj->phone_mobile, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'mobile').'</td>';
@@ -1372,7 +1372,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// Fax
 		if (!empty($arrayfields['p.fax']['checked'])) {
 			print '<td class="nowraponall tdoverflowmax150">'.dol_print_phone($obj->fax, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'fax').'</td>';
@@ -1380,7 +1380,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// EMail
 		if (!empty($arrayfields['p.email']['checked'])) {
 			print '<td class="nowraponall tdoverflowmax300">'.dol_print_email($obj->email, $obj->rowid, $obj->socid, 'AC_EMAIL', 18, 0, 1).'</td>';
@@ -1388,7 +1388,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// No EMail Subscription
 		if (!empty($arrayfields['unsubscribed']['checked'])) {
 			print '<td class="center">';
@@ -1402,7 +1402,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// Social Networks
 		if (isModEnabled('socialnetworks')) {
 			foreach ($socialnetworks as $key => $value) {
@@ -1448,7 +1448,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// Prospect Level
 		if (!empty($arrayfields['p.fk_prospectlevel']['checked'])) {
 			print '<td class="center">';
@@ -1481,7 +1481,7 @@ while ($i < min($num, $limit)) {
 
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-		
+
 		// Fields from hook
 		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
@@ -1495,7 +1495,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// Date modification
 		if (!empty($arrayfields['p.tms']['checked'])) {
 			print '<td class="center nowraponall">';
@@ -1505,7 +1505,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// Status
 		if (!empty($arrayfields['p.statut']['checked'])) {
 			print '<td class="center">'.$contactstatic->getLibStatut(5).'</td>';
@@ -1513,7 +1513,7 @@ while ($i < min($num, $limit)) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// Import key
 		if (!empty($arrayfields['p.import_key']['checked'])) {
 			print '<td class="tdoverflowmax100">';

From 64ecdd0632f4ef18518abcedf7ba117635e99362 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sat, 14 Jan 2023 18:35:09 +0100
Subject: [PATCH 560/816] Update subaccount.php

---
 htdocs/accountancy/admin/subaccount.php | 32 ++++++++++++++++---------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/htdocs/accountancy/admin/subaccount.php b/htdocs/accountancy/admin/subaccount.php
index 4f2274269d8..2f6a731ca48 100644
--- a/htdocs/accountancy/admin/subaccount.php
+++ b/htdocs/accountancy/admin/subaccount.php
@@ -19,17 +19,18 @@
 
 /**
  * \file 		htdocs/accountancy/admin/subaccount.php
- * \ingroup     Accountancy (Double entries)
- * \brief		List of accounting sub-account (auxiliary accounts)
+ * \ingroup 	Accountancy (Double entries)
+ * \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';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+
 
 // Load translation files required by the page
-$langs->loadLangs(array("compta", "bills", "admin", "accountancy", "salaries", "hrm", "errors"));
+$langs->loadLangs(array("accountancy", "admin", "bills", "compta", "errors", "hrm", "salaries"));
 
 $mesg = '';
 $action = GETPOST('action', 'aZ09');
@@ -81,6 +82,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL < 2) {
 	unset($arrayfields['reconcilable']);
 }
 
+
 /*
  * Actions
  */
@@ -120,11 +122,13 @@ if (empty($reshook)) {
 
 $form = new Form($db);
 
-$help_url = '';
-$title = $langs->trans('ChartOfIndividualAccountsOfSubsidiaryLedger');
 
+// Page Header
+$help_url = 'EN:Module_Double_Entry_Accounting#Setup';
+$title = $langs->trans('ChartOfIndividualAccountsOfSubsidiaryLedger');
 llxHeader('', $title, $help_url);
 
+
 // Customer
 $sql = "SELECT sa.rowid, sa.nom as label, sa.code_compta as subaccount, '1' as type, sa.entity";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe sa";
@@ -219,7 +223,7 @@ if (!empty($search_type) && $search_type >= 0) {
 	$sql .= " HAVING type LIKE '".$db->escape($search_type)."'";
 }
 
-// User
+// User - Employee
 $sql .= " UNION ";
 $sql .= " SELECT u.rowid, u.lastname as label, u.accountancy_code as subaccount, '3' as type, u.entity FROM ".MAIN_DB_PREFIX."user u";
 $sql .= " WHERE u.entity IN (".getEntity('user').")";
@@ -400,14 +404,17 @@ if ($resql) {
 		if (!empty($arrayfields['type']['checked'])) {
 			print '<td class="center">';
 			$s = '';
+			
 			// Customer
 			if ($obj->type == 1) {
 				$s .= '<a class="customer-back" style="padding-left: 6px; padding-right: 6px" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->rowid.'">'.$langs->trans("Customer").'</a>';
 			} elseif ($obj->type == 2) {
-				// Supplier
+				
+			// Supplier
 				$s .= '<a class="vendor-back" style="padding-left: 6px; padding-right: 6px" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$obj->rowid.'">'.$langs->trans("Supplier").'</a>';
 			} elseif ($obj->type == 3) {
-				// User
+				
+			// User - Employee
 				$s .= '<a class="user-back" style="padding-left: 6px; padding-right: 6px" title="'.$langs->trans("Employee").'" href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->rowid.'">'.$langs->trans("Employee").'</a>';
 			}
 			print $s;
@@ -440,14 +447,17 @@ if ($resql) {
 		// Action
 		print '<td class="center">';
 		$e = '';
+		
 		// Customer
 		if ($obj->type == 1) {
 			$e .= '<a class="editfielda" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/societe/card.php?action=edit&token='.newToken().'&socid='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">'.img_edit().'</a>';
 		} elseif ($obj->type == 2) {
-			// Supplier
+			
+		// Supplier
 			$e .= '<a class="editfielda" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/societe/card.php?action=edit&token='.newToken().'&socid='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">'.img_edit().'</a>';
 		} elseif ($obj->type == 3) {
-			// User
+			
+		// User - Employee
 			$e .= '<a class="editfielda" title="'.$langs->trans("Employee").'" href="'.DOL_URL_ROOT.'/user/card.php?action=edit&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">'.img_edit().'</a>';
 		}
 		print $e;

From 5fef3398fd2e70a17ff9d3c8ce9b4185e1deb356 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sat, 14 Jan 2023 17:36:09 +0000
Subject: [PATCH 561/816] Fixing style errors.

---
 htdocs/accountancy/admin/subaccount.php | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/htdocs/accountancy/admin/subaccount.php b/htdocs/accountancy/admin/subaccount.php
index 2f6a731ca48..40055a4b75f 100644
--- a/htdocs/accountancy/admin/subaccount.php
+++ b/htdocs/accountancy/admin/subaccount.php
@@ -404,17 +404,15 @@ if ($resql) {
 		if (!empty($arrayfields['type']['checked'])) {
 			print '<td class="center">';
 			$s = '';
-			
+
 			// Customer
 			if ($obj->type == 1) {
 				$s .= '<a class="customer-back" style="padding-left: 6px; padding-right: 6px" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->rowid.'">'.$langs->trans("Customer").'</a>';
 			} elseif ($obj->type == 2) {
-				
-			// Supplier
+				// Supplier
 				$s .= '<a class="vendor-back" style="padding-left: 6px; padding-right: 6px" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$obj->rowid.'">'.$langs->trans("Supplier").'</a>';
 			} elseif ($obj->type == 3) {
-				
-			// User - Employee
+				// User - Employee
 				$s .= '<a class="user-back" style="padding-left: 6px; padding-right: 6px" title="'.$langs->trans("Employee").'" href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->rowid.'">'.$langs->trans("Employee").'</a>';
 			}
 			print $s;
@@ -447,17 +445,15 @@ if ($resql) {
 		// Action
 		print '<td class="center">';
 		$e = '';
-		
+
 		// Customer
 		if ($obj->type == 1) {
 			$e .= '<a class="editfielda" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/societe/card.php?action=edit&token='.newToken().'&socid='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">'.img_edit().'</a>';
 		} elseif ($obj->type == 2) {
-			
-		// Supplier
+			// Supplier
 			$e .= '<a class="editfielda" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/societe/card.php?action=edit&token='.newToken().'&socid='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">'.img_edit().'</a>';
 		} elseif ($obj->type == 3) {
-			
-		// User - Employee
+			// User - Employee
 			$e .= '<a class="editfielda" title="'.$langs->trans("Employee").'" href="'.DOL_URL_ROOT.'/user/card.php?action=edit&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">'.img_edit().'</a>';
 		}
 		print $e;

From 982ee6259fa649b233b98e0e5e9f88a5127cc54e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 14 Jan 2023 21:21:48 +0100
Subject: [PATCH 562/816] NEW Session invalidation after a password change

---
 htdocs/api/class/api_login.class.php     |  3 +++
 htdocs/core/lib/security2.lib.php        |  7 +++----
 htdocs/core/lib/ws.lib.php               |  4 ++++
 htdocs/core/login/functions_dolibarr.php | 19 ++++++++++++++++++-
 htdocs/main.inc.php                      |  1 +
 htdocs/user/card.php                     |  4 ++++
 htdocs/user/class/user.class.php         |  2 +-
 7 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php
index d5362f4ac56..0b8d3e64828 100644
--- a/htdocs/api/class/api_login.class.php
+++ b/htdocs/api/class/api_login.class.php
@@ -121,6 +121,9 @@ class Login
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 		$login = checkLoginPassEntity($login, $password, $entity, $authmode, 'api');		// Check credentials.
+		if ($login === '--bad-login-validity--') {
+			$login = '';
+		}
 		if (empty($login)) {
 			throw new RestException(403, 'Access denied');
 		}
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index b33ad1333ef..5e4d58103d8 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -52,12 +52,11 @@ function dol_getwebuser($mode)
  *	@param		string	$entitytotest		Instance of data we must check
  *	@param		array	$authmode			Array list of selected authentication mode array('http', 'dolibarr', 'xxx'...)
  *	@param		string	$context			Context checkLoginPassEntity was created for ('api', 'dav', 'ws', '')
- *  @return		string						Login or ''
+ *  @return		string						Login or '' or '--bad-login-validity--'
  */
 function checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $authmode, $context = '')
 {
 	global $conf, $langs;
-	//global $dolauthmode;    // To return authentication finally used
 
 	// Check parameters
 	if ($entitytotest == '') {
@@ -100,10 +99,10 @@ function checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $auth
 					if ($login && $login != '--bad-login-validity--') {	// Login is successfull
 						$test = false; // To stop once at first login success
 						$conf->authmode = $mode; // This properties is defined only when logged to say what mode was successfully used
-						$dol_tz = GETPOST('tz');
+						/*$dol_tz = GETPOST('tz');
 						$dol_dst = GETPOST('dst');
 						$dol_screenwidth = GETPOST('screenwidth');
-						$dol_screenheight = GETPOST('screenheight');
+						$dol_screenheight = GETPOST('screenheight');*/
 					}
 				} else {
 					dol_syslog("Authentication KO - failed to load file '".$authfile."'", LOG_ERR);
diff --git a/htdocs/core/lib/ws.lib.php b/htdocs/core/lib/ws.lib.php
index ad4688f9134..a26604b18bc 100644
--- a/htdocs/core/lib/ws.lib.php
+++ b/htdocs/core/lib/ws.lib.php
@@ -86,6 +86,10 @@ function check_authentication($authentication, &$error, &$errorcode, &$errorlabe
 
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 			$login = checkLoginPassEntity($authentication['login'], $authentication['password'], $authentication['entity'], $authmode, 'ws');
+			if ($login === '--bad-login-validity--') {
+				$login = '';
+			}
+
 			if (empty($login)) {
 				$error++;
 				$errorcode = 'BAD_CREDENTIALS';
diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php
index e8c3ab38e46..b732d2ef64b 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -28,6 +28,7 @@
 /**
  * Check validity of user/password/entity
  * If test is ko, reason must be filled into $_SESSION["dol_loginmesg"]
+ * Note: On critical error (hack attempt), we put a log "functions_dolibarr::check_user_password_dolibarr authentication KO"
  *
  * @param	string	$usertotest		Login
  * @param	string	$passwordtotest	Password
@@ -56,7 +57,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 		$usernamecol2 = 'email';
 		$entitycol = 'entity';
 
-		$sql = "SELECT rowid, login, entity, pass, pass_crypted, datestartvalidity, dateendvalidity";
+		$sql = "SELECT rowid, login, entity, pass, pass_crypted, datestartvalidity, dateendvalidity, flagdelsessionsbefore";
 		$sql .= " FROM ".$table;
 		$sql .= " WHERE (".$usernamecol1." = '".$db->escape($usertotest)."'";
 		if (preg_match('/@/', $usertotest)) {
@@ -74,18 +75,34 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 			$obj = $db->fetch_object($resql);
 			if ($obj) {
 				$now = dol_now();
+				// Check date start validity
 				if ($obj->datestartvalidity && $db->jdate($obj->datestartvalidity) > $now) {
 					// Load translation files required by the page
 					$langs->loadLangs(array('main', 'errors'));
 					$_SESSION["dol_loginmesg"] = $langs->transnoentitiesnoconv("ErrorLoginDateValidity");
+					dol_syslog("functions_dolibarr::check_user_password_dolibarr bad datestart validity", LOG_WARNING);
 					return '--bad-login-validity--';
 				}
+				// Check date end validity
 				if ($obj->dateendvalidity && $db->jdate($obj->dateendvalidity) < dol_get_first_hour($now)) {
 					// Load translation files required by the page
 					$langs->loadLangs(array('main', 'errors'));
 					$_SESSION["dol_loginmesg"] = $langs->transnoentitiesnoconv("ErrorLoginDateValidity");
+					dol_syslog("functions_dolibarr::check_user_password_dolibarr bad date end validity", LOG_WARNING);
 					return '--bad-login-validity--';
 				}
+				// If there is an invalidation date, check that the current session date is not before this date
+				if ($obj->flagdelsessionsbefore && !empty($_SESSION["dol_logindate"])) {
+					dol_syslog("functions_dolibarr::check_user_password_dolibarr user has a date for session invalidation = ".$obj->flagdelsessionsbefore." and session date = ".$_SESSION["dol_logindate"]);
+					$datetmp = $db->jdate($obj->flagdelsessionsbefore, 'gmt');
+					if ($datetmp > $now) {
+						// Load translation files required by the page
+						$langs->loadLangs(array('main', 'errors'));
+						$_SESSION["dol_loginmesg"] = $langs->transnoentitiesnoconv("ErrorSessionInvalidatedAfterPasswordChange");
+						dol_syslog("functions_dolibarr::check_user_password_dolibarr session was invalidated", LOG_WARNING);
+						return '--bad-login-validity--';
+					}
+				}
 
 				$passclear = $obj->pass;
 				$passcrypted = $obj->pass_crypted;
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 549c72157a6..7d764d4a105 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1048,6 +1048,7 @@ if (!defined('NOLOGIN')) {
 
 		// Store value into session (values always stored)
 		$_SESSION["dol_login"] = $user->login;
+		$_SESSION["dol_logindate"] = dol_now('gmt');
 		$_SESSION["dol_authmode"] = isset($dol_authmode) ? $dol_authmode : '';
 		$_SESSION["dol_tz"] = isset($dol_tz) ? $dol_tz : '';
 		$_SESSION["dol_tz_string"] = isset($dol_tz_string) ? $dol_tz_string : '';
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 67ea2174322..0af78cc208f 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -71,6 +71,10 @@ $group = GETPOST("group", "int", 3);
 $cancel		= GETPOST('cancel', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'useracard'; // To manage different context of search
 
+if (empty($id)) {
+	$id = $user->id;
+}
+
 $dateemployment = dol_mktime(0, 0, 0, GETPOST('dateemploymentmonth', 'int'), GETPOST('dateemploymentday', 'int'), GETPOST('dateemploymentyear', 'int'));
 $dateemploymentend = dol_mktime(0, 0, 0, GETPOST('dateemploymentendmonth', 'int'), GETPOST('dateemploymentendday', 'int'), GETPOST('dateemploymentendyear', 'int'));
 $datestartvalidity = dol_mktime(0, 0, 0, GETPOST('datestartvaliditymonth', 'int'), GETPOST('datestartvalidityday', 'int'), GETPOST('datestartvalidityyear', 'int'));
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 9e208ff3e37..7e342e64337 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2298,7 +2298,7 @@ class User extends CommonObject
 			$sql = "UPDATE ".$this->db->prefix()."user";
 			$sql .= " SET pass_crypted = '".$this->db->escape($password_crypted)."',";
 			$sql .= " pass_temp = null";
-			if (empty($flagdelsessionsbefore)) {
+			if (!empty($flagdelsessionsbefore)) {
 				$sql .= ", flagdelsessionsbefore = '".$this->db->idate(dol_now() - 5, 'gmt')."'";
 			}
 			if (!empty($conf->global->DATABASE_PWD_ENCRYPTED)) {

From 39a224d7a1eaf637c369a199a8971b5c5874a019 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sun, 15 Jan 2023 01:18:32 +0100
Subject: [PATCH 563/816] Update bookmarks.lang

---
 htdocs/langs/en_US/bookmarks.lang | 47 ++++++++++++++++---------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/htdocs/langs/en_US/bookmarks.lang b/htdocs/langs/en_US/bookmarks.lang
index 26551eee4f0..bfbab1ef520 100644
--- a/htdocs/langs/en_US/bookmarks.lang
+++ b/htdocs/langs/en_US/bookmarks.lang
@@ -1,23 +1,24 @@
-# Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=Add current page to bookmarks
-Bookmark=Bookmark
-Bookmarks=Bookmarks
-ListOfBookmarks=List of bookmarks
-EditBookmarks=List/edit bookmarks
-NewBookmark=New bookmark
-ShowBookmark=Show bookmark
-OpenANewWindow=Open a new tab
-ReplaceWindow=Replace current tab
-BookmarkTargetNewWindowShort=New tab
-BookmarkTargetReplaceWindowShort=Current tab
-BookmarkTitle=Bookmark name
-UrlOrLink=URL
-BehaviourOnClick=Behaviour when a bookmark URL is selected
-CreateBookmark=Create bookmark
-SetHereATitleForLink=Set a name for the bookmark
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://externalurl.com) or an internal/relative link (/mypage.php). You can also use phone like tel:0123456.
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if the linked page should open in the current tab or a new tab
-BookmarksManagement=Bookmarks management
-BookmarksMenuShortCut=Ctrl + shift + m
-NoBookmarks=No bookmarks defined
-NoBookmarkFound=No bookmark found
\ No newline at end of file
+# Dolibarr language file - Source file is en_US - marque pages / bookmarks
+
+AddThisPageToBookmarks = Add current page to bookmarks
+BehaviourOnClick = Behaviour when a bookmark URL is selected
+Bookmark = Bookmark
+Bookmarks = Bookmarks
+BookmarkTargetNewWindowShort = New tab
+BookmarkTargetReplaceWindowShort = Current tab
+BookmarkTitle = Bookmark name
+BookmarksManagement = Bookmarks management
+BookmarksMenuShortCut = Ctrl + shift + m
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark = Choose if the linked page should open in the current tab or a new tab
+CreateBookmark = Create bookmark
+EditBookmarks = List/edit bookmarks
+ListOfBookmarks = List of bookmarks
+NewBookmark = New bookmark
+NoBookmarkFound = No bookmark found
+NoBookmarks = No bookmarks defined
+OpenANewWindow = Open a new tab
+ReplaceWindow = Replace current tab
+SetHereATitleForLink = Set a name for the bookmark
+ShowBookmark = Show bookmark
+UrlOrLink = URL
+UseAnExternalHttpLinkOrRelativeDolibarrLink = Use an external/absolute link (https://externalurl.com) or an internal/relative link (/mypage.php). You can also use phone like tel:0123456.

From b754b7a99fb530c4f7eee006ae7dc9b0ef0ee51f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 15 Jan 2023 01:25:07 +0100
Subject: [PATCH 564/816] Enhance vcard

---
 htdocs/core/class/vcard.class.php | 10 ++++++----
 htdocs/public/users/view.php      | 27 +++++++++++++++------------
 htdocs/user/virtualcard.php       |  8 ++++++++
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/htdocs/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php
index e7eb318e476..4404736f5e0 100644
--- a/htdocs/core/class/vcard.class.php
+++ b/htdocs/core/class/vcard.class.php
@@ -183,7 +183,7 @@ class vCard
 	}
 
 	/**
-	 *	mise en forme de l'adresse
+	 *	Address
 	 *
 	 *	@param	string	$postoffice		Postoffice
 	 *	@param	string	$extended		Extended
@@ -196,7 +196,7 @@ class vCard
 	 *  @param	string	$label			Label
 	 *	@return	void
 	 */
-	public function setAddress($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "HOME", $label = '')
+	public function setAddress($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "", $label = "")
 	{
 		// $type may be DOM | INTL | POSTAL | PARCEL | HOME | WORK or any combination of these: e.g. "WORK;PARCEL;POSTAL"
 		$key = "ADR";
@@ -207,7 +207,7 @@ class vCard
 			$key .= ';LABEL="'.encode($label).'"';
 		}
 		$key .= ";".$this->encoding;
-		$this->properties[$key] = ";".encode($extended).";".encode($street).";".encode($city).";".encode($region).";".encode($zip).";".encode($country);
+		$this->properties[$key] = encode($postoffice).";".encode($extended).";".encode($street).";".encode($city).";".encode($region).";".encode($zip).";".encode($country);
 
 		//if ($this->properties["LABEL;".$type.";".$this->encoding] == '') {
 			//$this->setLabel($postoffice, $extended, $street, $city, $region, $zip, $country, $type);
@@ -215,7 +215,7 @@ class vCard
 	}
 
 	/**
-	 *  mise en forme du label
+	 *  Address (old standard)
 	 *
 	 *  @param	string	$postoffice		Postoffice
 	 *  @param	string	$extended		Extended
@@ -226,6 +226,7 @@ class vCard
 	 *  @param	string	$country		Country
 	 *  @param	string	$type			Type
 	 *  @return	void
+	 *  @deprecated
 	 */
 	public function setLabel($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "HOME")
 	{
@@ -378,6 +379,7 @@ class vCard
 
 	/**
 	 * Return a VCARD string
+	 * See RFC https://datatracker.ietf.org/doc/html/rfc6350
 	 *
 	 * @param	Object			$object		Object (User or Contact)
 	 * @param	Societe|null	$company	Company. May be null
diff --git a/htdocs/public/users/view.php b/htdocs/public/users/view.php
index ec5f53377c2..a5d3ac5b1e6 100644
--- a/htdocs/public/users/view.php
+++ b/htdocs/public/users/view.php
@@ -114,11 +114,11 @@ if (!empty($object->photo)) {
 $urllogo = '';
 $urllogofull = '';
 if (!empty($logosmall) && is_readable($dir.'/'.$logosmall)) {
-	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&amp;entity='.$conf->entity.'&amp;securekey='.urlencode($securekey).'&amp;file='.urlencode($logosmall);
-	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart='.$modulepart.'&entity='.$conf->entity.'&securekey='.urlencode($securekey).'&file='.urlencode($logosmall);
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.($conf->entity > 1 ? '&amp;entity='.$conf->entity : '').'&amp;securekey='.urlencode($securekey).'&amp;file='.urlencode($logosmall);
+	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart='.$modulepart.($conf->entity > 1 ? '&entity='.$conf->entity : '').'&securekey='.urlencode($securekey).'&file='.urlencode($logosmall);
 } elseif (!empty($logo) && is_readable($dir.'/'.$logo)) {
-	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&amp;entity='.$conf->entity.'&amp;securekey='.urlencode($securekey).'&amp;file='.urlencode($logo);
-	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart='.$modulepart.'&amp;entity='.$conf->entity.'&amp;securekey='.urlencode($securekey).'&amp;file='.urlencode($logo);
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.($conf->entity > 1 ? '&amp;entity='.$conf->entity : '').'&amp;securekey='.urlencode($securekey).'&amp;file='.urlencode($logo);
+	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart='.$modulepart.($conf->entity > 1 ? '&entity='.$conf->entity : '').'&securekey='.urlencode($securekey).'&file='.urlencode($logo);
 }
 
 // Clean data we don't want on public page
@@ -152,6 +152,12 @@ if (getDolUserInt('USER_PUBLIC_HIDE_BIRTH', 0, $object)) {
 if (getDolUserInt('USER_PUBLIC_HIDE_SOCIALNETWORKS', 0, $object)) {
 	$object->socialnetworks = '';
 }
+if (getDolUserInt('USER_PUBLIC_HIDE_ADDRESS', 0, $object)) {
+	$object->address = '';
+	$object->zip = '';
+	$object->state = '';
+	$object->country = '';
+}
 if (getDolUserInt('USER_PUBLIC_HIDE_COMPANY', 0, $object)) {
 	$company = null;
 }
@@ -159,9 +165,6 @@ if (getDolUserInt('USER_PUBLIC_HIDE_COMPANY', 0, $object)) {
 
 // Output vcard
 if ($mode == 'vcard') {
-	// Reset data no selected for public VCard
-
-
 	// We create VCard
 	$output = $v->buildVCardString($object, $company, $langs, $urllogofull);
 
@@ -169,7 +172,7 @@ if ($mode == 'vcard') {
 	$filenameurlencoded = dol_sanitizeFileName(urlencode($filename));
 	//$filename = dol_sanitizeFileName($filename);
 
-	top_httphead('text/x-vcard; name="'.$filename.'"');
+	top_httphead('text/vcard; name="'.$filename.'"');
 
 	header("Content-Disposition: attachment; filename=\"".$filename."\"");
 	header("Content-Length: ".dol_strlen($output));
@@ -387,11 +390,11 @@ if (!getDolUserInt('USER_PUBLIC_HIDE_COMPANY', 0, $object)) {
 	$urllogo = '';
 	$urllogofull = '';
 	if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall)) {
-		$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$logosmall);
-		$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
+		$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany'.($conf->entity > 1 ? '&amp;entity='.$conf->entity : '').'&amp;file='.urlencode('logos/thumbs/'.$logosmall);
+		$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany'.($conf->entity > 1 ? '&entity='.$conf->entity : '').'&file='.urlencode('logos/thumbs/'.$logosmall);
 	} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo)) {
-		$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$logo);
-		$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
+		$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany'.($conf->entity > 1 ? '&amp;entity='.$conf->entity : '').'&amp;file='.urlencode('logos/'.$logo);
+		$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany'.($conf->entity > 1 ? '&entity='.$conf->entity : '').'&file='.urlencode('logos/'.$logo);
 	}
 	// Output html code for logo
 	if ($urllogo) {
diff --git a/htdocs/user/virtualcard.php b/htdocs/user/virtualcard.php
index 7e13950747c..4685c6e9b16 100644
--- a/htdocs/user/virtualcard.php
+++ b/htdocs/user/virtualcard.php
@@ -75,6 +75,7 @@ if ($action == 'update') {
 	$tmparray['USER_PUBLIC_HIDE_USER_MOBILE'] = (GETPOST('USER_PUBLIC_HIDE_USER_MOBILE') ? 1 : 0);
 	$tmparray['USER_PUBLIC_HIDE_BIRTH'] = (GETPOST('USER_PUBLIC_HIDE_BIRTH') ? 1 : 0);
 	$tmparray['USER_PUBLIC_HIDE_SOCIALNETWORKS'] = (GETPOST('USER_PUBLIC_HIDE_SOCIALNETWORKS') ? 1 : 0);
+	$tmparray['USER_PUBLIC_HIDE_ADDRESS'] = (GETPOST('USER_PUBLIC_HIDE_ADDRESS') ? 1 : 0);
 	$tmparray['USER_PUBLIC_HIDE_COMPANY'] = (GETPOST('USER_PUBLIC_HIDE_COMPANY') ? 1 : 0);
 	$tmparray['USER_PUBLIC_MORE'] = (GETPOST('USER_PUBLIC_MORE') ? GETPOST('USER_PUBLIC_MORE') : '');
 
@@ -242,6 +243,13 @@ if (getDolUserInt('USER_ENABLE_PUBLIC', 0, $object)) {
 	print $form->selectyesno("USER_PUBLIC_HIDE_SOCIALNETWORKS", (getDolUserInt('USER_PUBLIC_HIDE_SOCIALNETWORKS', 0, $object) ? getDolUserInt('USER_PUBLIC_HIDE_SOCIALNETWORKS', 0, $object) : 0), 1);
 	print "</td></tr>\n";
 
+	// Address
+	print '<tr class="oddeven" id="tredit"><td>';
+	print $langs->trans("HideOnVCard", $langs->transnoentitiesnoconv("Address"));
+	print '</td><td>';
+	print $form->selectyesno("USER_PUBLIC_HIDE_ADDRESS", (getDolUserInt('USER_PUBLIC_HIDE_ADDRESS', 0, $object) ? getDolUserInt('USER_PUBLIC_HIDE_ADDRESS', 0, $object) : 0), 1);
+	print "</td></tr>\n";
+
 	// Company name
 	print '<tr class="oddeven" id="tramount"><td>';
 	print $langs->trans("HideOnVCard", $langs->transnoentitiesnoconv("CompanySection"));

From 35a7f3c0ff759ee89ac1f4fdc45db37a26bd209e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 15 Jan 2023 01:28:02 +0100
Subject: [PATCH 565/816] Enhance vcard

---
 htdocs/core/class/vcard.class.php | 2 +-
 htdocs/public/users/view.php      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php
index 4404736f5e0..8d586648f80 100644
--- a/htdocs/core/class/vcard.class.php
+++ b/htdocs/core/class/vcard.class.php
@@ -449,7 +449,7 @@ class vCard
 		$country = $object->country_code ? $object->country : '';
 
 		if ($object->address || $object->town || $object->state || $object->zip || $object->country) {
-			$this->setAddress("", "", $object->address, $object->town, $object->state, $object->zip, $country, "TYPE=WORK");
+			$this->setAddress("", "", $object->address, $object->town, $object->state, $object->zip, $country, "");
 			//$this->setLabel("", "", $object->address, $object->town, $object->state, $object->zip, $country, "TYPE=HOME");
 		}
 
diff --git a/htdocs/public/users/view.php b/htdocs/public/users/view.php
index a5d3ac5b1e6..03d153dedd0 100644
--- a/htdocs/public/users/view.php
+++ b/htdocs/public/users/view.php
@@ -154,6 +154,7 @@ if (getDolUserInt('USER_PUBLIC_HIDE_SOCIALNETWORKS', 0, $object)) {
 }
 if (getDolUserInt('USER_PUBLIC_HIDE_ADDRESS', 0, $object)) {
 	$object->address = '';
+	$object->town = '';
 	$object->zip = '';
 	$object->state = '';
 	$object->country = '';

From e41098c5273838f1ac3d7991eaec8a4c84061f52 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 15 Jan 2023 01:31:23 +0100
Subject: [PATCH 566/816] Enhance vcard

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

diff --git a/htdocs/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php
index 8d586648f80..7625954690b 100644
--- a/htdocs/core/class/vcard.class.php
+++ b/htdocs/core/class/vcard.class.php
@@ -31,7 +31,7 @@
  */
 function encode($string)
 {
-	return str_replace(";", "\;", (dol_quoted_printable_encode(utf8_decode($string))));
+	return str_replace(";", "\;", (dol_quoted_printable_encode($string)));
 }
 
 
@@ -488,7 +488,7 @@ class vCard
 				$this->setPhoneNumber($company->fax, "TYPE=WORK,FAX");
 			}
 			if ($company->address || $company->town || $company->state || $company->zip || $company->country) {
-				$this->setAddress("", "", $company->address, $company->town, $company->state, $company->zip, $company->country, "TYPE=WORK");
+				$this->setAddress("", "", $company->address, $company->town, $company->state, $company->zip, $company->country, "");
 			}
 
 			if ($company->email && $company->email != $object->email) {

From f8e5889ba7777d056a297c0c882a71c1841f5cd0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 15 Jan 2023 01:42:11 +0100
Subject: [PATCH 567/816] Enhance vcard

---
 htdocs/core/class/vcard.class.php |  2 +-
 htdocs/langs/en_US/companies.lang |  3 ++-
 htdocs/user/virtualcard.php       | 11 ++++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php
index 7625954690b..a5e1cbf6814 100644
--- a/htdocs/core/class/vcard.class.php
+++ b/htdocs/core/class/vcard.class.php
@@ -488,7 +488,7 @@ class vCard
 				$this->setPhoneNumber($company->fax, "TYPE=WORK,FAX");
 			}
 			if ($company->address || $company->town || $company->state || $company->zip || $company->country) {
-				$this->setAddress("", "", $company->address, $company->town, $company->state, $company->zip, $company->country, "");
+				$this->setAddress("", "", $company->address, $company->town, $company->state, $company->zip, $company->country, "TYPE=WORK");
 			}
 
 			if ($company->email && $company->email != $object->email) {
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 7200ffb3d70..d31ecb077ff 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -499,4 +499,5 @@ 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
+TwoRecordsOfCompanyName=more than one record exists for this company please contact us to complete your partnership request"
+CompanySection=Company section
\ No newline at end of file
diff --git a/htdocs/user/virtualcard.php b/htdocs/user/virtualcard.php
index 4685c6e9b16..04f8fb42030 100644
--- a/htdocs/user/virtualcard.php
+++ b/htdocs/user/virtualcard.php
@@ -210,21 +210,21 @@ if (getDolUserInt('USER_ENABLE_PUBLIC', 0, $object)) {
 
 	// Office phone
 	print '<tr class="oddeven" id="tredit"><td>';
-	print $langs->trans("HideOnVCard", $langs->transnoentitiesnoconv("OfficePhone"));
+	print $langs->trans("HideOnVCard", $langs->transnoentitiesnoconv("PhonePro"));
 	print '</td><td>';
 	print $form->selectyesno("USER_PUBLIC_HIDE_OFFICE_PHONE", (getDolUserInt('USER_PUBLIC_HIDE_OFFICE_PHONE', 0, $object) ? getDolUserInt('USER_PUBLIC_HIDE_OFFICE_PHONE', 0, $object) : 0), 1);
 	print "</td></tr>\n";
 
 	// Office fax
 	print '<tr class="oddeven" id="tredit"><td>';
-	print $langs->trans("HideOnVCard", $langs->transnoentitiesnoconv("OfficeFax"));
+	print $langs->trans("HideOnVCard", $langs->transnoentitiesnoconv("Fax"));
 	print '</td><td>';
 	print $form->selectyesno("USER_PUBLIC_HIDE_OFFICE_FAX", (getDolUserInt('USER_PUBLIC_HIDE_OFFICE_FAX', 0, $object) ? getDolUserInt('USER_PUBLIC_HIDE_OFFICE_FAX', 0, $object) : 0), 1);
 	print "</td></tr>\n";
 
 	// User mobile
 	print '<tr class="oddeven" id="tredit"><td>';
-	print $langs->trans("HideOnVCard", $langs->transnoentitiesnoconv("UserMobile"));
+	print $langs->trans("HideOnVCard", $langs->transnoentitiesnoconv("PhoneMobile"));
 	print '</td><td>';
 	print $form->selectyesno("USER_PUBLIC_HIDE_USER_MOBILE", (getDolUserInt('USER_PUBLIC_HIDE_USER_MOBILE', 0, $object) ? getDolUserInt('USER_PUBLIC_HIDE_USER_MOBILE', 0, $object) : 0), 1);
 	print "</td></tr>\n";
@@ -238,7 +238,7 @@ if (getDolUserInt('USER_ENABLE_PUBLIC', 0, $object)) {
 
 	// Social networks
 	print '<tr class="oddeven" id="tredit"><td>';
-	print $langs->trans("HideOnVCard", $langs->transnoentitiesnoconv("SocialNetworks"));
+	print $langs->trans("HideOnVCard", $langs->transnoentitiesnoconv("SocialNetworksInformation"));
 	print '</td><td>';
 	print $form->selectyesno("USER_PUBLIC_HIDE_SOCIALNETWORKS", (getDolUserInt('USER_PUBLIC_HIDE_SOCIALNETWORKS', 0, $object) ? getDolUserInt('USER_PUBLIC_HIDE_SOCIALNETWORKS', 0, $object) : 0), 1);
 	print "</td></tr>\n";
@@ -262,7 +262,8 @@ if (getDolUserInt('USER_ENABLE_PUBLIC', 0, $object)) {
 	print $langs->trans("Text");
 	print '</td><td>';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor('USER_PUBLIC_MORE', getDolUserString('USER_PUBLIC_MORE', '', $object), '', 160, 'dolibarr_notes', '', false, false, isModEnabled('fckeditor'), ROWS_5, '90%');
+	$extendededitor = 0;	// We force no WYSIWYG editor
+	$doleditor = new DolEditor('USER_PUBLIC_MORE', getDolUserString('USER_PUBLIC_MORE', '', $object), '', 160, 'dolibarr_notes', '', false, false, $extendededitor, ROWS_5, '90%');
 	$doleditor->Create();
 	print "</td></tr>\n";
 

From bd8a48b6ddd7b15788782a9703daa12db440ff55 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 15 Jan 2023 01:45:54 +0100
Subject: [PATCH 568/816] css

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 278f70507bb..3e3a87c7bd0 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3170,7 +3170,7 @@ function dol_print_socialnetworks($value, $cid, $socid, $type, $dictsocialnetwor
 	if (!empty($type)) {
 		$htmllink = '<div class="divsocialnetwork inline-block valignmiddle">';
 		// Use dictionary definition for picto $dictsocialnetworks[$type]['icon']
-		$htmllink .= '<span class="fa paddingright pictofixedwidth '.($dictsocialnetworks[$type]['icon'] ? $dictsocialnetworks[$type]['icon'] : 'fa-link').'"></span>';
+		$htmllink .= '<span class="fa pictofixedwidth '.($dictsocialnetworks[$type]['icon'] ? $dictsocialnetworks[$type]['icon'] : 'fa-link').'"></span>';
 		if ($type == 'skype') {
 			$htmllink .= dol_escape_htmltag($value);
 			$htmllink .= '&nbsp; <a href="skype:';

From 4252e5b6bd340140d6f15318639b078829a89f24 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sun, 15 Jan 2023 01:56:47 +0100
Subject: [PATCH 569/816] Update ChangeLog

---
 ChangeLog | 113 +++++++++++++++++++++++++++---------------------------
 1 file changed, 56 insertions(+), 57 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1a3e96b18ce..4bc5e6f2479 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,26 +45,17 @@ NEW: #22676 massaction for updating product prices
 NEW: #22735 Massaction to affect users on projects
 NEW: #25594 can chose if VAT ID is unique or not for third parties
 NEW: #4482 adding js to hide/show advanced option on the export data page
-NEW: Accountancy - Add a graphic option to enable lettering function - FPC21
-NEW: Accountancy - Add a way to clean some words when you generate thirdparty accounting account
-NEW: Accountancy - Added an option during export to export or not the lettering FPC21
-NEW: Accountancy - Manage supplier deposit with specific account
-NEW: Accountancy - Model Digitaria - Add a way to clean some words when you generate thirdparty accounting account FPC22
 NEW: Add a constant to disallow modification of the product reference.
 NEW: Add a method doAutoRenewContracts that can be used as a cron task.
 NEW: Add " as enclosure by default for CSV export. Keep removing CR/LF.
 NEW: add attached file in presend email form of thirdparty card
 NEW: Add a way to enter LICENSE file content in property of website
-NEW: Add badge in admin extrafields setup
 NEW: add constant PROPAL_BYPASS_VALIDATED_STATUS
-NEW: Add date event (!= date project) and location on event organization
 NEW: Add employment anniversary in birthday box
-NEW: Add extrafield type "IP" to store IP addresses
 NEW: Add fail2ban rules examples to limit access to /public pages
 NEW: Add filter "Product subject to lot/Serial" in stock per lot/serial
 NEW: Add hidden option MAIN_EMAIL_SUPPORT_ACK to restore Email ack checkbox (feature abandonned by mailers)
 NEW: Add link to create an element from the category page
-NEW: add margin infos to takepos invoice lines
 NEW: Add max size send for "backup and link to mail" option
 NEW: Add method httponly_accessforbidden()
 NEW: Add more advices into the Setup security page
@@ -81,74 +72,83 @@ NEW: Add a new advanced permission "read price"
 NEW: Add substitution key __SENDEREMAIL_SIGNATURE__
 NEW: Add the referrer-policy to "same-origin" by default on all public pages.
 NEW: Add the SMTP header References on ticket email created by email
-NEW: Add the thirdparty column to the time list (projet/tasks/time.php)
 NEW: Add trigger to record the event of sending an email from a project #20912
 NEW: Allow download link option in module configuration (propal,invoice,supplier proposal, order)
-NEW: Bank - Add salaries & vat in tab planned entries
-NEW: Bulk action to remove a category in list/search website pages
-NEW: Can copy/paste images into emails sent.
-NEW: Can edit label of an emailing even once sent
-NEW: Can edit property css, cssview, csslist on extrafields
 NEW: Can enter the unit price including the vat
 NEW: Can invoice task time per different services
 NEW: Can join several files by default on email form
-NEW: Can send an email on scheduled job error
 NEW: Can set a commercial discount by entering amount including VAT
 NEW: Can set a monthly frequency (or multiple) in cron tasks.
 NEW: Can set start and end dates and comment on button "Activate all services"
 NEW: can sort and preselected best supplier price
 NEW: Can use products categories to make inventory
 NEW: Change filter type on tickets list into a multiselect combo
-NEW: conf TIMESPENT_ALWAYS_UPDATE_THM, when it's on we always check current thm of user to update it in task time line
 NEW: show date delivery planned on orders linked to company and product
-NEW: Default values in extrafields are not more limited to 255 char.
-NEW: display currency in takepos menu
-NEW: Enable online signature for interventions
 NEW: Encrypt all sensitive constants in llx_const
 NEW: filter on reception dates (from / to) in cheque paiement card
-NEW: Contracts: Default template of contract is not mandatory
-NEW: Contracts: Manage Position (Rank) on Contract Lines
-NEW: EMail-Collector: add IMAP port setting 
-NEW: EMail-Collector: add a button "Test collect"
-NEW: Extrafields: field price with currency
-NEW: Extrafields: support IP type in extrafields
-NEW: Members: default_lang for members
-NEW: Members: Table of membership types
-NEW: Members: add free membership amounts at the membership type level
-NEW: Projects: add author on list
-NEW: Proposals: show delivery mode on PDF for proposals
-NEW: Reception: add a from/to on search on date field
-NEW: TakePOS: Header Scroll in TakePOS
-NEW: TakePOS: add price to product box in TakePOS
-NEW: TakePOS: add setup parameters, can setup terminal name
-NEW: TakePOS: support of Stripe Terminal with TakePOS
-NEW: TakePOS: Receipt preview in TakePOS setup
-NEW: TakePOS: different product list on smartphone
-NEW: Website: can delete a whole website if disabled
-NEW: Website: can remove a website template
-NEW: Website: can set header "Strict-Transport-Security" in web sites.
-NEW: Website: can switch status of website and page from the website toolbar
-NEW: Website: Templates of websites are now directories and not zip into core repo
-NEW: Website: add 4 other templates in website module
-NEW: If we select another view list mode, we keep it
-NEW: Introduce dolEncrypt and dolDecrypt to be able to encrypt data in db
+NEW: Accountancy - Add a graphic option to enable lettering function - FPC21
+NEW: Accountancy - Add a way to clean some words when you generate thirdparty accounting account
+NEW: Accountancy - Added an option during export to export or not the lettering FPC21
+NEW: Accountancy - Manage supplier deposit with specific account
+NEW: Accountancy - Model Digitaria - Add a way to clean some words when you generate thirdparty accounting account FPC22
+NEW: Bank - add salaries & VAT in tab planned entries
+NEW: Contracts - Default template of contract is not mandatory
+NEW: Contracts - Manage Position (Rank) on Contract Lines
+NEW: EMail - can copy/paste images into emails sent
+NEW: EMail - can edit label of an emailing even once sent
+NEW: EMail - can send an email on scheduled job error
+NEW: EMail-Collector - add IMAP port setting 
+NEW: EMail-Collector - add a button "Test collect"
+NEW: Event-Organization - add date event (!= date project) and location on event organization
+NEW: Extrafields - add badge in admin extrafields setup
+NEW: Extrafields - can edit property css, cssview, csslist on extrafields
+NEW: Extrafields - default values in extrafields are not more limited to 255 char.
+NEW: Extrafields - field price with currency
+NEW: Extrafields - support IP type to store IP addresses
+NEW: Interventions - enable online signature for interventions
 NEW: Invoice - Add french mention on pdf when vat debit option is on
+NEW: Members - default_lang for members
+NEW: Members - Table of membership types
+NEW: Members - add free membership amounts at the membership type level
+NEW: Projects - add author on list
+NEW: Projects - add the thirdparty column to the time list (projet/tasks/time.php)
+NEW: Proposals - show delivery mode on PDF for proposals
+NEW: Proposals - skip accept/refuse process for proposals (option PROPAL_SKIP_ACCEPT_REFUSE)
+NEW: Reception - add a from/to on search on date field
+NEW: Stock - page for mass stock transfer can be used with no source stock
+NEW: Stock - product categories filter on inventory list
+NEW: Stock - show product label on inventory
+NEW: Stock - manage virtual stock at a future date
+NEW: TakePOS - add margin infos to TakePOS invoice lines
+NEW: TakePOS - display currency in TakePOS menu
+NEW: TakePOS - Header Scroll in TakePOS
+NEW: TakePOS - add price to product box in TakePOS
+NEW: TakePOS - add setup parameters, can setup terminal name
+NEW: TakePOS - support of Stripe Terminal with TakePOS
+NEW: TakePOS - Receipt preview in TakePOS setup
+NEW: TakePOS - different product list on smartphone
+NEW: Thirdparty - set thirdparty type with company modify trigger
+NEW: Website - can delete a whole website if disabled
+NEW: Website - can remove a website template
+NEW: Website - can set header "Strict-Transport-Security" in web sites.
+NEW: Website - can switch status of website and page from the website toolbar
+NEW: Website - Templates of websites are now directories and not zip into core repo
+NEW: Website - add 4 other templates in website module
+NEW: General - Bulk action to remove a category in list/search website pages
+NEW: General - If we select another view list mode, we keep it
+NEW: General - Introduce dolEncrypt and dolDecrypt to be able to encrypt data in db
 NEW: invoice export : add accounting affectation
 NEW: label on products categories filter
 NEW: The link "add to bookmark" is always on top in the bookmark popup
-NEW: Make module WebservicesClient deprecated. Use module WebHook instead.
 NEW: manage no email with thirdparties (better for GDPR)
 NEW: Manage VAT on all lines on purchases cycle
-NEW: manage virtual stock at a future date
 NEW: On a bank reconciled line, we can modify the bank receipt
 NEW: On a form to send an email, we show all emails of all contacts of object
-NEW: Page for mass stock transfer can be used with no source stock
 NEW: parent company column and filter in invoice and order list
 NEW: Add show "Sales rep" option for PDF
 NEW: Picto for shared link is clickable
 NEW: possibility to select scopes with checkbox for Oauth tokens
 NEW: private and public note on user, thirdparty and contact list
-NEW: product categories filter on inventory list
 NEW: Product supplier price: autofill default supplier VAT
 NEW: Public counters feature
 NEW: Start a simple support of recurrent events on agenda
@@ -156,15 +156,12 @@ NEW: Resize parent company column in order list
 NEW: Saved token of OAUTH module are now encrypted into llx_oauth_token
 NEW: Save one click to select on delivery ack, on emails.
 NEW: scheduled job to send unpaid invoice reminder can now use the cc and bcc from email template
-NEW: set thirdparty type with company modify trigger
 NEW: Show also scheduled task never finished in scheduled task widget
 NEW: show badge with number of extrafields in setup
 NEW: show category tree in sellist and chkbxlst for common object
 NEW: Show picto and color into combo for selection of tags
-NEW: show product label on inventory
 NEW: show sell-by and eat-by dates only if not empty
 NEW: show SellBy/EatBy dates for each batch product in shipment card
-NEW: skip accept/refuse process for proposals (option PROPAL_SKIP_ACCEPT_REFUSE)
 NEW: experimental SMTP using PhpImap allowing OAuth2 authentication (need to add option MAIN_IMAP_USE_PHPIMAP)
 NEW: can substitue project title in mail template
 NEW: Supplier order list - Add column private and public note
@@ -175,10 +172,11 @@ NEW: expand/collapse permissions on user permission page
 NEW: Add the target to select attendees of event for emailings
 
  Option / Const for System: 
-NEW: Option PRODUCTBATCH_SHOW_WAREHOUSE_ON_SHIPMENT showing warehouse on PDF
-NEW: Option PRODUIT_DESC_IN_FORM accept (desktop only or +smartphone)
-NEW: MAIN_SEARCH_CATEGORY_PRODUCT_ON_LISTS const to show category customer filter
-NEW: constant PROPAL_NEW_AS_SIGNED
+NEW: MAIN_SEARCH_CATEGORY_PRODUCT_ON_LISTS  const to show category customer filter
+NEW: PRODUCTBATCH_SHOW_WAREHOUSE_ON_SHIPMENT showing warehouse on PDF
+NEW: PRODUIT_DESC_IN_FORM accept (desktop only or +smartphone)
+NEW: PROPAL_NEW_AS_SIGNED
+NEW: TIMESPENT_ALWAYS_UPDATE_THM, when it's on we always check current thm of user to update it in task time line
 
  Localisation:
 NEW: adding JAPAN Chart-of-Account and regions/departments
@@ -187,6 +185,7 @@ NEW: adding NIF verification for Algeria
  Modules
 NEW: Experimental module Asset
 NEW: Init module bookcal
+NEW: Make module WebservicesClient deprecated. Use module WebHook instead.
 
 
 For developers or integrators:

From 4836c9935289d088cd65960f3a2c2545134f002e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 15 Jan 2023 02:01:28 +0100
Subject: [PATCH 570/816] Fix label link

---
 htdocs/public/users/view.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/users/view.php b/htdocs/public/users/view.php
index 03d153dedd0..d63a2a66eee 100644
--- a/htdocs/public/users/view.php
+++ b/htdocs/public/users/view.php
@@ -450,8 +450,9 @@ print '<br>';
 print '<div class="backgreypublicpayment">';
 print '<div class="center">';
 print '<a href="'.$urlforqrcode.'">';
-print img_picto($langs->trans("AddToContacts"), 'add').' ';
-print $langs->trans("AddToContacts");
+// Download / AddToContacts
+print img_picto($langs->trans("Download").' VCF', 'add').' ';
+print $langs->trans("Download").' VCF';
 print '</a>';
 print '</div>';
 //print '<div>';

From d7e4304992b37ff13a4059ccbe0e85856f4f9de0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 15 Jan 2023 02:09:55 +0100
Subject: [PATCH 571/816] Try to fix social network inks in vcard

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

diff --git a/htdocs/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php
index a5e1cbf6814..f6c8d14979b 100644
--- a/htdocs/core/class/vcard.class.php
+++ b/htdocs/core/class/vcard.class.php
@@ -441,7 +441,7 @@ class vCard
 					}
 				}
 				if ($urlsn) {
-					$this->properties["socialProfile;type=".$key] = $urlsn;
+					$this->properties["SOCIALPROFILE;TYPE=home"] = $key.':'.$urlsn;
 				}
 			}
 		}

From bec559aae9406eca2171cfb4b6926ad756563709 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 15 Jan 2023 02:16:35 +0100
Subject: [PATCH 572/816] Try to fix social network inks in vcard

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

diff --git a/htdocs/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php
index f6c8d14979b..c66974f939b 100644
--- a/htdocs/core/class/vcard.class.php
+++ b/htdocs/core/class/vcard.class.php
@@ -359,7 +359,8 @@ class vCard
 		$text .= "VERSION:4.0\r\n";		// With V4, all encoding are UTF-8
 		//$text.= "VERSION:2.1\r\n";
 		foreach ($this->properties as $key => $value) {
-			$text .= $key.":".$value."\r\n";
+			$newkey = preg_replace('/-.*$/', '', $key);	// remove suffix -twitter, -facebook, ...
+			$text .= $newkey.":".$value."\r\n";
 		}
 		$text .= "REV:".date("Ymd")."T".date("His")."Z\r\n";
 		//$text .= "MAILER: Dolibarr\r\n";
@@ -441,7 +442,7 @@ class vCard
 					}
 				}
 				if ($urlsn) {
-					$this->properties["SOCIALPROFILE;TYPE=home"] = $key.':'.$urlsn;
+					$this->properties["SOCIALPROFILE;TYPE=home-".$key] = $key.':'.$urlsn;
 				}
 			}
 		}

From 6a30104beb598a545d8798e68730c6afddc0981e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 15 Jan 2023 02:19:47 +0100
Subject: [PATCH 573/816] Try to fix social network inks in vcard

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

diff --git a/htdocs/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php
index c66974f939b..7b5a320f678 100644
--- a/htdocs/core/class/vcard.class.php
+++ b/htdocs/core/class/vcard.class.php
@@ -442,7 +442,7 @@ class vCard
 					}
 				}
 				if ($urlsn) {
-					$this->properties["SOCIALPROFILE;TYPE=home-".$key] = $key.':'.$urlsn;
+					$this->properties["SOCIALPROFILE;TYPE=WORK-".$key] = $key.':'.$urlsn;
 				}
 			}
 		}

From b54a15f5047ae977bf39ec959161aa6931c7763f Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sun, 15 Jan 2023 09:11:29 +0100
Subject: [PATCH 574/816] Fix missing keywords in dol_dir_list_in_database

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

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 21c290b595d..4195dee8dc1 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -344,6 +344,7 @@ function completeFileArrayWithDatabaseInfo(&$filearray, $relativedir)
 				$filearray[$key]['position_name'] = ($filearrayindatabase[$key2]['position'] ? $filearrayindatabase[$key2]['position'] : '0').'_'.$filearrayindatabase[$key2]['name'];
 				$filearray[$key]['position'] = $filearrayindatabase[$key2]['position'];
 				$filearray[$key]['cover'] = $filearrayindatabase[$key2]['cover'];
+				$filearray[$key]['keywords'] = $filearrayindatabase[$key2]['keywords'];
 				$filearray[$key]['acl'] = $filearrayindatabase[$key2]['acl'];
 				$filearray[$key]['rowid'] = $filearrayindatabase[$key2]['rowid'];
 				$filearray[$key]['label'] = $filearrayindatabase[$key2]['label'];

From 24c5fcb5a7b0e6e0c2b97062bace7c5eab67a363 Mon Sep 17 00:00:00 2001
From: TuxGasy <garcia@soamichel.fr>
Date: Sun, 15 Jan 2023 10:24:19 +0100
Subject: [PATCH 575/816] Update to PHP 8.1

---
 build/docker/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
index ead2a8af1c5..69f4d27b26f 100644
--- a/build/docker/Dockerfile
+++ b/build/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.3-apache
+FROM php:8.1-apache-bullseye
 
 ENV PHP_INI_DATE_TIMEZONE 'UTC'
 ENV PHP_INI_MEMORY_LIMIT 256M
@@ -25,7 +25,7 @@ RUN apt-get update -y \
         mailutils \
     && apt-get autoremove -y \
     && rm -rf /var/lib/apt/lists/* \
-    && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
+    && docker-php-ext-configure gd --with-freetype --with-jpeg \
     && docker-php-ext-install -j$(nproc) calendar intl mysqli pdo_mysql gd soap zip \
     && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
     && docker-php-ext-install -j$(nproc) ldap && \

From 0cb2af4ecb26b9cfdc932538e952a3918cb83a59 Mon Sep 17 00:00:00 2001
From: TuxGasy <garcia@soamichel.fr>
Date: Sun, 15 Jan 2023 10:42:52 +0100
Subject: [PATCH 576/816] Fix update PHP config

---
 build/docker/README.md          | 2 +-
 build/docker/docker-compose.yml | 2 ++
 build/docker/docker-run.sh      | 8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build/docker/README.md b/build/docker/README.md
index d469c7c7aae..007b5db6ace 100644
--- a/build/docker/README.md
+++ b/build/docker/README.md
@@ -25,7 +25,7 @@ The URL to go to the Dolibarr is :
 The URL to go to PhpMyAdmin is (login/password is root/root) :
 
         http://0.0.0.0:8080
-        
+
 In Dolibarr configuration Email let PHP mail function, To see all mail send by Dolibarr go to maildev
 
         http://0.0.0.0:8081
diff --git a/build/docker/docker-compose.yml b/build/docker/docker-compose.yml
index 8994043cd8a..e197d5dd06e 100644
--- a/build/docker/docker-compose.yml
+++ b/build/docker/docker-compose.yml
@@ -34,6 +34,8 @@ services:
         build: .
         environment:
             HOST_USER_ID: $HOST_USER_ID
+            PHP_INI_DATE_TIMEZONE: $PHP_INI_DATE_TIMEZONE
+            PHP_INI_MEMORY_LIMIT: $PHP_INI_MEMORY_LIMIT
         volumes:
             - ../../htdocs:/var/www/html/
             - ../../documents:/var/documents
diff --git a/build/docker/docker-run.sh b/build/docker/docker-run.sh
index 4e69ea4a3a2..fbd256ab625 100644
--- a/build/docker/docker-run.sh
+++ b/build/docker/docker-run.sh
@@ -15,10 +15,10 @@ fi
 echo "[docker-run] => Set Permission to www-data for /var/documents"
 chown -R www-data:www-data /var/documents
 
-if [ ! -f /usr/local/etc/php/php.ini ]; then
-  cat <<EOF > /usr/local/etc/php/php.ini
-date.timezone = $PHP_INI_DATE_TIMEZONE
+echo "[docker-run] => update ${PHP_INI_DIR}/conf.d/dolibarr-php.ini"
+cat <<EOF > ${PHP_INI_DIR}/conf.d/dolibarr-php.ini
+date.timezone = ${PHP_INI_DATE_TIMEZONE:-UTC}
+memory_limit = ${PHP_INI_MEMORY_LIMIT:-256M}
 EOF
-fi
 
 exec apache2-foreground

From 132fe6c19d9f42682a5b1f596fc5fc224ee47ba5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 15 Jan 2023 11:13:53 +0100
Subject: [PATCH 577/816] Fix missing photo on user link

---
 htdocs/core/class/html.form.class.php |  5 +----
 htdocs/user/card.php                  | 12 ++++++------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 369deba4455..276f7bacd69 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2137,10 +2137,7 @@ class Form
 						$out .= ' selected';
 					}
 					$out .= ' data-html="';
-					$outhtml = '';
-					// if (!empty($obj->photo)) {
-					$outhtml .= $userstatic->getNomUrl(-3, '', 0, 1, 24, 1, 'login', '', 1).' ';
-					// }
+					$outhtml = $userstatic->getNomUrl(-3, '', 0, 1, 24, 1, 'login', '', 1).' ';
 					if ($showstatus >= 0 && $obj->status == 0) {
 						$outhtml .= '<strike class="opacitymediumxxx">';
 					}
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 0af78cc208f..ea47ba10beb 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1514,7 +1514,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				$huser = new User($db);
 				if ($object->fk_user > 0) {
 					$huser->fetch($object->fk_user);
-					print $huser->getNomUrl(1);
+					print $huser->getNomUrl(-1);
 				} else {
 					print '<span class="opacitymedium">'.$langs->trans("None").'</span>';
 				}
@@ -1532,7 +1532,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				if (!empty($object->fk_user_expense_validator)) {
 					$evuser = new User($db);
 					$evuser->fetch($object->fk_user_expense_validator);
-					print $evuser->getNomUrl(1);
+					print $evuser->getNomUrl(-1);
 				}
 				print '</td>';
 				print "</tr>\n";
@@ -1548,7 +1548,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				if (!empty($object->fk_user_holiday_validator)) {
 					$hvuser = new User($db);
 					$hvuser->fetch($object->fk_user_holiday_validator);
-					print $hvuser->getNomUrl(1);
+					print $hvuser->getNomUrl(-1);
 				}
 				print '</td>';
 				print "</tr>\n";
@@ -2263,7 +2263,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				print '<input type="hidden" name="fk_user" value="'.$object->fk_user.'">';
 				$huser = new User($db);
 				$huser->fetch($object->fk_user);
-				print $huser->getNomUrl(1);
+				print $huser->getNomUrl(-1);
 			}
 			print '</td>';
 			print "</tr>\n";
@@ -2281,7 +2281,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 					print '<input type="hidden" name="fk_user_expense_validator" value="'.$object->fk_user_expense_validator.'">';
 					$evuser = new User($db);
 					$evuser->fetch($object->fk_user_expense_validator);
-					print $evuser->getNomUrl(1);
+					print $evuser->getNomUrl(-1);
 				}
 				print '</td>';
 				print "</tr>\n";
@@ -2300,7 +2300,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 					print '<input type="hidden" name="fk_user_holiday_validator" value="'.$object->fk_user_holiday_validator.'">';
 					$hvuser = new User($db);
 					$hvuser->fetch($object->fk_user_holiday_validator);
-					print $hvuser->getNomUrl(1);
+					print $hvuser->getNomUrl(-1);
 				}
 				print '</td>';
 				print "</tr>\n";

From fe2a58cf1d4beb1650c3089a306a7295b388451c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 15 Jan 2023 11:36:31 +0100
Subject: [PATCH 578/816] Fix popup of companies in contract home page

---
 htdocs/contrat/index.php | 113 ++++++++++++++++++++++++++++-----------
 1 file changed, 81 insertions(+), 32 deletions(-)

diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index d537934a299..c14775449c6 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -241,7 +241,7 @@ print "</table></div><br>";
 
 if (isModEnabled('contrat') && $user->rights->contrat->lire) {
 	$sql = "SELECT c.rowid, c.ref,";
-	$sql .= " s.nom as name, s.rowid as socid";
+	$sql .= " s.nom as name, s.name_alias, s.logo, s.rowid as socid, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur";
 	$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";
 	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -266,8 +266,6 @@ if (isModEnabled('contrat') && $user->rights->contrat->lire) {
 		print '<tr class="liste_titre">';
 		print '<th colspan="3">'.$langs->trans("DraftContracts").($num ? '<span class="badge marginleftonlyshort">'.$num.'</span>' : '').'</th></tr>';
 		if ($num) {
-			$companystatic = new Societe($db);
-
 			$i = 0;
 			//$tot_ttc = 0;
 			while ($i < $num) {
@@ -276,22 +274,29 @@ if (isModEnabled('contrat') && $user->rights->contrat->lire) {
 				$staticcontrat->ref = $obj->ref;
 				$staticcontrat->id = $obj->rowid;
 
-				$companystatic->id = $obj->socid;
-				$companystatic->name = $obj->name;
-				$companystatic->client = 1;
+				$staticcompany->id = $obj->socid;
+				$staticcompany->name = $obj->name;
+				$staticcompany->name_alias = $obj->name_alias;
+				$staticcompany->photo = 1;
+				$staticcompany->code_client = $obj->code_client;
+				$staticcompany->code_fournisseur = $obj->code_fournisseur;
+				$staticcompany->code_compta = $obj->code_compta;
+				$staticcompany->code_compta_fournisseur = $obj->code_compta_fournisseur;
+				$staticcompany->client = $obj->client;
+				$staticcompany->fournisseur = $obj->fournisseur;
 
 				print '<tr class="oddeven"><td class="nowrap">';
 				print $staticcontrat->getNomUrl(1, '');
 				print '</td>';
 				print '<td>';
-				print $companystatic->getNomUrl(1, '', 16);
+				print $staticcompany->getNomUrl(1, '', 16);
 				print '</td>';
 				print '</tr>';
 				//$tot_ttc+=$obj->total_ttc;
 				$i++;
 			}
 		} else {
-			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoContracts").'</td></tr>';
+			print '<tr class="oddeven"><td colspan="3"><span class="opacitymedium">'.$langs->trans("NoContracts").'</span></td></tr>';
 		}
 		print "</table></div><br>";
 		$db->free($resql);
@@ -312,7 +317,8 @@ $sql .= " sum(".$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.
 $sql .= " sum(".$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now)."')", 1, 0).') as nb_expired,';
 $sql .= " sum(".$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now - $conf->contrat->services->expires->warning_delay)."')", 1, 0).') as nb_late,';
 $sql .= " sum(".$db->ifsql("cd.statut=5", 1, 0).') as nb_closed,';
-$sql .= " c.rowid as cid, c.ref, c.datec, c.tms, c.statut, s.nom as name, s.rowid as socid";
+$sql .= " c.rowid as cid, c.ref, c.datec, c.tms, c.statut,";
+$sql .= " s.nom as name, s.name_alias, s.logo, s.rowid as socid, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,";
 if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
@@ -328,7 +334,8 @@ if (empty($user->rights->societe->client->voir) && !$socid) {
 if ($socid) {
 	$sql .= " AND s.rowid = ".((int) $socid);
 }
-$sql .= " GROUP BY c.rowid, c.ref, c.datec, c.tms, c.statut, s.nom, s.rowid";
+$sql .= " GROUP BY c.rowid, c.ref, c.datec, c.tms, c.statut,";
+$sql .= " s.nom, s.name_alias, s.logo, s.rowid, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur";
 $sql .= " ORDER BY c.tms DESC";
 $sql .= $db->plimit($max);
 
@@ -356,6 +363,14 @@ if ($result) {
 
 		$staticcompany->id = $obj->socid;
 		$staticcompany->name = $obj->name;
+		$staticcompany->name_alias = $obj->name_alias;
+		$staticcompany->photo = 1;
+		$staticcompany->code_client = $obj->code_client;
+		$staticcompany->code_fournisseur = $obj->code_fournisseur;
+		$staticcompany->code_compta = $obj->code_compta;
+		$staticcompany->code_compta_fournisseur = $obj->code_compta_fournisseur;
+		$staticcompany->client = $obj->client;
+		$staticcompany->fournisseur = $obj->fournisseur;
 
 		print '<tr class="oddeven">';
 		print '<td class="nowraponall">';
@@ -389,9 +404,9 @@ if ($result) {
 print '<br>';
 
 // Last modified services
-$sql = "SELECT c.ref, c.fk_soc, ";
+$sql = "SELECT c.ref, c.fk_soc as socid,";
 $sql .= " cd.rowid as cid, cd.statut, cd.label, cd.fk_product, cd.description as note, cd.fk_contrat, cd.date_fin_validite,";
-$sql .= " s.nom as name,";
+$sql .= " s.nom as name, s.name_alias, s.logo, s.rowid as socid, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
 $sql .= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype, p.entity as pentity";
 $sql .= " FROM (".MAIN_DB_PREFIX."contrat as c";
 $sql .= ", ".MAIN_DB_PREFIX."societe as s";
@@ -427,9 +442,23 @@ if ($resql) {
 
 		print '<tr class="oddeven">';
 		print '<td class="nowraponall">';
+
 		$staticcontrat->ref = ($obj->ref ? $obj->ref : $obj->fk_contrat);
 		$staticcontrat->id = $obj->fk_contrat;
+
+		$staticcompany->id = $obj->socid;
+		$staticcompany->name = $obj->name;
+		$staticcompany->name_alias = $obj->name_alias;
+		$staticcompany->photo = 1;
+		$staticcompany->code_client = $obj->code_client;
+		$staticcompany->code_fournisseur = $obj->code_fournisseur;
+		$staticcompany->code_compta = $obj->code_compta;
+		$staticcompany->code_compta_fournisseur = $obj->code_compta_fournisseur;
+		$staticcompany->client = $obj->client;
+		$staticcompany->fournisseur = $obj->fournisseur;
+
 		print $staticcontrat->getNomUrl(1, 16);
+
 		//if (1 == 1) print img_warning($langs->trans("Late"));
 		print '</td>';
 		print '<td>';
@@ -449,8 +478,6 @@ if ($resql) {
 		}
 		print '</td>';
 		print '<td class="tdoverflowmax125">';
-		$staticcompany->id = $obj->fk_soc;
-		$staticcompany->name = $obj->name;
 		print $staticcompany->getNomUrl(1, '', 20);
 		print '</td>';
 		print '<td class="nowrap right"><a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'&ligne='.$obj->cid.'">';
@@ -471,7 +498,7 @@ print '<br>';
 
 // Not activated services
 $sql = "SELECT c.ref, c.fk_soc, cd.rowid as cid, cd.statut, cd.label, cd.fk_product, cd.description as note, cd.fk_contrat,";
-$sql .= " s.nom as name,";
+$sql .= " s.nom as name, s.name_alias, s.logo, s.rowid as socid, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
 $sql .= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype, p.entity as pentity";
 $sql .= " FROM (".MAIN_DB_PREFIX."contrat as c";
 $sql .= ", ".MAIN_DB_PREFIX."societe as s";
@@ -507,19 +534,32 @@ if ($resql) {
 	while ($i < $num) {
 		$obj = $db->fetch_object($resql);
 
+		$staticcompany->id = $obj->fk_soc;
+		$staticcompany->name = $obj->name;
+		$staticcompany->name_alias = $obj->name_alias;
+		$staticcompany->photo = 1;
+		$staticcompany->code_client = $obj->code_client;
+		$staticcompany->code_fournisseur = $obj->code_fournisseur;
+		$staticcompany->code_compta = $obj->code_compta;
+		$staticcompany->code_compta_fournisseur = $obj->code_compta_fournisseur;
+		$staticcompany->client = $obj->client;
+		$staticcompany->fournisseur = $obj->fournisseur;
+
+		$staticcontrat->ref = ($obj->ref ? $obj->ref : $obj->fk_contrat);
+		$staticcontrat->id = $obj->fk_contrat;
+
+		$productstatic->id = $obj->fk_product;
+		$productstatic->type = $obj->ptype;
+		$productstatic->ref = $obj->pref;
+		$productstatic->entity = $obj->pentity;
+
 		print '<tr class="oddeven">';
 
 		print '<td class="nowraponall">';
-		$staticcontrat->ref = ($obj->ref ? $obj->ref : $obj->fk_contrat);
-		$staticcontrat->id = $obj->fk_contrat;
 		print $staticcontrat->getNomUrl(1, 16);
 		print '</td>';
 		print '<td class="nowrap">';
 		if ($obj->fk_product > 0) {
-			$productstatic->id = $obj->fk_product;
-			$productstatic->type = $obj->ptype;
-			$productstatic->ref = $obj->pref;
-			$productstatic->entity = $obj->pentity;
 			print $productstatic->getNomUrl(1, '', 20);
 		} else {
 			print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"), "service");
@@ -531,8 +571,6 @@ if ($resql) {
 		}
 		print '</td>';
 		print '<td class="tdoverflowmax125">';
-		$staticcompany->id = $obj->fk_soc;
-		$staticcompany->name = $obj->name;
 		print $staticcompany->getNomUrl(1, '', 20);
 		print '</td>';
 		print '<td width="16" class="right"><a href="line.php?id='.$obj->fk_contrat.'&ligne='.$obj->cid.'">';
@@ -553,7 +591,7 @@ print '<br>';
 
 // Expired services
 $sql = "SELECT c.ref, c.fk_soc, cd.rowid as cid, cd.statut, cd.label, cd.fk_product, cd.description as note, cd.fk_contrat,";
-$sql .= " s.nom as name,";
+$sql .= " s.nom as name, s.name_alias, s.logo, s.rowid as socid, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
 $sql .= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype, p.entity as pentity";
 $sql .= " FROM (".MAIN_DB_PREFIX."contrat as c";
 $sql .= ", ".MAIN_DB_PREFIX."societe as s";
@@ -590,19 +628,32 @@ if ($resql) {
 	while ($i < $num) {
 		$obj = $db->fetch_object($resql);
 
+		$staticcompany->id = $obj->fk_soc;
+		$staticcompany->name = $obj->name;
+		$staticcompany->name_alias = $obj->name_alias;
+		$staticcompany->photo = 1;
+		$staticcompany->code_client = $obj->code_client;
+		$staticcompany->code_fournisseur = $obj->code_fournisseur;
+		$staticcompany->code_compta = $obj->code_compta;
+		$staticcompany->code_compta_fournisseur = $obj->code_compta_fournisseur;
+		$staticcompany->client = $obj->client;
+		$staticcompany->fournisseur = $obj->fournisseur;
+
+		$staticcontrat->ref = ($obj->ref ? $obj->ref : $obj->fk_contrat);
+		$staticcontrat->id = $obj->fk_contrat;
+
+		$productstatic->id = $obj->fk_product;
+		$productstatic->type = $obj->ptype;
+		$productstatic->ref = $obj->pref;
+		$productstatic->entity = $obj->pentity;
+
 		print '<tr class="oddeven">';
 
 		print '<td class="nowraponall">';
-		$staticcontrat->ref = ($obj->ref ? $obj->ref : $obj->fk_contrat);
-		$staticcontrat->id = $obj->fk_contrat;
 		print $staticcontrat->getNomUrl(1, 16);
 		print '</td>';
 		print '<td class="nowrap">';
 		if ($obj->fk_product > 0) {
-			$productstatic->id = $obj->fk_product;
-			$productstatic->type = $obj->ptype;
-			$productstatic->ref = $obj->pref;
-			$productstatic->entity = $obj->pentity;
 			print $productstatic->getNomUrl(1, '', 20);
 		} else {
 			print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"), "service");
@@ -614,8 +665,6 @@ if ($resql) {
 		}
 		print '</td>';
 		print '<td class="tdoverflowmax125">';
-		$staticcompany->id = $obj->fk_soc;
-		$staticcompany->name = $obj->name;
 		print $staticcompany->getNomUrl(1, '', 20);
 		print '</td>';
 		print '<td width="16" class="right"><a href="line.php?id='.$obj->fk_contrat.'&ligne='.$obj->cid.'">';

From 3026842467387790c57cfb42f4bf3dc78f28fc08 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 15 Jan 2023 11:39:38 +0100
Subject: [PATCH 579/816] trans

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

diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index d31ecb077ff..38b6892dbae 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -499,5 +499,5 @@ 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"
+TwoRecordsOfCompanyName=more than one record exists for this company, please contact us to complete your partnership request
 CompanySection=Company section
\ No newline at end of file

From d842d0394d28db95428f5057dfdd6755a624d23f Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Sun, 15 Jan 2023 12:51:21 +0100
Subject: [PATCH 580/816] Revert "FIX re-open supplier order should not be
 allowed when there is a reception."

This reverts commit c52fab09e608d7eede0ece3f314304db147234d8.
---
 htdocs/fourn/commande/card.php | 46 ++++++++++++++--------------------
 htdocs/langs/en_US/orders.lang |  1 -
 2 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index ffb2e834db7..644469a257d 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2440,19 +2440,6 @@ if ($action == 'create') {
 			if (empty($reshook)) {
 				$object->fetchObjectLinked(); // Links are used to show or not button, so we load them now.
 
-				// check if reception
-				$hasreception = 0;
-				if ($conf->reception->enabled) {
-					if (!empty($object->linkedObjects['reception'])) {
-						foreach ($object->linkedObjects['reception'] as $element) {
-							if ($element->statut >= 0) {
-								$hasreception = 1;
-								break;
-							}
-						}
-					}
-				}
-
 				// Validate
 				if ($object->statut == 0 && $num > 0) {
 					if ($usercanvalidate) {
@@ -2528,21 +2515,17 @@ if ($action == 'create') {
 				// Reopen
 				if (in_array($object->statut, array(CommandeFournisseur::STATUS_ACCEPTED))) {
 					$buttonshown = 0;
-					if ($hasreception) {
-						print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("ReceptionExist").'">'.$langs->trans("Disapprove").'</a>';
-					} else {
-						if (!$buttonshown && $usercanapprove) {
-							if (empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER_ONLY)
-								|| (!empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER_ONLY) && $user->id == $object->user_approve_id)) {
-								print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("Disapprove").'</a>';
-								$buttonshown++;
-							}
+					if (!$buttonshown && $usercanapprove) {
+						if (empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER_ONLY)
+							|| (!empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER_ONLY) && $user->id == $object->user_approve_id)) {
+							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("Disapprove").'</a>';
+							$buttonshown++;
 						}
-						if (!$buttonshown && $usercanapprovesecond && !empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED)) {
-							if (empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER2_ONLY)
-								|| (!empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER2_ONLY) && $user->id == $object->user_approve_id2)) {
-								print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("Disapprove").'</a>';
-							}
+					}
+					if (!$buttonshown && $usercanapprovesecond && !empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED)) {
+						if (empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER2_ONLY)
+							|| (!empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER2_ONLY) && $user->id == $object->user_approve_id2)) {
+							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("Disapprove").'</a>';
 						}
 					}
 				}
@@ -2553,10 +2536,19 @@ if ($action == 'create') {
 				}
 
 				// Ship
+				$hasreception = 0;
 				if (isModEnabled('stock') && (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE))) {
 					$labelofbutton = $langs->trans('ReceiveProducts');
 					if ($conf->reception->enabled) {
 						$labelofbutton = $langs->trans("CreateReception");
+						if (!empty($object->linkedObjects['reception'])) {
+							foreach ($object->linkedObjects['reception'] as $element) {
+								if ($element->statut >= 0) {
+									$hasreception = 1;
+									break;
+								}
+							}
+						}
 					}
 
 					if (in_array($object->statut, array(3, 4, 5))) {
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index 0accaadfa62..f988cd62f19 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -204,4 +204,3 @@ StatusSupplierOrderApproved=Approved
 StatusSupplierOrderRefused=Refused
 StatusSupplierOrderReceivedPartially=Partially received
 StatusSupplierOrderReceivedAll=All products received
-NeedAtLeastOneInvoice = There has to be at least one Invoice

From f45ec82904c9fc4c0aabe40760535675d687ee20 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Sun, 15 Jan 2023 13:13:49 +0100
Subject: [PATCH 581/816] Disallow line delete if already dispatched

---
 htdocs/fourn/class/fournisseur.commande.class.php | 13 ++++++++++++-
 htdocs/langs/en_US/orders.lang                    |  2 ++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index a08f2046790..8b539138bfb 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2139,6 +2139,16 @@ class CommandeFournisseur extends CommonOrder
 				return 0;
 			}
 
+			// check if not yet received
+			$dispatchedLines = $this->getDispachedLines();
+			foreach ($dispatchedLines as $dispatchLine) {
+				if ($dispatchLine['orderlineid'] == $idline) {
+					$this->error = "LineAlreadyDispatched";
+					$this->errors[] = $this->error;
+					return -3;
+				}
+			}
+
 			if ($line->delete($notrigger) > 0) {
 				$this->update_price(1);
 				return 1;
@@ -2327,7 +2337,7 @@ class CommandeFournisseur extends CommonOrder
 		// List of already dispatched lines
 		$sql = "SELECT p.ref, p.label,";
 		$sql .= " e.rowid as warehouse_id, e.ref as entrepot,";
-		$sql .= " cfd.rowid as dispatchedlineid, cfd.fk_product, cfd.qty, cfd.eatby, cfd.sellby, cfd.batch, cfd.comment, cfd.status";
+		$sql .= " cfd.rowid as dispatchedlineid, cfd.fk_product, cfd.qty, cfd.eatby, cfd.sellby, cfd.batch, cfd.comment, cfd.status, cfd.fk_commandefourndet";
 		$sql .= " FROM ".MAIN_DB_PREFIX."product as p,";
 		$sql .= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as cfd";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e ON cfd.fk_entrepot = e.rowid";
@@ -2351,6 +2361,7 @@ class CommandeFournisseur extends CommonOrder
 						'productid' => $objp->fk_product,
 						'warehouseid' => $objp->warehouse_id,
 						'qty' => $objp->qty,
+						'orderlineid' => $objp->fk_commandefourndet
 					);
 				}
 
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index f988cd62f19..4be2b34fd73 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -204,3 +204,5 @@ StatusSupplierOrderApproved=Approved
 StatusSupplierOrderRefused=Refused
 StatusSupplierOrderReceivedPartially=Partially received
 StatusSupplierOrderReceivedAll=All products received
+NeedAtLeastOneInvoice = There has to be at least one Invoice
+LineAlreadyDispatched = The order line is already received.
\ No newline at end of file

From 2d2164550f2744d15ba8a757f532414868edc727 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 15 Jan 2023 20:48:29 +0100
Subject: [PATCH 582/816] Fix warnings

---
 htdocs/accountancy/customer/index.php      | 7 +++++--
 htdocs/accountancy/expensereport/index.php | 7 +++++--
 htdocs/accountancy/supplier/index.php      | 7 +++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 69702d8b10e..5f603a973c2 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -121,6 +121,7 @@ if (($action == 'clean' || $action == 'validatehistory') && $user->hasRight('acc
 if ($action == 'validatehistory') {
 	$error = 0;
 	$nbbinddone = 0;
+	$nbbindfailed = 0;
 	$notpossible = 0;
 
 	$db->begin();
@@ -266,12 +267,14 @@ if ($action == 'validatehistory') {
 				if (!$resqlupdate) {
 					$error++;
 					setEventMessages($db->lasterror(), null, 'errors');
+					$nbbindfailed++;
 					break;
 				} else {
 					$nbbinddone++;
 				}
 			} else {
 				$notpossible++;
+				$nbbindfailed++;
 			}
 
 			$i++;
@@ -286,8 +289,8 @@ if ($action == 'validatehistory') {
 	} else {
 		$db->commit();
 		setEventMessages($langs->trans('AutomaticBindingDone', 	$nbbinddone, $notpossible), null, ($notpossible ? 'warnings' : 'mesgs'));
-		if ($notpossible) {
-			setEventMessages($langs->trans('DoManualBindingForFailedRecord', $notpossible), null, 'warnings');
+		if ($nbbindfailed) {
+			setEventMessages($langs->trans('DoManualBindingForFailedRecord', $nbbindfailed), null, 'warnings');
 		}
 	}
 }
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index d256d13252a..0929c9c9e24 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -101,6 +101,7 @@ if (($action == 'clean' || $action == 'validatehistory') && $user->rights->accou
 if ($action == 'validatehistory') {
 	$error = 0;
 	$nbbinddone = 0;
+	$nbbindfailed = 0;
 	$notpossible = 0;
 
 	$db->begin();
@@ -143,12 +144,14 @@ if ($action == 'validatehistory') {
 				if (!$resqlupdate) {
 					$error++;
 					setEventMessages($db->lasterror(), null, 'errors');
+					$nbbindfailed++;
 					break;
 				} else {
 					$nbbinddone++;
 				}
 			} else {
 				$notpossible++;
+				$nbbindfailed++;
 			}
 
 			$i++;
@@ -163,8 +166,8 @@ if ($action == 'validatehistory') {
 	} else {
 		$db->commit();
 		setEventMessages($langs->trans('AutomaticBindingDone', $nbbinddone, $notpossible), null,  ($notpossible ? 'warnings' : 'mesgs'));
-		if ($notpossible) {
-			setEventMessages($langs->trans('DoManualBindingForFailedRecord', $notpossible), null, 'warnings');
+		if ($nbbindfailed) {
+			setEventMessages($langs->trans('DoManualBindingForFailedRecord', $nbbindfailed), null, 'warnings');
 		}
 	}
 }
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 3e0f4fbd784..87e67bbfcb6 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -119,6 +119,7 @@ if (($action == 'clean' || $action == 'validatehistory') && $user->rights->accou
 if ($action == 'validatehistory') {
 	$error = 0;
 	$nbbinddone = 0;
+	$nbbindfailed = 0;
 	$notpossible = 0;
 
 	$db->begin();
@@ -264,12 +265,14 @@ if ($action == 'validatehistory') {
 				if (!$resqlupdate) {
 					$error++;
 					setEventMessages($db->lasterror(), null, 'errors');
+					$nbbindfailed++;
 					break;
 				} else {
 					$nbbinddone++;
 				}
 			} else {
 				$notpossible++;
+				$nbbindfailed++;
 			}
 
 			$i++;
@@ -284,8 +287,8 @@ if ($action == 'validatehistory') {
 	} else {
 		$db->commit();
 		setEventMessages($langs->trans('AutomaticBindingDone', 	$nbbinddone, $notpossible), null, ($notpossible ? 'warnings' : 'mesgs'));
-		if ($notpossible) {
-			setEventMessages($langs->trans('DoManualBindingForFailedRecord', $notpossible), null, 'warnings');
+		if ($nbbindfailed) {
+			setEventMessages($langs->trans('DoManualBindingForFailedRecord', $nbbindfailed), null, 'warnings');
 		}
 	}
 }

From 70f3a6d84701dc212a905a27d4edadf64e440e36 Mon Sep 17 00:00:00 2001
From: Christian Humpel <christian.humpel@gmail.com>
Date: Sun, 15 Jan 2023 22:53:17 +0100
Subject: [PATCH 583/816] load bom class file.

---
 htdocs/mrp/mo_list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index 99e91fec184..c3ae9247c9d 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -27,6 +27,7 @@ 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.'/bom/class/bom.class.php';
 
 // load mrp libraries
 require_once __DIR__.'/class/mo.class.php';

From 70bec953075d5f2873bd5a14f4c10f0cb8ec4d1b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 16 Jan 2023 10:44:39 +0100
Subject: [PATCH 584/816] Fix regression test

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

diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 7a6af7b88ec..bcd5a506946 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -164,7 +164,7 @@ class HookManager
 		// Define type of hook ('output' or 'addreplace').
 		$hooktype = 'addreplace';
 		// TODO Remove hooks with type 'output' (exemple createFrom). All hooks must be converted into 'addreplace' hooks.
-		if (!in_array($method, array(
+		if (in_array($method, array(
 			'createFrom',
 			'dashboardMembers',
 			'dashboardEmailings',

From acc30da1fe2c25e221d01b6f5e5876aacf30a7e9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 16 Jan 2023 10:57:31 +0100
Subject: [PATCH 585/816] Fix do not change password if same

---
 .../triggers/interface_50_modAgenda_ActionsAuto.class.php     | 2 +-
 htdocs/langs/en_US/users.lang                                 | 3 ++-
 htdocs/user/card.php                                          | 2 +-
 htdocs/user/class/user.class.php                              | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index be78b6ecc18..ae53b01e19b 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -931,7 +931,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->sendtoid = 0;
 		} else {
 			// TODO Merge all previous cases into this generic one
-			// $action = BILL_DELETE, TICKET_CREATE, TICKET_MODIFY, TICKET_DELETE, CONTACT_SENTBYMAIL, RECRUITMENTCANDIDATURE_MODIFY, ...
+			// $action = PASSWORD, BILL_DELETE, TICKET_CREATE, TICKET_MODIFY, TICKET_DELETE, CONTACT_SENTBYMAIL, RECRUITMENTCANDIDATURE_MODIFY, ...
 			// Can also be a value defined by an external module like SENTBYSMS, COMPANY_SENTBYSMS, MEMBER_SENTBYSMS, ...
 			// Note: We are here only if $conf->global->MAIN_AGENDA_ACTIONAUTO_action is on (tested at begining of this function).
 			// Note that these key can be set in agenda setup, only if defined into llx_c_action_trigger
diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index 2f691153292..05c9ebb339d 100644
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Link to user
 LinkedToDolibarrThirdParty=Link to third party
 CreateDolibarrLogin=Create a user
 CreateDolibarrThirdParty=Create a third party
-LoginAccountDisableInDolibarr=Account disabled in Dolibarr.
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=Use personal value
 ExportDataset_user_1=Users and their properties
 DomainUser=Domain user %s
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index ea47ba10beb..b7254def46a 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -521,7 +521,7 @@ if (empty($reshook)) {
 				}
 
 				if (!$error) {
-					$ret = $object->update($user);
+					$ret = $object->update($user);		// This may include call to setPassword if password has changed
 					if ($ret < 0) {
 						$error++;
 						if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 7e342e64337..d7b93d323e1 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2031,9 +2031,9 @@ class User extends CommonObject
 
 			// Update password
 			if (!empty($this->pass)) {
-				if ($this->pass != $this->pass_indatabase && $this->pass != $this->pass_indatabase_crypted) {
+				if ($this->pass != $this->pass_indatabase && !dol_verifyHash($this->pass, $this->pass_indatabase_crypted)) {
 					// If a new value for password is set and different than the one crypted into database
-					$result = $this->setPassword($user, $this->pass, 0, $notrigger, $nosyncmemberpass);
+					$result = $this->setPassword($user, $this->pass, 0, $notrigger, $nosyncmemberpass, 0, 1);
 					if ($result < 0) {
 						return -5;
 					}

From 5867b6249661cbd15873e4ec3a9a63a8ffb772c9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 16 Jan 2023 10:57:31 +0100
Subject: [PATCH 586/816] Fix do not change password if same

---
 .../triggers/interface_50_modAgenda_ActionsAuto.class.php     | 2 +-
 htdocs/langs/en_US/users.lang                                 | 3 ++-
 htdocs/user/card.php                                          | 2 +-
 htdocs/user/class/user.class.php                              | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index e3f798dec62..686f59a70c7 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -920,7 +920,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->sendtoid = 0;
 		} else {
 			// TODO Merge all previous cases into this generic one
-			// $action = BILL_DELETE, TICKET_CREATE, TICKET_MODIFY, TICKET_DELETE, CONTACT_SENTBYMAIL, RECRUITMENTCANDIDATURE_MODIFY, ...
+			// $action = PASSWORD, BILL_DELETE, TICKET_CREATE, TICKET_MODIFY, TICKET_DELETE, CONTACT_SENTBYMAIL, RECRUITMENTCANDIDATURE_MODIFY, ...
 			// Can also be a value defined by an external module like SENTBYSMS, COMPANY_SENTBYSMS, MEMBER_SENTBYSMS, ...
 			// Note: We are here only if $conf->global->MAIN_AGENDA_ACTIONAUTO_action is on (tested at begining of this function).
 			// Note that these key can be set in agenda setup, only if defined into llx_c_action_trigger
diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index 757e9f1dedf..cfd8cbb0362 100644
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Link to user
 LinkedToDolibarrThirdParty=Link to third party
 CreateDolibarrLogin=Create a user
 CreateDolibarrThirdParty=Create a third party
-LoginAccountDisableInDolibarr=Account disabled in Dolibarr.
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=Use personal value
 ExportDataset_user_1=Users and their properties
 DomainUser=Domain user %s
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index aa8460ec9d5..775a4db05dc 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -516,7 +516,7 @@ if (empty($reshook)) {
 				}
 
 				if (!$error) {
-					$ret = $object->update($user);
+					$ret = $object->update($user);		// This may include call to setPassword if password has changed
 					if ($ret < 0) {
 						$error++;
 						if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index e90252877d1..1f179758d57 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2032,9 +2032,9 @@ class User extends CommonObject
 
 			// Update password
 			if (!empty($this->pass)) {
-				if ($this->pass != $this->pass_indatabase && $this->pass != $this->pass_indatabase_crypted) {
+				if ($this->pass != $this->pass_indatabase && !dol_verifyHash($this->pass, $this->pass_indatabase_crypted)) {
 					// If a new value for password is set and different than the one crypted into database
-					$result = $this->setPassword($user, $this->pass, 0, $notrigger, $nosyncmemberpass);
+					$result = $this->setPassword($user, $this->pass, 0, $notrigger, $nosyncmemberpass, 0, 1);
 					if ($result < 0) {
 						return -5;
 					}

From f2f4cdbe6ab8381efa86db1c7dd5eda37e79e554 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 16 Jan 2023 11:48:34 +0100
Subject: [PATCH 587/816] NEW Invalidate all sessions of a user when password
 is modified.

---
 htdocs/core/login/functions_dolibarr.php | 12 ------------
 htdocs/langs/en_US/errors.lang           |  2 ++
 htdocs/main.inc.php                      | 21 +++++++++++++++------
 htdocs/user/card.php                     | 14 ++++++++++++++
 htdocs/user/class/user.class.php         |  3 +++
 5 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php
index b732d2ef64b..5f4b722ea1c 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -91,18 +91,6 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 					dol_syslog("functions_dolibarr::check_user_password_dolibarr bad date end validity", LOG_WARNING);
 					return '--bad-login-validity--';
 				}
-				// If there is an invalidation date, check that the current session date is not before this date
-				if ($obj->flagdelsessionsbefore && !empty($_SESSION["dol_logindate"])) {
-					dol_syslog("functions_dolibarr::check_user_password_dolibarr user has a date for session invalidation = ".$obj->flagdelsessionsbefore." and session date = ".$_SESSION["dol_logindate"]);
-					$datetmp = $db->jdate($obj->flagdelsessionsbefore, 'gmt');
-					if ($datetmp > $now) {
-						// Load translation files required by the page
-						$langs->loadLangs(array('main', 'errors'));
-						$_SESSION["dol_loginmesg"] = $langs->transnoentitiesnoconv("ErrorSessionInvalidatedAfterPasswordChange");
-						dol_syslog("functions_dolibarr::check_user_password_dolibarr session was invalidated", LOG_WARNING);
-						return '--bad-login-validity--';
-					}
-				}
 
 				$passclear = $obj->pass;
 				$passcrypted = $obj->pass_crypted;
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index b3eeae4606b..b779c901b54 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -303,6 +303,7 @@ ErrorValueForTooLow=Value for <b>%s</b> is too low
 ErrorValueCantBeNull=Value for <b>%s</b> can't be null
 ErrorDateOfMovementLowerThanDateOfFileTransmission=The date of the bank transaction can't be lower than the date of the file transmission
 ErrorTooMuchFileInForm=Too much files in form, the maximum number is %s file(s)
+ErrorSessionInvalidatedAfterPasswordChange=The session was invalidated after a password change. Please relogin.
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -325,6 +326,7 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
 WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
+WarningYourPasswordWasModifiedPleaseLogin=Your password was modified. For security purpose you will have to login now with your new password.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 7d764d4a105..b53688de6e7 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -943,26 +943,35 @@ if (!defined('NOLOGIN')) {
 		dol_syslog("- This is an already logged session. _SESSION['dol_login']=".$login." _SESSION['dol_entity']=".$entity, LOG_DEBUG);
 
 		$resultFetchUser = $user->fetch('', $login, '', 1, ($entity > 0 ? $entity : -1));
-		if ($resultFetchUser <= 0) {
-			// Account has been removed after login
-			dol_syslog("Can't load user even if session logged. _SESSION['dol_login']=".$login, LOG_WARNING);
+		if ($resultFetchUser <= 0 || ($user->flagdelsessionsbefore && !empty($_SESSION["dol_logindate"]) && $user->flagdelsessionsbefore > $_SESSION["dol_logindate"])) {
+			if ($resultFetchUser <= 0) {
+				// Account has been removed after login
+				dol_syslog("Can't load user even if session logged. _SESSION['dol_login']=".$login, LOG_WARNING);
+			} else {
+				// Session is no more valid
+				dol_syslog("The user has a date for session invalidation = ".$user->flagdelsessionsbefore." and a session date = ".$_SESSION["dol_logindate"].". We must invalidate its sessions.");
+			}
 			session_destroy();
 			session_set_cookie_params(0, '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Add tag secure and httponly on session cookie
 			session_name($sessionname);
 			session_start();
 
 			if ($resultFetchUser == 0) {
-				// Load translation files required by page
 				$langs->loadLangs(array('main', 'errors'));
 
 				$_SESSION["dol_loginmesg"] = $langs->transnoentitiesnoconv("ErrorCantLoadUserFromDolibarrDatabase", $login);
 
 				$user->trigger_mesg = 'ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
-			}
-			if ($resultFetchUser < 0) {
+			} elseif ($resultFetchUser < 0) {
 				$_SESSION["dol_loginmesg"] = $user->error;
 
 				$user->trigger_mesg = $user->error;
+			} else {
+				$langs->loadLangs(array('main', 'errors'));
+
+				$_SESSION["dol_loginmesg"] = $langs->transnoentitiesnoconv("ErrorSessionInvalidatedAfterPasswordChange");
+
+				$user->trigger_mesg = 'ErrorUserSessionWasInvalidated - login='.$login;
 			}
 
 			// Call trigger
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index b7254def46a..602bc25eb3a 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -521,6 +521,13 @@ if (empty($reshook)) {
 				}
 
 				if (!$error) {
+					$passwordismodified = 0;
+					if (!empty($object->pass)) {
+						if ($object->pass != $object->pass_indatabase && !dol_verifyHash($object->pass, $object->pass_indatabase_crypted)) {
+							$passwordismodified = 1;
+						}
+					}
+
 					$ret = $object->update($user);		// This may include call to setPassword if password has changed
 					if ($ret < 0) {
 						$error++;
@@ -615,6 +622,13 @@ if (empty($reshook)) {
 						$langs->load("errors");
 						setEventMessages($langs->transnoentitiesnoconv("WarningYourLoginWasModifiedPleaseLogin"), null, 'warnings');
 					}
+					if ($passwordismodified && $object->login == $user->login) {    // Current user has changed its password
+						$error++;
+						$langs->load("errors");
+						setEventMessages($langs->transnoentitiesnoconv("WarningYourPasswordWasModifiedPleaseLogin"), null, 'warnings');
+						header("Location: ".DOL_URL_ROOT.'/user/card.php?id='.$object->id);
+						exit;
+					}
 				} else {
 					$db->rollback();
 				}
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index d7b93d323e1..22556d3e1c2 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -276,6 +276,7 @@ class User extends CommonObject
 
 	public $datelastlogin;
 	public $datepreviouslogin;
+	public $flagdelsessionsbefore;
 	public $iplastlogin;
 	public $ippreviouslogin;
 	public $datestartvalidity;
@@ -441,6 +442,7 @@ class User extends CommonObject
 		$sql .= " u.tms as datem,";
 		$sql .= " u.datelastlogin as datel,";
 		$sql .= " u.datepreviouslogin as datep,";
+		$sql .= " u.flagdelsessionsbefore,";
 		$sql .= " u.iplastlogin,";
 		$sql .= " u.ippreviouslogin,";
 		$sql .= " u.datelastpassvalidation,";
@@ -575,6 +577,7 @@ class User extends CommonObject
 				$this->datem				= $this->db->jdate($obj->datem);
 				$this->datelastlogin = $this->db->jdate($obj->datel);
 				$this->datepreviouslogin = $this->db->jdate($obj->datep);
+				$this->flagdelsessionsbefore = $this->db->jdate($obj->flagdelsessionsbefore, 'gmt');
 				$this->iplastlogin = $obj->iplastlogin;
 				$this->ippreviouslogin = $obj->ippreviouslogin;
 				$this->datestartvalidity = $this->db->jdate($obj->datestartvalidity);

From 6af49ff2165712d4789d2265c2b6927d803f46fd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 16 Jan 2023 12:33:54 +0100
Subject: [PATCH 588/816] Fix warning php8

---
 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 b53688de6e7..2904f576bf7 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -984,7 +984,7 @@ if (!defined('NOLOGIN')) {
 			// Hooks on failed login
 			$action = '';
 			$hookmanager->initHooks(array('login'));
-			$parameters = array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+			$parameters = array('dol_authmode' => (isset($dol_authmode) ? $dol_authmode : ''), 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
 			$reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
 			if ($reshook < 0) {
 				$error++;

From 3fc2f9273d02a2104210546b36ac3ec69902091c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 16 Jan 2023 12:33:54 +0100
Subject: [PATCH 589/816] Fix warning php8

---
 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 1188dd023ab..2ed8b1a012f 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -975,7 +975,7 @@ if (!defined('NOLOGIN')) {
 			// Hooks on failed login
 			$action = '';
 			$hookmanager->initHooks(array('login'));
-			$parameters = array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+			$parameters = array('dol_authmode' => (isset($dol_authmode) ? $dol_authmode : ''), 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
 			$reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
 			if ($reshook < 0) {
 				$error++;

From 481215eef45175bafcada49258666abd7a2ec2f1 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Mon, 16 Jan 2023 14:40:35 +0100
Subject: [PATCH 590/816] FIX Multicompany use "element" name and not
 "table_element"

---
 htdocs/asset/class/asset.class.php                            | 2 +-
 htdocs/asset/class/assetmodel.class.php                       | 2 +-
 htdocs/bom/class/bom.class.php                                | 4 ++--
 htdocs/core/class/commonobject.class.php                      | 2 +-
 htdocs/eventorganization/class/conferenceorbooth.class.php    | 2 +-
 .../class/conferenceorboothattendee.class.php                 | 2 +-
 htdocs/hrm/class/evaluation.class.php                         | 2 +-
 htdocs/hrm/class/evaluationdet.class.php                      | 2 +-
 htdocs/hrm/class/job.class.php                                | 2 +-
 htdocs/hrm/class/position.class.php                           | 2 +-
 htdocs/hrm/class/skill.class.php                              | 2 +-
 htdocs/hrm/class/skilldet.class.php                           | 2 +-
 htdocs/hrm/class/skillrank.class.php                          | 2 +-
 htdocs/knowledgemanagement/class/knowledgerecord.class.php    | 2 +-
 htdocs/mrp/class/mo.class.php                                 | 4 ++--
 htdocs/partnership/class/partnership.class.php                | 2 +-
 htdocs/partnership/class/partnership_type.class.php           | 2 +-
 .../product/stock/stocktransfer/class/stocktransfer.class.php | 2 +-
 .../stock/stocktransfer/class/stocktransferline.class.php     | 2 +-
 htdocs/recruitment/class/recruitmentcandidature.class.php     | 2 +-
 htdocs/recruitment/class/recruitmentjobposition.class.php     | 2 +-
 htdocs/ticket/class/cticketcategory.class.php                 | 2 +-
 htdocs/webhook/class/target.class.php                         | 2 +-
 htdocs/workstation/class/workstation.class.php                | 2 +-
 24 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index 7c2b55c045e..c01f4b967c4 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -410,7 +410,7 @@ class Asset extends CommonObject
 		$sql .= $this->getFieldList('t');
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			$sql .= " WHERE t.entity IN (".getEntity($this->table_element).")";
+			$sql .= " WHERE t.entity IN (".getEntity($this->element).")";
 		} else {
 			$sql .= " WHERE 1 = 1";
 		}
diff --git a/htdocs/asset/class/assetmodel.class.php b/htdocs/asset/class/assetmodel.class.php
index fb574e6ea18..a973abc3764 100644
--- a/htdocs/asset/class/assetmodel.class.php
+++ b/htdocs/asset/class/assetmodel.class.php
@@ -348,7 +348,7 @@ class AssetModel extends CommonObject
 		$sql .= $this->getFieldList('t');
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			$sql .= " WHERE t.entity IN (".getEntity($this->table_element).")";
+			$sql .= " WHERE t.entity IN (".getEntity($this->element).")";
 		} else {
 			$sql .= " WHERE 1 = 1";
 		}
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index cd5b119cabf..b819e438161 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -476,7 +476,7 @@ class BOM extends CommonObject
 		$sql .= $this->getFieldList();
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		if ($this->ismultientitymanaged) {
-			$sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+			$sql .= ' WHERE t.entity IN ('.getEntity($this->element).')';
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
@@ -1736,7 +1736,7 @@ class BOMLine extends CommonObjectLine
 		$sql .= $this->getFieldList();
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		if ($this->ismultientitymanaged) {
-			$sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+			$sql .= ' WHERE t.entity IN ('.getEntity($this->element).')';
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index f1920c74931..471d835f4a3 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -9331,7 +9331,7 @@ abstract class CommonObject
 			$sql .= ' WHERE 1 = 1'; // usage with empty id and empty ref is very rare
 		}
 		if (empty($id) && isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			$sql .= ' AND t.entity IN ('.getEntity($this->table_element).')';
+			$sql .= ' AND t.entity IN ('.getEntity($this->element).')';
 		}
 		if ($morewhere) {
 			$sql .= $morewhere;
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index db0928efc7d..bc21d7bb1c5 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -284,7 +284,7 @@ class ConferenceOrBooth extends ActionComm
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."c_actioncomm as cact ON cact.id=t.fk_action AND cact.module LIKE '%@eventorganization'";
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			$sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+			$sql .= ' WHERE t.entity IN ('.getEntity($this->element).')';
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index 595eaf67eeb..be06f70979e 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -423,7 +423,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."actioncomm as a on a.id = t.fk_actioncomm";
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			$sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+			$sql .= ' WHERE t.entity IN ('.getEntity($this->element).')';
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index 23ccc6c9fd2..51f8c8bc985 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -404,7 +404,7 @@ class Evaluation extends CommonObject
 		$sql .= $this->getFieldList('t');
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			$sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+			$sql .= ' WHERE t.entity IN ('.getEntity($this->element).')';
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
diff --git a/htdocs/hrm/class/evaluationdet.class.php b/htdocs/hrm/class/evaluationdet.class.php
index 5489065e52d..50d2fac8821 100644
--- a/htdocs/hrm/class/evaluationdet.class.php
+++ b/htdocs/hrm/class/evaluationdet.class.php
@@ -373,7 +373,7 @@ class Evaluationline extends CommonObject
 		$sql .= $this->getFieldList('t');
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			$sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+			$sql .= ' WHERE t.entity IN ('.getEntity($this->element).')';
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index 93950979a1a..076e223679d 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -374,7 +374,7 @@ class Job extends CommonObject
 		$sql .= $this->getFieldList('t');
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			$sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+			$sql .= ' WHERE t.entity IN ('.getEntity($this->element).')';
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index 98b5fd89be9..b685147a9b9 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -385,7 +385,7 @@ class Position extends CommonObject
 		$sql .= $this->getFieldList('t');
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			$sql .= ' WHERE t.entity IN (' . getEntity($this->table_element) . ')';
+			$sql .= ' WHERE t.entity IN (' . getEntity($this->element) . ')';
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index 3f56294a7b2..ec994a35746 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -443,7 +443,7 @@ class Skill extends CommonObject
 		$sql .= $this->getFieldList('t');
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			$sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+			$sql .= ' WHERE t.entity IN ('.getEntity($this->element).')';
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
diff --git a/htdocs/hrm/class/skilldet.class.php b/htdocs/hrm/class/skilldet.class.php
index 4dface42230..3db74d26da1 100644
--- a/htdocs/hrm/class/skilldet.class.php
+++ b/htdocs/hrm/class/skilldet.class.php
@@ -366,7 +366,7 @@ class Skilldet extends CommonObject
 		$sql .= $this->getFieldList('t');
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			$sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+			$sql .= ' WHERE t.entity IN ('.getEntity($this->element).')';
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
diff --git a/htdocs/hrm/class/skillrank.class.php b/htdocs/hrm/class/skillrank.class.php
index 2d75425823e..a08a647ca03 100644
--- a/htdocs/hrm/class/skillrank.class.php
+++ b/htdocs/hrm/class/skillrank.class.php
@@ -405,7 +405,7 @@ class SkillRank extends CommonObject
 		$sql .= $this->getFieldList('t');
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			$sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+			$sql .= ' WHERE t.entity IN ('.getEntity($this->element).')';
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index bf2bf38bbef..1cdb3aff9f5 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -381,7 +381,7 @@ class KnowledgeRecord extends CommonObject
 		$sql .= $this->getFieldList('t');
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			$sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+			$sql .= ' WHERE t.entity IN ('.getEntity($this->element).')';
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 13d0f67316c..68523ace9da 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -451,7 +451,7 @@ class Mo extends CommonObject
 		$sql .= $this->getFieldList();
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			$sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+			$sql .= ' WHERE t.entity IN ('.getEntity($this->element).')';
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
@@ -1717,7 +1717,7 @@ class MoLine extends CommonObjectLine
 		$sql .= $this->getFieldList();
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			$sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+			$sql .= ' WHERE t.entity IN ('.getEntity($this->element).')';
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index d7242f4e16c..a9645efaae2 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -483,7 +483,7 @@ class Partnership extends CommonObject
 		$sql .= $this->getFieldList('t');
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			$sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+			$sql .= ' WHERE t.entity IN ('.getEntity($this->element).')';
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
diff --git a/htdocs/partnership/class/partnership_type.class.php b/htdocs/partnership/class/partnership_type.class.php
index 0c42dae87d2..ba0f2c2a1ab 100644
--- a/htdocs/partnership/class/partnership_type.class.php
+++ b/htdocs/partnership/class/partnership_type.class.php
@@ -168,7 +168,7 @@ class PartnershipType extends CommonObject
 		$sql .= $this->getFieldList('t');
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			$sql .= " WHERE t.entity IN (".getEntity($this->table_element).")";
+			$sql .= " WHERE t.entity IN (".getEntity($this->element).")";
 		} else {
 			$sql .= " WHERE 1 = 1";
 		}
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
index 60f13396b80..0711815da15 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
@@ -428,7 +428,7 @@ class StockTransfer extends CommonObject
 		$sql = 'SELECT ';
 		$sql .= $this->getFieldList();
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql .= ' WHERE t.entity IN ('.getEntity($this->element).')';
 		else $sql .= ' WHERE 1 = 1';
 		// Manage filter
 		$sqlwhere = array();
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
index 4ee2f1db631..0460430c337 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
@@ -338,7 +338,7 @@ class StockTransferLine extends CommonObjectLine
 		$sql = 'SELECT ';
 		$sql .= $this->getFieldList();
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql .= ' WHERE t.entity IN ('.getEntity($this->element).')';
 		else $sql .= ' WHERE 1 = 1';
 		// Manage filter
 		$sqlwhere = array();
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index 1690f13da56..25d8b352a81 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -374,7 +374,7 @@ class RecruitmentCandidature extends CommonObject
 		$sql .= $this->getFieldList();
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			$sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+			$sql .= ' WHERE t.entity IN ('.getEntity($this->element).')';
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index 7a9d077f910..6b3fcf7eeb8 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -391,7 +391,7 @@ class RecruitmentJobPosition extends CommonObject
 		$sql .= $this->getFieldList();
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			$sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+			$sql .= ' WHERE t.entity IN ('.getEntity($this->element).')';
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
diff --git a/htdocs/ticket/class/cticketcategory.class.php b/htdocs/ticket/class/cticketcategory.class.php
index dd8b75292ad..334ea7cd1ab 100644
--- a/htdocs/ticket/class/cticketcategory.class.php
+++ b/htdocs/ticket/class/cticketcategory.class.php
@@ -384,7 +384,7 @@ class CTicketCategory extends CommonObject
 		$sql .= $this->getFieldList('t');
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			$sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+			$sql .= ' WHERE t.entity IN ('.getEntity($this->element).')';
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
diff --git a/htdocs/webhook/class/target.class.php b/htdocs/webhook/class/target.class.php
index 51a2a1beffa..701c74fbf4d 100644
--- a/htdocs/webhook/class/target.class.php
+++ b/htdocs/webhook/class/target.class.php
@@ -385,7 +385,7 @@ class Target extends CommonObject
 		$sql .= $this->getFieldList('t');
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			$sql .= " WHERE t.entity IN (".getEntity($this->table_element).")";
+			$sql .= " WHERE t.entity IN (".getEntity($this->element).")";
 		} else {
 			$sql .= " WHERE 1 = 1";
 		}
diff --git a/htdocs/workstation/class/workstation.class.php b/htdocs/workstation/class/workstation.class.php
index d3b098784da..58f326e3749 100644
--- a/htdocs/workstation/class/workstation.class.php
+++ b/htdocs/workstation/class/workstation.class.php
@@ -419,7 +419,7 @@ class Workstation extends CommonObject
 		$sql .= $this->getFieldList();
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			$sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+			$sql .= ' WHERE t.entity IN ('.getEntity($this->element).')';
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}

From 20633aa7747bfb38aa508839515585e19c9b3025 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Mon, 16 Jan 2023 15:03:01 +0100
Subject: [PATCH 591/816] fix checkbox by mergin two class

---
 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 85845e557ab..fdeebe484eb 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -1071,7 +1071,7 @@ class Job extends CommonObject
 		$return .= '</span>';
 		$return .= '<div class="info-box-content">';
 		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
-		$return .= '<input class="fright" id="cb'.$this->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		if (property_exists($this, 'deplacement')) {
 			$return .= '<br><span class="opacitymedium">'.$langs->trans("Type").'</span>';
 			$return .= ' : <span class="info-box-label ">'.$this->fields['deplacement']['arrayofkeyval'][$this->deplacement].'</span>';

From 902351cbaa2d15b4f050509e506ec8e2288f3738 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 16 Jan 2023 15:45:17 +0100
Subject: [PATCH 592/816] Fix phpunit

---
 test/phpunit/UserTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php
index f318ae4cbac..9963007af15 100644
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@@ -204,7 +204,7 @@ class UserTest extends PHPUnit\Framework\TestCase
 		$newlocalobject=new User($this->savdb);
 		$newlocalobject->initAsSpecimen();
 		$this->changeProperties($newlocalobject);
-		$this->assertEquals($this->objCompare($localobject, $newlocalobject, true, array('id','socid','societe_id','specimen','note','ref','pass','pass_indatabase','pass_indatabase_crypted','pass_temp','datec','datem','datelastlogin','datepreviouslogin','iplastlogin','ippreviouslogin','trackid')), array());    // Actual, Expected
+		$this->assertEquals($this->objCompare($localobject, $newlocalobject, true, array('id','socid','societe_id','specimen','note','ref','pass','pass_indatabase','pass_indatabase_crypted','pass_temp','datec','datem','datelastlogin','datepreviouslogin','flagdelsessionsbefore','iplastlogin','ippreviouslogin','trackid')), array());    // Actual, Expected
 
 		return $localobject;
 	}

From 6983ef95846949955b5591ca918de5b353cab546 Mon Sep 17 00:00:00 2001
From: lamrani abdelwadoud <lamrani002@gmail.com>
Date: Mon, 16 Jan 2023 15:53:57 +0100
Subject: [PATCH 593/816] Update product.class.php

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 96e3ac7c7f5..b0882e95632 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -6291,7 +6291,6 @@ class Product extends CommonObject
 		$return .= '<div class="info-box info-box-sm">';
 		$return .= '<div class="info-box-img">';
 		$label = '';
-
 		if ($this->is_photo_available($conf->product->multidir_output[$this->entity])) {
 				$label .= $this->show_photos('product', $conf->product->multidir_output[$this->entity]);
 				$return .= $label;
@@ -6303,7 +6302,6 @@ class Product extends CommonObject
 			}
 			$return .= $label;
 		}
-
 		$return .= '</div>';
 		$return .= '<div class="info-box-content">';
 		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>';

From 690646b7da0d151a1662f7333a9b462cfb915e3c Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Mon, 16 Jan 2023 16:12:27 +0100
Subject: [PATCH 594/816] fix errors in info-box.css

---
 htdocs/theme/eldy/info-box.inc.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 5c010e21e26..99e8e5e2ca1 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -491,12 +491,9 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
 	min-width: 350px;
 	max-width: 350px;
 }
-
-/**for make a checkbox in the right of the box in mode kanban */
 .fright {
 	float:right;
 }
-
 @media only screen and (max-width: 1740px) {
 	.info-box-module {
 		min-width: 315px;

From 6f93cac359f875dd97cead8973135ad1f4548e5d Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Mon, 16 Jan 2023 17:10:26 +0100
Subject: [PATCH 595/816] fix style error

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

diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php
index 5acd2532bef..1225f5304be 100644
--- a/htdocs/loan/list.php
+++ b/htdocs/loan/list.php
@@ -66,8 +66,7 @@ $search_amount = GETPOST('search_amount', 'alpha');
 
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'loanlist'; // To manage different context of search
 $optioncss = GETPOST('optioncss', 'alpha');
-$mode      = GETPOST('mode', 'alpha');  // mode view result
-
+$mode = GETPOST('mode', 'alpha');  // mode view result
 
 
 /*

From 931ce8be4a78871015e723839400b19b1e1d97bd Mon Sep 17 00:00:00 2001
From: marc <marc.baur@ptmsoft.fr>
Date: Mon, 16 Jan 2023 18:06:23 +0100
Subject: [PATCH 596/816] NEW #23436 Group social networks field Group social
 networks field on a thirdparty creation into one link

---
 htdocs/contact/card.php | 75 ++++++++++++++++++++++++----------------
 htdocs/societe/card.php | 76 +++++++++++++++++++++++++----------------
 2 files changed, 91 insertions(+), 60 deletions(-)

diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 6cf7d3051f3..e0c263572cb 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -864,21 +864,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 
 			if (isModEnabled('socialnetworks')) {
-				foreach ($socialnetworks as $key => $value) {
-					if ($value['active']) {
-						print '<tr>';
-						print '<td><label for="'.$value['label'].'">'.$form->editfieldkey($value['label'], $key, '', $object, 0).'</label></td>';
-						print '<td colspan="3">';
-						if (!empty($value['icon'])) {
-							print '<span class="fa '.$value['icon'].'"></span>';
-						}
-						print '<input type="text" name="'.$key.'" id="'.$key.'" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET($key) ?GETPOST($key, 'alphanohtml') : (!empty($object->socialnetworks[$key]) ? $object->socialnetworks[$key] : "")).'">';
-						print '</td>';
-						print '</tr>';
-					} elseif (!empty($object->socialnetworks[$key])) {
-						print '<input type="hidden" name="'.$key.'" value="'.$object->socialnetworks[$key].'">';
-					}
-				}
+				showSocialNetwork();
 			}
 
 			// Visibility
@@ -1151,21 +1137,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 
 			if (isModEnabled('socialnetworks')) {
-				foreach ($socialnetworks as $key => $value) {
-					if ($value['active']) {
-						print '<tr>';
-						print '<td><label for="'.$value['label'].'">'.$form->editfieldkey($value['label'], $key, '', $object, 0).'</label></td>';
-						print '<td colspan="3">';
-						if (!empty($value['icon'])) {
-							print '<span class="fa '.$value['icon'].'"></span>';
-						}
-						print '<input type="text" name="'.$key.'" id="'.$key.'" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET($key) ?GETPOST($key, 'alphanohtml') : (empty($object->socialnetworks[$key]) ? '' : $object->socialnetworks[$key])).'">';
-						print '</td>';
-						print '</tr>';
-					} elseif (!empty($object->socialnetworks[$key])) {
-						print '<input type="hidden" name="'.$key.'" value="'.$object->socialnetworks[$key].'">';
-					}
-				}
+				showSocialNetwork();
 			}
 
 			// Visibility
@@ -1620,6 +1592,49 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 	}
 }
 
+function showSocialNetwork() {
+	global $socialnetworks, $object, $form, $object, $langs;
+	echo '<script type="text/javascript">$("document").ready(function() {toogleSocialNetwork(false); });</script>';
+
+	print '<tr><td>&nbsp;</td><td><a id="lnk" href="javascript:toogleSocialNetwork(true)"></a></td></tr>';
+	foreach ($socialnetworks as $key => $value) {
+		if ($value['active']) {
+			print '<tr class="soc_network">';
+			print '<td><label for="'.$value['label'].'">'.$form->editfieldkey($value['label'], $key, '', $object, 0).'</label></td>';
+			print '<td colspan="3">';
+			if (!empty($value['icon'])) {
+				print '<span class="fa '.$value['icon'].'"></span>';
+			}
+			print '<input type="text" name="'.$key.'" id="'.$key.'" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET($key) ?GETPOST($key, 'alphanohtml') : (!empty($object->socialnetworks[$key]) ? $object->socialnetworks[$key] : "")).'">';
+			print '</td>';
+			print '</tr>';
+		} elseif (!empty($object->socialnetworks[$key])) {
+			print '<input type="hidden" name="'.$key.'" value="'.$object->socialnetworks[$key].'">';
+		}
+	}
+
+	print '<script type="text/javascript">
+
+	function toogleSocialNetwork(chgCookieState) {
+		const lnk = $("#lnk");
+		const items = $(".soc_network");
+		var cookieState = document.cookie.split(";").some((item) => item.trim().startsWith("DOLUSER_SOCIALNETWORKS_SHOW=true")) == true;
+
+		if (!chgCookieState) cookieState = !cookieState ;
+
+		if (cookieState) {
+			items.hide();
+			lnk.text("'.dol_escape_js($langs->transnoentitiesnoconv("ShowSocialNetwork")).'...");
+			if(chgCookieState) {document.cookie = "DOLUSER_SOCIALNETWORKS_SHOW=false; SameSite=Strict"};
+		} else {
+			items.show();
+			lnk.text("'.dol_escape_js($langs->transnoentitiesnoconv("HideSocialNetwork")).'");
+			if(chgCookieState) {document.cookie = "DOLUSER_SOCIALNETWORKS_SHOW=true; SameSite=Strict";}
+		}				
+	}
+	</script>';
+}
+
 
 llxFooter();
 
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 8b5dcd251d2..2d6356394dd 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1663,21 +1663,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		// Social networks
 		if (isModEnabled('socialnetworks')) {
-			foreach ($socialnetworks as $key => $value) {
-				if ($value['active']) {
-					print '<tr>';
-					print '<td><label for="'.$value['label'].'">'.$form->editfieldkey($value['label'], $key, '', $object, 0).'</label></td>';
-					print '<td colspan="3">';
-					if (!empty($value['icon'])) {
-						print '<span class="fa '.$value['icon'].' pictofixedwidth"></span>';
-					}
-					print '<input type="text" name="'.$key.'" id="'.$key.'" class="minwidth100 maxwidth300 widthcentpercentminusx" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET($key) ? GETPOST($key, 'alphanohtml') : (empty($object->socialnetworks[$key]) ? '' : $object->socialnetworks[$key])).'">';
-					print '</td>';
-					print '</tr>';
-				} elseif (!empty($object->socialnetworks[$key])) {
-					print '<input type="hidden" name="'.$key.'" value="'.$object->socialnetworks[$key].'">';
-				}
-			}
+			showSocialNetwork();
 		}
 
 		// Prof ids
@@ -2395,21 +2381,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			// Social network
 			if (isModEnabled('socialnetworks')) {
-				foreach ($socialnetworks as $key => $value) {
-					if ($value['active']) {
-						print '<tr>';
-						print '<td><label for="'.$value['label'].'">'.$form->editfieldkey($value['label'], $key, '', $object, 0).'</label></td>';
-						print '<td colspan="3">';
-						if (!empty($value['icon'])) {
-							print '<span class="fa '.$value['icon'].' pictofixedwidth"></span>';
-						}
-						print '<input type="text" name="'.$key.'" id="'.$key.'" class="minwidth100 maxwidth500 widthcentpercentminusx" maxlength="80" value="'.(empty($object->socialnetworks[$key]) ? '' : $object->socialnetworks[$key]).'">';
-						print '</td>';
-						print '</tr>';
-					} elseif (!empty($object->socialnetworks[$key])) {
-						print '<input type="hidden" name="'.$key.'" value="'.$object->socialnetworks[$key].'">';
-					}
-				}
+				showSocialNetwork();
 			}
 
 			// Prof ids
@@ -3326,6 +3298,50 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 	}
 }
+
+function showSocialNetwork() {
+	global $socialnetworks, $object, $form, $object, $langs;
+	echo '<script type="text/javascript">$("document").ready(function() {toogleSocialNetwork(false); });</script>';
+
+	print '<tr><td>&nbsp;</td><td><a id="lnk" href="javascript:toogleSocialNetwork(true)"></a></td></tr>';
+	foreach ($socialnetworks as $key => $value) {
+		if ($value['active']) {
+			print '<tr class="soc_network">';
+			print '<td><label for="'.$value['label'].'">'.$form->editfieldkey($value['label'], $key, '', $object, 0).'</label></td>';
+			print '<td colspan="3">';
+			if (!empty($value['icon'])) {
+				print '<span class="fa '.$value['icon'].' pictofixedwidth"></span>';
+			}
+			print '<input type="text" name="'.$key.'" id="'.$key.'" class="minwidth100 maxwidth300 widthcentpercentminusx" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET($key) ? GETPOST($key, 'alphanohtml') : (empty($object->socialnetworks[$key]) ? '' : $object->socialnetworks[$key])).'">';
+			print '</td>';
+			print '</tr>';
+		} elseif (!empty($object->socialnetworks[$key])) {
+			print '<input type="hidden" name="'.$key.'" value="'.$object->socialnetworks[$key].'">';
+		}
+	}
+
+	print '<script type="text/javascript">
+
+	function toogleSocialNetwork(chgCookieState) {
+		const lnk = $("#lnk");
+		const items = $(".soc_network");
+		var cookieState = document.cookie.split(";").some((item) => item.trim().startsWith("DOLUSER_SOCIALNETWORKS_SHOW=true")) == true;
+
+		if (!chgCookieState) cookieState = !cookieState ;
+
+		if (cookieState) {
+			items.hide();
+			lnk.text("'.dol_escape_js($langs->transnoentitiesnoconv("ShowSocialNetwork")).'...");
+			if(chgCookieState) {document.cookie = "DOLUSER_SOCIALNETWORKS_SHOW=false; SameSite=Strict"};
+		} else {
+			items.show();
+			lnk.text("'.dol_escape_js($langs->transnoentitiesnoconv("HideSocialNetwork")).'");
+			if(chgCookieState) {document.cookie = "DOLUSER_SOCIALNETWORKS_SHOW=true; SameSite=Strict";}
+		}				
+	}
+	</script>';
+}
+
 // End of page
 llxFooter();
 $db->close();

From b2df3e47f84c87388590fb77dfb401a8916b9670 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 16 Jan 2023 17:09:34 +0000
Subject: [PATCH 597/816] Fixing style errors.

---
 htdocs/contact/card.php | 3 ++-
 htdocs/societe/card.php | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index e0c263572cb..8c061020dc3 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -1592,7 +1592,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 	}
 }
 
-function showSocialNetwork() {
+function showSocialNetwork()
+{
 	global $socialnetworks, $object, $form, $object, $langs;
 	echo '<script type="text/javascript">$("document").ready(function() {toogleSocialNetwork(false); });</script>';
 
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 2d6356394dd..f06a4c14eee 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -3299,7 +3299,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 	}
 }
 
-function showSocialNetwork() {
+function showSocialNetwork()
+{
 	global $socialnetworks, $object, $form, $object, $langs;
 	echo '<script type="text/javascript">$("document").ready(function() {toogleSocialNetwork(false); });</script>';
 

From 9b164b907c1a9e9b641ff7bd9d4c308e9e36ba83 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Mon, 16 Jan 2023 19:25:54 +0100
Subject: [PATCH 598/816] Add warehouse modify and create triggers. Clean and
 remove deprecated vars.

---
 htdocs/product/stock/class/entrepot.class.php | 52 ++++++++++++-------
 1 file changed, 33 insertions(+), 19 deletions(-)

diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 065883e7a2c..ce5bef9c939 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -182,16 +182,17 @@ class Entrepot extends CommonObject
 	/**
 	 *	Creation d'un entrepot en base
 	 *
-	 *	@param		User	$user       Object user that create the warehouse
+	 *	@param		User	$user		Object user that create the warehouse
+	 *	@param		bool	$notrigger	false=launch triggers after, true=disable triggers
 	 *	@return		int					>0 if OK, =<0 if KO
 	 */
-	public function create($user)
+	public function create($user, $notrigger = false)
 	{
 		global $conf;
 
 		$error = 0;
 
-		$this->label = trim(!empty($this->label) ? $this->label : $this->libelle);
+		$this->label = trim($this->label);
 
 		// Error if label not defined
 		if ($this->label == '') {
@@ -222,14 +223,21 @@ class Entrepot extends CommonObject
 
 				// Actions on extra fields
 				if (!$error) {
-					if (!$error) {
-						$result = $this->insertExtraFields();
-						if ($result < 0) {
-							$error++;
-						}
+					$result = $this->insertExtraFields();
+					if ($result < 0) {
+						$error++;
 					}
 				}
 
+				if (!$error && !$notrigger) {
+					// Call triggers
+					$result = $this->call_trigger('WAREHOUSE_CREATE', $user);
+					if ($result < 0) {
+						$error++;
+					}
+					// End call triggers
+				}
+
 				if (!$error) {
 					$this->db->commit();
 					return $id;
@@ -254,11 +262,12 @@ class Entrepot extends CommonObject
 	/**
 	 *	Update properties of a warehouse
 	 *
-	 *	@param		int		$id     id of warehouse to modify
-	 *	@param      User	$user	User object
+	 *	@param		int		$id			id of warehouse to modify
+	 *	@param		User	$user		User object
+	 *	@param		bool 	$notrigger	false=launch triggers after, true=disable trigge
 	 *	@return		int				>0 if OK, <0 if KO
 	 */
-	public function update($id, $user)
+	public function update($id, $user, $notrigger = false)
 	{
 		global $conf;
 
@@ -267,9 +276,6 @@ class Entrepot extends CommonObject
 		if (empty($id)) {
 			$id = $this->id;
 		}
-		if (empty($this->label)) {
-			$this->label = $this->libelle; // For backward compatibility
-		}
 
 		// Check if new parent is already a child of current warehouse
 		if (!empty($this->fk_parent)) {
@@ -281,7 +287,7 @@ class Entrepot extends CommonObject
 			}
 		}
 
-		$this->label = trim(!empty($this->label) ? $this->label : $this->libelle);
+		$this->label = trim($this->label);
 
 		$this->description = trim($this->description);
 
@@ -324,6 +330,15 @@ class Entrepot extends CommonObject
 			}
 		}
 
+		if (!$error && !$notrigger) {
+			// Call triggers
+			$result = $this->call_trigger('WAREHOUSE_MODIFY', $user);
+			if ($result < 0) {
+				$error++;
+			}
+			// End call triggers
+		}
+
 		if (!$error) {
 			$this->db->commit();
 			return 1;
@@ -461,7 +476,6 @@ class Entrepot extends CommonObject
 				$this->fk_project     = $obj->fk_project;
 				$this->ref            = $obj->label;
 				$this->label          = $obj->label;
-				$this->libelle        = $obj->label; // deprecated
 				$this->description    = $obj->description;
 				$this->statut         = $obj->statut;
 				$this->lieu           = $obj->lieu;
@@ -705,7 +719,7 @@ class Entrepot extends CommonObject
 		if (isset($this->statut)) {
 			$label .= ' '.$this->getLibStatut(5);
 		}
-		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.(empty($this->ref) ? (empty($this->label) ? $this->libelle : $this->label) : $this->ref);
+		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.(empty($this->ref) ? $this->label : $this->ref);
 		if (!empty($this->lieu)) {
 			$label .= '<br><b>'.$langs->trans('LocationSummary').':</b> '.$this->lieu;
 		}
@@ -742,7 +756,7 @@ class Entrepot extends CommonObject
 			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
 		}
 		if ($withpicto != 2) {
-			$result .= (($showfullpath || !empty($conf->global->STOCK_ALWAYS_SHOW_FULL_ARBO)) ? $this->get_full_arbo() : (empty($this->label) ? $this->libelle : $this->label));
+			$result .= (($showfullpath || !empty($conf->global->STOCK_ALWAYS_SHOW_FULL_ARBO)) ? $this->get_full_arbo() : $this->label);
 		}
 		$result .= $linkend;
 
@@ -798,7 +812,7 @@ class Entrepot extends CommonObject
 		// phpcs:enable
 		global $user, $langs, $conf;
 
-		$TArbo = array(empty($this->label) ? $this->libelle : $this->label);
+		$TArbo = array($this->label);
 
 		$protection = 100; // We limit depth of warehouses to 100
 

From 73f4b80a0588a787f55e786dbc6b8f8062519d7c Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Mon, 16 Jan 2023 19:47:32 +0100
Subject: [PATCH 599/816] Update changelog for removed libelle

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

diff --git a/ChangeLog b/ChangeLog
index 1a3e96b18ce..fe39e1c1497 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ Following changes may create regressions for some external modules, but were nec
 * The deprecated method "escapeunderscore()" of database handlers has been removed. You must use "escapeforlike()" instead.
 * The method "nb_expedition()" has been renamed into "countNbOfShipments()" 
 * Revert default type of hooks. Default is now 'addreplace' hooks (and exception become 'output' hooks, that become deprecated).
+* Deprecated property libelle removed from entrepot class.
 
 
 

From 4cf4da973cac0cda9ca70558f8020c683fcf32f5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 16 Jan 2023 20:38:03 +0100
Subject: [PATCH 600/816] Add a method for test/dev purpose

---
 htdocs/core/login/functions_http.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/htdocs/core/login/functions_http.php b/htdocs/core/login/functions_http.php
index a23047c8f1c..73f5824c3cd 100644
--- a/htdocs/core/login/functions_http.php
+++ b/htdocs/core/login/functions_http.php
@@ -63,3 +63,25 @@ function check_user_password_http($usertotest, $passwordtotest, $entitytotest)
 
 	return $login;
 }
+
+
+/**
+ * Decode the value found into the Authorization HTTP header.
+ * Ex: "Authorization: Basic bG9naW46cGFzcw==", $value is "Basic bG9naW46cGFzcw==" and after base64decode is "login:pass"
+ * Note: the $_SERVER["REMOTE_USER"] contains only the login used in the HTTP Basic form
+ * Method not used yet, but we keep it for some dev/test purposes.
+ *
+ * @param 	string	$value 		Ex: $_SERVER["REMOTE_USER"]
+ * @return 	Object 				object.login & object.password
+ */
+function decodeHttpBasicAuth($value)
+{
+	$encoded_basic_auth = substr($value, 6);	// Remove the "Basic " string
+	$decoded_basic_auth = base64_decode($encoded_basic_auth);
+	$credentials_basic_auth = explode(':', $decoded_basic_auth);
+
+	return (object) [
+		'username'=> $credentials_basic_auth[0],
+		'password' => $credentials_basic_auth[1]
+	];
+}

From 90137268a126be6e29adbe24d461ecb45f9d4be1 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 16 Jan 2023 22:15:02 +0100
Subject: [PATCH 601/816] FIX: missing tokan on Supplier proposal links

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

diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 399d1271037..d09b6793dd0 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1968,30 +1968,30 @@ if ($action == 'create') {
 				// Create an order
 				if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled)) && $object->statut == SupplierProposal::STATUS_SIGNED) {
 					if ($usercancreateorder) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddSupplierOrderShort").'</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'&amp;token='.newToken().'">'.$langs->trans("AddSupplierOrderShort").'</a></div>';
 					}
 				}
 
 				// Set accepted/refused
 				if ($object->statut == SupplierProposal::STATUS_VALIDATED && $usercanclose) {
-					print '<div class="inline-block divButAction"><a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=statut'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#acceptedrefused').'"';
+					print '<div class="inline-block divButAction"><a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;token='.newToken().'&amp;action=statut'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#acceptedrefused').'"';
 					print '>'.$langs->trans('SetAcceptedRefused').'</a></div>';
 				}
 
 				// Close
 				if ($object->statut == SupplierProposal::STATUS_SIGNED && $usercanclose) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=close'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close').'"';
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;token='.newToken().'&amp;action=close'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close').'"';
 					print '>'.$langs->trans('Close').'</a></div>';
 				}
 
 				// Clone
 				if ($usercancreate) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object='.$object->element.'">'.$langs->trans("ToClone").'</a></div>';
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&object='.$object->element.'&token='.newToken().'">'.$langs->trans("ToClone").'</a></div>';
 				}
 
 				// Delete
 				if (($object->statut == SupplierProposal::STATUS_DRAFT && $usercancreate) || $usercandelete) {
-					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'"';
+					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&token='.newToken().'"';
 					print '>'.$langs->trans('Delete').'</a></div>';
 				}
 			}

From dbc9ca981628577dea9245ff7d6823c3e48b5142 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 16 Jan 2023 22:17:22 +0100
Subject: [PATCH 602/816] FIX: missing token on Supplier proposal links

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

diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index d09b6793dd0..d4bb56b3304 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1986,7 +1986,7 @@ if ($action == 'create') {
 
 				// Clone
 				if ($usercancreate) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&object='.$object->element.'&token='.newToken().'">'.$langs->trans("ToClone").'</a></div>';
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&object='.$object->element.'&amp;token='.newToken().'">'.$langs->trans("ToClone").'</a></div>';
 				}
 
 				// Delete

From ce0c69ae96d589d91b3eef113ccc15d6ad65d231 Mon Sep 17 00:00:00 2001
From: Randall Mora <50120822+randallmoraes@users.noreply.github.com>
Date: Mon, 16 Jan 2023 23:15:51 -0600
Subject: [PATCH 603/816] Restrict by supplier instead of customer

restrict permissions if user does not have access to view providers
---
 htdocs/core/menus/standard/eldy.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index a671ea31756..d354bc2445c 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1273,7 +1273,7 @@ function get_left_menu_thridparties($mainmenu, &$newmenu, $usemenuhider = 1, $le
 			$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->hasRight('societe',  'contact', 'lire'));
+			$newmenu->add("/contact/list.php?leftmenu=contacts&type=f", $langs->trans("Suppliers"), 2, $user->hasRight('fournisseur',  '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'));

From 95b391ae0a944e83b4f3d393a54a803c35e485da Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Tue, 17 Jan 2023 10:21:00 +0100
Subject: [PATCH 604/816] Fix - pos total qty

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

diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index fd36f229e5c..a763394b15b 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -1509,10 +1509,7 @@ if ($resql) {
 		}
 		// Product QtyOrdered
 		if (!empty($arrayfields['cdet.qty']['checked'])) {
-			print '<td class="nowrap tdoverflowmax200">'.$obj->qty.'</td>';
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'cdet.qty';
-			}
+			print '<td class="nowrap right">'.$obj->qty.'</td>';
 			if (isset($totalarray['val']['cdet.qty'])) {
 				$totalarray['val']['cdet.qty'] += $obj->qty;
 			} else {
@@ -1521,6 +1518,9 @@ if ($resql) {
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'cdet.qty';
+			}
 		}
 
 		// Ref

From 7668233d0ce6b0cee0984c266e432d48b3f28603 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 17 Jan 2023 10:22:23 +0100
Subject: [PATCH 605/816] NEW Tooltip to explain how to add a photo on product

---
 htdocs/core/class/commonobject.class.php | 36 +++++++++++++-----------
 htdocs/core/lib/functions.lib.php        |  4 +--
 htdocs/langs/en_US/main.lang             |  3 +-
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 93a3e1b5536..d6be7c463a1 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -8583,21 +8583,21 @@ abstract class CommonObject
 	/**
 	 *  Show photos of an object (nbmax maximum), into several columns
 	 *
-	 *  @param		string	$modulepart		'product', 'ticket', ...
-	 *  @param      string	$sdir        	Directory to scan (full absolute path)
-	 *  @param      int		$size        	0=original size, 1='small' use thumbnail if possible
-	 *  @param      int		$nbmax       	Nombre maximum de photos (0=pas de max)
-	 *  @param      int		$nbbyrow     	Number of image per line or -1 to use div separator or 0 to use no separator. Used only if size=1 or 'small'.
-	 * 	@param		int		$showfilename	1=Show filename
-	 * 	@param		int		$showaction		1=Show icon with action links (resize, delete)
-	 * 	@param		int		$maxHeight		Max height of original image when size='small' (so we can use original even if small requested). If 0, always use 'small' thumb image.
-	 * 	@param		int		$maxWidth		Max width of original image when size='small'
-	 *  @param      int     $nolink         Do not add a href link to view enlarged imaged into a new tab
-	 *  @param      int     $notitle        Do not add title tag on image
-	 *  @param		int		$usesharelink	Use the public shared link of image (if not available, the 'nophoto' image will be shown instead)
-	 *  @return     string					Html code to show photo. Number of photos shown is saved in this->nbphoto
+	 *  @param		string		$modulepart		'product', 'ticket', ...
+	 *  @param      string		$sdir        	Directory to scan (full absolute path)
+	 *  @param      int			$size        	0=original size, 1='small' use thumbnail if possible
+	 *  @param      int			$nbmax       	Nombre maximum de photos (0=pas de max)
+	 *  @param      int			$nbbyrow     	Number of image per line or -1 to use div separator or 0 to use no separator. Used only if size=1 or 'small'.
+	 * 	@param		int			$showfilename	1=Show filename
+	 * 	@param		int			$showaction		1=Show icon with action links (resize, delete)
+	 * 	@param		int			$maxHeight		Max height of original image when size='small' (so we can use original even if small requested). If 0, always use 'small' thumb image.
+	 * 	@param		int			$maxWidth		Max width of original image when size='small'
+	 *  @param      int     	$nolink         Do not add a href link to view enlarged imaged into a new tab
+	 *  @param      int|string  $overwritetitle Do not add title tag on image
+	 *  @param		int			$usesharelink	Use the public shared link of image (if not available, the 'nophoto' image will be shown instead)
+	 *  @return     string						Html code to show photo. Number of photos shown is saved in this->nbphoto
 	 */
-	public function show_photos($modulepart, $sdir, $size = 0, $nbmax = 0, $nbbyrow = 5, $showfilename = 0, $showaction = 0, $maxHeight = 120, $maxWidth = 160, $nolink = 0, $notitle = 0, $usesharelink = 0)
+	public function show_photos($modulepart, $sdir, $size = 0, $nbmax = 0, $nbbyrow = 5, $showfilename = 0, $showaction = 0, $maxHeight = 120, $maxWidth = 160, $nolink = 0, $overwritetitle = 0, $usesharelink = 0)
 	{
 		// phpcs:enable
 		global $conf, $user, $langs;
@@ -8700,8 +8700,12 @@ abstract class CommonObject
 						// Si fichier vignette disponible et image source trop grande, on utilise la vignette, sinon on utilise photo origine
 						$alt = $langs->transnoentitiesnoconv('File').': '.$relativefile;
 						$alt .= ' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];
-						if ($notitle) {
-							$alt = '';
+						if ($overwritetitle) {
+							if (is_numeric($overwritetitle)) {
+								$alt = '';
+							} else {
+								$alt = $overwritetitle;
+							}
 						}
 
 						$addphotorefcss = 1;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 3e3a87c7bd0..a25d083c251 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2122,14 +2122,14 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 			$maxvisiblephotos = 1;
 		}
 		if ($showimage) {
-			$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'</div>';
+			$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, 0, $width, 0, '').'</div>';
 		} else {
 			if (!empty($conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) {
 				$nophoto = '';
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';
 			} else {    // Show no photo link
 				$nophoto = '/public/theme/common/nophoto.png';
-				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo"'.($width ? ' style="width: '.$width.'px"' : '').' src="'.DOL_URL_ROOT.$nophoto.'"></div>';
+				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" title="'.dol_escape_htmltag($langs->trans("UploadAnImageToSeeAPhotoHere", $langs->transnoentitiesnoconv("Documents"))).'" alt="No photo"'.($width ? ' style="width: '.$width.'px"' : '').' src="'.DOL_URL_ROOT.$nophoto.'"></div>';
 			}
 		}
 	} elseif ($object->element == 'ticket') {
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index e7c7e010266..f65a05ce455 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1219,4 +1219,5 @@ NoSpecificContactAddress=No specific contact or address
 NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
 HideOnVCard=Hide %s
 AddToContacts=Add address to my contacts
-LastAccess=Last access
\ No newline at end of file
+LastAccess=Last access
+UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
\ No newline at end of file

From 756a971dadf049ded467dc4e5fca14747331e32c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 17 Jan 2023 11:23:19 +0100
Subject: [PATCH 606/816] NEW Bank name no more mandatory on creation. Can be
 generated if empty.

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

diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 0166a3a5635..bf4e1135f96 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -257,13 +257,8 @@ if (empty($reshook)) {
 	if ($action == 'add') {
 		$error = 0;
 
-		if (!GETPOST('label', 'alpha') || !GETPOST('bank', 'alpha')) {
-			if (!GETPOST('label', 'alpha')) {
-				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-			}
-			if (!GETPOST('bank', 'alpha')) {
-				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankName")), null, 'errors');
-			}
+		if (!GETPOST('label', 'alpha')) {
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
 			$action = 'create';
 			$error++;
 		}
@@ -274,6 +269,8 @@ if (empty($reshook)) {
 
 			$companybankaccount->socid           = $object->id;
 
+			$companybankaccount->fetch_thirdparty();
+
 			$companybankaccount->bank            = GETPOST('bank', 'alpha');
 			$companybankaccount->label           = GETPOST('label', 'alpha');
 			$companybankaccount->courant         = GETPOST('courant', 'alpha');
@@ -293,6 +290,12 @@ if (empty($reshook)) {
 			$companybankaccount->datec = dol_now();
 			$companybankaccount->status          = 1;
 
+			$companybankaccount->bank = trim($companybankaccount->bank);
+			if (empty($companybankaccount->bank) && !empty($companybankaccount->thirdparty)) {
+				$companybankaccount->bank = $langs->trans("Bank").' '.$companybankaccount->thirdparty->name;
+			}
+			$companybankaccount->bic = str_replace(' ', '', $companybankaccount->bic);
+
 			$db->begin();
 
 			// This test can be done only once properties were set
@@ -1980,7 +1983,7 @@ if ($socid && $action == 'create' && $permissiontoaddupdatepaymentinformation) {
 	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>';
+	print '<tr><td>'.$langs->trans("Bank").'</td>';
 	print '<td><input class="minwidth200" type="text" id="bank" name="bank" value="'.GETPOST('bank').'"></td></tr>';
 
 	// Show fields of bank account

From eb6b42d1e34f8f177f58f62e473b26a59bb6b017 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Tue, 17 Jan 2023 11:25:16 +0100
Subject: [PATCH 607/816] NEW - Add sub total in order list det

---
 htdocs/commande/list_det.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index fd36f229e5c..e638e56ff9a 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -1402,6 +1402,7 @@ if ($resql) {
 	$total_ht = 0;
 	$total_margin = 0;
 
+
 	// Détail commande
 	$totalqty = 0;
 
@@ -1419,6 +1420,15 @@ if ($resql) {
 		$text_warning = '';
 		$nbprod = 0;
 
+		// Print SubTotal
+		if (empty($i)) {
+			$oldref = $obj->product_ref;
+		}
+		if ($oldref != $obj->product_ref) {
+			include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+			$oldref = $obj->product_ref;
+		}
+
 		$companystatic->id = $obj->socid;
 		$companystatic->name = $obj->name;
 		$companystatic->name_alias = $obj->alias;

From 9c082d5df26e89494225b96aec026162b700cc0b Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Tue, 17 Jan 2023 11:31:40 +0100
Subject: [PATCH 608/816] kanban mode for liste of expensereport

---
 .../class/expensereport.class.php             |  37 ++
 htdocs/expensereport/list.php                 | 373 ++++++++++--------
 2 files changed, 237 insertions(+), 173 deletions(-)

diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 63cbeaad67b..e0b10319b45 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -2675,6 +2675,43 @@ class ExpenseReport extends CommonObject
 			return -1;
 		}
 	}
+
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $langs, $selected,$arrayofselected;
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
+		if (in_array($this->id, $arrayofselected)) {
+			$selected = 1;
+		}
+		$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		if (property_exists($this, 'fk_user_author') && !empty($this->id)) {
+			$return .= '<br><span class="info-box-label">'.$this->fk_user_author.'</span>';
+		}
+		if (property_exists($this, 'date_debut') && property_exists($this, 'date_fin')) {
+			$return .= '<br><span class="info-box-label">'.dol_print_date($this->date_debut, 'day').'</span>';
+			$return .= ' <span class="opacitymedium">'.$langs->trans("To").'</span> ';
+			$return .= '<span class="info-box-label">'.dol_print_date($this->date_fin, 'day').'</span>';
+		}
+		if (method_exists($this, 'getLibStatut')) {
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
 
 
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index ad16d5fb09f..918c916a52c 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -50,6 +50,7 @@ $confirm     = GETPOST('confirm', 'alpha');
 $cancel      = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect    = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'expensereportlist';
+$mode        = GETPOST('mode', 'alpha');
 
 $childids = $user->getAllChildIds(1);
 
@@ -378,6 +379,9 @@ if ($resql) {
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
 	$param = '';
+	if (!empty($mode)) {
+		$param .= '&mode='.urlencode($mode);
+	}
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 		$param .= '&contextpage='.urlencode($contextpage);
 	}
@@ -471,6 +475,7 @@ if ($resql) {
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="mode" value="'.$mode.'">';
 	if ($id > 0) {
 		print '<input type="hidden" name="id" value="'.$id.'">';
 	}
@@ -512,7 +517,10 @@ if ($resql) {
 		if (!empty($socid)) {
 			$url .= '&socid='.$socid;
 		}
-		$newcardbutton = dolGetButtonTitle($langs->trans('NewTrip'), '', 'fa fa-plus-circle', $url, '', $user->rights->expensereport->creer);
+		$newcardbutton = '';
+		$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+		$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+		$newcardbutton .= dolGetButtonTitle($langs->trans('NewTrip'), '', 'fa fa-plus-circle', $url, '', $user->rights->expensereport->creer);
 
 		print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'trip', 0, $newcardbutton, '', $limit, 0, 0, 1);
 	}
@@ -739,185 +747,204 @@ if ($resql) {
 			$expensereportstatic->note_private = $obj->note_private;
 			$expensereportstatic->note_public = $obj->note_public;
 
+			if ($mode == 'kanban') {
+				if ($i == 0) {
+					print '<tr><td colspan="12">';
+					print '<div class="box-flex-container">';
+				}
+				$usertmp->fetch($obj->id_user);
+				$expensereportstatic->fk_user_author = $usertmp->getNomUrl(1);
 
-			print '<tr class="oddeven">';
-			// Action column
-			if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-				print '<td class="nowrap center">';
-				if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-					$selected = 0;
-					if (in_array($obj->rowid, $arrayofselected)) {
-						$selected = 1;
+				// Output Kanban
+				if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+					if ($massactionbutton || $massaction) {
+						$selected = 0;
+
+						print $expensereportstatic->getKanbanView('');
 					}
-					print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 				}
-				print '</td>';
-			}
-			// Ref
-			if (!empty($arrayfields['d.ref']['checked'])) {
-				print '<td>';
-				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-				print '<td class="nobordernopadding nowrap">';
-				print $expensereportstatic->getNomUrl(1);
-				print '</td>';
-				// Warning late icon and note
-				print '<td class="nobordernopadding nowrap">';
-				if ($expensereportstatic->status == 2 && $expensereportstatic->hasDelay('toappove')) {
-					print img_warning($langs->trans("Late"));
+				if ($i == (min($num, $limit) - 1)) {
+					print '</div>';
+					print '</td></tr>';
 				}
-				if ($expensereportstatic->status == 5 && $expensereportstatic->hasDelay('topay')) {
-					print img_warning($langs->trans("Late"));
-				}
-				if (!empty($obj->note_private) || !empty($obj->note_public)) {
-					print ' <span class="note">';
-					print '<a href="'.DOL_URL_ROOT.'/expensereport/note.php?id='.$obj->rowid.'">'.img_picto($langs->trans("ViewPrivateNote"), 'object_generic').'</a>';
-					print '</span>';
-				}
-				print '</td>';
-				print '<td width="16" class="nobordernopadding hideonsmartphone right">';
-				$filename = dol_sanitizeFileName($obj->ref);
-				$filedir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($obj->ref);
-				$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
-				print $formfile->getDocumentsLink($expensereportstatic->element, $filename, $filedir);
-				print '</td>';
-				print '</tr></table>';
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// User
-			if (!empty($arrayfields['user']['checked'])) {
-				print '<td class="left">';
-				$usertmp->id = $obj->id_user;
-				$usertmp->lastname = $obj->lastname;
-				$usertmp->firstname = $obj->firstname;
-				$usertmp->login = $obj->login;
-				$usertmp->statut = $obj->statut;
-				$usertmp->photo = $obj->photo;
-				$usertmp->email = $obj->email;
-				print $usertmp->getNomUrl(-1);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Start date
-			if (!empty($arrayfields['d.date_debut']['checked'])) {
-				print '<td class="center">'.($obj->date_debut > 0 ? dol_print_date($db->jdate($obj->date_debut), 'day') : '').'</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// End date
-			if (!empty($arrayfields['d.date_fin']['checked'])) {
-				print '<td class="center">'.($obj->date_fin > 0 ? dol_print_date($db->jdate($obj->date_fin), 'day') : '').'</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Date validation
-			if (!empty($arrayfields['d.date_valid']['checked'])) {
-				print '<td class="center">'.($obj->date_valid > 0 ? dol_print_date($db->jdate($obj->date_valid), 'day') : '').'</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Date approval
-			if (!empty($arrayfields['d.date_approve']['checked'])) {
-				print '<td class="center">'.($obj->date_approve > 0 ? dol_print_date($db->jdate($obj->date_approve), 'day') : '').'</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Amount HT
-			if (!empty($arrayfields['d.total_ht']['checked'])) {
-				  print '<td class="right">'.price($obj->total_ht)."</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'd.total_ht';
-				}
-				  $totalarray['val']['d.total_ht'] += $obj->total_ht;
-			}
-			// Amount VAT
-			if (!empty($arrayfields['d.total_vat']['checked'])) {
-				print '<td class="right">'.price($obj->total_tva)."</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'd.total_tva';
-				}
-				$totalarray['val']['d.total_tva'] += $obj->total_tva;
-			}
-			// Amount TTC
-			if (!empty($arrayfields['d.total_ttc']['checked'])) {
-				print '<td class="right">'.price($obj->total_ttc)."</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'd.total_ttc';
-				}
-				$totalarray['val']['d.total_ttc'] += $obj->total_ttc;
-			}
-
-			// Extra fields
-			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-			// Fields from hook
-			$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
-			print $hookmanager->resPrint;
-
-			// Date creation
-			if (!empty($arrayfields['d.date_create']['checked'])) {
-				print '<td class="nowrap center">';
-				print dol_print_date($db->jdate($obj->date_create), 'dayhour');
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Date modification
-			if (!empty($arrayfields['d.tms']['checked'])) {
-				print '<td class="nowrap center">';
-				print dol_print_date($db->jdate($obj->date_modif), 'dayhour');
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Status
-			if (!empty($arrayfields['d.fk_statut']['checked'])) {
-				print '<td class="nowrap right">'.$expensereportstatic->getLibStatut(5).'</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Action column
-			if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-				print '<td class="nowrap center">';
-				if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-					$selected = 0;
-					if (in_array($obj->rowid, $arrayofselected)) {
-						$selected = 1;
+			} else {
+				print '<tr class="oddeven">';
+				// Action column
+				if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+					print '<td class="nowrap center">';
+					if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+						$selected = 0;
+						if (in_array($obj->rowid, $arrayofselected)) {
+							$selected = 1;
+						}
+						print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 					}
-					print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+					print '</td>';
 				}
-				print '</td>';
+				// Ref
+				if (!empty($arrayfields['d.ref']['checked'])) {
+					print '<td>';
+					print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+					print '<td class="nobordernopadding nowrap">';
+					print $expensereportstatic->getNomUrl(1);
+					print '</td>';
+					// Warning late icon and note
+					print '<td class="nobordernopadding nowrap">';
+					if ($expensereportstatic->status == 2 && $expensereportstatic->hasDelay('toappove')) {
+						print img_warning($langs->trans("Late"));
+					}
+					if ($expensereportstatic->status == 5 && $expensereportstatic->hasDelay('topay')) {
+						print img_warning($langs->trans("Late"));
+					}
+					if (!empty($obj->note_private) || !empty($obj->note_public)) {
+						print ' <span class="note">';
+						print '<a href="'.DOL_URL_ROOT.'/expensereport/note.php?id='.$obj->rowid.'">'.img_picto($langs->trans("ViewPrivateNote"), 'object_generic').'</a>';
+						print '</span>';
+					}
+					print '</td>';
+					print '<td width="16" class="nobordernopadding hideonsmartphone right">';
+					$filename = dol_sanitizeFileName($obj->ref);
+					$filedir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($obj->ref);
+					$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
+					print $formfile->getDocumentsLink($expensereportstatic->element, $filename, $filedir);
+					print '</td>';
+					print '</tr></table>';
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				// User
+				if (!empty($arrayfields['user']['checked'])) {
+					print '<td class="left">';
+					$usertmp->id = $obj->id_user;
+					$usertmp->lastname = $obj->lastname;
+					$usertmp->firstname = $obj->firstname;
+					$usertmp->login = $obj->login;
+					$usertmp->statut = $obj->statut;
+					$usertmp->photo = $obj->photo;
+					$usertmp->email = $obj->email;
+					print $usertmp->getNomUrl(-1);
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				// Start date
+				if (!empty($arrayfields['d.date_debut']['checked'])) {
+					print '<td class="center">'.($obj->date_debut > 0 ? dol_print_date($db->jdate($obj->date_debut), 'day') : '').'</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				// End date
+				if (!empty($arrayfields['d.date_fin']['checked'])) {
+					print '<td class="center">'.($obj->date_fin > 0 ? dol_print_date($db->jdate($obj->date_fin), 'day') : '').'</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				// Date validation
+				if (!empty($arrayfields['d.date_valid']['checked'])) {
+					print '<td class="center">'.($obj->date_valid > 0 ? dol_print_date($db->jdate($obj->date_valid), 'day') : '').'</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				// Date approval
+				if (!empty($arrayfields['d.date_approve']['checked'])) {
+					print '<td class="center">'.($obj->date_approve > 0 ? dol_print_date($db->jdate($obj->date_approve), 'day') : '').'</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				// Amount HT
+				if (!empty($arrayfields['d.total_ht']['checked'])) {
+					print '<td class="right">'.price($obj->total_ht)."</td>\n";
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+					if (!$i) {
+						$totalarray['pos'][$totalarray['nbfield']] = 'd.total_ht';
+					}
+					$totalarray['val']['d.total_ht'] += $obj->total_ht;
+				}
+				// Amount VAT
+				if (!empty($arrayfields['d.total_vat']['checked'])) {
+					print '<td class="right">'.price($obj->total_tva)."</td>\n";
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+					if (!$i) {
+						$totalarray['pos'][$totalarray['nbfield']] = 'd.total_tva';
+					}
+					$totalarray['val']['d.total_tva'] += $obj->total_tva;
+				}
+				// Amount TTC
+				if (!empty($arrayfields['d.total_ttc']['checked'])) {
+					print '<td class="right">'.price($obj->total_ttc)."</td>\n";
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+					if (!$i) {
+						$totalarray['pos'][$totalarray['nbfield']] = 'd.total_ttc';
+					}
+					$totalarray['val']['d.total_ttc'] += $obj->total_ttc;
+				}
+
+				// Extra fields
+				include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+				// Fields from hook
+				$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+				$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+				print $hookmanager->resPrint;
+
+				// Date creation
+				if (!empty($arrayfields['d.date_create']['checked'])) {
+					print '<td class="nowrap center">';
+					print dol_print_date($db->jdate($obj->date_create), 'dayhour');
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				// Date modification
+				if (!empty($arrayfields['d.tms']['checked'])) {
+					print '<td class="nowrap center">';
+					print dol_print_date($db->jdate($obj->date_modif), 'dayhour');
+					print '</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				// Status
+				if (!empty($arrayfields['d.fk_statut']['checked'])) {
+					print '<td class="nowrap right">'.$expensereportstatic->getLibStatut(5).'</td>';
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
+				}
+				// Action column
+				if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+					print '<td class="nowrap center">';
+					if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+						$selected = 0;
+						if (in_array($obj->rowid, $arrayofselected)) {
+							$selected = 1;
+						}
+						print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+					}
+					print '</td>';
+				}
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+
+				print "</tr>\n";
 			}
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-
-			print "</tr>\n";
-
-			$total_total_ht = $total_total_ht + $obj->total_ht;
-			$total_total_tva = $total_total_tva + $obj->total_tva;
-			$total_total_ttc = $total_total_ttc + $obj->total_ttc;
-
+				$total_total_ht = $total_total_ht + $obj->total_ht;
+				$total_total_tva = $total_total_tva + $obj->total_tva;
+				$total_total_ttc = $total_total_ttc + $obj->total_ttc;
 			$i++;
 		}
 	} else {

From 957e8538a4b7768a60d7495331eaad3d33d31b49 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Tue, 17 Jan 2023 11:36:03 +0100
Subject: [PATCH 609/816] FIX - Order list det sortfield default

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

diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index fd36f229e5c..c05ff36e9d2 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -137,10 +137,10 @@ $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortfield) {
-	$sortfield = 'c.ref';
+	$sortfield = 'pr.ref';
 }
 if (!$sortorder) {
-	$sortorder = 'DESC';
+	$sortorder = 'ASSC';
 }
 
 $show_shippable_command = GETPOST('show_shippable_command', 'aZ09');

From a165489237b8dc5da4b8213b247d33365d779e74 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Tue, 17 Jan 2023 11:46:39 +0100
Subject: [PATCH 610/816] Move checkbox

---
 htdocs/commande/list_det.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index fd36f229e5c..385408663fd 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -830,10 +830,6 @@ if ($resql) {
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'order', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
-	print '<input type="checkbox" name="productobuy"'.(!empty($productobuy)?'value="productobuychecked" checked':'' ).'><label for="productobuy">'.$langs->trans("productobuy").'</label>';
-	print '<input type="checkbox" name="productonly"'.(!empty($productonly)?'value="productonlychecked" checked':'' ).'><label for="productonly">'.$langs->trans("productonly").'</label>';
-	print '<input type="checkbox" name="disablelinefree"'.(!empty($disablelinefree)?'value="disablelinefreechecked" checked':'' ).'><label for="disablelinefree">'.$langs->trans("disablelinefree").'</label>';
-
 	$topicmail = "SendOrderRef";
 	$modelmail = "order_send";
 	$objecttmp = new Commande($db);
@@ -849,6 +845,11 @@ if ($resql) {
 
 	$moreforfilter = '';
 
+	$moreforfilter .= '<input type="checkbox" name="productobuy"'.(!empty($productobuy)?'value="productobuychecked" checked':'' ).'><label for="productobuy">'.$langs->trans("productobuy").'</label>';
+	$moreforfilter .= '<input type="checkbox" name="productonly"'.(!empty($productonly)?'value="productonlychecked" checked':'' ).'><label for="productonly">'.$langs->trans("productonly").'</label>';
+	$moreforfilter .= '<input type="checkbox" name="disablelinefree"'.(!empty($disablelinefree)?'value="disablelinefreechecked" checked':'' ).'><label for="disablelinefree">'.$langs->trans("disablelinefree").'</label>';
+	$moreforfilter .= '<br>';
+
 	// If the user can view prospects other than his'
 	if ($user->rights->user->user->lire) {
 		$langs->load("commercial");
@@ -888,6 +889,8 @@ if ($resql) {
 		$moreforfilter .= img_picto($tmptitle, 'stock', 'class="pictofixedwidth"').$formproduct->selectWarehouses($search_warehouse, 'search_warehouse', '', 1, 0, 0, $tmptitle, 0, 0, array(), 'maxwidth250 widthcentpercentminusx');
 		$moreforfilter .= '</div>';
 	}
+
+
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) {

From 8ced6d52e745f0ee6ae95f093e24298f2d01df55 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 17 Jan 2023 11:47:16 +0100
Subject: [PATCH 611/816] FIX Component js to generate password

---
 htdocs/core/ajax/security.php     |  9 +++++----
 htdocs/core/lib/security2.lib.php |  7 ++++---
 htdocs/user/card.php              | 14 ++++++++------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/ajax/security.php b/htdocs/core/ajax/security.php
index e5dc91c05d1..b01c952662e 100644
--- a/htdocs/core/ajax/security.php
+++ b/htdocs/core/ajax/security.php
@@ -36,9 +36,10 @@ if (!defined('NOREQUIREAJAX')) {
 if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (!defined('NOREQUIRETRAN')) {
+// We need langs because the getRandomPassword may use user language to define some rules of pass generation
+/*if (!defined('NOREQUIRETRAN')) {
 	define('NOREQUIRETRAN', '1');
-}
+}*/
 
 // Load Dolibarr environment
 require '../../main.inc.php';
@@ -55,9 +56,9 @@ top_httphead();
 
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
-// Registering the location of boxes
+// Return a new generated password
 if ($action) {
-	if ($action == 'getrandompassword' && ($user->admin || $user->rights->api->apikey->generate)) {
+	if ($action == 'getrandompassword') {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 		$generic = GETPOST('generic') ? true : false;
 		echo getRandomPassword($generic);
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index 5e4d58103d8..f450d390dff 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -560,10 +560,11 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
  *
  * @param		string 		$htmlname			HTML name of element to insert key into
  * @param		string		$htmlnameofbutton	HTML name of button
+ * @param		int			$generic			1=Return a generic pass, 0=Return a pass following setup rules
  * @return		string		    				HTML javascript code to set a password
  * @see getRandomPassword()
  */
-function dolJSToSetRandomPassword($htmlname, $htmlnameofbutton = 'generate_token')
+function dolJSToSetRandomPassword($htmlname, $htmlnameofbutton = 'generate_token', $generic = 1)
 {
 	global $conf;
 
@@ -571,10 +572,10 @@ function dolJSToSetRandomPassword($htmlname, $htmlnameofbutton = 'generate_token
 		print "\n".'<!-- Js code to suggest a security key --><script type="text/javascript">';
 		print '$(document).ready(function () {
             $("#'.dol_escape_js($htmlnameofbutton).'").click(function() {
-				console.log("We click on the button to suggest a key");
+				console.log("We click on the button '.dol_escape_js($htmlnameofbutton).' to suggest a key. We will fill '.dol_escape_js($htmlname).'");
             	$.get( "'.DOL_URL_ROOT.'/core/ajax/security.php", {
             		action: \'getrandompassword\',
-            		generic: true,
+            		generic: '.($generic ? '1' : '0').',
 					token: \''.dol_escape_js(newToken()).'\'
 				},
 				function(result) {
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 602bc25eb3a..264e06f70da 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1037,7 +1037,10 @@ if ($action == 'create' || $action == 'adduserldap') {
 			$valuetoshow .= preg_replace('/./i', '*', $ldap_pass);
 		} else {
 			// We do not use a field password but a field text to show new password to use.
-			$valuetoshow .= ($valuetoshow ? ' + '.$langs->trans("DolibarrPassword") : '').'<input maxsize="32" type="text" name="password" value="'.dol_escape_htmltag($password).'" autocomplete="new-password">';
+			$valuetoshow .= ($valuetoshow ? ' + '.$langs->trans("DolibarrPassword") : '').'<input class="minwidth300 maxwidth400 widthcentpercentminusx" maxsize="32" type="text" id="password" name="password" value="'.dol_escape_htmltag($password).'" autocomplete="new-password">';
+			if (!empty($conf->use_javascript_ajax)) {
+				$valuetoshow .= '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_password" class="linkobject"');
+			}
 		}
 	}
 
@@ -1058,7 +1061,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 		//$generated_password = getRandomPassword(false);
 		print '<tr><td>'.$langs->trans("ApiKey").'</td>';
 		print '<td>';
-		print '<input class="minwidth300 widthcentpercentminusx" maxsize="32" type="text" id="api_key" name="api_key" value="'.GETPOST('api_key', 'alphanohtml').'" autocomplete="off">';
+		print '<input class="minwidth300 maxwidth400 widthcentpercentminusx" maxsize="32" type="text" id="api_key" name="api_key" value="'.GETPOST('api_key', 'alphanohtml').'" autocomplete="off">';
 		if (!empty($conf->use_javascript_ajax)) {
 			print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"');
 		}
@@ -2406,7 +2409,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			}
 			if (preg_match('/dolibarr/', $dolibarr_main_authentication)) {
 				if ($caneditpassword) {
-					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<input maxlength="128" type="password" class="flat" name="password" value="'.dol_escape_htmltag($object->pass).'" autocomplete="new-password">';
+					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<input maxlength="128" type="password" class="flat" id="password" name="password" value="'.dol_escape_htmltag($object->pass).'" autocomplete="new-password">';
 				} else {
 					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').preg_replace('/./i', '*', $object->pass);
 				}
@@ -2889,11 +2892,10 @@ if ($action == 'create' || $action == 'adduserldap') {
 }
 
 if (!empty($conf->api->enabled)) {
-	$constname = 'api_key';
-
 	// Add button to autosuggest a key
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-	print dolJSToSetRandomPassword($constname, 'generate_api_key');
+	print dolJSToSetRandomPassword('password', 'generate_password', 0);
+	print dolJSToSetRandomPassword('api_key', 'generate_api_key', 1);
 }
 
 // End of page

From 4ca7f0df3cea4d0c0ad826e80d196d00bb915c4f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 16 Jan 2023 20:38:03 +0100
Subject: [PATCH 612/816] Add a method for test/dev purpose

---
 htdocs/core/login/functions_http.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/htdocs/core/login/functions_http.php b/htdocs/core/login/functions_http.php
index a23047c8f1c..73f5824c3cd 100644
--- a/htdocs/core/login/functions_http.php
+++ b/htdocs/core/login/functions_http.php
@@ -63,3 +63,25 @@ function check_user_password_http($usertotest, $passwordtotest, $entitytotest)
 
 	return $login;
 }
+
+
+/**
+ * Decode the value found into the Authorization HTTP header.
+ * Ex: "Authorization: Basic bG9naW46cGFzcw==", $value is "Basic bG9naW46cGFzcw==" and after base64decode is "login:pass"
+ * Note: the $_SERVER["REMOTE_USER"] contains only the login used in the HTTP Basic form
+ * Method not used yet, but we keep it for some dev/test purposes.
+ *
+ * @param 	string	$value 		Ex: $_SERVER["REMOTE_USER"]
+ * @return 	Object 				object.login & object.password
+ */
+function decodeHttpBasicAuth($value)
+{
+	$encoded_basic_auth = substr($value, 6);	// Remove the "Basic " string
+	$decoded_basic_auth = base64_decode($encoded_basic_auth);
+	$credentials_basic_auth = explode(':', $decoded_basic_auth);
+
+	return (object) [
+		'username'=> $credentials_basic_auth[0],
+		'password' => $credentials_basic_auth[1]
+	];
+}

From 28c3d185837b0530b2a2584fd6117967614a7e87 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 17 Jan 2023 11:47:16 +0100
Subject: [PATCH 613/816] FIX Component js to generate password

---
 htdocs/core/ajax/security.php     |  9 +++++----
 htdocs/core/lib/security2.lib.php |  7 ++++---
 htdocs/user/card.php              | 14 ++++++++------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/ajax/security.php b/htdocs/core/ajax/security.php
index e5dc91c05d1..b01c952662e 100644
--- a/htdocs/core/ajax/security.php
+++ b/htdocs/core/ajax/security.php
@@ -36,9 +36,10 @@ if (!defined('NOREQUIREAJAX')) {
 if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (!defined('NOREQUIRETRAN')) {
+// We need langs because the getRandomPassword may use user language to define some rules of pass generation
+/*if (!defined('NOREQUIRETRAN')) {
 	define('NOREQUIRETRAN', '1');
-}
+}*/
 
 // Load Dolibarr environment
 require '../../main.inc.php';
@@ -55,9 +56,9 @@ top_httphead();
 
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
-// Registering the location of boxes
+// Return a new generated password
 if ($action) {
-	if ($action == 'getrandompassword' && ($user->admin || $user->rights->api->apikey->generate)) {
+	if ($action == 'getrandompassword') {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 		$generic = GETPOST('generic') ? true : false;
 		echo getRandomPassword($generic);
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index b33ad1333ef..76ec442841c 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -561,10 +561,11 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
  *
  * @param		string 		$htmlname			HTML name of element to insert key into
  * @param		string		$htmlnameofbutton	HTML name of button
+ * @param		int			$generic			1=Return a generic pass, 0=Return a pass following setup rules
  * @return		string		    				HTML javascript code to set a password
  * @see getRandomPassword()
  */
-function dolJSToSetRandomPassword($htmlname, $htmlnameofbutton = 'generate_token')
+function dolJSToSetRandomPassword($htmlname, $htmlnameofbutton = 'generate_token', $generic = 1)
 {
 	global $conf;
 
@@ -572,10 +573,10 @@ function dolJSToSetRandomPassword($htmlname, $htmlnameofbutton = 'generate_token
 		print "\n".'<!-- Js code to suggest a security key --><script type="text/javascript">';
 		print '$(document).ready(function () {
             $("#'.dol_escape_js($htmlnameofbutton).'").click(function() {
-				console.log("We click on the button to suggest a key");
+				console.log("We click on the button '.dol_escape_js($htmlnameofbutton).' to suggest a key. We will fill '.dol_escape_js($htmlname).'");
             	$.get( "'.DOL_URL_ROOT.'/core/ajax/security.php", {
             		action: \'getrandompassword\',
-            		generic: true,
+            		generic: '.($generic ? '1' : '0').',
 					token: \''.dol_escape_js(newToken()).'\'
 				},
 				function(result) {
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 775a4db05dc..a6d72165e3b 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1018,7 +1018,10 @@ if ($action == 'create' || $action == 'adduserldap') {
 			$valuetoshow .= preg_replace('/./i', '*', $ldap_pass);
 		} else {
 			// We do not use a field password but a field text to show new password to use.
-			$valuetoshow .= ($valuetoshow ? ' + '.$langs->trans("DolibarrPassword") : '').'<input maxsize="32" type="text" name="password" value="'.dol_escape_htmltag($password).'" autocomplete="new-password">';
+			$valuetoshow .= ($valuetoshow ? ' + '.$langs->trans("DolibarrPassword") : '').'<input class="minwidth300 maxwidth400 widthcentpercentminusx" maxsize="32" type="text" id="password" name="password" value="'.dol_escape_htmltag($password).'" autocomplete="new-password">';
+			if (!empty($conf->use_javascript_ajax)) {
+				$valuetoshow .= '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_password" class="linkobject"');
+			}
 		}
 	}
 
@@ -1039,7 +1042,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 		//$generated_password = getRandomPassword(false);
 		print '<tr><td>'.$langs->trans("ApiKey").'</td>';
 		print '<td>';
-		print '<input class="minwidth300 widthcentpercentminusx" maxsize="32" type="text" id="api_key" name="api_key" value="'.GETPOST('api_key', 'alphanohtml').'" autocomplete="off">';
+		print '<input class="minwidth300 maxwidth400 widthcentpercentminusx" maxsize="32" type="text" id="api_key" name="api_key" value="'.GETPOST('api_key', 'alphanohtml').'" autocomplete="off">';
 		if (!empty($conf->use_javascript_ajax)) {
 			print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"');
 		}
@@ -2384,7 +2387,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			}
 			if (preg_match('/dolibarr/', $dolibarr_main_authentication)) {
 				if ($caneditpassword) {
-					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<input maxlength="128" type="password" class="flat" name="password" value="'.dol_escape_htmltag($object->pass).'" autocomplete="new-password">';
+					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<input maxlength="128" type="password" class="flat" id="password" name="password" value="'.dol_escape_htmltag($object->pass).'" autocomplete="new-password">';
 				} else {
 					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').preg_replace('/./i', '*', $object->pass);
 				}
@@ -2866,11 +2869,10 @@ if ($action == 'create' || $action == 'adduserldap') {
 }
 
 if (!empty($conf->api->enabled)) {
-	$constname = 'api_key';
-
 	// Add button to autosuggest a key
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-	print dolJSToSetRandomPassword($constname, 'generate_api_key');
+	print dolJSToSetRandomPassword('password', 'generate_password', 0);
+	print dolJSToSetRandomPassword('api_key', 'generate_api_key', 1);
 }
 
 // End of page

From c99425735fc4bbec3920ff6a11f14746af8ddb2a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 17 Jan 2023 11:55:10 +0100
Subject: [PATCH 614/816] Fix css

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

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index a6d72165e3b..dbe1764f54e 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1189,10 +1189,11 @@ if ($action == 'create' || $action == 'adduserldap') {
 		print "</td></tr>";
 	}
 
+	// Default language
 	if (getDolGlobalInt('MAIN_MULTILANGS')) {
 		print '<tr><td>'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0, 'string', '', 0, 0, 'id', $langs->trans("WarningNotLangOfInterface", $langs->transnoentitiesnoconv("UserGUISetup"))).'</td>';
 		print '<td class="maxwidthonsmartphone">'."\n";
-		print img_picto('', 'language', 'class="pictofixedwidth"').$formadmin->select_language(GETPOST('default_lang', 'alpha') ?GETPOST('default_lang', 'alpha') : ($object->lang ? $object->lang : ''), 'default_lang', 0, 0, 1, 0, 0, 'maxwidth200onsmartphone widthcentpercentminusx');
+		print img_picto('', 'language', 'class="pictofixedwidth"').$formadmin->select_language(GETPOST('default_lang', 'alpha') ?GETPOST('default_lang', 'alpha') : ($object->lang ? $object->lang : ''), 'default_lang', 0, 0, 1, 0, 0, 'maxwidth300 widthcentpercentminusx');
 		print '</td>';
 		print '</tr>';
 	}

From c3a5d32b8dd1c33e26781112723d2506b1452ca0 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Tue, 17 Jan 2023 12:07:02 +0100
Subject: [PATCH 615/816] FIX - Filter checkbox memory to reload page

---
 htdocs/commande/list_det.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index 385408663fd..651b8fffe8d 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -793,6 +793,15 @@ if ($resql) {
 	if ($search_fk_input_reason > 0) {
 		$param .= '&search_fk_input_reason='.urlencode($search_fk_input_reason);
 	}
+	if (!empty($productobuy)) {
+		$param .= '&productobuy='.urlencode($productobuy);
+	}
+	if (!empty($productonly)) {
+		$param .= '&productonly='.urlencode($productonly);
+	}
+	if (!empty($disablelinefree)) {
+		$param .= '&disablelinefree='.urlencode($disablelinefree);
+	}
 
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';

From fc8aed1a6d95d021ed5f934a10be241e18d319c3 Mon Sep 17 00:00:00 2001
From: hystepik <lucas.marcouiller@gmail.com>
Date: Tue, 17 Jan 2023 12:16:03 +0100
Subject: [PATCH 616/816] New #23494 : add birthday to thirdparty contact list

---
 htdocs/core/lib/company.lib.php | 37 +++++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index d49538f41dc..a29c22cbcf7 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -957,7 +957,13 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 	$search_poste   = GETPOST("search_poste", 'alpha');
 	$search_note_private = GETPOST('search_note_private', 'alphanohtml');
 	$search_roles = GETPOST("search_roles", 'array');
+	$search_birthday_dtstart = GETPOST("search_birthday_dtstart", 'alpha');
+	$search_birthday_dtend = GETPOST("search_birthday_dtend", 'alpha');
 
+	if ($search_birthday_dtstart != '' || $search_birthday_dtend != '') {
+		$search_birthday_dtstart = dol_mktime(0, 0, 0, GETPOST('search_birthday_dtstartmonth', 'int'), GETPOST('search_birthday_dtstartday', 'int'), GETPOST('search_birthday_dtstartyear', 'int'));
+		$search_birthday_dtend = dol_mktime(23, 59, 59, GETPOST('search_birthday_dtendmonth', 'int'), GETPOST('search_birthday_dtendday', 'int'), GETPOST('search_birthday_dtendyear', 'int'));
+	}
 	$socialnetworks = getArrayOfSocialNetworks();
 
 	$searchAddressPhoneDBFields = array(
@@ -1007,6 +1013,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 		'address'   =>array('type'=>'varchar(128)', 'label'=>'Address', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>3, 'index'=>1, 'position'=>30),
 		'note_private' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES')), 'visible'=>3, 'position'=>35),
 		'role'      =>array('type'=>'checkbox', 'label'=>'Role', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>4, 'index'=>1, 'position'=>40),
+		'birthday' 	=>array('type'=>'date', 'label'=>'Birthday', 'enabled'=>1, 'visible'=>-1, 'notnull'=> 0, 'position'=>45),
 		'statut'    =>array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'default'=>0, 'index'=>1, 'position'=>50, 'arrayofkeyval'=>array(0=>$contactstatic->LibStatut(0, 1), 1=>$contactstatic->LibStatut(1, 1))),
 	);
 
@@ -1018,6 +1025,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 		't.address'=>array('label'=>(empty($conf->dol_optimize_smallscreen) ? $langs->trans("Address").' / '.$langs->trans("Phone").' / '.$langs->trans("Email") : $langs->trans("Address")), 'checked'=>1, 'position'=>30),
 		't.note_private' => array('label' => 'NotePrivate', 'checked' => 0, 'position'=>35),
 		'sc.role'=>array('label'=>"ContactByDefaultFor", 'checked'=>1, 'position'=>40),
+		't.birthday'=>array('label'=>"Birthday", 'checked'=>0, 'position'=>45),
 		't.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>50, 'class'=>'center'),
 	);
 	// Extra fields
@@ -1052,6 +1060,8 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 		$search_address = '';
 		$search_poste = '';
 		$search_note_private = '';
+		$search_birthday_dtstart = '';
+		$search_birthday_dtend = '';
 		$search = array();
 		$search_array_options = array();
 
@@ -1111,6 +1121,9 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 	if ($search_note_private != '') {
 		$param .= '&search_note_private='.urlencode($search_note_private);
 	}
+	if ($search_birthday != '') {
+		$param .= '&search_birthday='.urlencode($search_birthday);
+	}
 	if ($optioncss != '') {
 		$param .= '&optioncss='.urlencode($optioncss);
 	}
@@ -1120,7 +1133,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 	$sql = "SELECT t.rowid, t.entity, t.lastname, t.firstname, t.fk_pays as country_id, t.civility, t.poste, t.phone as phone_pro, t.phone_mobile, t.phone_perso, t.fax, t.email, t.socialnetworks, t.statut, t.photo,";
-	$sql .= " t.civility as civility_id, t.address, t.zip, t.town";
+	$sql .= " t.civility as civility_id, t.address, t.zip, t.town, t.birthday";
 	$sql .= ", t.note_private";
 	$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as t";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople_extrafields as ef on (t.rowid = ef.fk_object)";
@@ -1144,6 +1157,12 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 	if ($search_note_private) {
 		$sql .= natural_search('t.note_private', $search_note_private);
 	}
+	if ($search_birthday_dtstart != '') {
+		$sql .= " AND t.birthday >= '".$db->idate($search_birthday_dtstart)."'";
+	}
+	if ($search_birthday_dtend != '') {
+		$sql .= " AND t.birthday <= '".$db->idate($search_birthday_dtend)."'";
+	}
 	if (count($search_roles) > 0) {
 		$sql .= " AND t.rowid IN (SELECT sc.fk_socpeople FROM ".MAIN_DB_PREFIX."societe_contacts as sc WHERE sc.fk_c_type_contact IN (".$db->sanitize(implode(',', $search_roles))."))";
 	}
@@ -1188,6 +1207,13 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 				print $form->selectarray('search_status', array('-1'=>'', '0'=>$contactstatic->LibStatut(0, 1), '1'=>$contactstatic->LibStatut(1, 1)), $search_status, 0, 0, 0, '', 0, 0, 0, '', 'onrightofpage');
 			} elseif (in_array($key, array('role'))) {
 				print $formcompany->showRoles("search_roles", $contactstatic, 'edit', $search_roles, 'minwidth200 maxwidth300');
+			} elseif (in_array($key, array('birthday'))) {
+				print '<div class="nowrap">';
+				print $form->selectDate($search_birthday_dtstart ? $search_birthday_dtstart : '', "search_birthday_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+				print '</div>';
+				print '<div class="nowrap">';
+				print $form->selectDate($search_birthday_dtend ? $search_birthday_dtend : '', "search_birthday_dtend", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+				print '</div>';
 			} else {
 				print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.(!empty($search[$key]) ? dol_escape_htmltag($search[$key]) : '').'">';
 			}
@@ -1342,6 +1368,13 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 				print '</td>';
 			}
 
+			// Birthday
+			if (!empty($arrayfields['t.birthday']['checked'])) {
+				print '<td>';
+				print dol_print_date($obj->birthday);
+				print '</td>';
+			}
+
 			// Status
 			if (!empty($arrayfields['t.statut']['checked'])) {
 				print '<td class="center">'.$contactstatic->getLibStatut(5).'</td>';
@@ -1384,7 +1417,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 			$i++;
 		}
 	} else {
-		$colspan = 1;
+		$colspan = 2;
 		foreach ($arrayfields as $key => $val) {
 			if (!empty($val['checked'])) {
 				$colspan++;

From 38e253fe0e8a115e8caade43060710491e560291 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 17 Jan 2023 12:25:13 +0100
Subject: [PATCH 617/816] Trans

---
 htdocs/langs/en_US/main.lang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index f65a05ce455..0d06736a23d 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1159,8 +1159,8 @@ SetSupervisor=Set the supervisor
 CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Assignement
 ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project
-TasksRole=Role assigned on each task of each project
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Bulk Supervisor Set
 ConfirmUpdatePrice=Choose a increase/decrease price rate
 ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?

From 251f5c705646fb0a3a02d6d9d0c02ffd9b5bc6fd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 17 Jan 2023 12:25:51 +0100
Subject: [PATCH 618/816] Trans

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

diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 17cdda6525e..e406566100e 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -172,3 +172,5 @@ ErrorSeveralCompaniesWithEmailContactUs=Several companies with this email has be
 ErrorSeveralCompaniesWithNameContactUs=Several companies with this name has been found so we can't validate automaticaly your registration. Please contact us at %s for a manual validation
 NoPublicActionsAllowedForThisEvent=No public actions are open to public for this event
 MaxNbOfAttendees=Max number of attendees
+DateStartEvent=Event start date
+DateEndEvent=Event end date

From 56e77b96017dd17ae980985621e416be58e99f23 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 17 Jan 2023 12:31:53 +0100
Subject: [PATCH 619/816] Fix default field on project list

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

diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 12b58799b5d..620a520d7ce 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -209,9 +209,9 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 $arrayfields['s.nom'] = array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'position'=>21, 'enabled'=>(!isModEnabled('societe') ? 0 : 1));
 $arrayfields['s.name_alias'] = array('label'=>"AliasNameShort", 'checked'=>0, 'position'=>22);
 $arrayfields['commercial'] = array('label'=>$langs->trans("SaleRepresentativesOfThirdParty"), 'checked'=>0, 'position'=>23);
-$arrayfields['c.assigned'] = array('label'=>$langs->trans("AssignedTo"), 'checked'=>-1, 'position'=>120);
+$arrayfields['c.assigned'] = array('label'=>$langs->trans("AssignedTo"), 'checked'=>1, 'position'=>120);
 $arrayfields['opp_weighted_amount'] = array('label'=>$langs->trans('OpportunityWeightedAmountShort'), 'checked'=>0, 'position'=> 116, 'enabled'=>(empty($conf->global->PROJECT_USE_OPPORTUNITIES) ? 0 : 1), 'position'=>106);
-$arrayfields['u.login'] = array('label'=>"Author", 'checked'=>1, 'position'=>165);
+$arrayfields['u.login'] = array('label'=>"Author", 'checked'=>-1, 'position'=>165);
 // Force some fields according to search_usage filter...
 if (GETPOST('search_usage_opportunity')) {
 	//$arrayfields['p.usage_opportunity']['visible'] = 1;	// Not require, filter on search_opp_status is enough

From 070128367d5df25c488045603b8c50e30184a00d Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Tue, 17 Jan 2023 12:36:58 +0100
Subject: [PATCH 620/816] kanban mode for list of expensereport payments

---
 .../class/paymentexpensereport.class.php      |  37 +++
 htdocs/expensereport/payment/list.php         | 233 ++++++++++--------
 2 files changed, 169 insertions(+), 101 deletions(-)

diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index c0ba86d55ff..5ca4135dc30 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -713,4 +713,41 @@ class PaymentExpenseReport extends CommonObject
 			dol_print_error($this->db);
 		}
 	}
+
+		/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $langs;
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
+		if (property_exists($this, 'datep')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("Date").'</span> : <span class="info-box-label">'.dol_print_date($this->db->jdate($this->datep), 'dayhour').'</span>';
+		}
+		if (property_exists($this, 'fk_typepayment')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("Type").'</span> : <span class="info-box-label">'.$this->fk_typepayment.'</span>';
+		}
+		if (property_exists($this, 'fk_bank') && !is_null($this->fk_bank)) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("Account").'</span> : <span class="info-box-label">'.$this->fk_bank.'</span>';
+		}
+		if (property_exists($this, 'amount') ) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("Amount").'</span> : <span class="info-box-label amount">'.price($this->amount).'</span>';
+		}
+		if (method_exists($this, 'getLibStatut')) {
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
diff --git a/htdocs/expensereport/payment/list.php b/htdocs/expensereport/payment/list.php
index cb93aae4ff0..4c838a73b1e 100644
--- a/htdocs/expensereport/payment/list.php
+++ b/htdocs/expensereport/payment/list.php
@@ -48,6 +48,7 @@ $action = GETPOST('action', 'alpha');
 $massaction = GETPOST('massaction', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'vendorpaymentlist';
+$mode = GETPOST('mode', 'alpha');
 
 $socid = GETPOST('socid', 'int');
 
@@ -254,6 +255,9 @@ $num = $db->num_rows($resql);
 $i = 0;
 
 $param = '';
+if (!empty($mode)) {
+	$param .= '&mode='.urlencode($mode);
+}
 if (!empty($contextpage) && $contextpage != $_SERVER['PHP_SELF']) {
 	$param .= '&contextpage='.urlencode($contextpage);
 }
@@ -315,8 +319,13 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
 
-print_barre_liste($langs->trans('ExpenseReportPayments'), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'expensereport', 0, '', '', $limit, 0, 0, 1);
+$newcardbutton = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+
+print_barre_liste($langs->trans('ExpenseReportPayments'), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'expensereport', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 if ($search_all) {
 	foreach ($fieldstosearchall as $key => $val) {
@@ -473,116 +482,138 @@ while ($i < min($num, $limit)) {
 
 	$paymentexpensereportstatic->id = $objp->rowid;
 	$paymentexpensereportstatic->ref = $objp->ref;
-	$paymentexpensereportstatic->datepaye = $objp->datep;
+	$paymentexpensereportstatic->datep = $objp->datep;
+	$paymentexpensereportstatic->amount = $objp->pamount;
+	$paymentexpensereportstatic->fk_typepayment = $objp->paiement_type;
+
+	if ($objp->bid) {
+		$accountstatic->fetch($objp->bid);
+		$paymentexpensereportstatic->fk_bank = $accountstatic->getNomUrl(1);
+	} else {
+		$paymentexpensereportstatic->fk_bank = null;
+	}
 
 	$userstatic->id = $objp->userid;
 	$userstatic->lastname = $objp->lastname;
 	$userstatic->firstname = $objp->firstname;
 
-	print '<tr class="oddeven">';
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr><td colspan="12">';
+			print '<div class="box-flex-container">';
+		}
+		// Output Kanban
+		print $paymentexpensereportstatic->getKanbanView('');
+		if ($i == (min($num, $limit) - 1)) {
+			print '</div>';
+			print '</td></tr>';
+		}
+	} else {
+		print '<tr class="oddeven">';
 
-	// No
-	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
-		print '<td>'.(($offset * $limit) + $i).'</td>';
+		// No
+		if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+			print '<td>'.(($offset * $limit) + $i).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Ref
+		if (!empty($arrayfields['pndf.rowid']['checked'])) {
+			print '<td class="nowrap">'.$paymentexpensereportstatic->getNomUrl(1).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Date
+		if (!empty($arrayfields['pndf.datep']['checked'])) {
+			$dateformatforpayment = 'dayhour';
+			print '<td class="nowrap center">'.dol_print_date($db->jdate($objp->datep), $dateformatforpayment).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Thirdparty
+		if (!empty($arrayfields['u.login']['checked'])) {
+			print '<td>';
+			if ($userstatic->id > 0) {
+				print $userstatic->getNomUrl(1);
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Pyament type
+		if (!empty($arrayfields['c.libelle']['checked'])) {
+			$payment_type = $langs->trans("PaymentType".$objp->paiement_type) != ("PaymentType".$objp->paiement_type) ? $langs->trans("PaymentType".$objp->paiement_type) : $objp->paiement_libelle;
+			print '<td>'.$payment_type.' '.dol_trunc($objp->num_payment, 32).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Cheque number (fund transfer)
+		if (!empty($arrayfields['pndf.num_payment']['checked'])) {
+			print '<td>'.$objp->num_payment.'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Bank account
+		if (!empty($arrayfields['ba.label']['checked'])) {
+			print '<td>';
+			if ($objp->bid) {
+				$accountstatic->id = $objp->bid;
+				$accountstatic->ref = $objp->bref;
+				$accountstatic->label = $objp->blabel;
+				$accountstatic->number = $objp->number;
+				$accountstatic->iban = $objp->iban_prefix;
+				$accountstatic->bic = $objp->bic;
+				$accountstatic->currency_code = $objp->currency_code;
+				$accountstatic->account_number = $objp->account_number;
+
+				$accountingjournal = new AccountingJournal($db);
+				$accountingjournal->fetch($objp->accountancy_journal);
+				$accountstatic->accountancy_journal = $accountingjournal->code;
+
+				print $accountstatic->getNomUrl(1);
+			} else {
+				print '&nbsp;';
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Amount
+		if (!empty($arrayfields['pndf.amount']['checked'])) {
+			print '<td class="right"><span class="amount">'.price($objp->pamount).'</span></td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			$totalarray['pos'][$checkedCount] = 'amount';
+			if (empty($totalarray['val']['amount'])) {
+				$totalarray['val']['amount'] = $objp->pamount;
+			} else {
+				$totalarray['val']['amount'] += $objp->pamount;
+			}
+		}
+
+		// Buttons
+		print '<td></td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
+
+		print '</tr>';
 	}
-
-	// Ref
-	if (!empty($arrayfields['pndf.rowid']['checked'])) {
-		print '<td class="nowrap">'.$paymentexpensereportstatic->getNomUrl(1).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Date
-	if (!empty($arrayfields['pndf.datep']['checked'])) {
-		$dateformatforpayment = 'dayhour';
-		print '<td class="nowrap center">'.dol_print_date($db->jdate($objp->datep), $dateformatforpayment).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Thirdparty
-	if (!empty($arrayfields['u.login']['checked'])) {
-		print '<td>';
-		if ($userstatic->id > 0) {
-			print $userstatic->getNomUrl(1);
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Pyament type
-	if (!empty($arrayfields['c.libelle']['checked'])) {
-		$payment_type = $langs->trans("PaymentType".$objp->paiement_type) != ("PaymentType".$objp->paiement_type) ? $langs->trans("PaymentType".$objp->paiement_type) : $objp->paiement_libelle;
-		print '<td>'.$payment_type.' '.dol_trunc($objp->num_payment, 32).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Cheque number (fund transfer)
-	if (!empty($arrayfields['pndf.num_payment']['checked'])) {
-		print '<td>'.$objp->num_payment.'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Bank account
-	if (!empty($arrayfields['ba.label']['checked'])) {
-		print '<td>';
-		if ($objp->bid) {
-			$accountstatic->id = $objp->bid;
-			$accountstatic->ref = $objp->bref;
-			$accountstatic->label = $objp->blabel;
-			$accountstatic->number = $objp->number;
-			$accountstatic->iban = $objp->iban_prefix;
-			$accountstatic->bic = $objp->bic;
-			$accountstatic->currency_code = $objp->currency_code;
-			$accountstatic->account_number = $objp->account_number;
-
-			$accountingjournal = new AccountingJournal($db);
-			$accountingjournal->fetch($objp->accountancy_journal);
-			$accountstatic->accountancy_journal = $accountingjournal->code;
-
-			print $accountstatic->getNomUrl(1);
-		} else {
-			print '&nbsp;';
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Amount
-	if (!empty($arrayfields['pndf.amount']['checked'])) {
-		print '<td class="right"><span class="amount">'.price($objp->pamount).'</span></td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-		$totalarray['pos'][$checkedCount] = 'amount';
-		if (empty($totalarray['val']['amount'])) {
-			$totalarray['val']['amount'] = $objp->pamount;
-		} else {
-			$totalarray['val']['amount'] += $objp->pamount;
-		}
-	}
-
-	// Buttons
-	print '<td></td>';
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
-
-	print '</tr>';
 	$i++;
 }
 

From 8909d7ba9c32c13e47e5e15a6b26d7746e72f826 Mon Sep 17 00:00:00 2001
From: marc <marc.baur@ptmsoft.fr>
Date: Tue, 17 Jan 2023 12:44:58 +0100
Subject: [PATCH 621/816] Add doc comment

---
 htdocs/contact/card.php | 3 +++
 htdocs/societe/card.php | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 8c061020dc3..dffd0fa9021 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -1592,6 +1592,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 	}
 }
 
+/**
+ * Show social network part if the module is enabled with hiding functionality
+ */
 function showSocialNetwork()
 {
 	global $socialnetworks, $object, $form, $object, $langs;
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index f06a4c14eee..869e5dcf262 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -3299,6 +3299,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 	}
 }
 
+/**
+ * Show social network part if the module is enabled with hiding functionality
+ */
 function showSocialNetwork()
 {
 	global $socialnetworks, $object, $form, $object, $langs;

From 698306e8a6334e043de03752d11c45a957124b4b Mon Sep 17 00:00:00 2001
From: marc <marc.baur@ptmsoft.fr>
Date: Tue, 17 Jan 2023 12:50:06 +0100
Subject: [PATCH 622/816] Add return in doc comment

---
 htdocs/contact/card.php | 2 ++
 htdocs/societe/card.php | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index dffd0fa9021..56d2d539e90 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -1594,6 +1594,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 /**
  * Show social network part if the module is enabled with hiding functionality
+ * 
+ * @return void
  */
 function showSocialNetwork()
 {
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 869e5dcf262..b8971033b2e 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -3301,6 +3301,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 /**
  * Show social network part if the module is enabled with hiding functionality
+ * 
+ * @return void
  */
 function showSocialNetwork()
 {

From cc691383f26a775161c59853c48b4ac1001f09cc Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 17 Jan 2023 11:50:35 +0000
Subject: [PATCH 623/816] Fixing style errors.

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

diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 56d2d539e90..3e7f5fdb1f1 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -1594,7 +1594,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 /**
  * Show social network part if the module is enabled with hiding functionality
- * 
+ *
  * @return void
  */
 function showSocialNetwork()
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index b8971033b2e..6ef8d929361 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -3301,7 +3301,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 /**
  * Show social network part if the module is enabled with hiding functionality
- * 
+ *
  * @return void
  */
 function showSocialNetwork()

From 86698834a3bd527b2c2abb22628069e55dec3247 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Tue, 17 Jan 2023 13:25:10 +0100
Subject: [PATCH 624/816] kanban for recruitment job list

---
 .../class/recruitmentjobposition.class.php    | 39 +++++++++++++++++++
 .../recruitmentjobposition_list.php           | 11 +++++-
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index fb34e33376e..1ee8d8e51fd 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -1107,4 +1107,43 @@ class RecruitmentJobPosition extends CommonObject
 
 		return $error;
 	}
+
+
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $langs, $selected,$arrayofselected,$obj;
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
+		if (in_array($this->id, $arrayofselected)) {
+			$selected = 1;
+		}
+		$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		if (property_exists($this, 'date_planned')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("Date").'</span> : <span class="info-box-label">'.dol_print_date($this->db->jdate($this->date_planned), 'day').'</span>';
+		}
+		if (property_exists($this, 'qty')) {
+			$return .= '<br><span class="opacitymedium" title="'.$langs->trans("NbOfEmployeesExpected").'">'.$langs->trans("NbOfEmployeesExpected", '', '', '', '', 2).'</span> : <span class="info-box-label">'.$this->qty.'</span>';
+		}
+		if (property_exists($this, 'remuneration_suggested')) {
+			$return .= ' | <span class="opacitymedium">'.$langs->trans("Remuneration").'</span> : <span class="info-box-label">'.$this->remuneration_suggested.'</span>';
+		}
+		if (method_exists($this, 'getLibStatut')) {
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).' | <span class="opacitymedium" title="'.$langs->trans("RecruitmentCandidatures").'">'.$langs->trans("RecruitmentCandidatures", '', '', '', '', 5).'</span> : <span>'.$obj->nbapplications.'</span></div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
diff --git a/htdocs/recruitment/recruitmentjobposition_list.php b/htdocs/recruitment/recruitmentjobposition_list.php
index e6b538b5167..670eca08040 100644
--- a/htdocs/recruitment/recruitmentjobposition_list.php
+++ b/htdocs/recruitment/recruitmentjobposition_list.php
@@ -585,14 +585,21 @@ while ($i < $imaxinloop) {
 
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
+	$object->date_planned = $obj->date_planned;
+
 
 	if ($mode == 'kanban') {
 		if ($i == 0) {
 			print '<tr><td colspan="'.$savnbfield.'">';
 			print '<div class="box-flex-container">';
 		}
-		// Output Kanban
-		print $object->getKanbanView('');
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			if ($massactionbutton || $massaction) {
+				$selected = 0;
+			}
+			// Output Kanban
+			print $object->getKanbanView('');
+		}
 		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';

From cc2ab0dd3e53d896f1aa5afcce748b217acb4a14 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Tue, 17 Jan 2023 13:48:57 +0100
Subject: [PATCH 625/816] kanban mode for list of applications job

---
 .../class/recruitmentcandidature.class.php    | 35 +++++++++++++++++++
 .../recruitmentcandidature_list.php           | 12 ++++++-
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index 1690f13da56..a1e49560adb 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -1024,6 +1024,41 @@ class RecruitmentCandidature extends CommonObject
 
 		return $error;
 	}
+
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $langs, $selected,$arrayofselected;
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
+		if (in_array($this->id, $arrayofselected)) {
+			$selected = 1;
+		}
+		$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		if (property_exists($this, 'fk_recruitmentjobposition')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans('Job').'</span> : <span class="info-box-label">'.$this->fk_recruitmentjobposition.'</span>';
+		}
+		if (property_exists($this, 'phone')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("phone").'</span> : <span class="info-box-label">'.$this->phone.'</span>';
+		}
+		if (method_exists($this, 'getLibStatut')) {
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
 
 
diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php
index 9b860ac54d5..8b62a5a202f 100644
--- a/htdocs/recruitment/recruitmentcandidature_list.php
+++ b/htdocs/recruitment/recruitmentcandidature_list.php
@@ -735,8 +735,18 @@ while ($i < $imaxinloop) {
 			print '<tr><td colspan="'.$savnbfield.'">';
 			print '<div class="box-flex-container">';
 		}
+		$recuitment = new RecruitmentJobPosition($db);
+		$recuitment->fetch($obj->fk_recruitmentjobposition);
+		$object->fk_recruitmentjobposition = $recuitment->getNomUrl();
+		$object->phone = $obj->phone;
 		// Output Kanban
-		print $object->getKanbanView('');
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			if ($massactionbutton || $massaction) {
+				$selected = 0;
+			}
+			// Output Kanban
+			print $object->getKanbanView('');
+		}
 		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';

From 48161b84002de18b9d5e92f0f5d1387fb3329e64 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 17 Jan 2023 13:50:23 +0100
Subject: [PATCH 626/816] Debug v17. Bad param for selection of project

---
 htdocs/bookcal/availabilities_card.php                       | 4 ++--
 htdocs/bookcal/booking_card.php                              | 4 ++--
 htdocs/comm/action/card.php                                  | 2 +-
 htdocs/comm/action/document.php                              | 2 +-
 htdocs/comm/action/info.php                                  | 2 +-
 htdocs/comm/propal/card.php                                  | 2 +-
 htdocs/comm/propal/contact.php                               | 2 +-
 htdocs/comm/propal/document.php                              | 2 +-
 htdocs/comm/propal/info.php                                  | 2 +-
 htdocs/comm/propal/note.php                                  | 2 +-
 htdocs/commande/card.php                                     | 2 +-
 htdocs/commande/contact.php                                  | 2 +-
 htdocs/commande/document.php                                 | 2 +-
 htdocs/commande/info.php                                     | 2 +-
 htdocs/commande/note.php                                     | 2 +-
 htdocs/compta/bank/various_payment/card.php                  | 2 +-
 htdocs/compta/bank/various_payment/document.php              | 2 +-
 htdocs/compta/bank/various_payment/info.php                  | 2 +-
 htdocs/compta/facture/card-rec.php                           | 2 +-
 htdocs/compta/facture/card.php                               | 2 +-
 htdocs/compta/facture/contact.php                            | 2 +-
 htdocs/compta/facture/document.php                           | 2 +-
 htdocs/compta/facture/info.php                               | 2 +-
 htdocs/compta/facture/note.php                               | 2 +-
 htdocs/compta/facture/prelevement.php                        | 2 +-
 htdocs/compta/sociales/card.php                              | 2 +-
 htdocs/contrat/agenda.php                                    | 2 +-
 htdocs/contrat/card.php                                      | 2 +-
 htdocs/contrat/contact.php                                   | 2 +-
 htdocs/contrat/document.php                                  | 2 +-
 htdocs/contrat/note.php                                      | 2 +-
 htdocs/core/class/html.form.class.php                        | 5 +++--
 htdocs/delivery/card.php                                     | 2 +-
 htdocs/don/card.php                                          | 2 +-
 htdocs/don/document.php                                      | 2 +-
 htdocs/don/info.php                                          | 2 +-
 htdocs/don/note.php                                          | 2 +-
 htdocs/expedition/card.php                                   | 2 +-
 htdocs/expedition/contact.php                                | 2 +-
 htdocs/expedition/document.php                               | 2 +-
 htdocs/expedition/note.php                                   | 2 +-
 htdocs/expedition/shipment.php                               | 2 +-
 htdocs/fichinter/card-rec.php                                | 2 +-
 htdocs/fichinter/card.php                                    | 2 +-
 htdocs/fichinter/contact.php                                 | 2 +-
 htdocs/fichinter/document.php                                | 2 +-
 htdocs/fichinter/info.php                                    | 2 +-
 htdocs/fichinter/note.php                                    | 2 +-
 htdocs/fourn/commande/card.php                               | 2 +-
 htdocs/fourn/commande/contact.php                            | 2 +-
 htdocs/fourn/commande/dispatch.php                           | 2 +-
 htdocs/fourn/commande/document.php                           | 2 +-
 htdocs/fourn/commande/info.php                               | 2 +-
 htdocs/fourn/commande/note.php                               | 2 +-
 htdocs/fourn/facture/card-rec.php                            | 2 +-
 htdocs/fourn/facture/card.php                                | 2 +-
 htdocs/fourn/facture/contact.php                             | 2 +-
 htdocs/fourn/facture/document.php                            | 2 +-
 htdocs/fourn/facture/info.php                                | 2 +-
 htdocs/fourn/facture/note.php                                | 2 +-
 htdocs/knowledgemanagement/knowledgerecord_card.php          | 4 ++--
 htdocs/loan/card.php                                         | 2 +-
 htdocs/loan/document.php                                     | 2 +-
 htdocs/loan/info.php                                         | 2 +-
 htdocs/loan/note.php                                         | 2 +-
 htdocs/loan/schedule.php                                     | 2 +-
 htdocs/modulebuilder/template/myobject_card.php              | 2 +-
 htdocs/mrp/mo_agenda.php                                     | 2 +-
 htdocs/mrp/mo_card.php                                       | 2 +-
 htdocs/mrp/mo_document.php                                   | 2 +-
 htdocs/mrp/mo_movements.php                                  | 2 +-
 htdocs/mrp/mo_note.php                                       | 2 +-
 htdocs/mrp/mo_production.php                                 | 2 +-
 htdocs/partnership/partnership_card.php                      | 4 ++--
 htdocs/product/inventory/card.php                            | 4 ++--
 htdocs/product/stock/card.php                                | 2 +-
 htdocs/product/stock/info.php                                | 2 +-
 htdocs/product/stock/movement_list.php                       | 2 +-
 htdocs/product/stock/stocktransfer/stocktransfer_contact.php | 2 +-
 htdocs/reception/card.php                                    | 2 +-
 htdocs/reception/contact.php                                 | 2 +-
 htdocs/reception/document.php                                | 2 +-
 htdocs/reception/note.php                                    | 2 +-
 htdocs/recruitment/recruitmentcandidature_agenda.php         | 2 +-
 htdocs/recruitment/recruitmentcandidature_card.php           | 4 ++--
 htdocs/recruitment/recruitmentcandidature_document.php       | 2 +-
 htdocs/recruitment/recruitmentcandidature_list.php           | 2 +-
 htdocs/recruitment/recruitmentcandidature_note.php           | 2 +-
 htdocs/recruitment/recruitmentjobposition_agenda.php         | 2 +-
 htdocs/recruitment/recruitmentjobposition_applications.php   | 2 +-
 htdocs/recruitment/recruitmentjobposition_card.php           | 2 +-
 htdocs/recruitment/recruitmentjobposition_document.php       | 2 +-
 htdocs/recruitment/recruitmentjobposition_note.php           | 2 +-
 htdocs/resource/element_resource.php                         | 4 ++--
 htdocs/salaries/card.php                                     | 2 +-
 htdocs/salaries/document.php                                 | 2 +-
 htdocs/salaries/info.php                                     | 2 +-
 htdocs/supplier_proposal/card.php                            | 2 +-
 htdocs/supplier_proposal/contact.php                         | 2 +-
 htdocs/supplier_proposal/document.php                        | 2 +-
 htdocs/supplier_proposal/info.php                            | 2 +-
 htdocs/supplier_proposal/note.php                            | 2 +-
 htdocs/ticket/agenda.php                                     | 2 +-
 htdocs/ticket/card.php                                       | 2 +-
 htdocs/ticket/contact.php                                    | 2 +-
 htdocs/ticket/document.php                                   | 2 +-
 htdocs/ticket/messaging.php                                  | 2 +-
 htdocs/webhook/target_card.php                               | 4 ++--
 htdocs/workstation/workstation_card.php                      | 4 ++--
 109 files changed, 120 insertions(+), 119 deletions(-)

diff --git a/htdocs/bookcal/availabilities_card.php b/htdocs/bookcal/availabilities_card.php
index b9f5277d4ae..f752d7f6a63 100644
--- a/htdocs/bookcal/availabilities_card.php
+++ b/htdocs/bookcal/availabilities_card.php
@@ -404,7 +404,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 //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->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 0, 1, '', 'maxwidth300');
 	 $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().'">';
@@ -412,7 +412,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 $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);
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 	 }
 	 } else {
 	 if (! empty($object->fk_project)) {
diff --git a/htdocs/bookcal/booking_card.php b/htdocs/bookcal/booking_card.php
index 0240ab2dccc..52f840c600b 100644
--- a/htdocs/bookcal/booking_card.php
+++ b/htdocs/bookcal/booking_card.php
@@ -400,7 +400,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 //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->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 0, 1, '', 'maxwidth300');
 	 $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().'">';
@@ -408,7 +408,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 $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);
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 	 }
 	 } else {
 	 if (! empty($object->fk_project)) {
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 11b8330b64c..2c1ce5e05aa 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -2191,7 +2191,7 @@ if ($id > 0) {
 				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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($object->fk_project)) {
 					$proj = new Project($db);
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 82cc7584c07..7fd71f45693 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -181,7 +181,7 @@ if ($object->id > 0) {
 			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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php
index d4588223b26..9bd14c4a528 100644
--- a/htdocs/comm/action/info.php
+++ b/htdocs/comm/action/info.php
@@ -109,7 +109,7 @@ if (isModEnabled('project')) {
 		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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+		$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 	} else {
 		if (!empty($object->fk_project)) {
 			$proj = new Project($db);
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 84e4e1bfb5e..7f1585f72a0 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2337,7 +2337,7 @@ if ($action == 'create') {
 			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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index 42f3f34f8d4..45f2d175f9a 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -149,7 +149,7 @@ if ($object->id > 0) {
 			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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index f1d1d7ef644..f1b6b2221e6 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -147,7 +147,7 @@ if ($object->id > 0) {
 			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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php
index 986601a91bc..8a1d2afaabd 100644
--- a/htdocs/comm/propal/info.php
+++ b/htdocs/comm/propal/info.php
@@ -94,7 +94,7 @@ if (isModEnabled('project')) {
 		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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+		$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 	} else {
 		if (!empty($object->fk_project)) {
 			$proj = new Project($db);
diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index fe4895ad2f8..4a772dae1d2 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -119,7 +119,7 @@ if ($object->id > 0) {
 				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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($object->fk_project)) {
 					$proj = new Project($db);
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 0510f089045..bd70e57e319 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2370,7 +2370,7 @@ if ($action == 'create' && $usercancreate) {
 				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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($object->fk_project)) {
 					$proj = new Project($db);
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index 04c16e68aa0..a6202d5d3bf 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -143,7 +143,7 @@ if ($id > 0 || !empty($ref)) {
 				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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($object->fk_project)) {
 					$proj = new Project($db);
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 0c35c3489f7..f16ad2ad3d3 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -140,7 +140,7 @@ if ($id > 0 || !empty($ref)) {
 				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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($object->fk_project)) {
 					$proj = new Project($db);
diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php
index 0acc5b793aa..2abe32aea71 100644
--- a/htdocs/commande/info.php
+++ b/htdocs/commande/info.php
@@ -94,7 +94,7 @@ if (isModEnabled('project')) {
 		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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+		$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 	} else {
 		if (!empty($object->fk_project)) {
 			$proj = new Project($db);
diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index e84dd5ad6e1..57eb073bba3 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -113,7 +113,7 @@ if ($id > 0 || !empty($ref)) {
 			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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 79f338cef85..f94eb38f27d 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -574,7 +574,7 @@ if ($id) {
 				$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);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		} else {
 			if (!empty($object->fk_project)) {
diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
index 611d516613b..43259727917 100644
--- a/htdocs/compta/bank/various_payment/document.php
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -114,7 +114,7 @@ if ($object->id) {
 				$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);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		} else {
 			if (!empty($object->fk_project)) {
diff --git a/htdocs/compta/bank/various_payment/info.php b/htdocs/compta/bank/various_payment/info.php
index 7cca5c7b4ec..ca31915d2f4 100644
--- a/htdocs/compta/bank/various_payment/info.php
+++ b/htdocs/compta/bank/various_payment/info.php
@@ -74,7 +74,7 @@ if (isModEnabled('project')) {
 			$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);
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 		}
 	} else {
 		if (!empty($object->fk_project)) {
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 26fb26d4cdb..b2f3521111e 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -1231,7 +1231,7 @@ if ($action == 'create') {
 					$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);
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 				}
 			} else {
 				if (!empty($object->fk_project)) {
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 287d99fc1fb..80d3ed2b436 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4381,7 +4381,7 @@ if ($action == 'create') {
 			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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index b367301911d..2548284f97f 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -148,7 +148,7 @@ if ($id > 0 || !empty($ref)) {
 				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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($object->fk_project)) {
 					$proj = new Project($db);
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 5cec55e2439..526bbe02068 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -152,7 +152,7 @@ if ($id > 0 || !empty($ref)) {
 				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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($object->fk_project)) {
 					$proj = new Project($db);
diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php
index 1ea28b295c3..0619d629385 100644
--- a/htdocs/compta/facture/info.php
+++ b/htdocs/compta/facture/info.php
@@ -108,7 +108,7 @@ if (isModEnabled('project')) {
 		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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+		$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 	} else {
 		if (!empty($object->fk_project)) {
 			$proj = new Project($db);
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index af08c6163e2..40f8b969fac 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -130,7 +130,7 @@ if ($id > 0 || !empty($ref)) {
 			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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 195b04a2ed5..829d3b0b482 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -375,7 +375,7 @@ if ($object->id > 0) {
 			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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index 7c644c63e38..b20ecd8ede9 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -557,7 +557,7 @@ if ($id > 0) {
 					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 					$morehtmlref .= '</form>';
 				} else {
-					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, 0, $object->fk_project, 'none', 0, 0, 0, 1);
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, 0, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 				}
 			} else {
 				if (!empty($object->fk_project)) {
diff --git a/htdocs/contrat/agenda.php b/htdocs/contrat/agenda.php
index 3a3c5440b30..f57d8012832 100644
--- a/htdocs/contrat/agenda.php
+++ b/htdocs/contrat/agenda.php
@@ -181,7 +181,7 @@ if ($id > 0) {
 			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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 8af35072b93..818550d344c 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1377,7 +1377,7 @@ if ($action == 'create') {
 				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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($object->fk_project)) {
 					$proj = new Project($db);
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index e5557c28a5b..6ca7b9b86ef 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -165,7 +165,7 @@ if ($id > 0 || !empty($ref)) {
 				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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($object->fk_project)) {
 					$proj = new Project($db);
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index 652738f10b5..3fb6ce25a6d 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -152,7 +152,7 @@ if ($object->id) {
 			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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index f17cc11f748..576d3ce5fe2 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -121,7 +121,7 @@ if ($id > 0 || !empty($ref)) {
 			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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 5a2efa07f40..1bdad2ed3c5 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5416,9 +5416,10 @@ class Form
 	 *    @param	int		$forcefocus			Force focus on field (works with javascript only)
 	 *    @param    int     $nooutput           No print is done. String is returned.
 	 *    @param	string	$textifnoproject	Text to show if no project
+	 *    @param	string	$morecss			More CSS
 	 *    @return	string                      Return html content
 	 */
-	public function form_project($page, $socid, $selected = '', $htmlname = 'projectid', $discard_closed = 0, $maxlength = 20, $forcefocus = 0, $nooutput = 0, $textifnoproject = '')
+	public function form_project($page, $socid, $selected = '', $htmlname = 'projectid', $discard_closed = 0, $maxlength = 20, $forcefocus = 0, $nooutput = 0, $textifnoproject = '', $morecss = '')
 	{
 		// phpcs:enable
 		global $langs;
@@ -5435,7 +5436,7 @@ class Form
 			$out .= '<form method="post" action="'.$page.'">';
 			$out .= '<input type="hidden" name="action" value="classin">';
 			$out .= '<input type="hidden" name="token" value="'.newToken().'">';
-			$out .= $formproject->select_projects($socid, $selected, $htmlname, $maxlength, 0, 1, $discard_closed, $forcefocus, 0, 0, '', 1);
+			$out .= $formproject->select_projects($socid, $selected, $htmlname, $maxlength, 0, 1, $discard_closed, $forcefocus, 0, 0, '', 1, 0, $morecss);
 			$out .= '<input type="submit" class="button smallpaddingimp" value="'.$langs->trans("Modify").'">';
 			$out .= '</form>';
 		} else {
diff --git a/htdocs/delivery/card.php b/htdocs/delivery/card.php
index b98b75015ab..cfcb1f3ea2a 100644
--- a/htdocs/delivery/card.php
+++ b/htdocs/delivery/card.php
@@ -338,7 +338,7 @@ if ($action == 'create') {
 					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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $objectsrc->socid, $objectsrc->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $objectsrc->socid, $objectsrc->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 				} else {
 					if (!empty($objectsrc->fk_project)) {
 						$proj = new Project($db);
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index ec22c82543f..a077c703fda 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -736,7 +736,7 @@ if (!empty($id) && $action != 'edit') {
 				$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);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		} else {
 			if (!empty($object->fk_project)) {
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index a5aa3984202..786371bcdd3 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -146,7 +146,7 @@ if ($object->id) {
 				$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);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		} else {
 			if (!empty($object->fk_project)) {
diff --git a/htdocs/don/info.php b/htdocs/don/info.php
index ad67cceb30c..75efd9f73f5 100644
--- a/htdocs/don/info.php
+++ b/htdocs/don/info.php
@@ -102,7 +102,7 @@ if (isModEnabled('project')) {
 			$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);
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 		}
 	} else {
 		if (!empty($object->fk_project)) {
diff --git a/htdocs/don/note.php b/htdocs/don/note.php
index dd3f4e176ce..14011000267 100644
--- a/htdocs/don/note.php
+++ b/htdocs/don/note.php
@@ -121,7 +121,7 @@ if ($id > 0 || !empty($ref)) {
 				$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);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		} else {
 			if (!empty($object->fk_project)) {
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 3e096bcc55d..8c62cdc3914 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1768,7 +1768,7 @@ if ($action == 'create') {
 			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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $objectsrc->socid, $objectsrc->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $objectsrc->socid, $objectsrc->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($objectsrc) && !empty($objectsrc->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index 48822121fa3..a3bcd1a2ef0 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -158,7 +158,7 @@ if ($id > 0 || !empty($ref)) {
 			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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $objectsrc->socid, $objectsrc->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $objectsrc->socid, $objectsrc->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($objectsrc) && !empty($objectsrc->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php
index 517c1cea8d2..c0725bd5fe1 100644
--- a/htdocs/expedition/document.php
+++ b/htdocs/expedition/document.php
@@ -150,7 +150,7 @@ if ($id > 0 || !empty($ref)) {
 				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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $objectsrc->socid, $objectsrc->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $objectsrc->socid, $objectsrc->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($objectsrc->fk_project)) {
 					$proj = new Project($db);
diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php
index 4401af0b20c..fcf191c4915 100644
--- a/htdocs/expedition/note.php
+++ b/htdocs/expedition/note.php
@@ -119,7 +119,7 @@ if ($id > 0 || !empty($ref)) {
 			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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $objectsrc->socid, $objectsrc->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $objectsrc->socid, $objectsrc->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($objectsrc) && !empty($objectsrc->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 2adf16e4c35..b4a89c5be30 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -296,7 +296,7 @@ if ($id > 0 || !empty($ref)) {
 				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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $objectsrc->socid, $objectsrc->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $objectsrc->socid, $objectsrc->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($objectsrc) && !empty($objectsrc->fk_project)) {
 					$proj = new Project($db);
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index 45779950ea6..86079c980c4 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -527,7 +527,7 @@ if ($action == 'create') {
 						$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);
+						$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 					}
 				} else {
 					if (!empty($object->fk_project)) {
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index aff1076eda5..accf1bb3cb5 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1177,7 +1177,7 @@ if ($action == 'create') {
 				$morehtmlref .= '<input type="submit" class="button button-edit 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);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		} else {
 			if (!empty($object->fk_project)) {
diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php
index 02099d959c7..aa0fe5b482f 100644
--- a/htdocs/fichinter/contact.php
+++ b/htdocs/fichinter/contact.php
@@ -141,7 +141,7 @@ if ($id > 0 || !empty($ref)) {
 				$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);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		} else {
 			if (!empty($object->fk_project)) {
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index 1b388763c02..3b4721d63a0 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -141,7 +141,7 @@ if ($object->id) {
 				$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);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		} else {
 			if (!empty($object->fk_project)) {
diff --git a/htdocs/fichinter/info.php b/htdocs/fichinter/info.php
index c556ba022e0..da1af1d613b 100644
--- a/htdocs/fichinter/info.php
+++ b/htdocs/fichinter/info.php
@@ -96,7 +96,7 @@ if (isModEnabled('project')) {
 			$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);
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 		}
 	} else {
 		if (!empty($object->fk_project)) {
diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php
index 5b246e55eb7..93bd60e519b 100644
--- a/htdocs/fichinter/note.php
+++ b/htdocs/fichinter/note.php
@@ -106,7 +106,7 @@ if ($id > 0 || !empty($ref)) {
 				$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);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		} else {
 			if (!empty($object->fk_project)) {
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 7f1e45a571a..ba39616da94 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2060,7 +2060,7 @@ if ($action == 'create') {
 			if ($action != 'classify' && $caneditproject) {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 			}
-			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index 3ca1eca77bf..1dfc47e9451 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -148,7 +148,7 @@ if ($id > 0 || !empty($ref)) {
 				if ($action != 'classify' && $caneditproject) {
 					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 				}
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($object->fk_project)) {
 					$proj = new Project($db);
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 504336f0a6e..f5a983ac5bb 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -554,7 +554,7 @@ if ($id > 0 || !empty($ref)) {
 			if ($action != 'classify' && $caneditproject) {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 			}
-			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index b3dfb8b9ece..d11c08ec91d 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -140,7 +140,7 @@ if ($object->id > 0) {
 			if ($action != 'classify' && $caneditproject) {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 			}
-			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php
index fc3918a32f3..4c438f1b991 100644
--- a/htdocs/fourn/commande/info.php
+++ b/htdocs/fourn/commande/info.php
@@ -153,7 +153,7 @@ if (isModEnabled('project')) {
 		if ($action != 'classify' && $caneditproject) {
 			$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 		}
-		$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+		$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 	} else {
 		if (!empty($object->fk_project)) {
 			$proj = new Project($db);
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index 33648dd9817..d1f21b0a2ee 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -122,7 +122,7 @@ if ($id > 0 || !empty($ref)) {
 				if ($action != 'classify' && $caneditproject) {
 					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 				}
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($object->fk_project)) {
 					$proj = new Project($db);
diff --git a/htdocs/fourn/facture/card-rec.php b/htdocs/fourn/facture/card-rec.php
index ead5a5f8ea8..910427f1075 100644
--- a/htdocs/fourn/facture/card-rec.php
+++ b/htdocs/fourn/facture/card-rec.php
@@ -1151,7 +1151,7 @@ if ($action == 'create') {
 					$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);
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 				}
 			} else {
 				if (!empty($object->fk_project)) {
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 81f24f07588..b851211e2d8 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2933,7 +2933,7 @@ if ($action == 'create') {
 				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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($object->fk_project)) {
 					$proj = new Project($db);
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index 542b37db092..9cbf579c144 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -149,7 +149,7 @@ if ($id > 0 || !empty($ref)) {
 				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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($object->fk_project)) {
 					$proj = new Project($db);
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 03012acbcaf..cff4a30f442 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -125,7 +125,7 @@ if ($object->id > 0) {
 			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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php
index 9223d47b791..9369a290c9c 100644
--- a/htdocs/fourn/facture/info.php
+++ b/htdocs/fourn/facture/info.php
@@ -91,7 +91,7 @@ if (isModEnabled('project')) {
 		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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+		$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 	} else {
 		if (!empty($object->fk_project)) {
 			$proj = new Project($db);
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index 1c61fdc8e07..c8178e39d74 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -121,7 +121,7 @@ if ($object->id > 0) {
 			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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/knowledgemanagement/knowledgerecord_card.php b/htdocs/knowledgemanagement/knowledgerecord_card.php
index 0c182d71f9e..52143048f72 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_card.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_card.php
@@ -393,7 +393,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 //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->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 0, 1, '', 'maxwidth300');
 	 $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().'">';
@@ -401,7 +401,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 $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);
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 	 }
 	 } else {
 	 if (!empty($object->fk_project)) {
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 0f19f994c70..c02dfaacda0 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -441,7 +441,7 @@ if ($id > 0) {
 					$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);
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 				}
 			} else {
 				if (!empty($object->fk_project)) {
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index c809711005f..04a72545738 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -119,7 +119,7 @@ if ($object->id) {
 				$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);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		} else {
 			if (!empty($object->fk_project)) {
diff --git a/htdocs/loan/info.php b/htdocs/loan/info.php
index 188a61c61e6..2156b889197 100644
--- a/htdocs/loan/info.php
+++ b/htdocs/loan/info.php
@@ -83,7 +83,7 @@ if (isModEnabled('project')) {
 			$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);
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 		}
 	} else {
 		if (!empty($object->fk_project)) {
diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php
index 2f2ee7021eb..b3ae1a0d8de 100644
--- a/htdocs/loan/note.php
+++ b/htdocs/loan/note.php
@@ -108,7 +108,7 @@ if ($id > 0) {
 				$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);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		} else {
 			if (!empty($object->fk_project)) {
diff --git a/htdocs/loan/schedule.php b/htdocs/loan/schedule.php
index 8887c82ef42..fc91fc2f86d 100644
--- a/htdocs/loan/schedule.php
+++ b/htdocs/loan/schedule.php
@@ -165,7 +165,7 @@ if (!empty($conf->project->enabled)) {
 				$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);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		}
 	} else {
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index a91e93e6b51..6bb89d1aaf7 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -405,7 +405,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($object->fk_project)) {
 					$proj = new Project($db);
diff --git a/htdocs/mrp/mo_agenda.php b/htdocs/mrp/mo_agenda.php
index 35e905cc2b5..12423ba93eb 100644
--- a/htdocs/mrp/mo_agenda.php
+++ b/htdocs/mrp/mo_agenda.php
@@ -168,7 +168,7 @@ if ($object->id > 0) {
 			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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index b1d12be0c8d..b3a4b3aced8 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -501,7 +501,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/mrp/mo_document.php b/htdocs/mrp/mo_document.php
index 2f213b6b825..1555bd22188 100644
--- a/htdocs/mrp/mo_document.php
+++ b/htdocs/mrp/mo_document.php
@@ -146,7 +146,7 @@ if ($object->id) {
 			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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php
index 84c359cfc25..c0357aa5e4b 100644
--- a/htdocs/mrp/mo_movements.php
+++ b/htdocs/mrp/mo_movements.php
@@ -343,7 +343,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/mrp/mo_note.php b/htdocs/mrp/mo_note.php
index 03a6fa7b487..06bab1d196c 100644
--- a/htdocs/mrp/mo_note.php
+++ b/htdocs/mrp/mo_note.php
@@ -122,7 +122,7 @@ if ($id > 0 || !empty($ref)) {
 			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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index c23f51c58cb..9e0e76db326 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -541,7 +541,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index ae4f44b968c..2cb57ee44aa 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -417,7 +417,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 //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->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 0, 1, '', 'maxwidth300');
 	 $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().'">';
@@ -425,7 +425,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 $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);
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 	 }
 	 } else {
 	 if (!empty($object->fk_project)) {
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index fb9803dd23b..874c1918de2 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -324,7 +324,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			{
 				$morehtmlref .= '<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				if ($action == 'classify') {
-					//$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					//$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 0, 1, '', 'maxwidth300');
 					$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().'">';
@@ -332,7 +332,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					$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);
+					$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 				}
 			}
 		} else {
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 81fcb2db701..bc69da4ffc4 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -453,7 +453,7 @@ if ($action == 'create') {
 						$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 						$morehtmlref .= '</form>';
 					} else {
-						$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, ($socid > 0 ? $socid : -1), $object->fk_project, 'none', 0, 0, 0, 1);
+						$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, ($socid > 0 ? $socid : -1), $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 					}
 				} else {
 					if (!empty($object->fk_project)) {
diff --git a/htdocs/product/stock/info.php b/htdocs/product/stock/info.php
index b47706df401..29965516498 100644
--- a/htdocs/product/stock/info.php
+++ b/htdocs/product/stock/info.php
@@ -76,7 +76,7 @@ if (!empty($conf->project->enabled)) {
 			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			$morehtmlref .= '</form>';
 		} else {
-			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!empty($object->socid) ? $object->socid : 0), $object->fk_project, 'none', 0, 0, 0, 1);
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!empty($object->socid) ? $object->socid : 0), $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 		}
 	} else {
 		if (!empty($object->fk_project)) {
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index c6a3727557b..c0b055352c0 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -796,7 +796,7 @@ if ($object->id > 0) {
 				$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);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		} else {
 			if (!empty($object->fk_project)) {
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_contact.php b/htdocs/product/stock/stocktransfer/stocktransfer_contact.php
index 6c0ef97fe28..045af2dd42a 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_contact.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_contact.php
@@ -151,7 +151,7 @@ if ($object->id > 0) {
 				$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);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		} else {
 			if (!empty($object->fk_project)) {
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 3e99bc1194c..37de354e071 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -1394,7 +1394,7 @@ if ($action == 'create') {
 				if ($action != 'classify' && $permissiontoadd) {
 					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 				}
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($objectsrc) && !empty($objectsrc->fk_project)) {
 					$proj = new Project($db);
diff --git a/htdocs/reception/contact.php b/htdocs/reception/contact.php
index a03460b1e49..02cbc9af957 100644
--- a/htdocs/reception/contact.php
+++ b/htdocs/reception/contact.php
@@ -172,7 +172,7 @@ if ($id > 0 || !empty($ref)) {
 			if ($action != 'classify' && $permissiontoadd) {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 			}
-			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($objectsrc) && !empty($objectsrc->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/reception/document.php b/htdocs/reception/document.php
index 980b5e50a33..dbb435b15dd 100644
--- a/htdocs/reception/document.php
+++ b/htdocs/reception/document.php
@@ -163,7 +163,7 @@ if ($id > 0 || !empty($ref)) {
 				if ($action != 'classify' && $permissiontoadd) {
 					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 				}
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($objectsrc) && !empty($objectsrc->fk_project)) {
 					$proj = new Project($db);
diff --git a/htdocs/reception/note.php b/htdocs/reception/note.php
index d916099b872..6546e839d03 100644
--- a/htdocs/reception/note.php
+++ b/htdocs/reception/note.php
@@ -143,7 +143,7 @@ if ($id > 0 || !empty($ref)) {
 			if ($action != 'classify' && $permissiontoadd) {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 			}
-			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($objectsrc) && !empty($objectsrc->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/recruitment/recruitmentcandidature_agenda.php b/htdocs/recruitment/recruitmentcandidature_agenda.php
index 3648b8ca13b..be38cd061cb 100644
--- a/htdocs/recruitment/recruitmentcandidature_agenda.php
+++ b/htdocs/recruitment/recruitmentcandidature_agenda.php
@@ -170,7 +170,7 @@ if ($object->id > 0) {
 				$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);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		} else {
 			if (!empty($object->fk_project)) {
diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php
index 2452c9e530b..eaabeee597b 100644
--- a/htdocs/recruitment/recruitmentcandidature_card.php
+++ b/htdocs/recruitment/recruitmentcandidature_card.php
@@ -442,7 +442,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 //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->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 0, 1, '', 'maxwidth300');
 	 $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().'">';
@@ -450,7 +450,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 $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);
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 	 }
 	 } else {
 	 if (!empty($object->fk_project)) {
diff --git a/htdocs/recruitment/recruitmentcandidature_document.php b/htdocs/recruitment/recruitmentcandidature_document.php
index 3f08c770111..282a3e36309 100644
--- a/htdocs/recruitment/recruitmentcandidature_document.php
+++ b/htdocs/recruitment/recruitmentcandidature_document.php
@@ -147,7 +147,7 @@ if ($object->id) {
 				$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);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		} else {
 			if (!empty($object->fk_project)) {
diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php
index 9b860ac54d5..da65c554e5f 100644
--- a/htdocs/recruitment/recruitmentcandidature_list.php
+++ b/htdocs/recruitment/recruitmentcandidature_list.php
@@ -438,7 +438,7 @@ if ($jobposition->id > 0 && (empty($action) || ($action != 'edit' && $action !=
 				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 				$morehtmlref .= '</form>';
 			} else {
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, !empty($object->socid) ? $object->socid : 0, $object->fk_project, 'none', 0, 0, 0, 1);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, !empty($object->socid) ? $object->socid : 0, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		} else {
 			if (!empty($object->fk_project)) {
diff --git a/htdocs/recruitment/recruitmentcandidature_note.php b/htdocs/recruitment/recruitmentcandidature_note.php
index 1649ab5ee5e..51fbc1ae0f8 100644
--- a/htdocs/recruitment/recruitmentcandidature_note.php
+++ b/htdocs/recruitment/recruitmentcandidature_note.php
@@ -122,7 +122,7 @@ if ($id > 0 || !empty($ref)) {
 				$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);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		} else {
 			if (!empty($object->fk_project)) {
diff --git a/htdocs/recruitment/recruitmentjobposition_agenda.php b/htdocs/recruitment/recruitmentjobposition_agenda.php
index fab164dcd2f..060fee7ed24 100644
--- a/htdocs/recruitment/recruitmentjobposition_agenda.php
+++ b/htdocs/recruitment/recruitmentjobposition_agenda.php
@@ -168,7 +168,7 @@ if ($object->id > 0) {
 				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 				$morehtmlref .= '</form>';
 			} else {
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, 0, $object->fk_project, 'none', 0, 0, 0, 1);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, 0, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		} else {
 			if (!empty($object->fk_project)) {
diff --git a/htdocs/recruitment/recruitmentjobposition_applications.php b/htdocs/recruitment/recruitmentjobposition_applications.php
index 3cdca44c93e..0447ace7979 100644
--- a/htdocs/recruitment/recruitmentjobposition_applications.php
+++ b/htdocs/recruitment/recruitmentjobposition_applications.php
@@ -239,7 +239,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				$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);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		} else {
 			if (!empty($object->fk_project)) {
diff --git a/htdocs/recruitment/recruitmentjobposition_card.php b/htdocs/recruitment/recruitmentjobposition_card.php
index 34365e05792..b19bd5787ba 100644
--- a/htdocs/recruitment/recruitmentjobposition_card.php
+++ b/htdocs/recruitment/recruitmentjobposition_card.php
@@ -341,7 +341,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 				$morehtmlref .= '</form>';
 			} else {
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, !empty($object->socid) ? $object->socid : 0, $object->fk_project, 'none', 0, 0, 0, 1);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, !empty($object->socid) ? $object->socid : 0, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		} else {
 			if (!empty($object->fk_project)) {
diff --git a/htdocs/recruitment/recruitmentjobposition_document.php b/htdocs/recruitment/recruitmentjobposition_document.php
index a162f4c3af7..55c8785073a 100644
--- a/htdocs/recruitment/recruitmentjobposition_document.php
+++ b/htdocs/recruitment/recruitmentjobposition_document.php
@@ -148,7 +148,7 @@ if ($object->id) {
 				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 				$morehtmlref .= '</form>';
 			} else {
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, !empty($object->socid) ? $object->socid : 0, $object->fk_project, 'none', 0, 0, 0, 1);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, !empty($object->socid) ? $object->socid : 0, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		} else {
 			if (!empty($object->fk_project)) {
diff --git a/htdocs/recruitment/recruitmentjobposition_note.php b/htdocs/recruitment/recruitmentjobposition_note.php
index 5dc4004a361..d4eb1f05615 100644
--- a/htdocs/recruitment/recruitmentjobposition_note.php
+++ b/htdocs/recruitment/recruitmentjobposition_note.php
@@ -125,7 +125,7 @@ if ($id > 0 || !empty($ref)) {
 				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 				$morehtmlref .= '</form>';
 			} else {
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, !empty($object->socid) ? $object->socid : 0, $object->fk_project, 'none', 0, 0, 0, 1);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, !empty($object->socid) ? $object->socid : 0, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		} else {
 			if (!empty($object->fk_project)) {
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index eedfcc06245..f69b82727f0 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -372,7 +372,7 @@ if (!$ret) {
 					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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 				} else {
 					if (!empty($object->fk_project)) {
 						$proj = new Project($db);
@@ -555,7 +555,7 @@ if (!$ret) {
 						$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 						$morehtmlref .= '</form>';
 					} else {
-						$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$fichinter->id, $fichinter->socid, $fichinter->fk_project, 'none', 0, 0, 0, 1);
+						$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$fichinter->id, $fichinter->socid, $fichinter->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 					}
 				} else {
 					if (!empty($fichinter->fk_project)) {
diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index 86a72c08053..f3ab3e1f908 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -809,7 +809,7 @@ if ($id > 0) {
 			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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/salaries/document.php b/htdocs/salaries/document.php
index 2ce7b2e2745..c90069ef8bf 100644
--- a/htdocs/salaries/document.php
+++ b/htdocs/salaries/document.php
@@ -191,7 +191,7 @@ if ($object->id) {
 			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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/salaries/info.php b/htdocs/salaries/info.php
index 1085b1175cf..356900456af 100644
--- a/htdocs/salaries/info.php
+++ b/htdocs/salaries/info.php
@@ -156,7 +156,7 @@ if (isModEnabled('project')) {
 		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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+		$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 	} else {
 		if (!empty($object->fk_project)) {
 			$proj = new Project($db);
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index c9dc776c9c5..7fc0912a815 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1602,7 +1602,7 @@ if ($action == 'create') {
 			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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/supplier_proposal/contact.php b/htdocs/supplier_proposal/contact.php
index 8db19cfb2a7..04d4e03b052 100644
--- a/htdocs/supplier_proposal/contact.php
+++ b/htdocs/supplier_proposal/contact.php
@@ -145,7 +145,7 @@ if ($id > 0 || !empty($ref)) {
 				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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($object->fk_project)) {
 					$proj = new Project($db);
diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php
index c1829fd61d6..dbd58b49921 100644
--- a/htdocs/supplier_proposal/document.php
+++ b/htdocs/supplier_proposal/document.php
@@ -131,7 +131,7 @@ if ($object->id > 0) {
 			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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/supplier_proposal/info.php b/htdocs/supplier_proposal/info.php
index 0b2af861163..23f00961b22 100644
--- a/htdocs/supplier_proposal/info.php
+++ b/htdocs/supplier_proposal/info.php
@@ -82,7 +82,7 @@ if (!empty($conf->project->enabled)) {
 		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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+		$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 	} else {
 		if (!empty($object->fk_project)) {
 			$proj = new Project($db);
diff --git a/htdocs/supplier_proposal/note.php b/htdocs/supplier_proposal/note.php
index aa0ccc5276a..2f514b95d31 100644
--- a/htdocs/supplier_proposal/note.php
+++ b/htdocs/supplier_proposal/note.php
@@ -116,7 +116,7 @@ if ($id > 0 || !empty($ref)) {
 					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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 				} else {
 					if (!empty($object->fk_project)) {
 						$proj = new Project($db);
diff --git a/htdocs/ticket/agenda.php b/htdocs/ticket/agenda.php
index 9111faedcb7..b8c5cb8ccae 100644
--- a/htdocs/ticket/agenda.php
+++ b/htdocs/ticket/agenda.php
@@ -200,7 +200,7 @@ if (isModEnabled('project')) {
 		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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+		$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 	} else {
 		if (!empty($object->fk_project)) {
 			$morehtmlref .= '<br>';
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index aecb699864d..25816e13686 100755
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -972,7 +972,7 @@ if ($action == 'create' || $action == 'presend') {
 				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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($object->fk_project)) {
 					$object->fetch_project();
diff --git a/htdocs/ticket/contact.php b/htdocs/ticket/contact.php
index 7f5a36faf1b..b5453ed638b 100644
--- a/htdocs/ticket/contact.php
+++ b/htdocs/ticket/contact.php
@@ -234,7 +234,7 @@ if ($id > 0 || !empty($track_id) || !empty($ref)) {
 				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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($object->fk_project)) {
 					$morehtmlref .= '<br>';
diff --git a/htdocs/ticket/document.php b/htdocs/ticket/document.php
index 8015cb32145..1c7a25323e2 100644
--- a/htdocs/ticket/document.php
+++ b/htdocs/ticket/document.php
@@ -169,7 +169,7 @@ if ($object->id) {
 			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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$morehtmlref .= '<br>';
diff --git a/htdocs/ticket/messaging.php b/htdocs/ticket/messaging.php
index bd06bd32e94..4ab9e3f66d1 100644
--- a/htdocs/ticket/messaging.php
+++ b/htdocs/ticket/messaging.php
@@ -197,7 +197,7 @@ if (isModEnabled('project')) {
 		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 .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, ($action == 'classify' ? 1 : 0), 0, 1, '');
+		$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 	} else {
 		if (!empty($object->fk_project)) {
 			$proj = new Project($db);
diff --git a/htdocs/webhook/target_card.php b/htdocs/webhook/target_card.php
index 83f2008703f..bf0afee45b8 100644
--- a/htdocs/webhook/target_card.php
+++ b/htdocs/webhook/target_card.php
@@ -345,7 +345,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 //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->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 0, 1, '', 'maxwidth300');
 	 $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().'">';
@@ -353,7 +353,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 $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);
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 	 }
 	 } else {
 	 if (!empty($object->fk_project)) {
diff --git a/htdocs/workstation/workstation_card.php b/htdocs/workstation/workstation_card.php
index 87ee470dce7..0e16293bd11 100644
--- a/htdocs/workstation/workstation_card.php
+++ b/htdocs/workstation/workstation_card.php
@@ -350,7 +350,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 //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->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 0, 1, '', 'maxwidth300');
 	 $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().'">';
@@ -358,7 +358,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 $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);
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 	 }
 	 } else {
 	 if (! empty($object->fk_project)) {

From 28e5c3c7e4de01b02bc74ccd8de33c635231530f Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Tue, 17 Jan 2023 14:39:47 +0100
Subject: [PATCH 627/816] kanban view for list of knowledge records

---
 .../class/knowledgerecord.class.php           |  36 +++
 .../knowledgerecord_list.php                  | 243 ++++++++++--------
 2 files changed, 168 insertions(+), 111 deletions(-)

diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index bf2bf38bbef..6dde2c42c19 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -1066,6 +1066,42 @@ class KnowledgeRecord extends CommonObject
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		return parent::setCategoriesCommon($categories, Categorie::TYPE_KNOWLEDGEMANAGEMENT);
 	}
+
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $langs, $selected,$arrayofselected;
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
+		if (in_array($this->id, $arrayofselected)) {
+			$selected = 1;
+		}
+		$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		if (property_exists($this, 'question')) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans('Question').'</span> : <span class="info-box-label">'.$this->question.'</span>';
+		}
+		if (property_exists($this, 'lang') && !empty($this->lang)) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("Language").'</span> : <span class="info-box-label" title="'.$langs->trans("Language_".$this->lang).'">'.$langs->trans("Language_".$this->lang, '', '', '', '', 12).'</span>';
+			$return .=  picto_from_langcode($this->lang, 'class="paddingrightonly saturatemedium opacitylow"');
+		}
+		if (method_exists($this, 'getLibStatut')) {
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
 
 
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index dffd3d63d7b..1c3fce89841 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -447,8 +447,12 @@ print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
 
-$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/knowledgemanagement/knowledgerecord_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
+$newcardbutton = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/knowledgemanagement/knowledgerecord_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -636,131 +640,148 @@ while ($i < $imaxinloop) {
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
 
-	// Show here line of result
-	$j = 0;
-	print '<tr data-rowid="'.$object->id.'" class="oddeven">';
-	// Action column
-	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
-		print '<td class="nowrap center">';
-		if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($object->id, $arrayofselected)) {
-				$selected = 1;
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr><td colspan="'.$savnbfield.'">';
+			print '<div class="box-flex-container">';
+		}
+		// Output Kanban
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			if ($massactionbutton || $massaction) {
+				$selected = 0;
 			}
-			print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+			print $object->getKanbanView('');
 		}
-		print '</td>';
-	}
-	foreach ($object->fields as $key => $val) {
-		$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
-		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'center';
-		} elseif ($key == 'status') {
-			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+		if ($i == ($imaxinloop - 1)) {
+			print '</div>';
+			print '</td></tr>';
 		}
-
-		if (in_array($val['type'], array('timestamp'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-		} elseif ($key == 'ref') {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-		}
-
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'right';
-		}
-		//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
-		if (!empty($arrayfields['t.'.$key]['checked'])) {
-			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '');
-			if (preg_match('/tdoverflow/', $cssforfield)) {
-				print ' title="'.dol_escape_htmltag($object->$key).'"';
-			}
-			print '>';
-			if ($key == 'status') {
-				print $object->getLibStatut(5);
-			} elseif ($key == 'rowid') {
-				print $object->showOutputField($val, $key, $object->id, '');
-			} elseif ($key == 'fk_user_creat') {
-				if ($object->fk_user_creat > 0) {
-					if (isset($conf->cache['user'][$object->fk_user_creat])) {
-						$user_temp = $conf->cache['user'][$object->fk_user_creat];
-					} else {
-						$user_temp = new User($db);
-						$user_temp->fetch($object->fk_user_creat);
-						$conf->cache['user'][$object->fk_user_creat] = $user_temp;
-					}
-					print $user_temp->getNomUrl(-1);
+	} else {
+		// Show here line of result
+		$j = 0;
+		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
+		// Action column
+		if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($object->id, $arrayofselected)) {
+					$selected = 1;
 				}
-			} elseif ($key == 'fk_user_modif') {
-				if ($object->fk_user_modif > 0) {
-					if (isset($conf->cache['user'][$object->fk_user_modif])) {
-						$user_temp = $conf->cache['user'][$object->fk_user_modif];
-					} else {
-						$user_temp = new User($db);
-						$user_temp->fetch($object->fk_user_modif);
-						$conf->cache['user'][$object->fk_user_modif] = $user_temp;
-					}
-					print $user_temp->getNomUrl(-1);
-				}
-			} elseif ($key == 'fk_user_valid') {
-				if ($object->fk_user_valid > 0) {
-					if (isset($conf->cache['user'][$object->fk_user_valid])) {
-						$user_temp = $conf->cache['user'][$object->fk_user_valid];
-					} else {
-						$user_temp = new User($db);
-						$user_temp->fetch($object->fk_user_valid);
-						$conf->cache['user'][$object->fk_user_valid] = $user_temp;
-					}
-					print $user_temp->getNomUrl(-1);
-				}
-			} elseif ($key == 'lang') {
-				$labellang = ($object->lang ? $langs->trans('Language_'.$object->lang) : '');
-				print picto_from_langcode($object->lang, 'class="paddingrightonly saturatemedium opacitylow"');
-				print $labellang;
-			} else {
-				print $object->showOutputField($val, $key, $object->$key, '');
+				print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
 			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
+		}
+		foreach ($object->fields as $key => $val) {
+			$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
+			if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'center';
+			} elseif ($key == 'status') {
+				$cssforfield .= ($cssforfield ? ' ' : '').'center';
 			}
-			if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
+
+			if (in_array($val['type'], array('timestamp'))) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+			} elseif ($key == 'ref') {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+			}
+
+			if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'right';
+			}
+			//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
+			if (!empty($arrayfields['t.'.$key]['checked'])) {
+				print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '');
+				if (preg_match('/tdoverflow/', $cssforfield)) {
+					print ' title="'.dol_escape_htmltag($object->$key).'"';
+				}
+				print '>';
+				if ($key == 'status') {
+					print $object->getLibStatut(5);
+				} elseif ($key == 'rowid') {
+					print $object->showOutputField($val, $key, $object->id, '');
+				} elseif ($key == 'fk_user_creat') {
+					if ($object->fk_user_creat > 0) {
+						if (isset($conf->cache['user'][$object->fk_user_creat])) {
+							$user_temp = $conf->cache['user'][$object->fk_user_creat];
+						} else {
+							$user_temp = new User($db);
+							$user_temp->fetch($object->fk_user_creat);
+							$conf->cache['user'][$object->fk_user_creat] = $user_temp;
+						}
+						print $user_temp->getNomUrl(-1);
+					}
+				} elseif ($key == 'fk_user_modif') {
+					if ($object->fk_user_modif > 0) {
+						if (isset($conf->cache['user'][$object->fk_user_modif])) {
+							$user_temp = $conf->cache['user'][$object->fk_user_modif];
+						} else {
+							$user_temp = new User($db);
+							$user_temp->fetch($object->fk_user_modif);
+							$conf->cache['user'][$object->fk_user_modif] = $user_temp;
+						}
+						print $user_temp->getNomUrl(-1);
+					}
+				} elseif ($key == 'fk_user_valid') {
+					if ($object->fk_user_valid > 0) {
+						if (isset($conf->cache['user'][$object->fk_user_valid])) {
+							$user_temp = $conf->cache['user'][$object->fk_user_valid];
+						} else {
+							$user_temp = new User($db);
+							$user_temp->fetch($object->fk_user_valid);
+							$conf->cache['user'][$object->fk_user_valid] = $user_temp;
+						}
+						print $user_temp->getNomUrl(-1);
+					}
+				} elseif ($key == 'lang') {
+					$labellang = ($object->lang ? $langs->trans('Language_'.$object->lang) : '');
+					print picto_from_langcode($object->lang, 'class="paddingrightonly saturatemedium opacitylow"');
+					print $labellang;
+				} else {
+					print $object->showOutputField($val, $key, $object->$key, '');
+				}
+				print '</td>';
 				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+					$totalarray['nbfield']++;
 				}
-				if (!isset($totalarray['val'])) {
-					$totalarray['val'] = array();
+				if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
+					if (!$i) {
+						$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+					}
+					if (!isset($totalarray['val'])) {
+						$totalarray['val'] = array();
+					}
+					if (!isset($totalarray['val']['t.'.$key])) {
+						$totalarray['val']['t.'.$key] = 0;
+					}
+					$totalarray['val']['t.'.$key] += $object->$key;
 				}
-				if (!isset($totalarray['val']['t.'.$key])) {
-					$totalarray['val']['t.'.$key] = 0;
-				}
-				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
-	}
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	// Action column
-	if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
-		print '<td class="nowrap center">';
-		if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($object->id, $arrayofselected)) {
-				$selected = 1;
+		// Extra fields
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+		// Fields from hook
+		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		// Action column
+		if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($object->id, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
-			print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+			print '</td>';
+		}
+		if (!$i) {
+			$totalarray['nbfield']++;
 		}
-		print '</td>';
-	}
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
-
-	print '</tr>'."\n";
 
+		print '</tr>'."\n";
+	}
 	$i++;
 }
 

From 6083aa3e50978ccd352bae9cf9450c744c19f5c0 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Tue, 17 Jan 2023 15:19:34 +0100
Subject: [PATCH 628/816] kanban mode for list of tickets

---
 htdocs/ticket/class/ticket.class.php |  36 +++
 htdocs/ticket/list.php               | 333 +++++++++++++++------------
 2 files changed, 217 insertions(+), 152 deletions(-)

diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index e27a7a5e0c7..d390fd6f351 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -2932,6 +2932,42 @@ class Ticket extends CommonObject
 
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
+
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $langs, $selected,$arrayofselected,$obj;
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
+		if (in_array($this->id, $arrayofselected)) {
+			$selected = 1;
+		}
+		$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		if (property_exists($this, 'fk_user_assign') && !empty($this->fk_user_assign)) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("AssignedTo").'</span> : <span class="info-box-label">'.$this->fk_user_assign.'</span>';
+		}
+		if (property_exists($this, 'type_code') && !empty($this->type_code)) {
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("Type").'</span> : ';
+			$return .= $langs->getLabelFromKey($this->db, 'TicketTypeShort'.$this->type_code, 'c_ticket_type', 'code', 'label', $this->type_code);
+		}
+		if (method_exists($this, 'getLibStatut')) {
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
 
 
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 79db9e0e73e..1d2cefaf622 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -629,6 +629,9 @@ if ($projectid > 0 || $project_ref) {
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
+if (!empty($mode)) {
+	$param .= '&mode='.urlencode($mode);
+}
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 	$param .= '&contextpage='.urlencode($contextpage);
 }
@@ -740,7 +743,10 @@ $url = DOL_URL_ROOT.'/ticket/card.php?action=create'.($socid ? '&socid='.$socid
 if (!empty($socid)) {
 	$url .= '&socid='.$socid;
 }
-$newcardbutton = dolGetButtonTitle($langs->trans('NewTicket'), '', 'fa fa-plus-circle', $url, '', $user->rights->ticket->write);
+$newcardbutton = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('NewTicket'), '', 'fa fa-plus-circle', $url, '', $user->rights->ticket->write);
 
 $picto = 'ticket';
 if ($socid > 0) {
@@ -999,176 +1005,199 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	$object->setVarsFromFetchObj($obj);
 	$object->status = $object->fk_statut; // fk_statut is deprecated
 
-	// Show here line of result
-	print '<tr class="oddeven">';
-	// Action column
-	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print '<td class="nowrap center">';
-		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($obj->rowid, $arrayofselected)) {
-				$selected = 1;
-			}
-			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr><td colspan="12">';
+			print '<div class="box-flex-container">';
 		}
-		print '</td>';
-	}
-	foreach ($object->fields as $key => $val) {
-		$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
-		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'center';
-		}
-		if (in_array($val['type'], array('timestamp'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-		}
-		if (in_array($key, array('ref', 'fk_project'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowraponall';
-		}
-		if ($key == 'fk_statut' || $key == 'severity_code') {
-			$cssforfield .= ($cssforfield ? ' ' : '').'center';
-		}
-		if (!empty($arrayfields['t.'.$key]['checked'])) {
-			print '<td';
-			if ($cssforfield || (array_key_exists('css', $val) && $val['css'])) {
-				print ' class="';
+		// get infos needed from object
+		$userstatic = new User($db);
+		$userstatic->fetch($obj->fk_user_assign);
+		$object->fk_user_assign = $userstatic->getNomUrl(-1);
+		$object->type_code = $obj->type_code;
+		// Output Kanban
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			if ($massactionbutton || $massaction) {
+				$selected = 0;
 			}
-			print $cssforfield;
-			if ($cssforfield && array_key_exists('css', $val) && $val['css']) {
-				print ' ';
-			}
-			if (array_key_exists('css', $val)) {
-				print $val['css'];
-			}
-			if ($cssforfield || (array_key_exists('css', $val) && $val['css'])) {
-				print '"';
-			}
-			print '>';
-			if ($key == 'fk_statut') {
-				print $object->getLibStatut(5);
-			} elseif ($key == 'subject') {
-				$s = $obj->subject;
-				print '<span title="'.dol_escape_htmltag($s).'">';
-				print dol_escape_htmltag($s);
-				print '</span>';
-			} elseif ($key == 'type_code') {
-				$s = $langs->getLabelFromKey($db, 'TicketTypeShort'.$object->type_code, 'c_ticket_type', 'code', 'label', $object->type_code);
-				print '<span title="'.dol_escape_htmltag($s).'">';
-				print $s;
-				print '</span>';
-			} elseif ($key == 'category_code') {
-				$s = $langs->getLabelFromKey($db, 'TicketCategoryShort'.$object->category_code, 'c_ticket_category', 'code', 'label', $object->category_code);
-				print '<span title="'.dol_escape_htmltag($s).'">';
-				print $s;
-				print '</span>';
-			} elseif ($key == 'severity_code') {
-				$s = $langs->getLabelFromKey($db, 'TicketSeverityShort'.$object->severity_code, 'c_ticket_severity', 'code', 'label', $object->severity_code);
-				print '<span title="'.dol_escape_htmltag($s).'">';
-				print $s;
-				print '</span>';
-			} elseif ($key == 'tms') {
-				print dol_print_date($db->jdate($obj->$key), 'dayhour', 'tzuser');
-			} elseif ($key == 'fk_user_create') {
-				if ($object->fk_user_create > 0) {
-					if (isset($conf->cache['user'][$object->fk_user_create])) {
-						$user_temp = $conf->cache['user'][$object->fk_user_create];
-					} else {
-						$user_temp = new User($db);
-						$user_temp->fetch($object->fk_user_create);
-						$conf->cache['user'][$object->fk_user_create] = $user_temp;
-					}
-					print $user_temp->getNomUrl(-1);
+			print $object->getKanbanView('');
+		}
+		if ($i == (min($num, $limit) - 1)) {
+			print '</div>';
+			print '</td></tr>';
+		}
+	} else {
+		// Show here line of result
+		print '<tr class="oddeven">';
+		// Action column
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($obj->rowid, $arrayofselected)) {
+					$selected = 1;
 				}
-			} elseif ($key == 'fk_user_assign') {
-				if ($object->fk_user_assign > 0) {
-					if (isset($conf->cache['user'][$object->fk_user_assign])) {
-						$user_temp = $conf->cache['user'][$object->fk_user_assign];
-					} else {
-						$user_temp = new User($db);
-						$user_temp->fetch($object->fk_user_assign);
-						$conf->cache['user'][$object->fk_user_assign] = $user_temp;
-					}
-					print $user_temp->getNomUrl(-1);
+				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+		}
+		foreach ($object->fields as $key => $val) {
+			$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
+			if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'center';
+			}
+			if (in_array($val['type'], array('timestamp'))) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+			}
+			if (in_array($key, array('ref', 'fk_project'))) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowraponall';
+			}
+			if ($key == 'fk_statut' || $key == 'severity_code') {
+				$cssforfield .= ($cssforfield ? ' ' : '').'center';
+			}
+			if (!empty($arrayfields['t.'.$key]['checked'])) {
+				print '<td';
+				if ($cssforfield || (array_key_exists('css', $val) && $val['css'])) {
+					print ' class="';
 				}
-			} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
-				print $object->showOutputField($val, $key, $db->jdate($obj->$key), '');
-			} elseif ($key == 'ref') {
-				print $object->showOutputField($val, $key, $obj->$key, '');
-
-				// display a warning on untreated tickets
-				$is_open = ($object->status != Ticket::STATUS_CLOSED && $object->status != Ticket::STATUS_CANCELED );
-				$should_show_warning = (!empty($conf->global->TICKET_DELAY_SINCE_LAST_RESPONSE) || !empty($conf->global->TICKET_DELAY_BEFORE_FIRST_RESPONSE));
-				if ($is_open && $should_show_warning) {
-					$date_last_msg_sent = (int) $object->date_last_msg_sent;
-					$hour_diff = ($now - $date_last_msg_sent) / 3600 ;
-
-					if (!empty($conf->global->TICKET_DELAY_BEFORE_FIRST_RESPONSE && $date_last_msg_sent == 0)) {
-						$creation_date =  $object->datec;
-						$hour_diff_creation = ($now - $creation_date) / 3600 ;
-						if ($hour_diff_creation > $conf->global->TICKET_DELAY_BEFORE_FIRST_RESPONSE) {
-							print " " . img_picto($langs->trans('Late') . ' : ' . $langs->trans('TicketsDelayForFirstResponseTooLong', $conf->global->TICKET_DELAY_BEFORE_FIRST_RESPONSE), 'warning', 'style="color: red;"', false, 0, 0, '', '');
+				print $cssforfield;
+				if ($cssforfield && array_key_exists('css', $val) && $val['css']) {
+					print ' ';
+				}
+				if (array_key_exists('css', $val)) {
+					print $val['css'];
+				}
+				if ($cssforfield || (array_key_exists('css', $val) && $val['css'])) {
+					print '"';
+				}
+				print '>';
+				if ($key == 'fk_statut') {
+					print $object->getLibStatut(5);
+				} elseif ($key == 'subject') {
+					$s = $obj->subject;
+					print '<span title="'.dol_escape_htmltag($s).'">';
+					print dol_escape_htmltag($s);
+					print '</span>';
+				} elseif ($key == 'type_code') {
+					$s = $langs->getLabelFromKey($db, 'TicketTypeShort'.$object->type_code, 'c_ticket_type', 'code', 'label', $object->type_code);
+					print '<span title="'.dol_escape_htmltag($s).'">';
+					print $s;
+					print '</span>';
+				} elseif ($key == 'category_code') {
+					$s = $langs->getLabelFromKey($db, 'TicketCategoryShort'.$object->category_code, 'c_ticket_category', 'code', 'label', $object->category_code);
+					print '<span title="'.dol_escape_htmltag($s).'">';
+					print $s;
+					print '</span>';
+				} elseif ($key == 'severity_code') {
+					$s = $langs->getLabelFromKey($db, 'TicketSeverityShort'.$object->severity_code, 'c_ticket_severity', 'code', 'label', $object->severity_code);
+					print '<span title="'.dol_escape_htmltag($s).'">';
+					print $s;
+					print '</span>';
+				} elseif ($key == 'tms') {
+					print dol_print_date($db->jdate($obj->$key), 'dayhour', 'tzuser');
+				} elseif ($key == 'fk_user_create') {
+					if ($object->fk_user_create > 0) {
+						if (isset($conf->cache['user'][$object->fk_user_create])) {
+							$user_temp = $conf->cache['user'][$object->fk_user_create];
+						} else {
+							$user_temp = new User($db);
+							$user_temp->fetch($object->fk_user_create);
+							$conf->cache['user'][$object->fk_user_create] = $user_temp;
 						}
-					} elseif (!empty($conf->global->TICKET_DELAY_SINCE_LAST_RESPONSE) && $hour_diff > $conf->global->TICKET_DELAY_SINCE_LAST_RESPONSE) {
-						print " " . img_picto($langs->trans('Late') . ' : ' . $langs->trans('TicketsDelayFromLastResponseTooLong', $conf->global->TICKET_DELAY_SINCE_LAST_RESPONSE), 'warning');
+						print $user_temp->getNomUrl(-1);
 					}
-				}
-			} else {	// Example: key=fk_soc, obj->key=123 val=array('type'=>'integer', ...
-				$tmp = explode(':', $val['type']);
-				if ($tmp[0] == 'integer' && !empty($tmp[1]) && class_exists($tmp[1])) {
-					// It is a type of an foreign field. We will try to reduce the number of fetch that the showOutputField is making.
-					//var_dump('eeee-'.$key.'-'.$obj->$key.'-'.$val['type']);
-					if ($key && $obj->$key && $val['type'] && array_key_exists($key.'-'.$obj->$key.'-'.$val['type'], $cacheofoutputfield)) {
-						$result = $cacheofoutputfield[$key.'-'.$obj->$key.'-'.$val['type']];
+				} elseif ($key == 'fk_user_assign') {
+					if ($object->fk_user_assign > 0) {
+						if (isset($conf->cache['user'][$object->fk_user_assign])) {
+							$user_temp = $conf->cache['user'][$object->fk_user_assign];
+						} else {
+							$user_temp = new User($db);
+							$user_temp->fetch($object->fk_user_assign);
+							$conf->cache['user'][$object->fk_user_assign] = $user_temp;
+						}
+						print $user_temp->getNomUrl(-1);
+					}
+				} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+					print $object->showOutputField($val, $key, $db->jdate($obj->$key), '');
+				} elseif ($key == 'ref') {
+					print $object->showOutputField($val, $key, $obj->$key, '');
+
+					// display a warning on untreated tickets
+					$is_open = ($object->status != Ticket::STATUS_CLOSED && $object->status != Ticket::STATUS_CANCELED );
+					$should_show_warning = (!empty($conf->global->TICKET_DELAY_SINCE_LAST_RESPONSE) || !empty($conf->global->TICKET_DELAY_BEFORE_FIRST_RESPONSE));
+					if ($is_open && $should_show_warning) {
+						$date_last_msg_sent = (int) $object->date_last_msg_sent;
+						$hour_diff = ($now - $date_last_msg_sent) / 3600 ;
+
+						if (!empty($conf->global->TICKET_DELAY_BEFORE_FIRST_RESPONSE && $date_last_msg_sent == 0)) {
+							$creation_date =  $object->datec;
+							$hour_diff_creation = ($now - $creation_date) / 3600 ;
+							if ($hour_diff_creation > $conf->global->TICKET_DELAY_BEFORE_FIRST_RESPONSE) {
+								print " " . img_picto($langs->trans('Late') . ' : ' . $langs->trans('TicketsDelayForFirstResponseTooLong', $conf->global->TICKET_DELAY_BEFORE_FIRST_RESPONSE), 'warning', 'style="color: red;"', false, 0, 0, '', '');
+							}
+						} elseif (!empty($conf->global->TICKET_DELAY_SINCE_LAST_RESPONSE) && $hour_diff > $conf->global->TICKET_DELAY_SINCE_LAST_RESPONSE) {
+							print " " . img_picto($langs->trans('Late') . ' : ' . $langs->trans('TicketsDelayFromLastResponseTooLong', $conf->global->TICKET_DELAY_SINCE_LAST_RESPONSE), 'warning');
+						}
+					}
+				} else {	// Example: key=fk_soc, obj->key=123 val=array('type'=>'integer', ...
+					$tmp = explode(':', $val['type']);
+					if ($tmp[0] == 'integer' && !empty($tmp[1]) && class_exists($tmp[1])) {
+						// It is a type of an foreign field. We will try to reduce the number of fetch that the showOutputField is making.
+						//var_dump('eeee-'.$key.'-'.$obj->$key.'-'.$val['type']);
+						if ($key && $obj->$key && $val['type'] && array_key_exists($key.'-'.$obj->$key.'-'.$val['type'], $cacheofoutputfield)) {
+							$result = $cacheofoutputfield[$key.'-'.$obj->$key.'-'.$val['type']];
+						} else {
+							$result = $object->showOutputField($val, $key, $obj->$key, '');
+							$cacheofoutputfield[$key.'-'.$obj->$key.'-'.$val['type']] = $result;
+						}
 					} else {
 						$result = $object->showOutputField($val, $key, $obj->$key, '');
-						$cacheofoutputfield[$key.'-'.$obj->$key.'-'.$val['type']] = $result;
 					}
-				} else {
-					$result = $object->showOutputField($val, $key, $obj->$key, '');
+					print $result;
 				}
-				print $result;
-			}
 
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
+				print '</td>';
 				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+					$totalarray['nbfield']++;
 				}
-				if (!isset($totalarray['val'])) {
-					$totalarray['val'] = array();
+				if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
+					if (!$i) {
+						$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+					}
+					if (!isset($totalarray['val'])) {
+						$totalarray['val'] = array();
+					}
+					if (!isset($totalarray['val']['t.'.$key])) {
+						$totalarray['val']['t.'.$key] = 0;
+					}
+					$totalarray['val']['t.'.$key] += $object->$key;
 				}
-				if (!isset($totalarray['val']['t.'.$key])) {
-					$totalarray['val']['t.'.$key] = 0;
-				}
-				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
-	}
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	// Action column
-	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print '<td class="nowrap center">';
-		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($obj->rowid, $arrayofselected)) {
-				$selected = 1;
+		// Extra fields
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+		// Fields from hook
+		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		// Action column
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($obj->rowid, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
-			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+			print '</td>';
+		}
+		if (!$i) {
+			$totalarray['nbfield']++;
 		}
-		print '</td>';
-	}
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
 
-	print '</tr>'."\n";
+		print '</tr>'."\n";
+	}
 
 	$i++;
 }

From d07934829088b350b3d46dbbef5228d25a8725e1 Mon Sep 17 00:00:00 2001
From: Quentin-Seekness <72733832+Quentin-Seekness@users.noreply.github.com>
Date: Tue, 17 Jan 2023 15:29:41 +0100
Subject: [PATCH 629/816] Update products.lang

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

diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 0a5d3f3f8ad..ed91bb7707e 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -315,7 +315,7 @@ GlobalVariableUpdaterHelpFormat1=Le format est {"URL": "http://example.com/urlof
 UpdateInterval=Intervale de mise à jour (minutes)
 LastUpdated=Dernière mise à jour
 CorrectlyUpdated=Mise à jour avec succès
-PropalMergePdfProductActualFile=Fichiers utilisés pour l'ajout au PDF Azur sont
+PropalMergePdfProductActualFile=Fichiers utilisés pour l'ajout au PDF des devis sont
 PropalMergePdfProductChooseFile=Sélectionnez les fichiers PDF
 IncludingProductWithTag=Comprenant des produits/services avec le tag/catégorie
 DefaultPriceRealPriceMayDependOnCustomer=Prix ​​par défaut, le prix réel peut dépendre du client

From 781c6ed0b87740dc587771fe3f2cb9bf7e20c8fe Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 17 Jan 2023 15:18:22 +0000
Subject: [PATCH 630/816] Fixing style errors.

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

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index d354bc2445c..dbc2be872eb 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1273,7 +1273,7 @@ function get_left_menu_thridparties($mainmenu, &$newmenu, $usemenuhider = 1, $le
 			$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->hasRight('fournisseur',  'lire') );
+			$newmenu->add("/contact/list.php?leftmenu=contacts&type=f", $langs->trans("Suppliers"), 2, $user->hasRight('fournisseur',  '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'));

From 0d134f62aced0c610faf61d0d6b42659dfc550e2 Mon Sep 17 00:00:00 2001
From: Adrien Raze <adrien.raze@atm-consulting.fr>
Date: Tue, 17 Jan 2023 17:22:32 +0100
Subject: [PATCH 631/816] FIX : Sub bom costs were not good

---
 htdocs/bom/tpl/objectline_view.tpl.php | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index b7087b27288..be12ec460ba 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -167,9 +167,14 @@ if ($filtertype != 1) {
 	}
 }
 $total_cost = 0;
+$tmpbom->calculateCosts();
 print '<td id="costline_'.$line->id.'" class="linecolcost nowrap right">';
 $coldisplay++;
-echo '<span class="amount">'.price($line->total_cost).'</span>';
+if(!empty($line->fk_bom_child)) {
+	echo '<span class="amount">'.price($tmpbom->total_cost).'</span>';
+} else {
+	echo '<span class="amount">'.price($line->total_cost).'</span>';
+}
 print '</td>';
 
 if ($this->status == 0 && ($object_rights->write) && $action != 'selectlines') {
@@ -309,15 +314,5 @@ if ($resql) {
 	}
 }
 
-// Replace of the total_cost value by the sum of all sub-BOM lines total_cost
-// TODO Remove this bad practice. We should not replace content of ouput using javascript but value should be good during generation of output.
-if ($total_cost > 0) {
-	$line->total_cost = price($total_cost);
-	?>
-	<script>
-		$('#costline_<?php echo $line->id?>').html('<?php echo "<span class=\"amount\">".price($total_cost)."</span>"; ?>');
-	</script>
-	<?php
-}
 
 print "<!-- END PHP TEMPLATE objectline_view.tpl.php -->\n";

From 947365fabfabd96a198952de5acfa24dfe5bf99d Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+BB2A-Anthony@users.noreply.github.com>
Date: Tue, 17 Jan 2023 17:48:37 +0100
Subject: [PATCH 632/816] Update list_det.php

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

diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index c05ff36e9d2..48d21abf4a3 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -140,7 +140,7 @@ if (!$sortfield) {
 	$sortfield = 'pr.ref';
 }
 if (!$sortorder) {
-	$sortorder = 'ASSC';
+	$sortorder = 'ASC';
 }
 
 $show_shippable_command = GETPOST('show_shippable_command', 'aZ09');

From e5d4ea1b7cc6184bafa1aa0ccda8ee829af0f14d Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 17 Jan 2023 18:30:06 +0100
Subject: [PATCH 633/816] FIX error with dol_banner_tab, ref is needed

---
 htdocs/contrat/agenda.php | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/htdocs/contrat/agenda.php b/htdocs/contrat/agenda.php
index d654ac38d9f..3e51e9a1de5 100644
--- a/htdocs/contrat/agenda.php
+++ b/htdocs/contrat/agenda.php
@@ -54,7 +54,11 @@ $ref		= GETPOST('ref', 'alpha');
 if ($user->socid) {
 	$socid = $user->socid;
 }
-$result = restrictedArea($user, 'contrat', $id, '');
+
+// Security check
+$fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
+$fieldtype = (!empty($id) ? 'rowid' : 'ref');
+$result = restrictedArea($user, 'contrat', $fieldvalue, '', '', '', $fieldtype);
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
@@ -73,6 +77,13 @@ if (!$sortorder) {
 	$sortorder = 'DESC,DESC';
 }
 
+
+$object = new Contrat($db);
+
+if ($id > 0 || !empty($ref)) {
+	$result = $object->fetch($id, $ref);
+}
+
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('agendacontract', 'globalcard'));
 
@@ -81,7 +92,7 @@ $hookmanager->initHooks(array('agendacontract', 'globalcard'));
  * Actions
  */
 
-$parameters = array('id'=>$id);
+$parameters = array('id' => $id, 'ref' => $ref);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -102,8 +113,6 @@ if (empty($reshook)) {
 }
 
 
-
-
 /*
  * View
  */
@@ -114,7 +123,7 @@ if (!empty($conf->projet->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
-if ($id > 0) {
+if ($object->id > 0) {
 	// Load object modContract
 	$module = (!empty($conf->global->CONTRACT_ADDON) ? $conf->global->CONTRACT_ADDON : 'mod_contract_serpis');
 	if (substr($module, 0, 13) == 'mod_contract_' && substr($module, -3) == 'php') {
@@ -128,8 +137,6 @@ if ($id > 0) {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 
-	$object = new Contrat($db);
-	$result = $object->fetch($id);
 	$object->fetch_thirdparty();
 
 	$title = $langs->trans("Agenda");
@@ -205,13 +212,13 @@ if ($id > 0) {
 	}
 	$morehtmlref .= '</div>';
 
-	dol_banner_tab($object, 'id', $linkback, 1, 'ref', 'none', $morehtmlref);
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'none', $morehtmlref);
 
 	print '<div class="fichecenter">';
 
 	print '<div class="underbanner clearboth"></div>';
 
-	$object->info($id);
+	$object->info($object->id);
 	dol_print_object_info($object, 1);
 
 	print '</div>';
@@ -254,7 +261,7 @@ if ($id > 0) {
 	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		print '<br>';
 
-		$param = '&id='.$id;
+		$param = '&id='.$object->id;
 		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 			$param .= '&contextpage='.$contextpage;
 		}

From 82cccc82f58a342b52b3ce2d33bf81fda3abf6be Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 17 Jan 2023 19:23:01 +0000
Subject: [PATCH 634/816] 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 be12ec460ba..2c18ffbd87f 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -170,7 +170,7 @@ $total_cost = 0;
 $tmpbom->calculateCosts();
 print '<td id="costline_'.$line->id.'" class="linecolcost nowrap right">';
 $coldisplay++;
-if(!empty($line->fk_bom_child)) {
+if (!empty($line->fk_bom_child)) {
 	echo '<span class="amount">'.price($tmpbom->total_cost).'</span>';
 } else {
 	echo '<span class="amount">'.price($line->total_cost).'</span>';

From 26972c55a8c9ea716b5af46bd2e1f002779c20db Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 17 Jan 2023 23:56:22 +0100
Subject: [PATCH 635/816] Fix warnings

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

diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index aca15e9d7a3..a5b5264052d 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -138,10 +138,10 @@ if (!empty($dolibarr_main_prod)) {
 }
 
 // Clean parameters
-$dolibarr_main_data_root = trim($dolibarr_main_data_root);
-$dolibarr_main_url_root = trim(preg_replace('/\/+$/', '', $dolibarr_main_url_root));
+$dolibarr_main_data_root = (empty($dolibarr_main_data_root) ? '' : trim($dolibarr_main_data_root));
+$dolibarr_main_url_root = trim(preg_replace('/\/+$/', '', empty($dolibarr_main_url_root) ? '' : $dolibarr_main_url_root));
 $dolibarr_main_url_root_alt = (empty($dolibarr_main_url_root_alt) ? '' : trim($dolibarr_main_url_root_alt));
-$dolibarr_main_document_root = trim($dolibarr_main_document_root);
+$dolibarr_main_document_root = (empty($dolibarr_main_document_root) ? '' : trim($dolibarr_main_document_root));
 $dolibarr_main_document_root_alt = (empty($dolibarr_main_document_root_alt) ? '' : trim($dolibarr_main_document_root_alt));
 
 if (empty($dolibarr_main_db_port)) {

From 708e284381f15d06da6fbf9591fc89f5ed73831a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 18 Jan 2023 00:13:21 +0100
Subject: [PATCH 636/816] Enhance backward compatibility

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

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 5876e8aff4a..2b233f3e0f6 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -794,6 +794,9 @@ class Societe extends CommonObject
 	public $partnerships = array();
 
 
+	const STATUS_CEASED = 0;
+	const STATUS_INACTIVITY = 1;
+
 
 	/**
 	 * @var Account|string Default BAN account

From 29966d8499b59a9f01562979c7f472f1ab1cd44a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9=20Courtier?= <noe.courtier@scopen.fr>
Date: Wed, 18 Jan 2023 09:29:11 +0100
Subject: [PATCH 637/816] FIX: Add missing token when deleting template inn
 order_supplier admin menu

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

diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 7cf64e4800d..5b7a9845c10 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -381,7 +381,7 @@ foreach ($dirmodels as $reldir) {
 					if (in_array($name, $def)) {
 						print '<td class="center">'."\n";
 						if ($conf->global->COMMANDE_SUPPLIER_ADDON_PDF != "$name") {
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=order_supplier">';
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=order_supplier">';
 							print img_picto($langs->trans("Enabled"), 'switch_on');
 							print '</a>';
 						} else {

From d344e108c95d29e2d6d4101148ce9fae4f37baab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9=20Courtier?= <noe.courtier@scopen.fr>
Date: Wed, 18 Jan 2023 09:44:23 +0100
Subject: [PATCH 638/816] FIX: Errors Handling for CreateFrom Hooks

---
 htdocs/comm/action/class/actioncomm.class.php              | 2 ++
 htdocs/comm/propal/card.php                                | 1 +
 htdocs/comm/propal/class/propal.class.php                  | 2 ++
 htdocs/commande/card.php                                   | 1 +
 htdocs/commande/class/commande.class.php                   | 4 ++++
 htdocs/compta/facture/class/facture.class.php              | 4 ++++
 htdocs/contrat/card.php                                    | 1 +
 htdocs/contrat/class/contrat.class.php                     | 2 ++
 htdocs/expensereport/class/expensereport.class.php         | 2 ++
 htdocs/fichinter/class/fichinter.class.php                 | 2 ++
 htdocs/fourn/class/fournisseur.commande.class.php          | 2 ++
 htdocs/fourn/commande/card.php                             | 1 +
 htdocs/supplier_proposal/card.php                          | 1 +
 htdocs/supplier_proposal/class/supplier_proposal.class.php | 2 ++
 14 files changed, 27 insertions(+)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 769bd9ddd50..8032ead20ba 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -708,6 +708,8 @@ class ActionComm extends CommonObject
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
+                    $this->errors += $hookmanager->errors;
+                    $this->error = $hookmanager->error;
 					$error++;
 				}
 			}
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index da4c756705f..ea2ab40db42 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -567,6 +567,7 @@ if (empty($reshook)) {
 							$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
 																											   // modified by hook
 							if ($reshook < 0) {
+                                setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 								$error++;
 							}
 						} else {
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index f36b8027461..6567e11cdbf 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1412,6 +1412,8 @@ class Propal extends CommonObject
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
+                    $this->errors += $hookmanager->errors;
+                    $this->error = $hookmanager->error;
 					$error++;
 				}
 			}
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index d394df997ff..b74114164b0 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -445,6 +445,7 @@ if (empty($reshook)) {
 						// Note that $action and $object may be modified by hook
 						$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action);
 						if ($reshook < 0) {
+                            setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 							$error++;
 						}
 					} else {
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 33de271b45d..bd3be625561 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1252,6 +1252,8 @@ class Commande extends CommonOrder
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
+                    $this->errors += $hookmanager->errors;
+                    $this->error = $hookmanager->error;
 					$error++;
 				}
 			}
@@ -1406,6 +1408,8 @@ class Commande extends CommonOrder
 			$action = '';
 			$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 			if ($reshook < 0) {
+                $this->errors += $hookmanager->errors;
+                $this->error = $hookmanager->error;
 				$error++;
 			}
 
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 862a86e9e16..ba5eab04d16 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1299,6 +1299,8 @@ class Facture extends CommonInvoice
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
+                    $this->errors += $hookmanager->errors;
+                    $this->error = $hookmanager->error;
 					$error++;
 				}
 			}
@@ -1432,6 +1434,8 @@ class Facture extends CommonInvoice
 			$action = '';
 			$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 			if ($reshook < 0) {
+                $this->errors += $hookmanager->errors;
+                $this->error = $hookmanager->error;
 				$error++;
 			}
 
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 624d59b0d94..2acf59593ff 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -341,6 +341,7 @@ if (empty($reshook)) {
 					$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
 					// modified by hook
 					if ($reshook < 0) {
+                        setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 						$error++;
 					}
 				} else {
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 309df80605e..3d397fcb6c1 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2564,6 +2564,8 @@ class Contrat extends CommonObject
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $clonedObj, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
+                    $this->errors += $hookmanager->errors;
+                    $this->error = $hookmanager->error;
 					$error++;
 				}
 			}
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 3f62087dd0b..fa69245dc58 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -455,6 +455,8 @@ class ExpenseReport extends CommonObject
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
+                    $this->errors += $hookmanager->errors;
+                    $this->error = $hookmanager->error;
 					$error++;
 				}
 			}
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 000b654bf72..d8e213d31e8 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -1211,6 +1211,8 @@ class Fichinter extends CommonObject
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
+                    $this->errors += $hookmanager->errors;
+                    $this->error = $hookmanager->error;
 					$error++;
 				}
 			}
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index e78dd9dd02a..c5f700dd6a7 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1654,6 +1654,8 @@ class CommandeFournisseur extends CommonOrder
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
+                    $this->errors += $hookmanager->errors;
+                    $this->error = $hookmanager->error;
 					$error++;
 				}
 			}
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 86e34ce39a1..f7e339c6c9a 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1314,6 +1314,7 @@ if (empty($reshook)) {
 							$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
 
 							if ($reshook < 0) {
+                                setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 								$error++;
 							}
 						} else {
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 4ad5fa9ff56..2f4dd6e0540 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -407,6 +407,7 @@ if (empty($reshook)) {
 							$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
 																											   // modified by hook
 							if ($reshook < 0) {
+                                setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 								$error++;
 							}
 						} else {
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 78fc1c7fd15..dc18f7dcb2b 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -1160,6 +1160,8 @@ class SupplierProposal extends CommonObject
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
+                    $this->errors += $hookmanager->errors;
+                    $this->error = $hookmanager->error;
 					$error++;
 				}
 			}

From 4ee0ede6d8e8205e9431da95463de6ef886312f6 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 18 Jan 2023 08:53:28 +0000
Subject: [PATCH 639/816] Fixing style errors.

---
 htdocs/comm/action/class/actioncomm.class.php             | 4 ++--
 htdocs/comm/propal/card.php                               | 2 +-
 htdocs/comm/propal/class/propal.class.php                 | 4 ++--
 htdocs/commande/card.php                                  | 2 +-
 htdocs/commande/class/commande.class.php                  | 8 ++++----
 htdocs/compta/facture/class/facture.class.php             | 8 ++++----
 htdocs/contrat/card.php                                   | 2 +-
 htdocs/contrat/class/contrat.class.php                    | 4 ++--
 htdocs/expensereport/class/expensereport.class.php        | 4 ++--
 htdocs/fichinter/class/fichinter.class.php                | 4 ++--
 htdocs/fourn/class/fournisseur.commande.class.php         | 4 ++--
 htdocs/fourn/commande/card.php                            | 2 +-
 htdocs/supplier_proposal/card.php                         | 2 +-
 .../supplier_proposal/class/supplier_proposal.class.php   | 4 ++--
 14 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 8032ead20ba..f5e1fe40b1f 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -708,8 +708,8 @@ class ActionComm extends CommonObject
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
-                    $this->errors += $hookmanager->errors;
-                    $this->error = $hookmanager->error;
+					$this->errors += $hookmanager->errors;
+					$this->error = $hookmanager->error;
 					$error++;
 				}
 			}
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index ea2ab40db42..e575195799c 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -567,7 +567,7 @@ if (empty($reshook)) {
 							$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
 																											   // modified by hook
 							if ($reshook < 0) {
-                                setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+								setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 								$error++;
 							}
 						} else {
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 6567e11cdbf..edd443c1b58 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1412,8 +1412,8 @@ class Propal extends CommonObject
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
-                    $this->errors += $hookmanager->errors;
-                    $this->error = $hookmanager->error;
+					$this->errors += $hookmanager->errors;
+					$this->error = $hookmanager->error;
 					$error++;
 				}
 			}
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index b74114164b0..e099aafc9ca 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -445,7 +445,7 @@ if (empty($reshook)) {
 						// Note that $action and $object may be modified by hook
 						$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action);
 						if ($reshook < 0) {
-                            setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+							setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 							$error++;
 						}
 					} else {
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index bd3be625561..c636b4e905d 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1252,8 +1252,8 @@ class Commande extends CommonOrder
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
-                    $this->errors += $hookmanager->errors;
-                    $this->error = $hookmanager->error;
+					$this->errors += $hookmanager->errors;
+					$this->error = $hookmanager->error;
 					$error++;
 				}
 			}
@@ -1408,8 +1408,8 @@ class Commande extends CommonOrder
 			$action = '';
 			$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 			if ($reshook < 0) {
-                $this->errors += $hookmanager->errors;
-                $this->error = $hookmanager->error;
+				$this->errors += $hookmanager->errors;
+				$this->error = $hookmanager->error;
 				$error++;
 			}
 
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index ba5eab04d16..2af2b35240d 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1299,8 +1299,8 @@ class Facture extends CommonInvoice
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
-                    $this->errors += $hookmanager->errors;
-                    $this->error = $hookmanager->error;
+					$this->errors += $hookmanager->errors;
+					$this->error = $hookmanager->error;
 					$error++;
 				}
 			}
@@ -1434,8 +1434,8 @@ class Facture extends CommonInvoice
 			$action = '';
 			$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 			if ($reshook < 0) {
-                $this->errors += $hookmanager->errors;
-                $this->error = $hookmanager->error;
+				$this->errors += $hookmanager->errors;
+				$this->error = $hookmanager->error;
 				$error++;
 			}
 
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 2acf59593ff..a63e8d7c6ca 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -341,7 +341,7 @@ if (empty($reshook)) {
 					$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
 					// modified by hook
 					if ($reshook < 0) {
-                        setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+						setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 						$error++;
 					}
 				} else {
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 3d397fcb6c1..f16b26646bc 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2564,8 +2564,8 @@ class Contrat extends CommonObject
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $clonedObj, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
-                    $this->errors += $hookmanager->errors;
-                    $this->error = $hookmanager->error;
+					$this->errors += $hookmanager->errors;
+					$this->error = $hookmanager->error;
 					$error++;
 				}
 			}
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index fa69245dc58..a0fe9fa8335 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -455,8 +455,8 @@ class ExpenseReport extends CommonObject
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
-                    $this->errors += $hookmanager->errors;
-                    $this->error = $hookmanager->error;
+					$this->errors += $hookmanager->errors;
+					$this->error = $hookmanager->error;
 					$error++;
 				}
 			}
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index d8e213d31e8..0205fec9e39 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -1211,8 +1211,8 @@ class Fichinter extends CommonObject
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
-                    $this->errors += $hookmanager->errors;
-                    $this->error = $hookmanager->error;
+					$this->errors += $hookmanager->errors;
+					$this->error = $hookmanager->error;
 					$error++;
 				}
 			}
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index c5f700dd6a7..112708a92b7 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1654,8 +1654,8 @@ class CommandeFournisseur extends CommonOrder
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
-                    $this->errors += $hookmanager->errors;
-                    $this->error = $hookmanager->error;
+					$this->errors += $hookmanager->errors;
+					$this->error = $hookmanager->error;
 					$error++;
 				}
 			}
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index f7e339c6c9a..a8ee29fc974 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1314,7 +1314,7 @@ if (empty($reshook)) {
 							$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
 
 							if ($reshook < 0) {
-                                setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+								setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 								$error++;
 							}
 						} else {
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 2f4dd6e0540..01f9ad5e2dd 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -407,7 +407,7 @@ if (empty($reshook)) {
 							$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
 																											   // modified by hook
 							if ($reshook < 0) {
-                                setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+								setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 								$error++;
 							}
 						} else {
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index dc18f7dcb2b..088594f6ab4 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -1160,8 +1160,8 @@ class SupplierProposal extends CommonObject
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
-                    $this->errors += $hookmanager->errors;
-                    $this->error = $hookmanager->error;
+					$this->errors += $hookmanager->errors;
+					$this->error = $hookmanager->error;
 					$error++;
 				}
 			}

From 98356222c18786336ef9c421a2ac7b39b776ae01 Mon Sep 17 00:00:00 2001
From: kkhelifa <kkhelifa@open-dsi.fr>
Date: Wed, 18 Jan 2023 10:36:52 +0100
Subject: [PATCH 640/816] NEW: Can add any contact on events if global
 MAIN_ACTIONCOM_CAN_ADD_ANY_CONTACT is set at 1

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

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 91eb9f49516..e6205cd5317 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1446,7 +1446,7 @@ if ($action == 'create') {
 		}
 		if ($origin=='contact') $preselectedids[GETPOST('originid', 'int')] = GETPOST('originid', 'int');
 		print img_picto('', 'contact', 'class="paddingrightonly"');
-		print $form->selectcontacts(GETPOST('socid', 'int'), $preselectedids, 'socpeopleassigned[]', 1, '', '', 0, 'minwidth300 quatrevingtpercent', false, 0, array(), false, 'multiple', 'contactid');
+		print $form->selectcontacts(empty($conf->global->MAIN_ACTIONCOM_CAN_ADD_ANY_CONTACT) ? GETPOST('socid', 'int') : 0, $preselectedids, 'socpeopleassigned[]', 1, '', '', 0, 'minwidth300 quatrevingtpercent', false, 0, array(), false, 'multiple', 'contactid');
 		print '</td></tr>';
 	}
 
@@ -1949,7 +1949,7 @@ if ($id > 0) {
 			// related contact
 			print '<tr><td>'.$langs->trans("ActionOnContact").'</td><td>';
 			print '<div class="maxwidth200onsmartphone">';
-			print img_picto('', 'contact', 'class="paddingrightonly"').$form->selectcontacts($object->socid, array_keys($object->socpeopleassigned), 'socpeopleassigned[]', 1, '', '', 1, 'quatrevingtpercent', false, 0, 0, array(), 'multiple', 'contactid');
+			print img_picto('', 'contact', 'class="paddingrightonly"').$form->selectcontacts(empty($conf->global->MAIN_ACTIONCOM_CAN_ADD_ANY_CONTACT) ? $object->socid : 0, array_keys($object->socpeopleassigned), 'socpeopleassigned[]', 1, '', '', 1, 'quatrevingtpercent', false, 0, 0, array(), 'multiple', 'contactid');
 			print '</div>';
 			print '</td>';
 			print '</tr>';

From cb963780312edca5445f075d516eecd6955856a7 Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Wed, 18 Jan 2023 10:48:18 +0100
Subject: [PATCH 641/816] FIX: API access for deactivated users

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

diff --git a/htdocs/api/class/api_access.class.php b/htdocs/api/class/api_access.class.php
index 5a4097b089b..09bb46ed98e 100644
--- a/htdocs/api/class/api_access.class.php
+++ b/htdocs/api/class/api_access.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2016	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2023	Ferran Marcet			<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -147,6 +148,9 @@ class DolibarrApiAccess implements iAuthenticate
 			if ($result <= 0) {
 				throw new RestException(503, 'Error when fetching user :'.$fuser->error.' (conf->entity='.$conf->entity.')');
 			}
+			if ($fuser->statut == 0) {
+				throw new RestException(503, 'Error when fetching user. This user has been locked or disabled');
+			}
 
 			$fuser->getrights();
 

From 1d50acb3cfdc083bc142d00d65c3f21808881143 Mon Sep 17 00:00:00 2001
From: GregM <gregory.maza@atm-consulting.fr>
Date: Wed, 18 Jan 2023 12:10:58 +0100
Subject: [PATCH 642/816] Fix fieldvalue emailtemplate

---
 htdocs/core/class/html.formsetup.class.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
index 1cfddb588fd..0c9adf0be59 100644
--- a/htdocs/core/class/html.formsetup.class.php
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -1069,16 +1069,18 @@ class FormSetupItem
 		} elseif ($this->type == 'yesno') {
 			$out.= ajax_constantonoff($this->confKey);
 		} elseif (preg_match('/emailtemplate:/', $this->type)) {
-			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-			$formmail = new FormMail($this->db);
+			if ($this->fieldValue > 0){
+				include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+				$formmail = new FormMail($this->db);
 
-			$tmp = explode(':', $this->type);
+				$tmp = explode(':', $this->type);
 
-			$template = $formmail->getEMailTemplate($this->db, $tmp[1], $user, $this->langs, $this->fieldValue);
-			if ($template<0) {
-				$this->setErrors($formmail->errors);
+				$template = $formmail->getEMailTemplate($this->db, $tmp[1], $user, $this->langs, $this->fieldValue);
+				if ($template<0) {
+					$this->setErrors($formmail->errors);
+				}
+				$out.= $this->langs->trans($template->label);
 			}
-			$out.= $this->langs->trans($template->label);
 		} elseif (preg_match('/category:/', $this->type)) {
 			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 			$c = new Categorie($this->db);

From 289570ffe5ddc4e5010627500a4e7b3dc7f436f4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 18 Jan 2023 12:57:18 +0100
Subject: [PATCH 643/816] Debug

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

diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 195b04a2ed5..896aecb1b8c 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -742,8 +742,8 @@ if ($object->id > 0) {
 				print '<input type="submit" class="butAction" value="'.$buttonlabel.'" />';
 				print '</form>';
 
-				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..."
+				if (!empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT_SHOW_OLD_BUTTON)) {	// This is hidden, prefer to use mode enabled with STRIPE_SEPA_DIRECT_DEBIT
+					// TODO Replace this with a checkbox for each payment mode: "Send request to XXX immediatly..."
 					print "<br>";
 					//add stripe sepa button
 					$buttonlabel = $langs->trans("MakeWithdrawRequestStripe");

From 330f2307bd850b34edcc14db2961d7ae3b894a12 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 18 Jan 2023 12:59:48 +0100
Subject: [PATCH 644/816] Fix message

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

diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 896aecb1b8c..365fa59fdcb 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -742,7 +742,7 @@ if ($object->id > 0) {
 				print '<input type="submit" class="butAction" value="'.$buttonlabel.'" />';
 				print '</form>';
 
-				if (!empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT_SHOW_OLD_BUTTON)) {	// This is hidden, prefer to use mode enabled with STRIPE_SEPA_DIRECT_DEBIT
+				if (getDolGlobalString('STRIPE_SEPA_DIRECT_DEBIT_SHOW_OLD_BUTTON')) {	// This is hidden, prefer to use mode enabled with STRIPE_SEPA_DIRECT_DEBIT
 					// TODO Replace this with a checkbox for each payment mode: "Send request to XXX immediatly..."
 					print "<br>";
 					//add stripe sepa button
@@ -781,14 +781,14 @@ if ($object->id > 0) {
 
 	if ($type == 'bank-transfer') {
 		print '<div class="opacitymedium">'.$langs->trans("DoCreditTransferBeforePayments");
-		if (isModEnabled('stripe')) {
+		if (isModEnabled('stripe') && getDolGlobalString('STRIPE_SEPA_DIRECT_DEBIT')) {
 			print ' '.$langs->trans("DoStandingOrdersBeforePayments2");
 		}
 		print ' '.$langs->trans("DoStandingOrdersBeforePayments3");
 		print '</div><br>';
 	} else {
 		print '<div class="opacitymedium">'.$langs->trans("DoStandingOrdersBeforePayments");
-		if (isModEnabled('stripe')) {
+		if (isModEnabled('stripe') && getDolGlobalString('STRIPE_SEPA_DIRECT_DEBIT')) {
 			print ' '.$langs->trans("DoStandingOrdersBeforePayments2");
 		}
 		print ' '.$langs->trans("DoStandingOrdersBeforePayments3");

From a384bdecdcca3e05f781dee7224da2ff611f9531 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 18 Jan 2023 14:36:46 +0100
Subject: [PATCH 645/816] Debug payment SEPA from backoffice with Stripe

---
 htdocs/compta/facture/prelevement.php     |  18 +-
 htdocs/core/class/commoninvoice.class.php | 202 +++++++---------------
 2 files changed, 77 insertions(+), 143 deletions(-)

diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 365fa59fdcb..39e6446b573 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -807,13 +807,13 @@ if ($object->id > 0) {
 	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>&nbsp;</td>';
 	print '</tr>';
 
 	$sql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande as date_demande,";
@@ -864,9 +864,10 @@ if ($object->id > 0) {
 			// Amount
 			print '<td class="center"><span class="amount">'.price($obj->amount).'</span></td>';
 
-			// Ref of SEPA request
+			// Date process
 			print '<td class="center"><span class="opacitymedium">'.$langs->trans("OrderWaiting").'</span></td>';
 
+			// Link to make payment now
 			print '<td>';
 			if (!empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT)) {
 				$langs->load("stripe");
@@ -874,8 +875,10 @@ if ($object->id > 0) {
 			}
 			print '</td>';
 
+			//
 			print '<td align="center">-</td>';
 
+			// Actions
 			print '<td class="right">';
 			print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken().'&did='.$obj->rowid.'&type='.$type.'">';
 			print img_delete();
@@ -929,14 +932,21 @@ if ($object->id > 0) {
 
 			print '<tr class="oddeven">';
 
+			// Date
 			print '<td class="left">'.dol_print_date($db->jdate($obj->date_demande), 'day')."</td>\n";
 
+			// User
 			print '<td align="center">';
 			print $tmpuser->getNomUrl(1, '', 0, 0, 0, 0, 'login');
 			print '</td>';
 
+			// Amount
 			print '<td class="center">'.price($obj->amount).'</td>';
 
+			// Date process
+			print '<td class="center">'.dol_print_date($db->jdate($obj->date_traite), 'day')."</td>\n";
+
+			// Link to payment request done
 			print '<td class="center">';
 			if ($obj->fk_prelevement_bons > 0) {
 				$withdrawreceipt = new BonPrelevement($db);
@@ -946,10 +956,10 @@ if ($object->id > 0) {
 			}
 			print "</td>\n";
 
+			//
 			print '<td>&nbsp;</td>';
 
-			print '<td class="center">'.dol_print_date($db->jdate($obj->date_traite), 'day')."</td>\n";
-
+			// Actions
 			print '<td>&nbsp;</td>';
 
 			print "</tr>\n";
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 3f53c3c4e94..7a8b5e3cbf7 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -865,7 +865,7 @@ abstract class CommonInvoice extends CommonObject
 
 
 	/**
-	 *	Create a withdrawal request for a direct debit order or a credit transfer order.
+	 *	Create a withdrawal request at Stripe 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
@@ -900,6 +900,7 @@ abstract class CommonInvoice extends CommonObject
 
 			$sql = "SELECT rowid, date_demande, amount, fk_facture, fk_facture_fourn";
 			$sql .= " FROM ".$this->db->prefix()."prelevement_demande";
+			$sql .= " AND fk_facture = ".((int) $this->fk_facture);		// Add a protection to not pay another invoice than current one
 			$sql .= " WHERE rowid = ".((int) $did);
 
 			dol_syslog(get_class($this)."::makeStripeSepaRequest 1", LOG_DEBUG);
@@ -1035,9 +1036,9 @@ abstract class CommonInvoice extends CommonObject
 							}
 
 
-							dol_syslog("makeStripeSepaRequest get stripe account", LOG_DEBUG);
+							dol_syslog("makeStripeSepaRequest get stripe connet account", LOG_DEBUG);
 							$stripeacc = $stripe->getStripeAccount($service, $this->socid);								// Get Stripe OAuth connect account if it exists (no network access here)
-							dol_syslog("makeStripeSepaRequest get stripe account return " . json_encode($stripeacc), LOG_DEBUG);
+							dol_syslog("makeStripeSepaRequest get stripe connect account return " . json_encode($stripeacc), LOG_DEBUG);
 
 							if ($foundalternativestripeaccount) {
 								if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
@@ -1072,101 +1073,64 @@ abstract class CommonInvoice extends CommonObject
 								}
 
 								if (!$error) {	// Payment was not canceled
-									//erics card or sepa ?
 									$sepaMode = false;
+									$stripecard = null;
 									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)
+									if ($stripecard) {  // Can be src_... (for sepa) - Other card_... (old mode) or pm_... (new mode) should not happen here.
 										$FULLTAG = 'INV=' . $this->id . '-CUS=' . $thirdparty->id;
-										$description = 'Stripe payment from doTakePaymentStripeForThirdparty: ' . $FULLTAG . ' ref=' . $this->ref;
+										$description = 'Stripe payment from makeStripeSepaRequest: ' . $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);
+										// Using new SCA method
+										dol_syslog("* Create payment on SEPA " . $stripecard->id . ", amounttopay=" . $amounttopay . ", amountstripe=" . $amountstripe . ", FULLTAG=" . $FULLTAG, LOG_DEBUG);
 
-											$ipaddress = getUserRemoteIP();
+										// Create payment intent and charge payment (confirmnow = true)
+										$paymentintent = $stripe->getPaymentIntent($amounttopay, $currency, $FULLTAG, $description, $this, $customer->id, $stripeacc, $servicestatus, 0, 'automatic', true, $stripecard->id, 1);
 
-											$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'];
+										$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);
 
-												$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);
-											}
+											$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);
 
-											// 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;
+											$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);
+											dol_syslog('Failed to charge payment mode ' . $stripecard->id . ' stripefailurecode=' . $stripefailurecode . ' stripefailuremessage=' . $stripefailuremessage . ' stripefailuredeclinecode=' . $stripefailuredeclinecode, LOG_WARNING);
 
 											// Save a stripe payment was in error
 											$this->stripechargeerror++;
@@ -1202,20 +1166,20 @@ abstract class CommonInvoice extends CommonObject
 												$errmsg .= ($stripefailuredeclinecode ? ' - ' . $stripefailuredeclinecode : '');
 											}
 
-											$description = 'Stripe payment ERROR from doTakePaymentStripeForThirdparty: ' . $FULLTAG;
+											$description = 'Stripe payment ERROR from makeStripeSepaRequest: ' . $FULLTAG;
 											$postactionmessages[] = $errmsg . ' (' . $stripearrayofkeys['publishable_key'] . ')';
 											$this->errors[] = $errmsg;
 										} else {
-											dol_syslog('Successfuly charge card ' . $stripecard->id);
+											dol_syslog('Successfuly charge direct debit ' . $stripecard->id);
 
-											$postactionmessages[] = 'Success to charge card (' . $charge->id . ' with ' . $stripearrayofkeys['publishable_key'] . ')';
+											$postactionmessages[] = 'Success to charge direct debit (' . $charge->id . ' with ' . $stripearrayofkeys['publishable_key'] . ')';
 
 											// Save a stripe payment was done in realy life so later we will be able to force a commit on recorded payments
 											// even if in batch mode (method doTakePaymentStripe), we will always make all action in one transaction with a forced commit.
 											$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;
+											$description = 'Stripe payment OK (' . $charge->id . ') from makeStripeSepaRequest: ' . $FULLTAG;
 
 											$db = $this->db;
 
@@ -1300,13 +1264,8 @@ abstract class CommonInvoice extends CommonObject
 											if (!$errorforinvoice && isModEnabled('banque')) {
 												dol_syslog('* Add payment to bank');
 
+												// The bank used is the one defined into Stripe setup
 												$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;
 												}
@@ -1323,7 +1282,7 @@ abstract class CommonInvoice extends CommonObject
 														$error++;
 														$errorforinvoice++;
 													} else {
-														$postactionmessages[] = 'Bank transaction of payment created (by doTakePaymentStripeForThirdparty)';
+														$postactionmessages[] = 'Bank transaction of payment created (by makeStripeSepaRequest)';
 													}
 												} else {
 													$postactionmessages[] = 'Setup of bank account to use in module ' . $paymentmethod . ' was not set. No way to record the payment.';
@@ -1334,55 +1293,24 @@ abstract class CommonInvoice extends CommonObject
 											}
 
 											if ($ispostactionok < 1) {
-												$description = 'Stripe payment OK (' . $charge->id . ' - ' . $amounttopay . ' ' . $conf->currency . ') but post action KO from doTakePaymentStripeForThirdparty: ' . $FULLTAG;
+												$description = 'Stripe payment OK (' . $charge->id . ' - ' . $amounttopay . ' ' . $conf->currency . ') but post action KO from makeStripeSepaRequest: ' . $FULLTAG;
 											} else {
-												$description = 'Stripe payment+post action OK (' . $charge->id . ' - ' . $amounttopay . ' ' . $conf->currency . ') from doTakePaymentStripeForThirdparty: ' . $FULLTAG;
+												$description = 'Stripe payment+post action OK (' . $charge->id . ' - ' . $amounttopay . ' ' . $conf->currency . ') from makeStripeSepaRequest: ' . $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 = '';
-										}
+										$actioncode = '';
+										$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'] . ')';
-
+										dol_syslog("No direct debit payment method found for this stripe customer " . $customer->id, LOG_WARNING);
+										$this->errors[] = 'Failed to get direct debit payment method for stripe customer = ' . $customer->id;
 										$object = $invoice;
 
-										$actioncode = 'PAYMENT_STRIPE_KO';
+										$actioncode = '';
 										$extraparams = '';
 									}
 								} else {
@@ -1427,6 +1355,7 @@ abstract class CommonInvoice extends CommonObject
 								$extraparams = '';
 							}
 
+							/*
 							// Send email + create action after
 							if ($sendemailtocustomer && $labeltouse) {
 								dol_syslog("* Send email with result of payment - " . $labeltouse);
@@ -1537,6 +1466,7 @@ abstract class CommonInvoice extends CommonObject
 									}
 								}
 							}
+							*/
 
 							if ($description) {
 								dol_syslog("* Record event for payment result - " . $description);
@@ -1588,18 +1518,12 @@ 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' ?";
 					}
 
-					$sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_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 .= ")";
+					// TODO Create a prelevement_bon ?
+					// For the moment no
+
+					// We must update the direct debit payment request as "done"
+					$sql = "UPDATE".MAIN_DB_PREFIX."prelevement_demande SET traite = 1, date_traite = '".$this->db->idate(dol_now())."'";
+					$sql .= "WHERE rowid = ".((int) $did);
 
 					dol_syslog(get_class($this)."::makeStripeSepaRequest", LOG_DEBUG);
 					$resql = $this->db->query($sql);

From 1fe589ac3e2d67effa6b8722fe47a8e17309b58b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 18 Jan 2023 14:43:09 +0100
Subject: [PATCH 646/816] Fix debug payment using SEPA Stripe

---
 htdocs/core/class/commoninvoice.class.php | 45 +++++++++++++++++++----
 1 file changed, 38 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 7a8b5e3cbf7..93d125291ef 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -1299,18 +1299,49 @@ abstract class CommonInvoice extends CommonObject
 											}
 										}
 
-										$object = $invoice;
+										$object = $this;
 
-										$actioncode = '';
-										$extraparams = '';
+										// 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 direct debit payment method found for this stripe customer " . $customer->id, LOG_WARNING);
 										$this->errors[] = 'Failed to get direct debit payment method for stripe customer = ' . $customer->id;
-										$object = $invoice;
 
-										$actioncode = '';
+										$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 = $this;
+
+										$actioncode = 'PAYMENT_STRIPE_KO';
 										$extraparams = '';
 									}
 								} else {
@@ -1322,7 +1353,7 @@ abstract class CommonInvoice extends CommonObject
 									$stripefailurecode = '';
 									$stripefailuremessage = '';
 
-									$object = $invoice;
+									$object = $this;
 
 									$actioncode = '';
 									$extraparams = '';
@@ -1349,7 +1380,7 @@ abstract class CommonInvoice extends CommonObject
 								$stripefailuremessage = 'Failed to find or use your payment mode (no payment mode for this customer id)';
 								$postactionmessages = [];
 
-								$object = $invoice;
+								$object = $this;
 
 								$actioncode = 'PAYMENT_STRIPE_KO';
 								$extraparams = '';

From 6d8f80d46e778dc65b5edbad47d0e3ae69a95b18 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 18 Jan 2023 16:10:21 +0100
Subject: [PATCH 647/816] fix: module builder, backport workgin solution form
 15.0

---
 htdocs/modulebuilder/index.php | 50 ++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 25034194119..fcfea65dd83 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -1295,33 +1295,35 @@ if ($dirins && $action == 'addproperty' && empty($cancel) && !empty($module) &&
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Type")), null, 'errors');
 		}
-	}
 
-	if (!$error) {
-		$addfieldentry = array(
-			'name'=>GETPOST('propname', 'aZ09'),
-			'label'=>GETPOST('proplabel', 'alpha'),
-			'type'=>GETPOST('proptype', 'alpha'),
-			'arrayofkeyval'=>GETPOST('proparrayofkeyval', 'restricthtml'), // Example json string '{"0":"Draft","1":"Active","-1":"Cancel"}'
-			'visible'=>GETPOST('propvisible', 'int'),
-			'enabled'=>GETPOST('propenabled', 'int'),
-			'position'=>GETPOST('propposition', 'int'),
-			'notnull'=>GETPOST('propnotnull', 'int'),
-			'index'=>GETPOST('propindex', 'int'),
-			'searchall'=>GETPOST('propsearchall', 'int'),
-			'isameasure'=>GETPOST('propisameasure', 'int'),
-			'comment'=>GETPOST('propcomment', 'alpha'),
-			'help'=>GETPOST('prophelp', 'alpha'),
-			'css'=>GETPOST('propcss', 'aZ09'),
-			'cssview'=>GETPOST('propcssview', 'aZ09'),
-			'csslist'=>GETPOST('propcsslist', 'aZ09'),
-			'default'=>GETPOST('propdefault', 'restricthtml'),
-			'noteditable'=>intval(GETPOST('propnoteditable', 'int')),
-		);
+		if (!$error && !GETPOST('regenerateclasssql')&& !GETPOST('regeneratemissing')) {
+			$addfieldentry = array(
+				'name'=>GETPOST('propname', 'aZ09'),
+				'label'=>GETPOST('proplabel', 'alpha'),
+				'type'=>GETPOST('proptype', 'alpha'),
+				'arrayofkeyval'=>GETPOST('proparrayofkeyval', 'restricthtml'), // Example json string '{"0":"Draft","1":"Active","-1":"Cancel"}'
+				'visible'=>GETPOST('propvisible', 'int'),
+				'enabled'=>GETPOST('propenabled', 'int'),
+				'position'=>GETPOST('propposition', 'int'),
+				'notnull'=>GETPOST('propnotnull', 'int'),
+				'index'=>GETPOST('propindex', 'int'),
+				'searchall'=>GETPOST('propsearchall', 'int'),
+				'isameasure'=>GETPOST('propisameasure', 'int'),
+				'comment'=>GETPOST('propcomment', 'alpha'),
+				'help'=>GETPOST('prophelp', 'alpha'),
+				'css'=>GETPOST('propcss', 'aZ09'),
+				'cssview'=>GETPOST('propcssview', 'aZ09'),
+				'csslist'=>GETPOST('propcsslist', 'aZ09'),
+				'default'=>GETPOST('propdefault', 'restricthtml'),
+				'noteditable'=>intval(GETPOST('propnoteditable', 'int')),
+			);
 
-		if (!empty($addfieldentry['arrayofkeyval']) && !is_array($addfieldentry['arrayofkeyval'])) {
-			$addfieldentry['arrayofkeyval'] = json_decode($addfieldentry['arrayofkeyval'], true);
+			if (!empty($addfieldentry['arrayofkeyval']) && !is_array($addfieldentry['arrayofkeyval'])) {
+				$addfieldentry['arrayofkeyval'] = json_decode($addfieldentry['arrayofkeyval'], true);
+			}
 		}
+	} else {
+		$addfieldentry = array();
 	}
 
 	/*if (GETPOST('regeneratemissing'))

From a00fa5a192dd339c8ca49e7f489ce4ecb31a5feb Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Wed, 18 Jan 2023 16:11:22 +0100
Subject: [PATCH 648/816] FIX: Do not convert negative line to discount if
 variable is active

---
 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 eb8b824ef3e..2211422f3c5 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2015-2018  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
- * Copyright (C) 2016-2021  Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2016-2023  Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2018       Charlene Benke	        <charlie@patas-monkey.com>
  * Copyright (C) 2021	   	Anthony Berton			<anthony.berton@bb2a.fr>
  *
@@ -403,7 +403,7 @@ if (empty($reshook)) {
 							$desc = dol_concatdesc($desc, $langs->trans("Order").' '.$cmd->ref.' - '.dol_print_date($cmd->date, 'day'));
 						}
 
-						if ($lines[$i]->subprice < 0) {
+						if ($lines[$i]->subprice < 0 && empty($conf->global->INVOICE_KEEP_DISCOUNT_LINES_AS_IN_ORIGIN)) {
 							// Negative line, we create a discount line
 							$discount = new DiscountAbsolute($db);
 							$discount->fk_soc = $objecttmp->socid;

From a3d4eb404df858202eeacf5f872d6fc3d7b1cd3d Mon Sep 17 00:00:00 2001
From: GregM <gregory.maza@atm-consulting.fr>
Date: Wed, 18 Jan 2023 17:36:05 +0100
Subject: [PATCH 649/816] Fix contact firstname lastname extrafields

---
 htdocs/core/class/extrafields.class.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 1d5bd8dc7ef..6644548d87c 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1457,15 +1457,15 @@ class ExtraFields
 							$labeltoshow = dol_trunc($labeltoshow, 45);
 
 							if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
+								$labeltoshow = '';
 								foreach ($fields_label as $field_toshow) {
 									$translabel = $langs->trans($obj->$field_toshow);
 									if ($translabel != $obj->$field_toshow) {
-										$labeltoshow = dol_trunc($translabel, 18).' ';
+										$labeltoshow .= ' '.dol_trunc($translabel, 18).' ';
 									} else {
-										$labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';
+										$labeltoshow .= ' '.dol_trunc($obj->$field_toshow, 18).' ';
 									}
 								}
-
 								$data[$obj->rowid] = $labeltoshow;
 							} else {
 								if (!$notrans) {
@@ -1774,17 +1774,20 @@ class ExtraFields
 						$fields_label = explode('|', $InfoFieldList[1]);
 						if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
 							if (is_array($fields_label) && count($fields_label) > 1) {
+								$label = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">';
 								foreach ($fields_label as $field_toshow) {
 									$translabel = '';
 									if (!empty($obj->$field_toshow)) {
 										$translabel = $langs->trans($obj->$field_toshow);
 									}
 									if ($translabel != $field_toshow) {
-										$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.dol_trunc($translabel, 18).'</li>';
+										$label .= ' '.dol_trunc($translabel, 18);
 									} else {
-										$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.$obj->$field_toshow.'</li>';
+										$label .= ' '.$obj->$field_toshow;
 									}
 								}
+								$label .= '</li>';
+								$toprint[] = $label;
 							} else {
 								$translabel = '';
 								if (!empty($obj->{$InfoFieldList[1]})) {

From 4637f8a65e900a61e3f64bcc796e7ad882a004cf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 18 Jan 2023 19:11:15 +0100
Subject: [PATCH 650/816] Fix security

---
 SECURITY.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index b121b606180..e095b64fdff 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -53,16 +53,17 @@ ONLY vulnerabilities discovered, when the following setup on test platform is us
 * $dolibarr_nocsrfcheck must be kept to the value 0 into conf.php (this is the default value)
 * $dolibarr_main_force_https must be set to something else than 0.
 * The constant MAIN_SECURITY_CSRF_WITH_TOKEN must be set to 3 into backoffice menu Home - Setup - Other (this protection should be set to 3 soon by default)
-* The module DebugBar and ModuleBuilder must NOT be enabled (by default, these modules are not enabled. They are developer tools)
 * ONLY security reports on modules provided by default and with the "stable" status are valid (troubles into "experimental", "developement" or external modules are not valid vulnerabilities).
 * The root of web server must link to htdocs and the documents directory must be outside of the web server root (this is the default when using the default installer but may differs with external installer).
 * The web server setup must be done so that only the documents directory is in write mode. The root directory called htdocs must be read-only.
 * CSRF attacks are accepted but double check that you have set MAIN_SECURITY_CSRF_WITH_TOKEN to value 3.
+* The module DebugBar and ModuleBuilder must NOT be enabled (by default, these modules are not enabled. They are developer tools)
 * Ability for a high level user to edit web site pages into the CMS by including HTML or Javascript is an expected feature. Vulnerabilities into the website module are validated only if HTML or Javascript injection can be done by a non allowed user.
+* Fail2ban rules for rate limit on the login page,password forgotten page and all public pages (/public/*) must be installed as recommendend into the section "About - Admin tools - Section Access limits and mitigation".
 
 Scope is the web application (back office) and the APIs.
 
-## Qualifying vulnerabilities for reporting
+## Example of vulnerabilities Qualified for reporting.
 
 * Remote code execution (RCE)
 * Local files access and manipulation (LFI, RFI, XXE, SSRF, XSPA)
@@ -78,7 +79,7 @@ Scope is the web application (back office) and the APIs.
 * Software version disclosure (for non admin users only)
 * Stack traces or path disclosure (for non admin users only)
 
-## Non-qualifying vulnerabilities for reporting
+## Example of vulnerabilities non Non-qualified for reporting.
 
 * "Self" XSS
 * SSL/TLS best practices
@@ -95,3 +96,4 @@ Scope is the web application (back office) and the APIs.
 * Software version or private IP disclosure when logged user is admin
 * Stack traces or path disclosure when logged user is admin
 * Any vulnerabilities due to a configuration different than the one defined into chapter "Scope for qualified vulnerabilities".
+* Brute force attacks on login page, password forgotten page or any public pages (/public/*) are not qualified if the fail2ban recommended fail2ban rules were not installed.  

From 40e007bb6195735ebc4410d413916594247fd3cd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 18 Jan 2023 19:54:38 +0100
Subject: [PATCH 651/816] More generic error message

---
 htdocs/api/class/api_access.class.php | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/htdocs/api/class/api_access.class.php b/htdocs/api/class/api_access.class.php
index f885677225e..37b7b079716 100644
--- a/htdocs/api/class/api_access.class.php
+++ b/htdocs/api/class/api_access.class.php
@@ -142,12 +142,28 @@ class DolibarrApiAccess implements iAuthenticate
 			if (!$login) {
 				throw new RestException(503, 'Error when searching login user from api key');
 			}
+
+			$genericmessageerroruser = 'Error user not valid (not found or bad status or bad validity dates) (conf->entity='.$conf->entity.')';
+
 			$fuser = new User($this->db);
 			$result = $fuser->fetch('', $login, '', 0, (empty($userentity) ? -1 : $conf->entity)); // If user is not entity 0, we search in working entity $conf->entity  (that may have been forced to a different value than user entity)
 			if ($result <= 0) {
-				throw new RestException(503, 'Error when fetching user :'.$fuser->error.' (conf->entity='.$conf->entity.')');
+				throw new RestException(503, $genericmessageerroruser);
 			}
 
+			$now = dol_now();
+
+			// Check date start validity
+			if ($fuser->datestartvalidity && $this->db->jdate($fuser->datestartvalidity) > $now) {
+				throw new RestException(503, $genericmessageerroruser);
+			}
+			// Check date end validity
+			if ($fuser->dateendvalidity && $this->db->jdate($fuser->dateendvalidity) < dol_get_first_hour($now)) {
+				throw new RestException(503, $genericmessageerroruser);
+			}
+
+
+			// User seems valid
 			$fuser->getrights();
 
 			// Set the property $user to the $user of API

From aa273d215572d896ba26f1dae8489edd1238e4c2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 18 Jan 2023 20:11:12 +0100
Subject: [PATCH 652/816] Update index.php

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

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index fcfea65dd83..052b1189b3d 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -1296,7 +1296,7 @@ if ($dirins && $action == 'addproperty' && empty($cancel) && !empty($module) &&
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Type")), null, 'errors');
 		}
 
-		if (!$error && !GETPOST('regenerateclasssql')&& !GETPOST('regeneratemissing')) {
+		if (!$error && !GETPOST('regenerateclasssql') && !GETPOST('regeneratemissing')) {
 			$addfieldentry = array(
 				'name'=>GETPOST('propname', 'aZ09'),
 				'label'=>GETPOST('proplabel', 'alpha'),

From c31aee2e27f004486945586a9d65c899d19dd689 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 18 Jan 2023 20:42:29 +0100
Subject: [PATCH 653/816] Doc

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

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index be515a2abf3..5692a285dda 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -49,12 +49,12 @@ class FormTicket
 	public $db;
 
 	/**
-	 * @var string	The track_id of the ticket. Used also for the $keytoavoidconflict to name session vars to upload files.
+	 * @var string		A hash value of the ticket. Duplicate of ref but for public purposes.
 	 */
 	public $track_id;
 
 	/**
-	 * @var string trackid
+	 * @var string 		Email $trackid. Used also for the $keytoavoidconflict to name session vars to upload files.
 	 */
 	public $trackid;
 

From ea6964ccd059de8382ccec91d4f2ad2f3cc506ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 18 Jan 2023 22:03:38 +0100
Subject: [PATCH 654/816] fix undeclared properties for php 8.2

---
 htdocs/adherents/class/adherent.class.php      | 15 ++++++++++++++-
 htdocs/adherents/class/adherent_type.class.php | 13 +++++++++++++
 htdocs/core/class/commonobject.class.php       |  9 +++++++++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 225261e8f9f..99e84d61026 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2009-2017	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2014-2018	Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2015		Marcos García			<marcosgdf@gmail.com>
- * Copyright (C) 2015-2022	Frédéric France			<frederic.france@netlogic.fr>
+ * Copyright (C) 2015-2023	Frédéric France			<frederic.france@netlogic.fr>
  * Copyright (C) 2015		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2016		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2018-2019	Thibault FOUCART		<support@ptibogxiv.net>
@@ -89,6 +89,11 @@ class Adherent extends CommonObject
 	 */
 	public $pass_indatabase_crypted;
 
+	/**
+	 * @var string fullname
+	 */
+	public $fullname;
+
 	/**
 	 * @var string company name
 	 * @deprecated
@@ -292,6 +297,10 @@ class Adherent extends CommonObject
 
 	public $first_subscription_date;
 
+	public $first_subscription_date_start;
+
+	public $first_subscription_date_end;
+
 	public $first_subscription_amount;
 
 	public $last_subscription_date;
@@ -304,6 +313,10 @@ class Adherent extends CommonObject
 
 	public $subscriptions = array();
 
+	/**
+	 * @var string ip
+	 */
+	public $ip;
 
 	// Fields loaded by fetchPartnerships() from partnership table
 
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 0a4663f8149..915502a9e96 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -129,6 +129,19 @@ class AdherentType extends CommonObject
 	/** @var string string other */
 	public $other = array();
 
+	/**
+	 * @var string description
+	 */
+	public $description;
+
+	/**
+	 * @var string email
+	 */
+	public $email;
+
+	/**
+	 * @var array multilangs
+	 */
 	public $multilangs = array();
 
 
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index ecf03696d7a..9f28f6c0d70 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -593,6 +593,15 @@ abstract class CommonObject
 	protected $labelStatus;
 	protected $labelStatusShort;
 
+	/**
+	 * @var array nb used in load_stateboard
+	 */
+	public $nb = array();
+
+	/**
+	 * @var string output
+	 */
+	public $output;
 
 	/**
 	 * @var array	List of child tables. To test if we can delete object.

From cccba873a8f5eaf49e45ffa61eb43cb3635c6ecb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 18 Jan 2023 22:20:25 +0100
Subject: [PATCH 655/816] fix undeclared properties for php 8.2

---
 htdocs/adherents/class/adherent.class.php |  7 +++++++
 htdocs/contact/class/contact.class.php    | 15 +++++++++++++++
 htdocs/user/class/user.class.php          |  5 +++++
 3 files changed, 27 insertions(+)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 99e84d61026..2d8433de0c4 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -94,6 +94,13 @@ class Adherent extends CommonObject
 	 */
 	public $fullname;
 
+	/**
+	 * @var string The civility code, not an integer
+	 */
+	public $civility_id;
+	public $civility_code;
+	public $civility;
+
 	/**
 	 * @var string company name
 	 * @deprecated
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 67b3ce2a38a..8c3991cabaf 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -130,6 +130,16 @@ class Contact extends CommonObject
 	public $civility_code;
 	public $civility;
 
+	/**
+	 * @var int egroupware_id
+	 */
+	public $egroupware_id;
+
+	/**
+	 * @var int birthday_alert
+	 */
+	public $birthday_alert;
+
 	/**
 	 * @var string The civilite code, not an integer
 	 * @deprecated
@@ -137,6 +147,11 @@ class Contact extends CommonObject
 	 */
 	public $civilite;
 
+	/**
+	 * @var string fullname
+	 */
+	public $fullname;
+
 	/**
 	 * @var string Address
 	 */
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 22556d3e1c2..3dc74832503 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -76,6 +76,11 @@ class User extends CommonObject
 	public $employee;
 	public $civility_code;
 
+	/**
+	 * @var string fullname
+	 */
+	public $fullname;
+
 	/**
 	 * @var string gender
 	 */

From 0f475783deb28af48e98141c9733f31c471a6114 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 18 Jan 2023 22:27:52 +0100
Subject: [PATCH 656/816] Enhance method getKanbanView

---
 htdocs/adherents/class/adherent.class.php     |  3 +-
 .../adherents/class/adherent_type.class.php   |  5 +--
 htdocs/adherents/class/subscription.class.php |  3 +-
 htdocs/bom/class/bom.class.php                |  5 +--
 htdocs/comm/propal/class/propal.class.php     |  5 +--
 htdocs/compta/bank/class/account.class.php    |  5 +--
 .../bank/class/paymentvarious.class.php       |  5 +--
 .../cashcontrol/class/cashcontrol.class.php   |  5 +--
 htdocs/compta/facture/class/facture.class.php |  5 +--
 .../compta/localtax/class/localtax.class.php  |  5 +--
 .../cheque/class/remisecheque.class.php       |  5 +--
 .../class/bonprelevement.class.php            |  5 +--
 .../sociales/class/chargesociales.class.php   |  5 +--
 htdocs/compta/tva/class/tva.class.php         |  5 +--
 htdocs/contact/class/contact.class.php        |  3 +-
 htdocs/contrat/class/contrat.class.php        |  5 +--
 htdocs/core/class/commonobject.class.php      | 28 ----------------
 htdocs/core/class/commonobjectline.class.php  | 33 -------------------
 htdocs/core/class/commonorder.class.php       |  3 +-
 htdocs/don/class/don.class.php                |  5 +--
 .../class/expensereport.class.php             |  5 +--
 .../class/paymentexpensereport.class.php      |  5 +--
 htdocs/fichinter/class/fichinter.class.php    |  5 +--
 .../class/fournisseur.commande.class.php      |  5 +--
 .../fourn/class/fournisseur.facture.class.php |  5 +--
 htdocs/holiday/class/holiday.class.php        | 14 ++++----
 htdocs/holiday/list.php                       | 13 ++++++--
 htdocs/hrm/class/evaluation.class.php         |  5 +--
 htdocs/hrm/class/job.class.php                |  5 +--
 htdocs/hrm/class/skill.class.php              |  5 +--
 .../class/knowledgerecord.class.php           |  5 +--
 .../template/class/myobject.class.php         |  5 ++-
 htdocs/mrp/class/mo.class.php                 |  5 +--
 htdocs/product/stock/class/entrepot.class.php |  3 +-
 htdocs/projet/class/task.class.php            |  5 +--
 .../class/recruitmentcandidature.class.php    |  5 +--
 .../class/recruitmentjobposition.class.php    |  5 +--
 htdocs/salaries/class/paymentsalary.class.php |  5 +--
 htdocs/salaries/class/salary.class.php        |  5 +--
 .../class/supplier_proposal.class.php         |  5 +--
 htdocs/ticket/class/ticket.class.php          |  5 +--
 htdocs/user/class/user.class.php              |  3 +-
 htdocs/user/class/usergroup.class.php         |  3 +-
 43 files changed, 125 insertions(+), 144 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 225261e8f9f..fb72636ef1a 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -3208,9 +3208,10 @@ class Adherent extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param		array		$arraydata				Array of data
 	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 0a4663f8149..ea60e9c1fcd 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -933,9 +933,10 @@ class AdherentType extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return 	string				HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs,$user;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index 12e19fd9c3a..b5079676603 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -510,9 +510,10 @@ class Subscription extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param		array		$arraydata				Array of data
 	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
 		$return .= '<div class="info-box info-box-sm">';
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 1e28aafffe2..d7982a44069 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -1523,9 +1523,10 @@ class BOM extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $db,$langs;
 		$prod = new Product($db);
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 1541478a321..c4328328f18 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -3921,9 +3921,10 @@ class Propal extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index fe0a267dc83..e144677832f 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1751,9 +1751,10 @@ class Account extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index 857b49d1576..d5888e0e7a1 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -773,9 +773,10 @@ class PaymentVarious extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
index 01bebc35f5d..8cc3c93b59c 100644
--- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php
+++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
@@ -474,9 +474,10 @@ class CashControl extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 431c3b0a2a3..561ebf3e9ed 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -5758,9 +5758,10 @@ class Facture extends CommonInvoice
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
 		$return .= '<div class="info-box info-box-sm">';
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index d2300128550..a6db785b779 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -634,9 +634,10 @@ class Localtax extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 1e4e7d05a7d..6666f0fe1c4 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -1025,9 +1025,10 @@ class RemiseCheque extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs;
 
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 24db7fb5b64..b9d1fd7c54a 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -2412,9 +2412,10 @@ class BonPrelevement extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs;
 
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index b5e98b3b62e..cacc2280f53 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -754,9 +754,10 @@ class ChargeSociales extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index 78fb178ff27..2ec1199dd29 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -911,9 +911,10 @@ class Tva extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 67b3ce2a38a..8c5c84a0d61 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -2123,9 +2123,10 @@ class Contact extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param		array		$arraydata				Array of data
 	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index ddec606a82c..539d7b63f31 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2796,9 +2796,10 @@ class Contrat extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index ecf03696d7a..40c05e06b91 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -770,34 +770,6 @@ abstract class CommonObject
 		}
 	}
 
-	/**
-	 *	Return clicable link of object (with eventually picto)
-	 *
-	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string								HTML Code for Kanban thumb.
-	 */
-	public function getKanbanView($option = '')
-	{
-		$return = '<div class="box-flex-item box-flex-grow-zero">';
-		$return .= '<div class="info-box info-box-sm">';
-		$return .= '<span class="info-box-icon bg-infobox-action">';
-		$return .= img_picto('', $this->picto);
-		$return .= '</span>';
-		$return .= '<div class="info-box-content">';
-		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>';
-		if (property_exists($this, 'label')) {
-			$return .= '<br><span class="info-box-label opacitymedium">'.$this->label.'</span>';
-		}
-		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
-		}
-		$return .= '</div>';
-		$return .= '</div>';
-		$return .= '</div>';
-
-		return $return;
-	}
-
 	/**
 	 * 	Return full address of contact
 	 *
diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php
index b116519ad53..972ab7e4476 100644
--- a/htdocs/core/class/commonobjectline.class.php
+++ b/htdocs/core/class/commonobjectline.class.php
@@ -166,37 +166,4 @@ abstract class CommonObjectLine extends CommonObject
 	{
 		return 0;
 	}
-
-	/**
-	 *	Return clicable link of object (with eventually picto)
-	 *
-	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
-	 */
-	public function getKanbanView($option = '')
-	{
-		global $langs;
-		$return = '<div class="box-flex-item box-flex-grow-zero">';
-		$return .= '<div class="info-box info-box-sm">';
-		$return .= '<span class="info-box-icon bg-infobox-action">';
-		$return .= img_picto('', $this->picto);
-		//$return .= '<i class="fa fa-dol-action"></i>'; // Can be image
-		$return .= '</span>';
-		$return .= '<div class="info-box-content">';
-		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : '').'</span>';
-		if (property_exists($this, 'date_delivery')) {
-			$return .= '<br><span class="info-box-label opacitymedium">'.dol_print_date($this->db->jdate($this->date_delivery), "dayhour").'</span>';
-		}
-		if (property_exists($this, 'town') && !empty($this->town)) {
-			$return .= '<br><span class="info-box-label opacitymedium">'.$langs->trans("Town").'</span>';
-			$return .= '<span class="info-box-label "> : '.$this->town.'</span>';
-		}
-		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
-		}
-		$return .= '</div>';
-		$return .= '</div>';
-		$return .= '</div>';
-		return $return;
-	}
 }
diff --git a/htdocs/core/class/commonorder.class.php b/htdocs/core/class/commonorder.class.php
index 9002d50ed39..65ae367c3b2 100644
--- a/htdocs/core/class/commonorder.class.php
+++ b/htdocs/core/class/commonorder.class.php
@@ -37,9 +37,10 @@ abstract class CommonOrder extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param		array		$arraydata				Array of data
 	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs, $conf;
 
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index c1d09a6cdd0..acd3b34961c 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -1146,9 +1146,10 @@ class Don extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs;
 
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index f56167651ab..06adcd92770 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -2682,9 +2682,10 @@ class ExpenseReport extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs, $selected,$arrayofselected;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index 5ca4135dc30..053f46d20cf 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -718,9 +718,10 @@ class PaymentExpenseReport extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 4a7872b2859..450e2c63af3 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -1461,9 +1461,10 @@ class Fichinter extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 5355e969443..910cebdb38e 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -3551,9 +3551,10 @@ class CommandeFournisseur extends CommonOrder
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 9ca933b7c43..2c45a8d67d5 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -3237,9 +3237,10 @@ class FactureFournisseur extends CommonInvoice
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index e8f56659de9..e4a82be6ea7 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -2423,25 +2423,23 @@ class Holiday extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param		array		$arraydata				Label of holiday type (if known)
 	 *  @return		string		HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
-		global $langs, $selected;
+		global $langs;
+
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
 		$return .= '<div class="info-box info-box-sm">';
 		$return .= '<span class="info-box-icon bg-infobox-action">';
 		$return .= img_picto('', $this->picto);
 		$return .= '</span>';
 		$return .= '<div class="info-box-content">';
-		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
-		if (property_exists($this, 'fk_user') && !empty($this->id)) {
-			$return .= '| <span class="info-box-label">'.$this->fk_user.'</span>';
-			$return .= '<input class="fright" id="cb'.$this->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
-		}
+		$return .= '<span class="info-box-ref">'.$arraydata['user']->getNomUrl(-1).'</span>';
 		if (property_exists($this, 'fk_type')) {
 			$return .= '<br><span class="opacitymedium">'.$langs->trans("Type").'</span> : ';
-			$return .= '<span class="info_box-label">'.$langs->trans($this->getTypes(1, -1)[$this->fk_type]['code']).'</span>';
+			$return .= '<span class="info_box-label maxwidth100">'.arraydata['labeltype'].'</span>';
 		}
 		if (property_exists($this, 'date_debut') && property_exists($this, 'date_fin')) {
 			$return .= '<br><span class="info-box-label">'.dol_print_date($this->date_debut, 'day').'</span>';
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 56dd3ff2d98..6166ffb3b4e 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -835,15 +835,22 @@ if ($resql) {
 					print '<div class="box-flex-container">';
 				}
 
-				$holidaystatic->fk_type = $holidaystatic->getTypes(1, -1)[$obj->fk_type]['rowid'];
-				$holidaystatic->fk_user = $userstatic->getNomUrl(1);
+				$holidaystatic->fk_type = $typeleaves[$obj->fk_type]['rowid'];
+
 				// Output Kanban
 				if ($massactionbutton || $massaction) {
 					$selected = 0;
 					if (in_array($object->id, $arrayofselected)) {
 						$selected = 1;
 					}
-					print $holidaystatic->getKanbanView('');
+					if (empty($typeleaves[$obj->fk_type])) {
+						$labeltypeleavetoshow = $langs->trans("TypeWasDisabledOrRemoved", $obj->fk_type);
+					} else {
+						$labeltypeleavetoshow = ($langs->trans($typeleaves[$obj->fk_type]['code']) != $typeleaves[$obj->fk_type]['code'] ? $langs->trans($typeleaves[$obj->fk_type]['code']) : $typeleaves[$obj->fk_type]['label']);
+					}
+
+					$arraydata = array('user'=>$userstatic, 'labeltype'=>$labeltypeleavetoshow);
+					print $holidaystatic->getKanbanView('', $arraydata);
 				}
 				if ($i == (min($num, $limit) - 1)) {
 					print '</div>';
diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index 4a9dd0defde..48cb8cdd0c3 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -1060,9 +1060,10 @@ class Evaluation extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $selected, $langs;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index dfed55cebec..1afa8c75647 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -1059,9 +1059,10 @@ class Job extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $selected, $langs;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index 5960ef8d351..8b7b6910f2b 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -1118,9 +1118,10 @@ class Skill extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $selected, $langs;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 4d9aa9d7ed4..3f9f1b40223 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -1071,9 +1071,10 @@ class KnowledgeRecord extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs, $selected,$arrayofselected;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 4bee8d9529a..5ac7f8c30de 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -869,10 +869,10 @@ class MyObject extends CommonObject
 	 *	Return a thumb for kanban views
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param		array		$arraydata				Array of data
 	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	/*
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
 		$return .= '<div class="info-box info-box-sm">';
@@ -893,7 +893,6 @@ class MyObject extends CommonObject
 
 		return $return;
 	}
-	*/
 
 	/**
 	 *  Return the label of the status
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index f95064454b7..9a7ba6007cc 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -1562,9 +1562,10 @@ class Mo extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index ce5bef9c939..3ce244a4bb1 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -921,9 +921,10 @@ class Entrepot extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param		array		$arraydata				Array of data
 	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 6c2e8ad29a4..597e680f8f0 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -2330,9 +2330,10 @@ class Task extends CommonObjectLine
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs, $conf;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index bdbcdb97811..e3dfd4bd135 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -1029,9 +1029,10 @@ class RecruitmentCandidature extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs, $selected,$arrayofselected;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index 7ab290e691a..a63e6b012b2 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -1113,9 +1113,10 @@ class RecruitmentJobPosition extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs, $selected,$arrayofselected,$obj;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index 4817abec6c8..0f141bc3023 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -767,9 +767,10 @@ class PaymentSalary extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs, $db;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/salaries/class/salary.class.php b/htdocs/salaries/class/salary.class.php
index 7f9ea31cdc9..2f7bb36869e 100644
--- a/htdocs/salaries/class/salary.class.php
+++ b/htdocs/salaries/class/salary.class.php
@@ -712,9 +712,10 @@ class Salary extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 5de7b1d851a..f2e6d19afa8 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -2732,9 +2732,10 @@ class SupplierProposal extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index d390fd6f351..e0f880264f9 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -2937,9 +2937,10 @@ class Ticket extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @return		string		HTML Code for Kanban thumb.
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs, $selected,$arrayofselected,$obj;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 22556d3e1c2..7f61ba2c7ab 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2996,9 +2996,10 @@ class User extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param		array		$arraydata				Array of data
 	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
 		$return .= '<div class="info-box info-box-sm">';
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 71339991172..a9884ca59d1 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -922,9 +922,10 @@ class UserGroup extends CommonObject
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param		array		$arraydata				Array of data
 	 *  @return		string								HTML Code for Kanban thumb.
 	 */
-	public function getKanbanView($option = '')
+	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';

From 9cd6adb6c8df667dd63f1a1bed3ce1723aac31cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 18 Jan 2023 22:28:43 +0100
Subject: [PATCH 657/816] use oldcopy only to retrieve old values instaed
 undeclared properties

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

diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 3e7f5fdb1f1..66cdc1ed1aa 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -322,9 +322,6 @@ if (empty($reshook)) {
 		$result = $object->fetch($id);
 		$object->oldcopy = clone $object;
 
-		$object->old_lastname = (string) GETPOST("old_lastname", 'alpha');
-		$object->old_firstname = (string) GETPOST("old_firstname", 'alpha');
-
 		$result = $object->delete(); // TODO Add $user as first param
 		if ($result > 0) {
 			setEventMessages("RecordDeleted", null, 'mesgs');
@@ -408,9 +405,6 @@ if (empty($reshook)) {
 
 			$object->oldcopy = clone $object;
 
-			$object->old_lastname = (string) GETPOST("old_lastname", 'alpha');
-			$object->old_firstname = (string) GETPOST("old_firstname", 'alpha');
-
 			$object->socid = GETPOST("socid", 'int');
 			$object->lastname = (string) GETPOST("lastname", 'alpha');
 			$object->firstname = (string) GETPOST("firstname", 'alpha');
@@ -972,7 +966,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 								/* set country at end because it will trigger page refresh */
 								console.log("Set country id to '.dol_escape_js($objsoc->country_id).'");
 								$(\'select[name="country_id"]\').val("'.dol_escape_js($objsoc->country_id).'").trigger("change");   /* trigger required to update select2 components */
-            				});
+							});
 						})'."\n";
 				print '</script>'."\n";
 			}
@@ -982,8 +976,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<input type="hidden" name="id" value="'.$id.'">';
 			print '<input type="hidden" name="action" value="update">';
 			print '<input type="hidden" name="contactid" value="'.$object->id.'">';
-			print '<input type="hidden" name="old_lastname" value="'.$object->lastname.'">';
-			print '<input type="hidden" name="old_firstname" value="'.$object->firstname.'">';
 			if (!empty($backtopage)) {
 				print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 			}
@@ -1033,7 +1025,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<div class="paddingrightonly valignmiddle inline-block quatrevingtpercent">';
 			print '<textarea class="flat minwidth200 centpercent" name="address" id="address">'.(GETPOSTISSET("address") ? GETPOST("address", 'alphanohtml') : $object->address).'</textarea>';
 			print '</div><div class="paddingrightonly valignmiddle inline-block">';
-			if ($conf->use_javascript_ajax) {
+			if (!empty($conf->use_javascript_ajax)) {
 				print '<a href="#" id="copyaddressfromsoc">'.$langs->trans('CopyAddressFromSoc').'</a><br>';
 			}
 			print '</div>';
@@ -1636,7 +1628,7 @@ function showSocialNetwork()
 			items.show();
 			lnk.text("'.dol_escape_js($langs->transnoentitiesnoconv("HideSocialNetwork")).'");
 			if(chgCookieState) {document.cookie = "DOLUSER_SOCIALNETWORKS_SHOW=true; SameSite=Strict";}
-		}				
+		}
 	}
 	</script>';
 }

From 9d314ac035d751cff8943e42e1eff3d68dc2bf3d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 18 Jan 2023 22:34:59 +0100
Subject: [PATCH 658/816] Debug v17

---
 htdocs/core/actions_addupdatedelete.inc.php                | 2 +-
 htdocs/eventorganization/class/conferenceorbooth.class.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index 49f3b2fa302..18ab3ac5eda 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -285,7 +285,7 @@ if ($action == 'update' && !empty($permissiontoadd)) {
 			$action = 'view';
 			$urltogo = $backtopage ? str_replace('__ID__', $result, $backtopage) : $backurlforlist;
 			$urltogo = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $urltogo); // New method to autoselect project after a New on another form object creation
-			if ($urltogo && !$noback) {
+			if ($urltogo && empty($noback)) {
 				header("Location: " . $urltogo);
 				exit;
 			}
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index bc21d7bb1c5..92ec38981ba 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -108,7 +108,7 @@ class ConferenceOrBooth extends ActionComm
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'csslist'=>'tdoverflowmax125', 'help'=>"OrganizationEvenLabelName", 'showoncombobox'=>'1', 'autofocusoncreate'=>1),
 		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'help'=>"OrganizationEventLinkToThirdParty", 'picto'=>'company', 'css'=>'tdoverflowmax150 maxwidth500', 'csslist'=>'width100'),
 		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1:t.usage_organize_event=1', 'label'=>'Project', 'enabled'=>"isModEnabled('project')", 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'picto'=>'project', 'css'=>'tdoverflowmax150 maxwidth500', 'csslist'=>'width100'),
-		'note' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>1),
+		'note' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>3),
 		'fk_action' => array('type'=>'sellist:c_actioncomm:libelle:id::module LIKE (\'%@eventorganization\')', 'label'=>'Format', 'enabled'=>'1', 'position'=>60, 'notnull'=>1, 'visible'=>1, 'css'=>'width100'),
 		'datep' => array('type'=>'datetime', 'label'=>'DateStart', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>1, 'showoncombobox'=>'2',),
 		'datep2' => array('type'=>'datetime', 'label'=>'DateEnd', 'enabled'=>'1', 'position'=>71, 'notnull'=>0, 'visible'=>1, 'showoncombobox'=>'3',),
@@ -249,7 +249,7 @@ class ConferenceOrBooth extends ActionComm
 
 		$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_new.php?id='.urlencode($id).'&type=conf';
 
-		$encodedsecurekey = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
+		$encodedsecurekey = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'conferenceorbooth'.$id, 2);
 		$link_subscription .= '&securekey='.urlencode($encodedsecurekey);
 
 		/*$this->fields['pubregister'] = array('type'=>'url', 'label'=>$langs->trans("PublicAttendeeSubscriptionPage"), 'enabled'=>'1', 'position'=>72, 'notnull'=>0, 'visible'=>1);

From 823a7ee72b5af6840a1197fa79882e4554e0eaef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 18 Jan 2023 22:37:08 +0100
Subject: [PATCH 659/816] fix undeclared properties

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

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 35ebda89c2c..2a462f77bc4 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2014-2015 Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2018      Nicolas ZABOURI	    <info@inovea-conseil.com>
  * Copyright (C) 2016-2022 Ferran Marcet        <fmarcet@2byte.es>
- * Copyright (C) 2021-2022 Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2021-2023 Frédéric France      <frederic.france@netlogic.fr>
  * Copyright (C) 2022      Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -236,6 +236,11 @@ class Commande extends CommonOrder
 	 */
 	public $user_valid;
 
+	/**
+	 * @var OrderLine one line of an order
+	 */
+	public $line;
+
 	/**
 	 * @var OrderLine[]
 	 */

From 20956e9b7deebbbffe8a323bfb986abe48841acf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 18 Jan 2023 22:50:13 +0100
Subject: [PATCH 660/816] Fix data truncated

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

diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index c3c08b6cf2f..f1d845bcc41 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -100,7 +100,7 @@ if (empty($reshook)) {
 			$datestart = dol_mktime(12, 0, 0, GETPOST('startmonth', 'int'), GETPOST('startday', 'int'), GETPOST('startyear', 'int'));
 			$dateend	= dol_mktime(12, 0, 0, GETPOST('endmonth', 'int'), GETPOST('endday', 'int'), GETPOST('endyear', 'int'));
 			$capital = price2num(GETPOST('capital'));
-			$rate	   = GETPOST('rate');
+			$rate	   = price2num(GETPOST('rate'));
 
 			if (!$capital) {
 				$error++; $action = 'create';

From 1a2b48c57560ac8677b493c383252a405621a9f8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 18 Jan 2023 23:07:34 +0100
Subject: [PATCH 661/816] Fix kanban

---
 htdocs/bom/bom_list.php                       | 95 ++++++++++++-------
 .../modulebuilder/template/myobject_list.php  | 14 +--
 2 files changed, 68 insertions(+), 41 deletions(-)

diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index 1cb4946715a..601eb9b75b3 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -72,6 +72,7 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // Default sort order (if not yet defined by previous GETPOST)
 if (!$sortfield) {
+	reset($object->fields);					// Reset is required to avoid key() to return null.
 	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
 }
 if (!$sortorder) {
@@ -79,7 +80,7 @@ if (!$sortorder) {
 }
 
 // Initialize array of search criterias
-$search_all = GETPOST("search_all", 'alpha');
+$search_all = GETPOST('search_all', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
 	if (GETPOST('search_'.$key, 'alpha') !== '') {
@@ -108,7 +109,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
+			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
@@ -299,7 +300,7 @@ $sql .= $object->getFieldList('t');
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key.' ' : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');
 	}
 }
 // Add fields from hooks
@@ -336,17 +337,17 @@ foreach ($search as $key => $val) {
 			$mode_search = 2;
 		}
 		if ($search[$key] != '') {
-			$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+			$sql .= natural_search("t.".$db->escape($key), $search[$key], (($key == 'status') ? 2 : $mode_search));
 		}
 	} else {
 		if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
 			$columnName=preg_replace('/(_dtstart|_dtend)$/', '', $key);
 			if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
 				if (preg_match('/_dtstart$/', $key)) {
-					$sql .= " AND t." . $columnName . " >= '" . $db->idate($search[$key]) . "'";
+					$sql .= " AND t.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
 				}
 				if (preg_match('/_dtend$/', $key)) {
-					$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
+					$sql .= " AND t.".$db->escape($columnName)." <= '".$db->idate($search[$key])."'";
 				}
 			}
 		}
@@ -366,9 +367,8 @@ $sql .= $hookmanager->resPrint;
 
 /* If a group by is required
 $sql.= " GROUP BY ";
-foreach($object->fields as $key => $val)
-{
-	$sql .= "t.".$key.", ";
+foreach($object->fields as $key => $val) {
+	$sql .= "t.".$db->escape($key).", ";
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -445,11 +445,17 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.urlencode($limit);
 }
 foreach ($search as $key => $val) {
-	if (is_array($search[$key]) && count($search[$key])) {
+	if (is_array($search[$key])) {
 		foreach ($search[$key] as $skey) {
-			$param .= '&search_'.$key.'[]='.urlencode($skey);
+			if ($skey != '') {
+				$param .= '&search_'.$key.'[]='.urlencode($skey);
+			}
 		}
-	} else {
+	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
+		$param .= '&search_'.$key.'month='.((int) GETPOST('search_'.$key.'month', 'int'));
+		$param .= '&search_'.$key.'day='.((int) GETPOST('search_'.$key.'day', 'int'));
+		$param .= '&search_'.$key.'year='.((int) GETPOST('search_'.$key.'year', 'int'));
+	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
 }
@@ -469,7 +475,7 @@ $arrayofmassactions = array(
 	'enable'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Enable"),
 	'disable'=>img_picto('', 'close_title', 'class="pictofixedwidth"').$langs->trans("Disable"),
 );
-if ($permissiontodelete) {
+if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
@@ -488,6 +494,7 @@ print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="page_y" value="">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 $newcardbutton = '';
@@ -505,10 +512,13 @@ $trackid = 'bom'.$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 = '';
@@ -544,13 +554,14 @@ print '<tr class="liste_titre">';
 
 // Action column
 if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-	print '<td class="liste_titre center">';
+	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons('left');
 	print $searchpicto;
 	print '</td>';
 }
 
 foreach ($object->fields as $key => $val) {
+	$searchkey = empty($search[$key]) ? '' : $search[$key];
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
@@ -558,13 +569,13 @@ foreach ($object->fields as $key => $val) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'rowid' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').($key == 'status' ? ' parentonrightofpage' : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100'.($key == 'status' ? ' search_status onrightofpage' : ''), 1);
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100'.($key == 'status' ? ' search_status width100 onrightofpage' : ''), 1);
 		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
 			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth125', 1);
 		} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
@@ -576,6 +587,12 @@ foreach ($object->fields as $key => $val) {
 			print '<div class="nowrap">';
 			print $form->selectDate($search[$key.'_dtend'] ? $search[$key.'_dtend'] : '', "search_".$key."_dtend", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 			print '</div>';
+		} elseif ($key == 'lang') {
+			require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+			$formadmin = new FormAdmin($db);
+			print $formadmin->select_language($search[$key], 'search_lang', 0, null, 1, 0, 0, 'minwidth150 maxwidth200', 2);
+		} else {
+			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 		}
 		print '</td>';
 	}
@@ -589,20 +606,22 @@ $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $obje
 print $hookmanager->resPrint;
 // Action column
 if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-	print '<td class="liste_titre center">';
+	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
 }
 print '</tr>'."\n";
 
+$totalarray = array();
+$totalarray['nbfield'] = 0;
 
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 // Action column
 if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 }
 foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
@@ -612,23 +631,26 @@ foreach ($object->fields as $key => $val) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'rowid' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
+	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
+		$totalarray['nbfield']++;
 	}
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
 if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 }
+$totalarray['nbfield']++;	// For the column action
 print '</tr>'."\n";
 
 
@@ -646,9 +668,11 @@ if (isset($extrafields->attributes[$object->table_element]['computed']) && is_ar
 // Loop on record
 // --------------------------------------------------------------------
 $i = 0;
+$savnbfield = $totalarray['nbfield'];
 $totalarray = array();
 $totalarray['nbfield'] = 0;
-while ($i < ($limit ? min($num, $limit) : $num)) {
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
 		break; // Should not happen
@@ -660,20 +684,19 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	// mode view kanban
 	if ($mode == 'kanban') {
 		if ($i == 0) {
-			print '<tr><td colspan="12">';
+			print '<tr><td colspan="'.$savnbfield.'">';
 			print '<div class="box-flex-container">';
 		}
-
+		// Output kanban
 		print $object->getKanbanView('');
-
-
-		if ($i == min($num, $limit)-1) {
+		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';
 		}
 	} else {
 		// Show here line of result
-		print '<tr class="oddeven">';
+		$j = 0;
+		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
 		// Action column
 		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 			print '<td class="nowrap center">';
@@ -705,7 +728,11 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			}
 
 			if (!empty($arrayfields['t.'.$key]['checked'])) {
-				print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
+				print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '');
+				if (preg_match('/tdoverflow/', $cssforfield)) {
+					print ' title="'.dol_escape_htmltag($object->$key).'"';
+				}
+				print '>';
 				if ($key == 'status') {
 					print $object->getLibStatut(5);
 				} elseif ($key == 'rowid') {
@@ -754,9 +781,9 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		}
 
 		print '</tr>'."\n";
-
-		$i++;
 	}
+
+	$i++;
 }
 
 // Show total line
@@ -771,14 +798,14 @@ if ($num == 0) {
 			$colspan++;
 		}
 	}
-	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
 }
 
 
 $db->free($resql);
 
 $parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
 print '</table>'."\n";
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 5ff0628bc8f..b28a7a5f955 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -136,7 +136,7 @@ if (!$sortorder) {
 }
 
 // Initialize array of search criterias
-$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
+$search_all = GETPOST('search_all', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
 	if (GETPOST('search_'.$key, 'alpha') !== '') {
@@ -552,7 +552,7 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 // Action column
-if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons('left');
 	print $searchpicto;
@@ -604,7 +604,7 @@ print $hookmanager->resPrint;
 	print '<td class="liste_titre"></td>';
 }*/
 // Action column
-if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
@@ -618,7 +618,7 @@ $totalarray['nbfield'] = 0;
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
-if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 }
 foreach ($object->fields as $key => $val) {
@@ -649,7 +649,7 @@ print $hookmanager->resPrint;
 	$totalarray['nbfield']++;
 }*/
 // Action column
-if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 }
 $totalarray['nbfield']++;	// For the column action
@@ -699,7 +699,7 @@ while ($i < $imaxinloop) {
 		$j = 0;
 		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
 		// Action column
-		if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 			print '<td class="nowrap center">';
 			if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 				$selected = 0;
@@ -770,7 +770,7 @@ while ($i < $imaxinloop) {
 			print '<td class="right">'.$obj->anotherfield.'</td>';
 		}*/
 		// Action column
-		if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 			print '<td class="nowrap center">';
 			if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 				$selected = 0;

From 1f3fb86e9b002525c6e47b560864ae3d3ad9fe22 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 18 Jan 2023 23:15:10 +0100
Subject: [PATCH 662/816] css

---
 .../class/conferenceorbooth.class.php         |  2 +-
 .../conferenceorbooth_list.php                | 22 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 92ec38981ba..76b1941fe69 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -106,7 +106,7 @@ class ConferenceOrBooth extends ActionComm
 		'id' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
 		'ref' => array('type'=>'integer', 'label'=>'Ref', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>2, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'csslist'=>'left', 'comment'=>"Id"),
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'csslist'=>'tdoverflowmax125', 'help'=>"OrganizationEvenLabelName", 'showoncombobox'=>'1', 'autofocusoncreate'=>1),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'help'=>"OrganizationEventLinkToThirdParty", 'picto'=>'company', 'css'=>'tdoverflowmax150 maxwidth500', 'csslist'=>'width100'),
+		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'help'=>"OrganizationEventLinkToThirdParty", 'picto'=>'company', 'csslist'=>'tdoverflowmax150', 'css'=>'maxwidth500'),
 		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1:t.usage_organize_event=1', 'label'=>'Project', 'enabled'=>"isModEnabled('project')", 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'picto'=>'project', 'css'=>'tdoverflowmax150 maxwidth500', 'csslist'=>'width100'),
 		'note' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>3),
 		'fk_action' => array('type'=>'sellist:c_actioncomm:libelle:id::module LIKE (\'%@eventorganization\')', 'label'=>'Format', 'enabled'=>'1', 'position'=>60, 'notnull'=>1, 'visible'=>1, 'css'=>'width100'),
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index 1dd77122384..21172d774d9 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -757,7 +757,7 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 // Action column
-if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons('left');
 	print $searchpicto;
@@ -776,9 +776,9 @@ foreach ($object->fields as $key => $val) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
-		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
+		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').($key == 'status' ? ' parentonrightofpage' : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100'.($key == 'status' ? ' search_status onrightofpage' : ''), 1);
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100'.($key == 'status' ? ' search_status width100 onrightofpage' : ''), 1);
 		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
 			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', $cssforfield.' maxwidth250', 1);
 		} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
@@ -806,7 +806,7 @@ $parameters = array('arrayfields'=>$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
@@ -820,7 +820,7 @@ $totalarray['nbfield'] = 0;
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
-if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 }
 foreach ($object->fields as $key => $val) {
@@ -831,7 +831,7 @@ foreach ($object->fields as $key => $val) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'rowid' && $key != 'ref' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'rowid' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
@@ -847,7 +847,7 @@ $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 }
 $totalarray['nbfield']++;
@@ -885,7 +885,7 @@ while ($i < $imaxinloop) {
 	$j = 0;
 	print '<tr data-rowid="'.$object->id.'" class="oddeven">';
 	// Action column
-	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 		print '<td class="nowrap center">';
 		if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 			$selected = 0;
@@ -910,7 +910,7 @@ while ($i < $imaxinloop) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 		}
 
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'ref', 'status'))) {
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'right';
 		}
 		//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
@@ -953,7 +953,7 @@ while ($i < $imaxinloop) {
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Action column
-	if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 		print '<td class="nowrap center">';
 		if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 			$selected = 0;
@@ -984,7 +984,7 @@ if ($num == 0) {
 			$colspan++;
 		}
 	}
-	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
 }
 
 

From a4c06a2188edad3fd08e609bff92a5368e50f4ca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 18 Jan 2023 23:19:09 +0100
Subject: [PATCH 663/816] css

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

diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 76b1941fe69..b3232f079f6 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -112,13 +112,13 @@ class ConferenceOrBooth extends ActionComm
 		'fk_action' => array('type'=>'sellist:c_actioncomm:libelle:id::module LIKE (\'%@eventorganization\')', 'label'=>'Format', 'enabled'=>'1', 'position'=>60, 'notnull'=>1, 'visible'=>1, 'css'=>'width100'),
 		'datep' => array('type'=>'datetime', 'label'=>'DateStart', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>1, 'showoncombobox'=>'2',),
 		'datep2' => array('type'=>'datetime', 'label'=>'DateEnd', 'enabled'=>'1', 'position'=>71, 'notnull'=>0, 'visible'=>1, 'showoncombobox'=>'3',),
-		'datec' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
-		'fk_user_author' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
-		'fk_user_mod' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
+		'datec' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2, 'csslist'=>'nowraponall'),
+		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2, 'csslist'=>'nowraponall'),
+		'fk_user_author' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid', 'csslist'=>'tdoverflowmax100'),
+		'fk_user_mod' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2, 'csslist'=>'tdoverflowmax100'),
+		'num_vote' => array('type'=>'smallint', 'label'=>'NbVotes', 'enabled'=>'1', 'position'=>800, 'notnull'=>-1, 'visible'=>5, 'default'=>'0', 'index'=>0),
 		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
 		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>1, 'default'=>'0', 'index'=>1, 'arrayofkeyval'=>array('0'=>'EvntOrgDraft', '1'=>'EvntOrgSuggested', '2'=> 'EvntOrgConfirmed', '3' =>'EvntOrgNotQualified', '4' =>'EvntOrgDone', '9'=>'EvntOrgCancelled'),),
-		'num_vote' => array('type'=>'smallint', 'label'=>'NbVotes', 'enabled'=>'1', 'position'=>1001, 'notnull'=>-1, 'visible'=>5, 'default'=>'0', 'index'=>0),
 	);
 	public $rowid;
 	public $id;

From ff7a666c2b2e53191198e4187466e98b854e3f84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 18 Jan 2023 23:43:54 +0100
Subject: [PATCH 664/816] Update bonprelevement.class.php

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

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index a1dcdba6f58..7d16bcd8136 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1690,7 +1690,7 @@ class BonPrelevement extends CommonObject
 
 		fclose($this->file);
 		if (!empty($conf->global->MAIN_UMASK)) {
-			@chmod($this->file, octdec($conf->global->MAIN_UMASK));
+			@chmod($this->filename, octdec($conf->global->MAIN_UMASK));
 		}
 
 		return $result;

From a33603b6aeb76b9e67d35744865c1639dea9a189 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 18 Jan 2023 23:58:26 +0100
Subject: [PATCH 665/816] Doxygen

---
 .../fichinter/class/api_interventions.class.php  | 16 ++++++----------
 htdocs/reception/class/api_receptions.class.php  | 15 +++++++--------
 .../recruitment/class/api_recruitment.class.php  |  8 ++++----
 htdocs/societe/class/api_thirdparties.class.php  | 13 +++++++------
 .../class/api_supplier_proposals.class.php       |  2 +-
 htdocs/zapier/class/api_zapier.class.php         |  4 ++--
 6 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/htdocs/fichinter/class/api_interventions.class.php b/htdocs/fichinter/class/api_interventions.class.php
index f96dc3d6aa7..14fc9f16fcf 100644
--- a/htdocs/fichinter/class/api_interventions.class.php
+++ b/htdocs/fichinter/class/api_interventions.class.php
@@ -64,11 +64,10 @@ class Interventions extends DolibarrApi
 
 	/**
 	 * Get properties of a Expense Report object
-	 *
 	 * Return an array with Expense Report information
 	 *
 	 * @param       int         $id         ID of Expense Report
-	 * @return 	    array|mixed             Data without useless information
+	 * @return  	Object              	Object with cleaned properties
 	 *
 	 * @throws 	RestException
 	 */
@@ -93,7 +92,6 @@ class Interventions extends DolibarrApi
 
 	/**
 	 * List of interventions
-	 *
 	 * Return a list of interventions
 	 *
 	 * @param string	       $sortfield	        Sort field
@@ -336,12 +334,11 @@ class Interventions extends DolibarrApi
 	 *   "notrigger": 0
 	 * }
 	 *
-	 * @param   int $id             Intervention ID
-	 * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
+	 * @param   int 	$id             Intervention ID
+	 * @param   int 	$notrigger      1=Does not execute triggers, 0= execute triggers
+	 * @return  Object              	Object with cleaned properties
 	 *
 	 * @url POST    {id}/validate
-	 *
-	 * @return  array
 	 */
 	public function validate($id, $notrigger = 0)
 	{
@@ -373,11 +370,10 @@ class Interventions extends DolibarrApi
 	/**
 	 * Close an intervention
 	 *
-	 * @param   int 	$id             Intervention ID
+	 * @param   	int 	$id             Intervention ID
+	 * @return  	Object              	Object with cleaned properties
 	 *
 	 * @url POST    {id}/close
-	 *
-	 * @return  array
 	 */
 	public function closeFichinter($id)
 	{
diff --git a/htdocs/reception/class/api_receptions.class.php b/htdocs/reception/class/api_receptions.class.php
index 473650161e2..ca46cb8909c 100644
--- a/htdocs/reception/class/api_receptions.class.php
+++ b/htdocs/reception/class/api_receptions.class.php
@@ -59,7 +59,7 @@ class Receptions extends DolibarrApi
 	 * Return an array with reception informations
 	 *
 	 * @param       int         $id         ID of reception
-	 * @return 	array|mixed data without useless information
+	 * @return  	Object              	Object with cleaned properties
 	 *
 	 * @throws 	RestException
 	 */
@@ -497,12 +497,12 @@ class Receptions extends DolibarrApi
 	 * This may record stock movements if module stock is enabled and option to
 	 * decrease stock on reception is on.
 	 *
-	 * @param   int $id             Reception ID
-	 * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
+	 * @param   int 	$id             Reception ID
+	 * @param   int 	$notrigger      1=Does not execute triggers, 0= execute triggers
+	 * @return  Object              	Object with cleaned properties
 	 *
 	 * @url POST    {id}/validate
 	 *
-	 * @return  array
 	 * \todo An error 403 is returned if the request has an empty body.
 	 * Error message: "Forbidden: Content type `text/plain` is not supported."
 	 * Workaround: send this in the body
@@ -625,12 +625,11 @@ class Receptions extends DolibarrApi
 	/**
 	* Close a reception (Classify it as "Delivered")
 	*
-	* @param   int     $id             Reception ID
-	* @param   int     $notrigger      Disabled triggers
+	* @param   	int     $id             Reception ID
+	* @param   	int     $notrigger      Disabled triggers
+	* @return  	Object              	Object with cleaned properties
 	*
 	* @url POST    {id}/close
-	*
-	* @return  int
 	*/
 	public function close($id, $notrigger = 0)
 	{
diff --git a/htdocs/recruitment/class/api_recruitment.class.php b/htdocs/recruitment/class/api_recruitment.class.php
index cf4fa7a143e..9162a6250f3 100644
--- a/htdocs/recruitment/class/api_recruitment.class.php
+++ b/htdocs/recruitment/class/api_recruitment.class.php
@@ -66,8 +66,8 @@ class Recruitment extends DolibarrApi
 	 *
 	 * Return an array with jobposition informations
 	 *
-	 * @param 	int 	$id ID of jobposition
-	 * @return 	array|mixed data without useless information
+	 * @param 	int 		$id 	ID of jobposition
+	 * @return  Object             	Object with cleaned properties
 	 *
 	 * @url	GET jobposition/{id}
 	 *
@@ -97,8 +97,8 @@ class Recruitment extends DolibarrApi
 	 *
 	 * Return an array with candidature informations
 	 *
-	 * @param 	int 	$id ID of candidature
-	 * @return 	array|mixed data without useless information
+	 * @param 	int 	$id 	ID of candidature
+	 * @return  Object          Object with cleaned properties
 	 *
 	 * @url	GET candidature/{id}
 	 *
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index c4781c0df6a..10266b6f0ac 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -523,8 +523,8 @@ class Thirdparties extends DolibarrApi
 	/**
 	 * Delete thirdparty
 	 *
-	 * @param int $id   Thirdparty ID
-	 * @return integer
+	 * @param 	int 	$id   Thirdparty ID
+	 * @return 	array
 	 */
 	public function delete($id)
 	{
@@ -1351,10 +1351,10 @@ class Thirdparties extends DolibarrApi
 	/**
 	 * Generate a Document from a bank account record (like SEPA mandate)
 	 *
-	 * @param int 		$id 			Thirdparty id
-	 * @param int 		$companybankid 	Companybank id
-	 * @param string 	$model 			Model of document to generate
-	 * @return void
+	 * @param 	int 		$id 			Thirdparty id
+	 * @param 	int 		$companybankid 	Companybank id
+	 * @param 	string 		$model 			Model of document to generate
+	 * @return 	array
 	 *
 	 * @url GET {id}/generateBankAccountDocument/{companybankid}/{model}
 	 */
@@ -1375,6 +1375,7 @@ class Thirdparties extends DolibarrApi
 		$this->company->setDocModel(DolibarrApiAccess::$user, $model);
 
 		$this->company->fk_bank = $this->company->fk_account;
+		$this->company->fk_account = $this->company->fk_account;
 
 		$outputlangs = $langs;
 		$newlang = '';
diff --git a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
index f2036edda88..496d67df829 100644
--- a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
+++ b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
@@ -58,7 +58,7 @@ class Supplierproposals extends DolibarrApi
 	 * Return an array with supplier proposal informations
 	 *
 	 * @param       int         $id         ID of supplier proposal
-	 * @return 	array|mixed data without useless information
+	 * @return  	Object              	Object with cleaned properties
 	 *
 	 * @throws 	RestException
 	 */
diff --git a/htdocs/zapier/class/api_zapier.class.php b/htdocs/zapier/class/api_zapier.class.php
index 56ab923435d..aac72a281f7 100644
--- a/htdocs/zapier/class/api_zapier.class.php
+++ b/htdocs/zapier/class/api_zapier.class.php
@@ -66,8 +66,8 @@ class Zapier extends DolibarrApi
 	 *
 	 * Return an array with hook informations
 	 *
-	 * @param   int             $id ID of hook
-	 * @return  array|mixed     data without useless information
+	 * @param   int             $id 	ID of hook
+	 * @return  Object              	Object with cleaned properties
 	 *
 	 * @url GET /hooks/{id}
 	 * @throws  RestException

From 58645a1d4aadc575d5c965573d7dd56b3a1df0a6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 19 Jan 2023 00:19:57 +0100
Subject: [PATCH 666/816] Debug v17

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

diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index c2ad387d955..6ea79cf00eb 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -241,7 +241,7 @@ if ($arrayfields['version']['checked']) {
 }
 if ($arrayfields['id']['checked']) {
 	print '<td class="liste_titre left">';
-	print '<input class="flat" type="text" name="search_id" size="6 value="'.dol_escape_htmltag($search_id).'">';
+	print '<input class="flat" type="text" name="search_id" size="6" value="'.dol_escape_htmltag($search_id).'">';
 	print '</td>';
 }
 if ($arrayfields['permission']['checked']) {

From e28fce631827f318431287ea71c20367b52f3542 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 19 Jan 2023 01:16:39 +0100
Subject: [PATCH 667/816] Debug

---
 htdocs/bookcal/admin/about.php                | 80 -------------------
 .../admin/availabilities_extrafields.php      |  4 +-
 htdocs/bookcal/admin/booking_extrafields.php  |  4 +-
 htdocs/bookcal/admin/setup.php                |  4 +-
 htdocs/bookcal/availabilities_agenda.php      |  2 +-
 htdocs/bookcal/availabilities_card.php        |  2 +-
 htdocs/bookcal/availabilities_contact.php     |  2 +-
 htdocs/bookcal/availabilities_document.php    |  2 +-
 htdocs/bookcal/availabilities_list.php        |  4 +-
 htdocs/bookcal/availabilities_note.php        |  2 +-
 htdocs/bookcal/bookcalindex.php               |  2 +-
 htdocs/bookcal/booking_agenda.php             |  2 +-
 htdocs/bookcal/booking_card.php               |  2 +-
 htdocs/bookcal/booking_contact.php            |  2 +-
 htdocs/bookcal/booking_document.php           |  2 +-
 htdocs/bookcal/booking_list.php               |  2 +-
 htdocs/bookcal/booking_note.php               |  2 +-
 htdocs/bookcal/class/availabilities.class.php | 12 +--
 htdocs/bookcal/class/booking.class.php        |  6 +-
 htdocs/bookcal/lib/bookcal.lib.php            |  7 +-
 .../lib/bookcal_availabilities.lib.php        |  2 +-
 htdocs/bookcal/lib/bookcal_booking.lib.php    |  2 +-
 htdocs/comm/action/index.php                  |  6 +-
 htdocs/core/class/commonobject.class.php      | 19 +++--
 htdocs/core/modules/modBookCal.class.php      |  8 +-
 htdocs/langs/en_US/admin.lang                 |  2 +
 htdocs/societe/class/societe.class.php        |  4 +-
 27 files changed, 56 insertions(+), 132 deletions(-)
 delete mode 100644 htdocs/bookcal/admin/about.php

diff --git a/htdocs/bookcal/admin/about.php b/htdocs/bookcal/admin/about.php
deleted file mode 100644
index 2ff4e874450..00000000000
--- a/htdocs/bookcal/admin/about.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2022 Alice Adminson <aadminson@example.com>
- *
- * This 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    bookcal/admin/about.php
- * \ingroup bookcal
- * \brief   About page of module BookCal.
- */
-
-// Load Dolibarr environment
-require '../../main.inc.php';
-
-// Libraries
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once '../lib/bookcal.lib.php';
-
-// Translations
-$langs->loadLangs(array("errors", "admin", "bookcal@bookcal"));
-
-// Access control
-if (!$user->admin) {
-	accessforbidden();
-}
-
-// Parameters
-$action = GETPOST('action', 'aZ09');
-$backtopage = GETPOST('backtopage', 'alpha');
-
-
-/*
- * Actions
- */
-
-// None
-
-
-/*
- * View
- */
-
-$form = new Form($db);
-
-$help_url = '';
-$page_name = "BookCalAbout";
-
-llxHeader('', $langs->trans($page_name), $help_url);
-
-// 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, 'title_setup');
-
-// Configuration header
-$head = bookcalAdminPrepareHead();
-print dol_get_fiche_head($head, 'about', $langs->trans($page_name), 0, 'bookcal@bookcal');
-
-dol_include_once('/bookcal/core/modules/modBookCal.class.php');
-$tmpmodule = new modBookCal($db);
-print $tmpmodule->getDescLong();
-
-// Page end
-print dol_get_fiche_end();
-llxFooter();
-$db->close();
diff --git a/htdocs/bookcal/admin/availabilities_extrafields.php b/htdocs/bookcal/admin/availabilities_extrafields.php
index ba7dca39570..190a44f339d 100644
--- a/htdocs/bookcal/admin/availabilities_extrafields.php
+++ b/htdocs/bookcal/admin/availabilities_extrafields.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once '../lib/bookcal.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('bookcal@bookcal', 'admin'));
+$langs->loadLangs(array('agenda', 'admin'));
 
 $extrafields = new ExtraFields($db);
 $form = new Form($db);
@@ -80,7 +80,7 @@ print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
 
 $head = bookcalAdminPrepareHead();
 
-print dol_get_fiche_head($head, 'availabilities_extrafields', $langs->trans($page_name), -1, 'bookcal@bookcal');
+print dol_get_fiche_head($head, 'availabilities_extrafields', $langs->trans($page_name), -1, 'fa-calendar-check');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/bookcal/admin/booking_extrafields.php b/htdocs/bookcal/admin/booking_extrafields.php
index 2e9163af158..b4029a99338 100644
--- a/htdocs/bookcal/admin/booking_extrafields.php
+++ b/htdocs/bookcal/admin/booking_extrafields.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once '../lib/bookcal.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('bookcal@bookcal', 'admin'));
+$langs->loadLangs(array('agenda', 'admin'));
 
 $extrafields = new ExtraFields($db);
 $form = new Form($db);
@@ -80,7 +80,7 @@ print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
 
 $head = bookcalAdminPrepareHead();
 
-print dol_get_fiche_head($head, 'booking_extrafields', $langs->trans($page_name), -1, 'bookcal@bookcal');
+print dol_get_fiche_head($head, 'booking_extrafields', $langs->trans($page_name), -1, 'fa-calendar-check');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/bookcal/admin/setup.php b/htdocs/bookcal/admin/setup.php
index 9772ffbbbf0..e3addec83e3 100644
--- a/htdocs/bookcal/admin/setup.php
+++ b/htdocs/bookcal/admin/setup.php
@@ -33,7 +33,7 @@ require_once '../lib/bookcal.lib.php';
 //require_once "../class/myclass.class.php";
 
 // Translations
-$langs->loadLangs(array("admin", "bookcal@bookcal"));
+$langs->loadLangs(array("admin", "agenda"));
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('bookcalsetup', 'globalsetup'));
@@ -269,7 +269,7 @@ print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
 
 // Configuration header
 $head = bookcalAdminPrepareHead();
-print dol_get_fiche_head($head, 'settings', $langs->trans($page_name), -1, "bookcal@bookcal");
+print dol_get_fiche_head($head, 'settings', $langs->trans($page_name), -1, "fa-calendar-check");
 
 // Setup page goes here
 echo '<span class="opacitymedium">'.$langs->trans("BookCalSetupPage").'</span><br><br>';
diff --git a/htdocs/bookcal/availabilities_agenda.php b/htdocs/bookcal/availabilities_agenda.php
index 0d34fa992c1..d97970c3add 100644
--- a/htdocs/bookcal/availabilities_agenda.php
+++ b/htdocs/bookcal/availabilities_agenda.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_availabilities.lib.php';
 
 
 // Load translation files required by the page
-$langs->loadLangs(array("bookcal@bookcal", "other"));
+$langs->loadLangs(array("agenda", "other"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
diff --git a/htdocs/bookcal/availabilities_card.php b/htdocs/bookcal/availabilities_card.php
index ac580c650c5..f64b5e6f4b6 100644
--- a/htdocs/bookcal/availabilities_card.php
+++ b/htdocs/bookcal/availabilities_card.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/bookcal/class/availabilities.class.php';
 require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_availabilities.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("bookcal@bookcal", "other"));
+$langs->loadLangs(array("agenda", "other"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
diff --git a/htdocs/bookcal/availabilities_contact.php b/htdocs/bookcal/availabilities_contact.php
index 41508aaa46a..348602f58a9 100644
--- a/htdocs/bookcal/availabilities_contact.php
+++ b/htdocs/bookcal/availabilities_contact.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/bookcal/class/availabilities.class.php';
 require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_availabilities.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("bookcal@bookcal", "companies", "other", "mails"));
+$langs->loadLangs(array("agenda", "companies", "other", "mails"));
 
 $id     = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
 $ref    = GETPOST('ref', 'alpha');
diff --git a/htdocs/bookcal/availabilities_document.php b/htdocs/bookcal/availabilities_document.php
index e7335bff74c..ed6b2976570 100644
--- a/htdocs/bookcal/availabilities_document.php
+++ b/htdocs/bookcal/availabilities_document.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/bookcal/class/availabilities.class.php';
 require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_availabilities.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("bookcal@bookcal", "companies", "other", "mails"));
+$langs->loadLangs(array("agenda", "companies", "other", "mails"));
 
 
 $action = GETPOST('action', 'aZ09');
diff --git a/htdocs/bookcal/availabilities_list.php b/htdocs/bookcal/availabilities_list.php
index 9af4b65a022..26d66ce0ca4 100644
--- a/htdocs/bookcal/availabilities_list.php
+++ b/htdocs/bookcal/availabilities_list.php
@@ -36,7 +36,7 @@ require_once __DIR__.'/class/availabilities.class.php';
 //dol_include_once('/othermodule/class/otherobject.class.php');
 
 // Load translation files required by the page
-$langs->loadLangs(array("bookcal@bookcal", "other"));
+$langs->loadLangs(array("agenda", "other"));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
@@ -210,7 +210,7 @@ $now = dol_now();
 
 //$help_url = "EN:Module_Availabilities|FR:Module_Availabilities_FR|ES:Módulo_Availabilities";
 $help_url = '';
-$title = $langs->trans("Availabilitiess");
+$title = $langs->trans("Availabilities");
 $morejs = array();
 $morecss = array();
 
diff --git a/htdocs/bookcal/availabilities_note.php b/htdocs/bookcal/availabilities_note.php
index 44ced158e03..6913491d85e 100644
--- a/htdocs/bookcal/availabilities_note.php
+++ b/htdocs/bookcal/availabilities_note.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/bookcal/class/availabilities.class.php';
 require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_availabilities.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("bookcal@bookcal", "companies"));
+$langs->loadLangs(array("agenda", "companies"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
diff --git a/htdocs/bookcal/bookcalindex.php b/htdocs/bookcal/bookcalindex.php
index 6ec6ae6fb3e..46281eb048a 100644
--- a/htdocs/bookcal/bookcalindex.php
+++ b/htdocs/bookcal/bookcalindex.php
@@ -30,7 +30,7 @@ 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("bookcal@bookcal"));
+$langs->loadLangs(array("agenda"));
 
 $action = GETPOST('action', 'aZ09');
 
diff --git a/htdocs/bookcal/booking_agenda.php b/htdocs/bookcal/booking_agenda.php
index a9163d7f70d..fb26fce4fc7 100644
--- a/htdocs/bookcal/booking_agenda.php
+++ b/htdocs/bookcal/booking_agenda.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_booking.lib.php';
 
 
 // Load translation files required by the page
-$langs->loadLangs(array("bookcal@bookcal", "other"));
+$langs->loadLangs(array("agenda", "other"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
diff --git a/htdocs/bookcal/booking_card.php b/htdocs/bookcal/booking_card.php
index 7f0fc3b9f3a..82bd884cd2d 100644
--- a/htdocs/bookcal/booking_card.php
+++ b/htdocs/bookcal/booking_card.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/bookcal/class/booking.class.php';
 require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_booking.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("bookcal@bookcal", "other"));
+$langs->loadLangs(array("agenda", "other"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
diff --git a/htdocs/bookcal/booking_contact.php b/htdocs/bookcal/booking_contact.php
index bb73368b770..631f6af8e6c 100644
--- a/htdocs/bookcal/booking_contact.php
+++ b/htdocs/bookcal/booking_contact.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/bookcal/class/booking.class.php';
 require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_booking.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("bookcal@bookcal", "companies", "other", "mails"));
+$langs->loadLangs(array("agenda", "companies", "other", "mails"));
 
 $id     = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
 $ref    = GETPOST('ref', 'alpha');
diff --git a/htdocs/bookcal/booking_document.php b/htdocs/bookcal/booking_document.php
index c102597e189..fa925759399 100644
--- a/htdocs/bookcal/booking_document.php
+++ b/htdocs/bookcal/booking_document.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/bookcal/class/booking.class.php';
 require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_booking.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("bookcal@bookcal", "companies", "other", "mails"));
+$langs->loadLangs(array("agenda", "companies", "other", "mails"));
 
 
 $action = GETPOST('action', 'aZ09');
diff --git a/htdocs/bookcal/booking_list.php b/htdocs/bookcal/booking_list.php
index c7ebdd6f378..2e4fbfccd16 100644
--- a/htdocs/bookcal/booking_list.php
+++ b/htdocs/bookcal/booking_list.php
@@ -36,7 +36,7 @@ require_once __DIR__.'/class/booking.class.php';
 //dol_include_once('/othermodule/class/otherobject.class.php');
 
 // Load translation files required by the page
-$langs->loadLangs(array("bookcal@bookcal", "other"));
+$langs->loadLangs(array("agenda", "other"));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
diff --git a/htdocs/bookcal/booking_note.php b/htdocs/bookcal/booking_note.php
index c8b2de4e6ff..809f382cc16 100644
--- a/htdocs/bookcal/booking_note.php
+++ b/htdocs/bookcal/booking_note.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/bookcal/class/booking.class.php';
 require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_booking.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("bookcal@bookcal", "companies"));
+$langs->loadLangs(array("agenda", "companies"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
diff --git a/htdocs/bookcal/class/availabilities.class.php b/htdocs/bookcal/class/availabilities.class.php
index 3ccc4542670..6b4502e3364 100644
--- a/htdocs/bookcal/class/availabilities.class.php
+++ b/htdocs/bookcal/class/availabilities.class.php
@@ -116,10 +116,10 @@ class Availabilities extends CommonObject
 		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
 		'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
 		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>'1', 'position'=>2000, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated', '9'=>'Canceled'), 'validate'=>'1',),
-		'start' => array('type'=>'date', 'label'=>'Start Date', 'enabled'=>'1', 'position'=>40, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'isameasure'=>'1',),
-		'end' => array('type'=>'date', 'label'=>'End Date', 'enabled'=>'1', 'position'=>45, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'isameasure'=>'1',),
+		'start' => array('type'=>'date', 'label'=>'Start Date', 'enabled'=>'1', 'position'=>40, 'notnull'=>1, 'visible'=>1, 'searchall'=>1),
+		'end' => array('type'=>'date', 'label'=>'End Date', 'enabled'=>'1', 'position'=>45, 'notnull'=>1, 'visible'=>1, 'searchall'=>1),
 		'type' => array('type'=>'integer', 'label'=>'Type', 'enabled'=>'1', 'position'=>49, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Customer', '1'=>'Supplier', '2'=>'Else'),),
-		'duration' => array('type'=>'integer', 'label'=>'Duration', 'enabled'=>'1', 'position'=>47, 'notnull'=>1, 'visible'=>1, 'default'=>'30', 'isameasure'=>'1',),
+		'duration' => array('type'=>'integer', 'label'=>'Duration', 'enabled'=>'1', 'position'=>47, 'notnull'=>1, 'visible'=>1, 'default'=>'30'),
 		'startHour' => array('type'=>'integer', 'label'=>'Start Hour', 'enabled'=>'1', 'position'=>46, 'notnull'=>1, 'visible'=>-1,),
 		'endHour' => array('type'=>'integer', 'label'=>'End Hour', 'enabled'=>'1', 'position'=>46.5, 'notnull'=>1, 'visible'=>-1,),
 	);
@@ -842,7 +842,7 @@ class Availabilities extends CommonObject
 		// phpcs:enable
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
-			//$langs->load("bookcal@bookcal");
+			//$langs->load("agenda");
 			$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
 			$this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
 			$this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
@@ -944,7 +944,7 @@ class Availabilities extends CommonObject
 	public function getNextNumRef()
 	{
 		global $langs, $conf;
-		$langs->load("bookcal@bookcal");
+		$langs->load("agenda");
 
 		if (empty($conf->global->BOOKCAL_AVAILABILITIES_ADDON)) {
 			$conf->global->BOOKCAL_AVAILABILITIES_ADDON = 'mod_availabilities_standard';
@@ -1009,7 +1009,7 @@ class Availabilities extends CommonObject
 		$result = 0;
 		$includedocgeneration = 0;
 
-		$langs->load("bookcal@bookcal");
+		$langs->load("agenda");
 
 		if (!dol_strlen($modele)) {
 			$modele = 'standard_availabilities';
diff --git a/htdocs/bookcal/class/booking.class.php b/htdocs/bookcal/class/booking.class.php
index 1a4f402626b..80807d7125f 100644
--- a/htdocs/bookcal/class/booking.class.php
+++ b/htdocs/bookcal/class/booking.class.php
@@ -842,7 +842,7 @@ class Booking extends CommonObject
 		// phpcs:enable
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
-			//$langs->load("bookcal@bookcal");
+			//$langs->load("agenda");
 			$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
 			$this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
 			$this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
@@ -944,7 +944,7 @@ class Booking extends CommonObject
 	public function getNextNumRef()
 	{
 		global $langs, $conf;
-		$langs->load("bookcal@bookcal");
+		$langs->load("agenda");
 
 		if (empty($conf->global->BOOKCAL_BOOKING_ADDON)) {
 			$conf->global->BOOKCAL_BOOKING_ADDON = 'mod_booking_standard';
@@ -1009,7 +1009,7 @@ class Booking extends CommonObject
 		$result = 0;
 		$includedocgeneration = 0;
 
-		$langs->load("bookcal@bookcal");
+		$langs->load("agenda");
 
 		if (!dol_strlen($modele)) {
 			$modele = 'standard_booking';
diff --git a/htdocs/bookcal/lib/bookcal.lib.php b/htdocs/bookcal/lib/bookcal.lib.php
index bc60468fb1d..3f809da08d8 100644
--- a/htdocs/bookcal/lib/bookcal.lib.php
+++ b/htdocs/bookcal/lib/bookcal.lib.php
@@ -30,7 +30,7 @@ function bookcalAdminPrepareHead()
 {
 	global $langs, $conf;
 
-	$langs->load("bookcal@bookcal");
+	$langs->load("agenda");
 
 	$h = 0;
 	$head = array();
@@ -47,11 +47,6 @@ function bookcalAdminPrepareHead()
 	$h++;
 	*/
 
-	$head[$h][0] = dol_buildpath("/bookcal/admin/about.php", 1);
-	$head[$h][1] = $langs->trans("About");
-	$head[$h][2] = 'about';
-	$h++;
-
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
 	//$this->tabs = array(
diff --git a/htdocs/bookcal/lib/bookcal_availabilities.lib.php b/htdocs/bookcal/lib/bookcal_availabilities.lib.php
index 83d204a2d76..1fb4b2aed75 100644
--- a/htdocs/bookcal/lib/bookcal_availabilities.lib.php
+++ b/htdocs/bookcal/lib/bookcal_availabilities.lib.php
@@ -31,7 +31,7 @@ function availabilitiesPrepareHead($object)
 {
 	global $db, $langs, $conf;
 
-	$langs->load("bookcal@bookcal");
+	$langs->load("agenda");
 
 	$showtabofpagecontact = 1;
 	$showtabofpagenote = 1;
diff --git a/htdocs/bookcal/lib/bookcal_booking.lib.php b/htdocs/bookcal/lib/bookcal_booking.lib.php
index a6cb0e50df6..c0dec7d6d2e 100644
--- a/htdocs/bookcal/lib/bookcal_booking.lib.php
+++ b/htdocs/bookcal/lib/bookcal_booking.lib.php
@@ -31,7 +31,7 @@ function bookingPrepareHead($object)
 {
 	global $db, $langs, $conf;
 
-	$langs->load("bookcal@bookcal");
+	$langs->load("agenda");
 
 	$showtabofpagecontact = 1;
 	$showtabofpagenote = 1;
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 8ec011f5e9d..e730243bfbf 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -1945,7 +1945,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 						}
 
 						$listofusertoshow = '';
-						$listofusertoshow .= '<br>'.$cacheusers[$tmpid]->getNomUrl(-1, '', 0, 0, 0, 0, '', 'paddingright valigntextbottom');
+						$listofusertoshow .= '<br>'.$cacheusers[$tmpid]->getNomUrl(-1, '', 0, 0, 0, 0, '', 'paddingright valignmiddle');
 						print $listofusertoshow;
 					} else {										// Other calendar
 						// Picto
@@ -2020,7 +2020,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 								$cacheusers[$tmpid] = $newuser;
 							}
 
-							$listofusertoshow .= $cacheusers[$tmpid]->getNomUrl(-3, '', 0, 0, 0, 0, '', 'paddingright valigntextbottom');
+							$listofusertoshow .= $cacheusers[$tmpid]->getNomUrl(-3, '', 0, 0, 0, 0, '', 'valignmiddle');
 						}
 
 						print $titletoshow;
@@ -2070,7 +2070,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 							$linerelatedto .= dolGetElementUrl($event->fk_element, $event->elementtype, 1);
 						}
 						if ($linerelatedto) {
-							print '<br>'.$linerelatedto;
+							print ' '.$linerelatedto;
 						}
 					}
 
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 82d3d263e21..b998fcbd71a 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7858,30 +7858,34 @@ abstract class CommonObject
 	/**
 	 * Return validation test result for a field
 	 *
-	 * @param  array   $val		       		Array of properties of field to show
+	 * @param  array   $fields	       		Array of properties of field to show
 	 * @param  string  $fieldKey            Key of attribute
 	 * @param  string  $fieldValue          value of attribute
 	 * @return bool return false if fail true on success, see $this->error for error message
 	 */
-	public function validateField($val, $fieldKey, $fieldValue)
+	public function validateField($fields, $fieldKey, $fieldValue)
 	{
 		global $langs;
 
-		if (!class_exists('Validate')) { require_once DOL_DOCUMENT_ROOT . '/core/class/validate.class.php'; }
+		if (!class_exists('Validate')) {
+			require_once DOL_DOCUMENT_ROOT . '/core/class/validate.class.php';
+		}
 
 		$this->clearFieldError($fieldKey);
 
-		if (!isset($val[$fieldKey])) {
+		if (!isset($fields[$fieldKey])) {
 			$this->setFieldError($fieldKey, $langs->trans('FieldNotFoundInObject'));
 			return false;
 		}
 
+		$val = $fields[$fieldKey];
+
 		$param = array();
 		$param['options'] = array();
-		$type  = $val[$fieldKey]['type'];
+		$type  = $val['type'];
 
 		$required = false;
-		if (isset($val[$fieldKey]['notnull']) && $val[$fieldKey]['notnull'] === 1) {
+		if (isset($val['notnull']) && $val['notnull'] === 1) {
 			// 'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
 			$required = true;
 		}
@@ -7892,6 +7896,7 @@ abstract class CommonObject
 		//
 		// PREPARE Elements
 		//
+		$reg = array();
 
 		// Convert var to be able to share same code than showOutputField of extrafields
 		if (preg_match('/varchar\((\d+)\)/', $type, $reg)) {
@@ -7905,7 +7910,7 @@ abstract class CommonObject
 			$type = 'select';
 		}
 
-		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) {
+		if (!empty($val['type']) && preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) {
 			$type = 'link';
 		}
 
diff --git a/htdocs/core/modules/modBookCal.class.php b/htdocs/core/modules/modBookCal.class.php
index c3066dbd2e0..6e3d6768206 100644
--- a/htdocs/core/modules/modBookCal.class.php
+++ b/htdocs/core/modules/modBookCal.class.php
@@ -40,11 +40,12 @@ class modBookCal extends DolibarrModules
 	public function __construct($db)
 	{
 		global $langs, $conf;
+
 		$this->db = $db;
 
 		// Id for module (must be unique).
 		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-		$this->numero = 500000; // TODO Go on page https://wiki.dolibarr.org/index.php/List_of_modules_id to reserve an id number for your module
+		$this->numero = 2430;
 
 		// Key text used to identify module (for permissions, menus, etc...)
 		$this->rights_class = 'bookcal';
@@ -76,7 +77,7 @@ class modBookCal extends DolibarrModules
 		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
 		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
 		// To use a supported fa-xxx css style of font awesome, use this->picto='xxx'
-		$this->picto = 'fa-generic';
+		$this->picto = 'fa-calendar-check';
 
 		// Define some features supported by module (triggers, login, substitutions, menus, css, etc...)
 		$this->module_parts = array(
@@ -463,8 +464,7 @@ class modBookCal extends DolibarrModules
 	{
 		global $conf, $langs;
 
-		//$result = $this->_load_tables('/install/mysql/', 'bookcal');
-		$result = $this->_load_tables('/bookcal/sql/');
+		$result = $this->_load_tables('/install/mysql/', 'bookcal');
 		if ($result < 0) {
 			return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
 		}
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 934464db3de..8e0acd832d5 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -645,6 +645,8 @@ Module2300Name=Scheduled jobs
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
 Module2400Desc=Track events. Log automatic events for tracking purposes or record manual events or meetings. This is the principal module for good Customer or Vendor Relationship Management.
+Module2430Name=Booking Calendar System
+Module2430Desc=Provide an online calendar to allow anyone to book rendez-vous, according to predefined ranges or availabilities.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API / Web services (SOAP server)
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 98b2bec97a0..29f400fc778 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2763,11 +2763,13 @@ class Societe extends CommonObject
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-			$linkclose .= ' class="classfortooltip refurl"';
+			$linkclose .= ' class="classfortooltip refurl valignmiddle"';
 			$target_value = array('_self', '_blank', '_parent', '_top');
 			if (in_array($target, $target_value)) {
 				$linkclose .= ' target="'.dol_escape_htmltag($target).'"';
 			}
+		} else {
+			$linkclose .= ' class="valignmiddle"';
 		}
 		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';

From b2d9ade2d34443e48a0aeca8ce212b0d0f1d501a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 19 Jan 2023 01:26:59 +0100
Subject: [PATCH 668/816] Fix bad test

---
 htdocs/comm/action/peruser.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 0ee3b6db4a1..fda36284add 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -628,10 +628,11 @@ if ($mode == 'show_day') {
 if ($type) {
 	$sql .= " AND ca.id = ".((int) $type);
 }
+var_dump($status);
 if ($status == '0') {
 	$sql .= " AND a.percent = 0";
 }
-if ($status == '-1' || $status == 'na') {
+if ($status === 'na') {
 	// Not applicable
 	$sql .= " AND a.percent = -1";
 }
@@ -658,7 +659,7 @@ if ($filtert > 0 || $usergroup > 0) {
 }
 // Sort on date
 $sql .= ' ORDER BY fk_user_action, datep'; //fk_user_action
-
+print $sql;
 
 dol_syslog("comm/action/peruser.php", LOG_DEBUG);
 $resql = $db->query($sql);

From df345945ad67794f9310f206f7b714d18ca1248f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 19 Jan 2023 01:28:04 +0100
Subject: [PATCH 669/816] Fix regression

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

diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index fda36284add..bf0747a2582 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -628,7 +628,6 @@ if ($mode == 'show_day') {
 if ($type) {
 	$sql .= " AND ca.id = ".((int) $type);
 }
-var_dump($status);
 if ($status == '0') {
 	$sql .= " AND a.percent = 0";
 }
@@ -659,7 +658,6 @@ if ($filtert > 0 || $usergroup > 0) {
 }
 // Sort on date
 $sql .= ' ORDER BY fk_user_action, datep'; //fk_user_action
-print $sql;
 
 dol_syslog("comm/action/peruser.php", LOG_DEBUG);
 $resql = $db->query($sql);

From d3c4255e0e12a16228a67ce135ab8ab34f9847c6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 19 Jan 2023 01:28:48 +0100
Subject: [PATCH 670/816] Fix bad test

---
 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 5c5ef948c30..c6c91228af0 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -628,7 +628,7 @@ if ($type) {
 if ($status == '0') {
 	$sql .= " AND a.percent = 0";
 }
-if ($status == '-1' || $status == 'na') {
+if ($status == 'na') {
 	// Not applicable
 	$sql .= " AND a.percent = -1";
 }

From a6936a0b6a5f3b3b323befaf212d95baa1227e2d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 19 Jan 2023 02:26:24 +0100
Subject: [PATCH 671/816] Debug v17

---
 htdocs/comm/action/list.php    |  5 +-
 htdocs/comm/action/pertype.php | 88 ++++++++++++++++++----------------
 htdocs/comm/action/peruser.php | 53 ++++++++++++--------
 3 files changed, 81 insertions(+), 65 deletions(-)

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index ab2037d5f76..8807ccd4764 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -795,9 +795,8 @@ if (!empty($arrayfields['a.tms']['checked'])) {
 	print '<td class="liste_titre"></td>';
 }
 if (!empty($arrayfields['a.percent']['checked'])) {
-	print '<td class="liste_titre center">';
-	$formactions->form_select_status_action('formaction', $search_status, 1, 'search_status', 1, 2, 'minwidth100imp maxwidth125');
-	print ajax_combobox('selectsearch_status');
+	print '<td class="liste_titre right parentonrightofpage">';
+	$formactions->form_select_status_action('formaction', $search_status, 1, 'search_status', 1, 2, 'search_status width100 onrightofpage');
 	print '</td>';
 }
 // Action column
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index c13de5fb183..9d3bd0044e4 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -63,23 +63,19 @@ if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS)) {
 
 // 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
@@ -110,14 +106,14 @@ $month = GETPOST("month", "int") ? GETPOST("month", "int") : date("m");
 $week = GETPOST("week", "int") ? GETPOST("week", "int") : date("W");
 $day = GETPOST("day", "int") ? GETPOST("day", "int") : date("d");
 $pid = GETPOSTISSET("search_projectid") ? GETPOST("search_projectid", "int", 3) : GETPOST("projectid", "int", 3);
-$status = GETPOSTISSET("search_status") ? GETPOST("search_status", 'alpha') : GETPOST("status", 'alpha');
+$status = GETPOSTISSET("search_status") ? GETPOST("search_status", 'aZ09') : GETPOST("status", 'aZ09');
 $type = GETPOSTISSET("search_type") ? GETPOST("search_type", 'alpha') : GETPOST("type", 'alpha');
 $maxprint = ((GETPOST("maxprint", 'int') != '') ? GETPOST("maxprint", 'int') : $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
 $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);
+if (GETPOST('search_actioncode', 'array:aZ09')) {
+	$actioncode = GETPOST('search_actioncode', 'array:aZ09', 3);
 	if (!count($actioncode)) {
 		$actioncode = '0';
 	}
@@ -321,7 +317,7 @@ if ($pid) {
 if ($type) {
 	$param .= "&search_type=".urlencode($type);
 }
-if ($mode == 'show_day' || $mode == 'show_week' || $mode == 'show_month' || $mode != 'show_peruser') {
+if ($mode != 'show_pertype') {
 	$param .= '&mode='.urlencode($mode);
 }
 if ($begin_h != '') {
@@ -356,12 +352,13 @@ $next_year  = $year + 1;
 $next_month = $month;
 $next_day   = $day;
 
-// Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)
+// Define firstdaytoshow and lastdaytoshow. Warning: lastdaytoshow is last second to show + 1
+// $firstdaytoshow and lastdaytoshow become a gmt dates to use to search/compare because first_xxx are in tz idea and we used tzuserrel
 $firstdaytoshow = dol_mktime(0, 0, 0, $first_month, $first_day, $first_year, 'tzuserrel');
 $lastdaytoshow = dol_time_plus_duree($firstdaytoshow, 7, 'd');
 //print $firstday.'-'.$first_month.'-'.$first_year;
-//print dol_print_date($firstdaytoshow,'dayhour');
-//print dol_print_date($lastdaytoshow,'dayhour');
+//print dol_print_date($firstdaytoshow, 'dayhour', 'gmt');
+//print dol_print_date($lastdaytoshow,'dayhour', 'gmt');
 
 $max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year, 'gmt'));
 
@@ -480,7 +477,7 @@ if (empty($reshook)) {
 	$viewmode = $hookmanager->resPrint;
 }
 
-
+$newparam = '';
 $newcardbutton = '';
 if ($user->rights->agenda->myactions->create || $user->hasRight('agenda', 'allactions', 'create')) {
 	$tmpforcreatebutton = dol_getdate(dol_now(), true);
@@ -595,12 +592,12 @@ if ($filtert > 0 || $usergroup > 0) {
 if ($mode == 'show_day') {
 	$sql .= " AND (";
 	$sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year, 'tzuserrel'))."'";
-	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
+	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year, 'tzuserrel'))."')";
 	$sql .= " OR ";
 	$sql .= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year, 'tzuserrel'))."'";
-	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
+	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year, 'tzuserrel'))."')";
 	$sql .= " OR ";
-	$sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
+	$sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year, 'tzuserrel'))."'";
 	$sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year, 'tzuserrel'))."')";
 	$sql .= ')';
 } else {
@@ -622,12 +619,14 @@ if ($type) {
 if ($status == '0') {
 	$sql .= " AND a.percent = 0";
 }
-if ($status == '-1') {
+if ($status === 'na') {
+	// Not applicable
 	$sql .= " AND a.percent = -1";
-}	// Not applicable
+}
 if ($status == '50') {
+	// Running already started
 	$sql .= " AND (a.percent > 0 AND a.percent < 100)";
-}	// Running already started
+}
 if ($status == 'done' || $status == '100') {
 	$sql .= " AND (a.percent = 100)";
 }
@@ -791,8 +790,9 @@ echo '<input type="hidden" name="newdate" id="newdate">';
 
 //print "begin_d=".$begin_d." end_d=".$end_d;
 
+echo '<div class="div-table-responsive">';
 
-echo '<table width="100%" class="nocellnopadd cal_month">';
+echo '<table class="centpercent nocellnopadd cal_month">';
 
 echo '<tr class="liste_titre">';
 echo '<td></td>';
@@ -850,10 +850,11 @@ foreach ($typeofevents as $typeofevent) {
 
 		// Show days of the current week
 		$curtime = dol_time_plus_duree($firstdaytoshow, $iter_day, 'd');
-		$tmparray = dol_getdate($curtime, 'fast');
-		$tmpday = $tmparray['mday'];
-		$tmpmonth = $tmparray['mon'];
-		$tmpyear = $tmparray['year'];
+		// $curtime is a gmt time, but we want the day, month, year in user TZ
+		$tmpday = dol_print_date($curtime, "%d", "tzuserrel");
+		$tmpmonth = dol_print_date($curtime, "%m", "tzuserrel");
+		$tmpyear = dol_print_date($curtime, "%Y", "tzuserrel");
+		//var_dump($curtime.' '.$tmpday.' '.$tmpmonth.' '.$tmpyear);
 
 		$style = 'cal_current_month';
 		if ($iter_day == 6) {
@@ -878,6 +879,8 @@ foreach ($typeofevents as $typeofevent) {
 echo "</table>\n";
 echo "<br>";
 
+echo '</div>';
+
 if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
 	$langs->load("commercial");
 	print '<br>'.$langs->trans("Legend").': <br>';
@@ -987,14 +990,14 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 
 	// We are in a particular day for $username, now we scan all events
 	foreach ($eventarray as $daykey => $notused) {
-		$annee = dol_print_date($daykey, '%Y');
-		$mois = dol_print_date($daykey, '%m');
-		$jour = dol_print_date($daykey, '%d');
+		$annee = dol_print_date($daykey, '%Y', 'tzuserrel');
+		$mois =  dol_print_date($daykey, '%m', 'tzuserrel');
+		$jour =  dol_print_date($daykey, '%d', 'tzuserrel');
 
-		if ($day == $jour && $month == $mois && $year == $annee) {	// Is it the day we are looking for when calling function ?
+		if ($day == $jour && (int) $month == (int) $mois && $year == $annee) {	// Is it the day we are looking for when calling function ?
 			// Scan all event for this date
 			foreach ($eventarray[$daykey] as $index => $event) {
-				//print $daykey.' '.$year.'-'.$month.'-'.$day.' -> '.$event->id.' '.$index.' '.$annee.'-'.$mois.'-'.$jour."<br>\n";
+				//print 'daykey='.$daykey.' '.$year.'-'.$month.'-'.$day.' -> '.$event->id.' '.$index.' '.$annee.'-'.$mois.'-'.$jour."<br>\n";
 				//var_dump($event);
 
 				$keysofuserassigned = array_keys($event->userassigned);
@@ -1176,7 +1179,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 		}
 	}
 
-	// Now output $casesX
+	// Now output $casesX from start hour to end hour
 	for ($h = $begin_h; $h < $end_h; $h++) {
 		$color1 = ''; $color2 = '';
 		$style1 = ''; $style2 = '';
@@ -1217,11 +1220,12 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 			}
 		}
 
-		$ids1 = ''; $ids2 = '';
-		if (count($cases1[$h]) && array_keys($cases1[$h])) {
+		$ids1 = '';
+		$ids2 = '';
+		if (!empty($cases1[$h]) && is_array($cases1[$h]) && count($cases1[$h]) && array_keys($cases1[$h])) {
 			$ids1 = join(',', array_keys($cases1[$h]));
 		}
-		if (count($cases2[$h]) && array_keys($cases2[$h])) {
+		if (!empty($cases2[$h]) && is_array($cases2[$h]) && count($cases2[$h]) && array_keys($cases2[$h])) {
 			$ids2 = join(',', array_keys($cases2[$h]));
 		}
 
@@ -1230,7 +1234,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 		} else {
 			echo '<td class="'.$style.' cal_peruser'.($var ? ' cal_impair '.$style.'_impair' : '').'">';
 		}
-		if (count($cases1[$h]) == 1) {	// only 1 event
+		if (!empty($cases1[$h]) && is_array($cases1[$h]) && count($cases1[$h]) == 1) {	// only 1 event
 			$output = array_slice($cases1[$h], 0, 1);
 			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
 			if ($output[0]['string']) {
@@ -1239,12 +1243,12 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 			if ($output[0]['color']) {
 				$color1 = $output[0]['color'];
 			}
-		} elseif (count($cases1[$h]) > 1) {
+		} elseif (!empty($cases1[$h]) && is_array($cases1[$h]) && count($cases1[$h]) > 1) {
 			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
 			$color1 = '222222';
 		}
 
-		if (count($cases2[$h]) == 1) {	// only 1 event
+		if (!empty($cases2[$h]) && is_array($cases2[$h]) && count($cases2[$h]) == 1) {	// only 1 event
 			$output = array_slice($cases2[$h], 0, 1);
 			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
 			if ($output[0]['string']) {
@@ -1253,7 +1257,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 			if ($output[0]['color']) {
 				$color2 = $output[0]['color'];
 			}
-		} elseif (count($cases2[$h]) > 1) {
+		} elseif (!empty($cases2[$h]) && is_array($cases2[$h]) && count($cases2[$h]) > 1) {
 			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
 			$color2 = '222222';
 		}
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index bf0747a2582..1ae651dae6d 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -349,14 +349,14 @@ $next_year  = $next['year'];
 $next_month = $next['month'];
 $next_day   = $next['day'];
 
-// Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)
-$firstdaytoshow = dol_mktime(0, 0, 0, $first_month, $first_day, $first_year, 'gmt');
-
+// Define firstdaytoshow and lastdaytoshow. Warning: lastdaytoshow is last second to show + 1
+// $firstdaytoshow and lastdaytoshow become a gmt dates to use to search/compare because first_xxx are in tz idea and we used tzuserrel
+$firstdaytoshow = dol_mktime(0, 0, 0, $first_month, $first_day, $first_year, 'tzuserrel');
 $nb_weeks_to_show = (!empty($conf->global->AGENDA_NB_WEEKS_IN_VIEW_PER_USER)) ? ((int) $conf->global->AGENDA_NB_WEEKS_IN_VIEW_PER_USER * 7) : 7;
 $lastdaytoshow = dol_time_plus_duree($firstdaytoshow, $nb_weeks_to_show, 'd');
 //print $firstday.'-'.$first_month.'-'.$first_year;
-//print dol_print_date($firstdaytoshow,'dayhour');
-//print dol_print_date($lastdaytoshow,'dayhour');
+//print dol_print_date($firstdaytoshow, 'dayhour', 'gmt');
+//print dol_print_date($lastdaytoshow,'dayhour', 'gmt');
 
 $max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year, 'gmt'));
 
@@ -658,6 +658,7 @@ if ($filtert > 0 || $usergroup > 0) {
 }
 // Sort on date
 $sql .= ' ORDER BY fk_user_action, datep'; //fk_user_action
+//print $sql;
 
 dol_syslog("comm/action/peruser.php", LOG_DEBUG);
 $resql = $db->query($sql);
@@ -667,6 +668,7 @@ if ($resql) {
 	$i = 0;
 	while ($i < $num) {
 		$obj = $db->fetch_object($resql);
+		//print $obj->fk_user_action.' '.$obj->id."<br>";
 
 		// Discard auto action if option is on
 		if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->code == 'AC_OTH_AUTO') {
@@ -677,6 +679,7 @@ if ($resql) {
 		$datep = $db->jdate($obj->datep);
 		$datep2 = $db->jdate($obj->datep2);
 
+
 		// Create a new object action
 		$event = new ActionComm($db);
 		$event->id = $obj->id;
@@ -719,13 +722,15 @@ if ($resql) {
 			}
 		}
 
+		//print '<br>'.$i.' - eventid='.$event->id.' '.dol_print_date($event->date_start_in_calendar, 'dayhour').' '.dol_print_date($firstdaytoshow, 'dayhour').' - '.dol_print_date($event->date_end_in_calendar, 'dayhour').' '.dol_print_date($lastdaytoshow, 'dayhour').'<br>'."\n";
+
 		// Check values
 		if ($event->date_end_in_calendar < $firstdaytoshow ||
 		$event->date_start_in_calendar >= $lastdaytoshow) {
 			// This record is out of visible range
 			unset($event);
 		} else {
-			//print $i.' - '.dol_print_date($this->date_start_in_calendar, 'dayhour').' - '.dol_print_date($this->date_end_in_calendar, 'dayhour').'<br>'."\n";
+			//print $i.' - eventid='.$event->id.' '.dol_print_date($event->date_start_in_calendar, 'dayhour').' - '.dol_print_date($event->date_end_in_calendar, 'dayhour').'<br>'."\n";
 			$event->fetch_userassigned(); // This load $event->userassigned
 
 			if ($event->date_start_in_calendar < $firstdaytoshow) {
@@ -746,7 +751,7 @@ if ($resql) {
 			$loop = true; $j = 0;
 			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');
 			do {
-				//if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'<br>';
+				//print 'Add event into eventarray for daykey='.$daykey.'='.dol_print_date($daykey, 'dayhour', 'gmt').' '.$event->id.' '.$event->datep.' '.$event->datef.'<br>';
 
 				$eventarray[$daykey][] = $event;
 				$j++;
@@ -804,6 +809,7 @@ echo '<input type="hidden" name="newdate" id="newdate">';
 
 $currentdaytoshow = $firstdaytoshow;
 echo '<div class="div-table-responsive">';
+//print dol_print_date($currentdaytoshow, 'dayhour', 'gmt');
 
 while ($currentdaytoshow < $lastdaytoshow) {
 	echo '<table class="centpercent noborder nocellnopadd cal_month">';
@@ -855,9 +861,9 @@ while ($currentdaytoshow < $lastdaytoshow) {
 		echo '<span class="bold spandayofweek">'.$langs->trans("Day".(($i + (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1)) % 7)).'</span>';
 		print "<br>";
 		if ($i) {
-			print dol_print_date(dol_time_plus_duree($currentdaytoshow, $i, 'd'), 'day');
+			print dol_print_date(dol_time_plus_duree($currentdaytoshow, $i, 'd'), 'day', 'tzuserrel');
 		} else {
-			print dol_print_date($currentdaytoshow, 'day');
+			print dol_print_date($currentdaytoshow, 'day', 'tzuserrel');
 		}
 		echo "</td>\n";
 		$i++;
@@ -978,6 +984,8 @@ while ($currentdaytoshow < $lastdaytoshow) {
 	$showheader = true;
 	$var = false;
 	foreach ($usernames as $username) {
+		//if ($username->login != 'admin') continue;
+
 		$var = !$var;
 		echo "<tr>";
 		echo '<td class="tdoverflowmax100 cal_current_month cal_peruserviewname'.($var ? ' cal_impair' : '').'">';
@@ -995,10 +1003,10 @@ while ($currentdaytoshow < $lastdaytoshow) {
 
 			// Show days of the current week
 			$curtime = dol_time_plus_duree($currentdaytoshow, $iter_day, 'd');
-			$tmparray = dol_getdate($curtime, 'fast');
-			$tmpday = $tmparray['mday'];
-			$tmpmonth = $tmparray['mon'];
-			$tmpyear = $tmparray['year'];
+			// $curtime is a gmt time, but we want the day, month, year in user TZ
+			$tmpday = dol_print_date($curtime, "%d", "tzuserrel");
+			$tmpmonth = dol_print_date($curtime, "%m", "tzuserrel");
+			$tmpyear = dol_print_date($curtime, "%Y", "tzuserrel");
 			//var_dump($curtime.' '.$tmpday.' '.$tmpmonth.' '.$tmpyear);
 
 			$style = 'cal_current_month';
@@ -1136,17 +1144,22 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 	//if ($username->id && $day==1) {
 	//var_dump($eventarray);
 	//}
+	//var_dump("------ username=".$username->login." for day=".$day);
 
 	// We are in a particular day for $username, now we scan all events
 	foreach ($eventarray as $daykey => $notused) {
-		$annee = dol_print_date($daykey, '%Y');
-		$mois =  dol_print_date($daykey, '%m');
-		$jour =  dol_print_date($daykey, '%d');
+		$annee = dol_print_date($daykey, '%Y', 'tzuserrel');
+		$mois =  dol_print_date($daykey, '%m', 'tzuserrel');
+		$jour =  dol_print_date($daykey, '%d', 'tzuserrel');
+		//var_dump("daykey=$daykey day=$day jour=$jour, month=$month mois=$mois, year=$year annee=$annee");
+
+
+		if ($day == $jour && (int) $month == (int) $mois && $year == $annee) {	// Is it the day we are looking for when calling function ?
+			//var_dump("day=$day jour=$jour month=$month mois=$mois year=$year annee=$annee");
 
-		if ($day == $jour && $month == $mois && $year == $annee) {	// Is it the day we are looking for when calling function ?
 			// Scan all event for this date
 			foreach ($eventarray[$daykey] as $index => $event) {
-				//print $daykey.' '.dol_print_date($daykey, 'dayhour', 'gmt').' '.$year.'-'.$month.'-'.$day.' -> '.$event->id.' '.$index.' '.$annee.'-'.$mois.'-'.$jour."<br>\n";
+				//print 'daykey='.$daykey.'='.dol_print_date($daykey, 'dayhour', 'gmt').' '.$year.'-'.$month.'-'.$day.' -> This event: '.$event->id.' '.$index.' is open for this daykey '.$annee.'-'.$mois.'-'.$jour."<br>\n";
 				//var_dump($event);
 
 				$keysofuserassigned = array_keys($event->userassigned);
@@ -1355,7 +1368,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 		}
 	}
 
-	// Now output $casesX
+	// Now output $casesX from start hour to end hour
 	for ($h = $begin_h; $h < $end_h; $h++) {
 		$color1 = ''; $color2 = '';
 		$style1 = ''; $style2 = '';
@@ -1437,7 +1450,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
 			$color2 = '222222';
 		}
-		print '<table class="nobordernopadding" width="100%">';
+		print '<table class="nobordernopadding case centpercent">';
 		print '<tr><td ';
 		if ($style1 == 'peruser_notbusy') {
 			print 'style="border: 1px solid #'.($color1 ? $color1 : "888").' !important" ';

From 28139689ff6fb74336f75dc6ad269dcfbaff9374 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 19 Jan 2023 02:26:24 +0100
Subject: [PATCH 672/816] Debug v17

---
 htdocs/comm/action/list.php    |  5 +-
 htdocs/comm/action/pertype.php | 88 ++++++++++++++++++----------------
 htdocs/comm/action/peruser.php | 53 ++++++++++++--------
 3 files changed, 81 insertions(+), 65 deletions(-)

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 5eb538d4e62..4ff5c864908 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -795,9 +795,8 @@ if (!empty($arrayfields['a.tms']['checked'])) {
 	print '<td class="liste_titre"></td>';
 }
 if (!empty($arrayfields['a.percent']['checked'])) {
-	print '<td class="liste_titre center">';
-	$formactions->form_select_status_action('formaction', $search_status, 1, 'search_status', 1, 2, 'minwidth100imp maxwidth125');
-	print ajax_combobox('selectsearch_status');
+	print '<td class="liste_titre right parentonrightofpage">';
+	$formactions->form_select_status_action('formaction', $search_status, 1, 'search_status', 1, 2, 'search_status width100 onrightofpage');
 	print '</td>';
 }
 // Action column
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 61092df5665..7fe8f8108ed 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -63,23 +63,19 @@ if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS)) {
 
 // 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
@@ -110,14 +106,14 @@ $month = GETPOST("month", "int") ? GETPOST("month", "int") : date("m");
 $week = GETPOST("week", "int") ? GETPOST("week", "int") : date("W");
 $day = GETPOST("day", "int") ? GETPOST("day", "int") : date("d");
 $pid = GETPOSTISSET("search_projectid") ? GETPOST("search_projectid", "int", 3) : GETPOST("projectid", "int", 3);
-$status = GETPOSTISSET("search_status") ? GETPOST("search_status", 'alpha') : GETPOST("status", 'alpha');
+$status = GETPOSTISSET("search_status") ? GETPOST("search_status", 'aZ09') : GETPOST("status", 'aZ09');
 $type = GETPOSTISSET("search_type") ? GETPOST("search_type", 'alpha') : GETPOST("type", 'alpha');
 $maxprint = ((GETPOST("maxprint", 'int') != '') ? GETPOST("maxprint", 'int') : $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
 $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);
+if (GETPOST('search_actioncode', 'array:aZ09')) {
+	$actioncode = GETPOST('search_actioncode', 'array:aZ09', 3);
 	if (!count($actioncode)) {
 		$actioncode = '0';
 	}
@@ -321,7 +317,7 @@ if ($pid) {
 if ($type) {
 	$param .= "&search_type=".urlencode($type);
 }
-if ($mode == 'show_day' || $mode == 'show_week' || $mode == 'show_month' || $mode != 'show_peruser') {
+if ($mode != 'show_pertype') {
 	$param .= '&mode='.urlencode($mode);
 }
 if ($begin_h != '') {
@@ -356,12 +352,13 @@ $next_year  = $year + 1;
 $next_month = $month;
 $next_day   = $day;
 
-// Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)
+// Define firstdaytoshow and lastdaytoshow. Warning: lastdaytoshow is last second to show + 1
+// $firstdaytoshow and lastdaytoshow become a gmt dates to use to search/compare because first_xxx are in tz idea and we used tzuserrel
 $firstdaytoshow = dol_mktime(0, 0, 0, $first_month, $first_day, $first_year, 'tzuserrel');
 $lastdaytoshow = dol_time_plus_duree($firstdaytoshow, 7, 'd');
 //print $firstday.'-'.$first_month.'-'.$first_year;
-//print dol_print_date($firstdaytoshow,'dayhour');
-//print dol_print_date($lastdaytoshow,'dayhour');
+//print dol_print_date($firstdaytoshow, 'dayhour', 'gmt');
+//print dol_print_date($lastdaytoshow,'dayhour', 'gmt');
 
 $max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year, 'gmt'));
 
@@ -477,7 +474,7 @@ if (empty($reshook)) {
 	$viewmode = $hookmanager->resPrint;
 }
 
-
+$newparam = '';
 $newcardbutton = '';
 if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create) {
 	$tmpforcreatebutton = dol_getdate(dol_now(), true);
@@ -592,12 +589,12 @@ if ($filtert > 0 || $usergroup > 0) {
 if ($mode == 'show_day') {
 	$sql .= " AND (";
 	$sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year, 'tzuserrel'))."'";
-	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
+	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year, 'tzuserrel'))."')";
 	$sql .= " OR ";
 	$sql .= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year, 'tzuserrel'))."'";
-	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
+	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year, 'tzuserrel'))."')";
 	$sql .= " OR ";
-	$sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
+	$sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year, 'tzuserrel'))."'";
 	$sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year, 'tzuserrel'))."')";
 	$sql .= ')';
 } else {
@@ -619,12 +616,14 @@ if ($type) {
 if ($status == '0') {
 	$sql .= " AND a.percent = 0";
 }
-if ($status == '-1') {
+if ($status === 'na') {
+	// Not applicable
 	$sql .= " AND a.percent = -1";
-}	// Not applicable
+}
 if ($status == '50') {
+	// Running already started
 	$sql .= " AND (a.percent > 0 AND a.percent < 100)";
-}	// Running already started
+}
 if ($status == 'done' || $status == '100') {
 	$sql .= " AND (a.percent = 100)";
 }
@@ -788,8 +787,9 @@ echo '<input type="hidden" name="newdate" id="newdate">';
 
 //print "begin_d=".$begin_d." end_d=".$end_d;
 
+echo '<div class="div-table-responsive">';
 
-echo '<table width="100%" class="nocellnopadd cal_month">';
+echo '<table class="centpercent nocellnopadd cal_month">';
 
 echo '<tr class="liste_titre">';
 echo '<td></td>';
@@ -847,10 +847,11 @@ foreach ($typeofevents as $typeofevent) {
 
 		// Show days of the current week
 		$curtime = dol_time_plus_duree($firstdaytoshow, $iter_day, 'd');
-		$tmparray = dol_getdate($curtime, 'fast');
-		$tmpday = $tmparray['mday'];
-		$tmpmonth = $tmparray['mon'];
-		$tmpyear = $tmparray['year'];
+		// $curtime is a gmt time, but we want the day, month, year in user TZ
+		$tmpday = dol_print_date($curtime, "%d", "tzuserrel");
+		$tmpmonth = dol_print_date($curtime, "%m", "tzuserrel");
+		$tmpyear = dol_print_date($curtime, "%Y", "tzuserrel");
+		//var_dump($curtime.' '.$tmpday.' '.$tmpmonth.' '.$tmpyear);
 
 		$style = 'cal_current_month';
 		if ($iter_day == 6) {
@@ -875,6 +876,8 @@ foreach ($typeofevents as $typeofevent) {
 echo "</table>\n";
 echo "<br>";
 
+echo '</div>';
+
 if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
 	$langs->load("commercial");
 	print '<br>'.$langs->trans("Legend").': <br>';
@@ -984,14 +987,14 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 
 	// We are in a particular day for $username, now we scan all events
 	foreach ($eventarray as $daykey => $notused) {
-		$annee = dol_print_date($daykey, '%Y');
-		$mois = dol_print_date($daykey, '%m');
-		$jour = dol_print_date($daykey, '%d');
+		$annee = dol_print_date($daykey, '%Y', 'tzuserrel');
+		$mois =  dol_print_date($daykey, '%m', 'tzuserrel');
+		$jour =  dol_print_date($daykey, '%d', 'tzuserrel');
 
-		if ($day == $jour && $month == $mois && $year == $annee) {	// Is it the day we are looking for when calling function ?
+		if ($day == $jour && (int) $month == (int) $mois && $year == $annee) {	// Is it the day we are looking for when calling function ?
 			// Scan all event for this date
 			foreach ($eventarray[$daykey] as $index => $event) {
-				//print $daykey.' '.$year.'-'.$month.'-'.$day.' -> '.$event->id.' '.$index.' '.$annee.'-'.$mois.'-'.$jour."<br>\n";
+				//print 'daykey='.$daykey.' '.$year.'-'.$month.'-'.$day.' -> '.$event->id.' '.$index.' '.$annee.'-'.$mois.'-'.$jour."<br>\n";
 				//var_dump($event);
 
 				$keysofuserassigned = array_keys($event->userassigned);
@@ -1173,7 +1176,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 		}
 	}
 
-	// Now output $casesX
+	// Now output $casesX from start hour to end hour
 	for ($h = $begin_h; $h < $end_h; $h++) {
 		$color1 = ''; $color2 = '';
 		$style1 = ''; $style2 = '';
@@ -1214,11 +1217,12 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 			}
 		}
 
-		$ids1 = ''; $ids2 = '';
-		if (count($cases1[$h]) && array_keys($cases1[$h])) {
+		$ids1 = '';
+		$ids2 = '';
+		if (!empty($cases1[$h]) && is_array($cases1[$h]) && count($cases1[$h]) && array_keys($cases1[$h])) {
 			$ids1 = join(',', array_keys($cases1[$h]));
 		}
-		if (count($cases2[$h]) && array_keys($cases2[$h])) {
+		if (!empty($cases2[$h]) && is_array($cases2[$h]) && count($cases2[$h]) && array_keys($cases2[$h])) {
 			$ids2 = join(',', array_keys($cases2[$h]));
 		}
 
@@ -1227,7 +1231,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 		} else {
 			echo '<td class="'.$style.' cal_peruser'.($var ? ' cal_impair '.$style.'_impair' : '').'">';
 		}
-		if (count($cases1[$h]) == 1) {	// only 1 event
+		if (!empty($cases1[$h]) && is_array($cases1[$h]) && count($cases1[$h]) == 1) {	// only 1 event
 			$output = array_slice($cases1[$h], 0, 1);
 			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
 			if ($output[0]['string']) {
@@ -1236,12 +1240,12 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 			if ($output[0]['color']) {
 				$color1 = $output[0]['color'];
 			}
-		} elseif (count($cases1[$h]) > 1) {
+		} elseif (!empty($cases1[$h]) && is_array($cases1[$h]) && count($cases1[$h]) > 1) {
 			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
 			$color1 = '222222';
 		}
 
-		if (count($cases2[$h]) == 1) {	// only 1 event
+		if (!empty($cases2[$h]) && is_array($cases2[$h]) && count($cases2[$h]) == 1) {	// only 1 event
 			$output = array_slice($cases2[$h], 0, 1);
 			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
 			if ($output[0]['string']) {
@@ -1250,7 +1254,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 			if ($output[0]['color']) {
 				$color2 = $output[0]['color'];
 			}
-		} elseif (count($cases2[$h]) > 1) {
+		} elseif (!empty($cases2[$h]) && is_array($cases2[$h]) && count($cases2[$h]) > 1) {
 			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
 			$color2 = '222222';
 		}
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index c6c91228af0..993bc3a908a 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -349,14 +349,14 @@ $next_year  = $next['year'];
 $next_month = $next['month'];
 $next_day   = $next['day'];
 
-// Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)
-$firstdaytoshow = dol_mktime(0, 0, 0, $first_month, $first_day, $first_year, 'gmt');
-
+// Define firstdaytoshow and lastdaytoshow. Warning: lastdaytoshow is last second to show + 1
+// $firstdaytoshow and lastdaytoshow become a gmt dates to use to search/compare because first_xxx are in tz idea and we used tzuserrel
+$firstdaytoshow = dol_mktime(0, 0, 0, $first_month, $first_day, $first_year, 'tzuserrel');
 $nb_weeks_to_show = (!empty($conf->global->AGENDA_NB_WEEKS_IN_VIEW_PER_USER)) ? ((int) $conf->global->AGENDA_NB_WEEKS_IN_VIEW_PER_USER * 7) : 7;
 $lastdaytoshow = dol_time_plus_duree($firstdaytoshow, $nb_weeks_to_show, 'd');
 //print $firstday.'-'.$first_month.'-'.$first_year;
-//print dol_print_date($firstdaytoshow,'dayhour');
-//print dol_print_date($lastdaytoshow,'dayhour');
+//print dol_print_date($firstdaytoshow, 'dayhour', 'gmt');
+//print dol_print_date($lastdaytoshow,'dayhour', 'gmt');
 
 $max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year, 'gmt'));
 
@@ -655,6 +655,7 @@ if ($filtert > 0 || $usergroup > 0) {
 }
 // Sort on date
 $sql .= ' ORDER BY fk_user_action, datep'; //fk_user_action
+//print $sql;
 
 
 dol_syslog("comm/action/peruser.php", LOG_DEBUG);
@@ -665,6 +666,7 @@ if ($resql) {
 	$i = 0;
 	while ($i < $num) {
 		$obj = $db->fetch_object($resql);
+		//print $obj->fk_user_action.' '.$obj->id."<br>";
 
 		// Discard auto action if option is on
 		if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->code == 'AC_OTH_AUTO') {
@@ -675,6 +677,7 @@ if ($resql) {
 		$datep = $db->jdate($obj->datep);
 		$datep2 = $db->jdate($obj->datep2);
 
+
 		// Create a new object action
 		$event = new ActionComm($db);
 		$event->id = $obj->id;
@@ -717,13 +720,15 @@ if ($resql) {
 			}
 		}
 
+		//print '<br>'.$i.' - eventid='.$event->id.' '.dol_print_date($event->date_start_in_calendar, 'dayhour').' '.dol_print_date($firstdaytoshow, 'dayhour').' - '.dol_print_date($event->date_end_in_calendar, 'dayhour').' '.dol_print_date($lastdaytoshow, 'dayhour').'<br>'."\n";
+
 		// Check values
 		if ($event->date_end_in_calendar < $firstdaytoshow ||
 		$event->date_start_in_calendar >= $lastdaytoshow) {
 			// This record is out of visible range
 			unset($event);
 		} else {
-			//print $i.' - '.dol_print_date($this->date_start_in_calendar, 'dayhour').' - '.dol_print_date($this->date_end_in_calendar, 'dayhour').'<br>'."\n";
+			//print $i.' - eventid='.$event->id.' '.dol_print_date($event->date_start_in_calendar, 'dayhour').' - '.dol_print_date($event->date_end_in_calendar, 'dayhour').'<br>'."\n";
 			$event->fetch_userassigned(); // This load $event->userassigned
 
 			if ($event->date_start_in_calendar < $firstdaytoshow) {
@@ -744,7 +749,7 @@ if ($resql) {
 			$loop = true; $j = 0;
 			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');
 			do {
-				//if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'<br>';
+				//print 'Add event into eventarray for daykey='.$daykey.'='.dol_print_date($daykey, 'dayhour', 'gmt').' '.$event->id.' '.$event->datep.' '.$event->datef.'<br>';
 
 				$eventarray[$daykey][] = $event;
 				$j++;
@@ -802,6 +807,7 @@ echo '<input type="hidden" name="newdate" id="newdate">';
 
 $currentdaytoshow = $firstdaytoshow;
 echo '<div class="div-table-responsive">';
+//print dol_print_date($currentdaytoshow, 'dayhour', 'gmt');
 
 while ($currentdaytoshow < $lastdaytoshow) {
 	echo '<table class="centpercent noborder nocellnopadd cal_month">';
@@ -853,9 +859,9 @@ while ($currentdaytoshow < $lastdaytoshow) {
 		echo '<span class="bold spandayofweek">'.$langs->trans("Day".(($i + (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1)) % 7)).'</span>';
 		print "<br>";
 		if ($i) {
-			print dol_print_date(dol_time_plus_duree($currentdaytoshow, $i, 'd'), 'day');
+			print dol_print_date(dol_time_plus_duree($currentdaytoshow, $i, 'd'), 'day', 'tzuserrel');
 		} else {
-			print dol_print_date($currentdaytoshow, 'day');
+			print dol_print_date($currentdaytoshow, 'day', 'tzuserrel');
 		}
 		echo "</td>\n";
 		$i++;
@@ -976,6 +982,8 @@ while ($currentdaytoshow < $lastdaytoshow) {
 	$showheader = true;
 	$var = false;
 	foreach ($usernames as $username) {
+		//if ($username->login != 'admin') continue;
+
 		$var = !$var;
 		echo "<tr>";
 		echo '<td class="tdoverflowmax100 cal_current_month cal_peruserviewname'.($var ? ' cal_impair' : '').'">';
@@ -993,10 +1001,10 @@ while ($currentdaytoshow < $lastdaytoshow) {
 
 			// Show days of the current week
 			$curtime = dol_time_plus_duree($currentdaytoshow, $iter_day, 'd');
-			$tmparray = dol_getdate($curtime, 'fast');
-			$tmpday = $tmparray['mday'];
-			$tmpmonth = $tmparray['mon'];
-			$tmpyear = $tmparray['year'];
+			// $curtime is a gmt time, but we want the day, month, year in user TZ
+			$tmpday = dol_print_date($curtime, "%d", "tzuserrel");
+			$tmpmonth = dol_print_date($curtime, "%m", "tzuserrel");
+			$tmpyear = dol_print_date($curtime, "%Y", "tzuserrel");
 			//var_dump($curtime.' '.$tmpday.' '.$tmpmonth.' '.$tmpyear);
 
 			$style = 'cal_current_month';
@@ -1134,17 +1142,22 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 	//if ($username->id && $day==1) {
 	//var_dump($eventarray);
 	//}
+	//var_dump("------ username=".$username->login." for day=".$day);
 
 	// We are in a particular day for $username, now we scan all events
 	foreach ($eventarray as $daykey => $notused) {
-		$annee = dol_print_date($daykey, '%Y');
-		$mois =  dol_print_date($daykey, '%m');
-		$jour =  dol_print_date($daykey, '%d');
+		$annee = dol_print_date($daykey, '%Y', 'tzuserrel');
+		$mois =  dol_print_date($daykey, '%m', 'tzuserrel');
+		$jour =  dol_print_date($daykey, '%d', 'tzuserrel');
+		//var_dump("daykey=$daykey day=$day jour=$jour, month=$month mois=$mois, year=$year annee=$annee");
+
+
+		if ($day == $jour && (int) $month == (int) $mois && $year == $annee) {	// Is it the day we are looking for when calling function ?
+			//var_dump("day=$day jour=$jour month=$month mois=$mois year=$year annee=$annee");
 
-		if ($day == $jour && $month == $mois && $year == $annee) {	// Is it the day we are looking for when calling function ?
 			// Scan all event for this date
 			foreach ($eventarray[$daykey] as $index => $event) {
-				//print $daykey.' '.dol_print_date($daykey, 'dayhour', 'gmt').' '.$year.'-'.$month.'-'.$day.' -> '.$event->id.' '.$index.' '.$annee.'-'.$mois.'-'.$jour."<br>\n";
+				//print 'daykey='.$daykey.'='.dol_print_date($daykey, 'dayhour', 'gmt').' '.$year.'-'.$month.'-'.$day.' -> This event: '.$event->id.' '.$index.' is open for this daykey '.$annee.'-'.$mois.'-'.$jour."<br>\n";
 				//var_dump($event);
 
 				$keysofuserassigned = array_keys($event->userassigned);
@@ -1353,7 +1366,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 		}
 	}
 
-	// Now output $casesX
+	// Now output $casesX from start hour to end hour
 	for ($h = $begin_h; $h < $end_h; $h++) {
 		$color1 = ''; $color2 = '';
 		$style1 = ''; $style2 = '';
@@ -1435,7 +1448,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
 			$color2 = '222222';
 		}
-		print '<table class="nobordernopadding" width="100%">';
+		print '<table class="nobordernopadding case centpercent">';
 		print '<tr><td ';
 		if ($style1 == 'peruser_notbusy') {
 			print 'style="border: 1px solid #'.($color1 ? $color1 : "888").' !important" ';

From c8d0226613ef1f09e2e17a69d3406178d5f6ebae Mon Sep 17 00:00:00 2001
From: Thomas Negre <tnegre@open-dsi.fr>
Date: Thu, 19 Jan 2023 11:24:53 +0100
Subject: [PATCH 673/816] Harmonize CSS for tables in
 fichehalfleft/fichehalfright

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

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 43dfbf67869..1592fed7493 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -3549,7 +3549,7 @@ td.border, div.tagtable div div.border {
 }
 
 
-.fichehalfright table.noborder {
+.fichehalfright table.noborder , .fichehalfleft table.noborder{
 	margin: 0px 0px 0px 0px;
 }
 table.liste, table.noborder, table.formdoc, div.noborder {

From 17b6cb2724ae6afa81b61ec67d974891ab806e1b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 19 Jan 2023 13:23:08 +0100
Subject: [PATCH 674/816] Fix warning

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

diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index 09595b61376..eee3ee68e6c 100644
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -309,7 +309,7 @@ class mailing_contacts1 extends MailingTargets
 
 		// Choose language if multilangue active
 
-		if (@$conf->global->MAIN_MULTILANGS==1) {
+		if (getDolGlobalInt('MAIN_MULTILANGS') == 1) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 			$formadmin = new FormAdmin($this->db);
 			$s .= '<span class="opacitymedium">'.$langs->trans("DefaultLang").':</span> ';

From 4157263cb898f1847cfcfc22dee6007c01b13a4d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 19 Jan 2023 13:40:37 +0100
Subject: [PATCH 675/816] FIX Add bookmark with search fields that are arrays

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

diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index c13b810a4bc..88cae3e4293 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -52,6 +52,7 @@ function printDropdownBookmarksList()
 			}
 		}
 	}
+
 	$tmpurl = '';
 	// No urlencode, all param $url will be urlencoded later
 	if ($sortfield) {
@@ -65,7 +66,13 @@ 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(dol_escape_htmltag($key) => dol_escape_htmltag($val)));
+				if (is_array($val)) {
+					foreach ($val as $tmpsubval) {
+						$url_param[] = http_build_query(array(dol_escape_htmltag($key).'[]' => dol_escape_htmltag($tmpsubval)));
+					}
+				} elseif ($val != '') {
+					$url_param[$key] = http_build_query(array(dol_escape_htmltag($key) => dol_escape_htmltag($val)));
+				}
 			}
 		}
 	}

From d426598ab59da022843d23166fe77dab1944990c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 19 Jan 2023 13:46:54 +0100
Subject: [PATCH 676/816] Fix search criteria on service lines

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

diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index cfc888e229a..08989fdcad0 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -256,7 +256,7 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
 if ($search_product_category > 0) {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=cd.fk_product';
 }
-$sql .= " WHERE c.entity = ".$conf->entity;
+$sql .= " WHERE c.entity IN (".getEntity($object->element).")";
 $sql .= " AND c.rowid = cd.fk_contrat";
 if ($search_product_category > 0) {
 	$sql .= " AND cp.fk_categorie = ".((int) $search_product_category);
@@ -281,13 +281,13 @@ if ($filter == "notexpired") {
 	$sql .= " AND cd.date_fin_validite >= '".$db->idate($now)."'";
 }
 if ($search_name) {
-	$sql .= " AND s.nom LIKE '%".$db->escape($search_name)."%'";
+	$sql .= natural_search("c.ref", $search_name);
 }
 if ($search_contract) {
-	$sql .= " AND c.ref LIKE '%".$db->escape($search_contract)."%' ";
+	$sql .= natural_search("c.ref", $search_contract);
 }
 if ($search_service) {
-	$sql .= " AND (p.ref LIKE '%".$db->escape($search_service)."%' OR p.description LIKE '%".$db->escape($search_service)."%' OR cd.description LIKE '%".$db->escape($search_service)."%')";
+	$sql .= natural_search(array("p.ref", "p.description", "cd.description"), $search_service);
 }
 if ($socid > 0) {
 	$sql .= " AND s.rowid = ".((int) $socid);

From 1afd2069461f6d20a0a86c816840e10884f675ca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 19 Jan 2023 13:50:11 +0100
Subject: [PATCH 677/816] Fix debug v17

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

diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 08989fdcad0..99d03f2d793 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -217,7 +217,7 @@ $form = new Form($db);
 
 $sql = "SELECT c.rowid as cid, c.ref, c.statut as cstatut, c.ref_customer, c.ref_supplier,";
 $sql .= " s.rowid as socid, s.nom as name, s.email, s.client, s.fournisseur,";
-$sql .= " cd.rowid, cd.description, cd.statut,";
+$sql .= " cd.rowid, cd.description, cd.statut, cd.product_type as type,";
 $sql .= " p.rowid as pid, p.ref as pref, p.label as label, p.fk_product_type as ptype, p.tobuy, p.tosell, p.barcode, p.entity as pentity,";
 if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " sc.fk_soc, sc.fk_user,";

From d171750e28567e90b115086cee327874fbf808a8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 19 Jan 2023 13:53:37 +0100
Subject: [PATCH 678/816] Fix warning

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

diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 99d03f2d793..9b3081a412a 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -692,7 +692,7 @@ $contractstatic = new Contrat($db);
 $productstatic = new Product($db);
 
 $i = 0;
-$totalarray = array();
+$totalarray = array('nbfield'=>0);
 while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($resql);
 

From 7cf144890feb32fb7e951595cb6acb8c36c1b039 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 19 Jan 2023 14:17:11 +0100
Subject: [PATCH 679/816] Fix default value

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

diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 99d03f2d793..6efd3e84e4e 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -136,7 +136,7 @@ $arrayfields = array(
 	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1, 'position'=>90),
 	'cd.tva_tx'=>array('label'=>"VATRate", 'checked'=>-1, 'position'=>100),
 	'cd.subprice'=>array('label'=>"PriceUHT", 'checked'=>-1, 'position'=>105),
-	'cd.qty'=>array('label'=>"Qty", 'checked'=>-1, 'position'=>108),
+	'cd.qty'=>array('label'=>"Qty", 'checked'=>1, 'position'=>108),
 	'cd.total_ht'=>array('label'=>"TotalHT", 'checked'=>-1, 'position'=>109),
 	'cd.total_tva'=>array('label'=>"TotalVAT", 'checked'=>-1, 'position'=>110),
 	'cd.date_ouverture_prevue'=>array('label'=>"DateStartPlannedShort", 'checked'=>(($mode == "" || $mode == -1) || $mode == "0"), 'position'=>150),

From d01135a931b0e00c81dfb67ee321a0e1c4e23865 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 19 Jan 2023 14:28:10 +0100
Subject: [PATCH 680/816] css

---
 htdocs/contrat/class/contrat.class.php | 2 +-
 htdocs/contrat/services_list.php       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 539d7b63f31..4d08fdb96cd 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2979,7 +2979,7 @@ class ContratLigne extends CommonObjectLine
 		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
 		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>30, 'index'=>1),
 		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>35),
-		'qty' =>array('type'=>'integer', 'label'=>'Quantity', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>35, 'isameasure'=>1),
+		'qty' =>array('type'=>'integer', 'label'=>'Quantity', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>35, 'isameasure'=>1),
 		'total_ht' =>array('type'=>'integer', 'label'=>'AmountHT', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>36, 'isameasure'=>1),
 		'total_tva' =>array('type'=>'integer', 'label'=>'AmountVAT', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>37, 'isameasure'=>1),
 		'total_ttc' =>array('type'=>'integer', 'label'=>'AmountTTC', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>38, 'isameasure'=>1),
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 6efd3e84e4e..19c4659c589 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -137,7 +137,7 @@ $arrayfields = array(
 	'cd.tva_tx'=>array('label'=>"VATRate", 'checked'=>-1, 'position'=>100),
 	'cd.subprice'=>array('label'=>"PriceUHT", 'checked'=>-1, 'position'=>105),
 	'cd.qty'=>array('label'=>"Qty", 'checked'=>1, 'position'=>108),
-	'cd.total_ht'=>array('label'=>"TotalHT", 'checked'=>-1, 'position'=>109),
+	'cd.total_ht'=>array('label'=>"TotalHT", 'checked'=>-1, 'position'=>109, 'isameasure'=>1),
 	'cd.total_tva'=>array('label'=>"TotalVAT", 'checked'=>-1, 'position'=>110),
 	'cd.date_ouverture_prevue'=>array('label'=>"DateStartPlannedShort", 'checked'=>(($mode == "" || $mode == -1) || $mode == "0"), 'position'=>150),
 	'cd.date_ouverture'=>array('label'=>"DateStartRealShort", 'checked'=>(($mode == "" || $mode == -1) || $mode > 0), 'position'=>160),
@@ -670,7 +670,7 @@ if (!empty($arrayfields['cd.tms']['checked'])) {
 }
 if (!empty($arrayfields['status']['checked'])) {
 	// Status
-	print '<td class="liste_titre right">';
+	print '<td class="liste_titre right parentonrightofpage">';
 	$arrayofstatus = array(
 		'0'=>$langs->trans("ServiceStatusInitial"),
 		'4'=>$langs->trans("ServiceStatusRunning"),
@@ -678,7 +678,7 @@ if (!empty($arrayfields['status']['checked'])) {
 		'4&filter=expired'=>$langs->trans("ServiceStatusLate"),
 		'5'=>$langs->trans("ServiceStatusClosed")
 	);
-	print $form->selectarray('search_status', $arrayofstatus, (strstr($search_status, ',') ?-1 : $search_status), 1, 0, 0, '', 0, 0, 0, '', 'minwidth100imp maxwidth150');
+	print $form->selectarray('search_status', $arrayofstatus, (strstr($search_status, ',') ?-1 : $search_status), 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
 	print '</td>';
 }
 // Action column

From 79c21e083a42ecaa6ecd67ab91390abad9bd16df Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 19 Jan 2023 14:29:28 +0100
Subject: [PATCH 681/816] Fix bad position title lines

---
 htdocs/contrat/services_list.php | 111 ++++++++++++++++---------------
 1 file changed, 56 insertions(+), 55 deletions(-)

diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 9b3081a412a..21f49ebc789 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -517,60 +517,6 @@ $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfi
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
-print '<tr class="liste_titre">';
-if (!empty($arrayfields['c.ref']['checked'])) {
-	print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], "c.ref", "", $param, "", $sortfield, $sortorder);
-}
-if (!empty($arrayfields['p.description']['checked'])) {
-	print_liste_field_titre($arrayfields['p.description']['label'], $_SERVER["PHP_SELF"], "p.description", "", $param, "", $sortfield, $sortorder);
-}
-if (!empty($arrayfields['cd.tva_tx']['checked'])) {
-	print_liste_field_titre($arrayfields['cd.tva_tx']['label'], $_SERVER["PHP_SELF"], "cd.tva_tx", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-}
-if (!empty($arrayfields['cd.subprice']['checked'])) {
-	print_liste_field_titre($arrayfields['cd.subprice']['label'], $_SERVER["PHP_SELF"], "cd.subprice", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-}
-if (!empty($arrayfields['cd.qty']['checked'])) {
-	print_liste_field_titre($arrayfields['cd.qty']['label'], $_SERVER["PHP_SELF"], "cd.qty", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-}
-if (!empty($arrayfields['cd.total_ht']['checked'])) {
-	print_liste_field_titre($arrayfields['cd.total_ht']['label'], $_SERVER["PHP_SELF"], "cd.total_ht", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-}
-if (!empty($arrayfields['cd.total_tva']['checked'])) {
-	print_liste_field_titre($arrayfields['cd.total_tva']['label'], $_SERVER["PHP_SELF"], "cd.total_tva", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-}
-if (!empty($arrayfields['s.nom']['checked'])) {
-	print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, "", $sortfield, $sortorder);
-}
-if (!empty($arrayfields['cd.date_ouverture_prevue']['checked'])) {
-	print_liste_field_titre($arrayfields['cd.date_ouverture_prevue']['label'], $_SERVER["PHP_SELF"], "cd.date_ouverture_prevue", "", $param, '', $sortfield, $sortorder, 'center ');
-}
-if (!empty($arrayfields['cd.date_ouverture']['checked'])) {
-	print_liste_field_titre($arrayfields['cd.date_ouverture']['label'], $_SERVER["PHP_SELF"], "cd.date_ouverture", "", $param, '', $sortfield, $sortorder, 'center ');
-}
-if (!empty($arrayfields['cd.date_fin_validite']['checked'])) {
-	print_liste_field_titre($arrayfields['cd.date_fin_validite']['label'], $_SERVER["PHP_SELF"], "cd.date_fin_validite", "", $param, '', $sortfield, $sortorder, 'center ');
-}
-if (!empty($arrayfields['cd.date_cloture']['checked'])) {
-	print_liste_field_titre($arrayfields['cd.date_cloture']['label'], $_SERVER["PHP_SELF"], "cd.date_cloture", "", $param, '', $sortfield, $sortorder, 'center ');
-}
-// Extra fields
-include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
-// Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
-$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
-print $hookmanager->resPrint;
-if (!empty($arrayfields['cd.datec']['checked'])) {
-	print_liste_field_titre($arrayfields['cd.datec']['label'], $_SERVER["PHP_SELF"], "cd.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-}
-if (!empty($arrayfields['cd.tms']['checked'])) {
-	print_liste_field_titre($arrayfields['cd.tms']['label'], $_SERVER["PHP_SELF"], "cd.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-}
-if (!empty($arrayfields['status']['checked'])) {
-	print_liste_field_titre($arrayfields['status']['label'], $_SERVER["PHP_SELF"], "cd.statut,c.statut", "", $param, '', $sortfield, $sortorder, 'right ');
-}
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
-print "</tr>\n";
 
 print '<tr class="liste_titre">';
 if (!empty($arrayfields['c.ref']['checked'])) {
@@ -614,7 +560,6 @@ if (!empty($arrayfields['s.nom']['checked'])) {
 	print '</td>';
 }
 
-
 if (!empty($arrayfields['cd.date_ouverture_prevue']['checked'])) {
 	print '<td class="liste_titre center">';
 	$arrayofoperators = array('<'=>'<', '>'=>'>');
@@ -688,6 +633,62 @@ print $searchpicto;
 print '</td>';
 print "</tr>\n";
 
+print '<tr class="liste_titre">';
+if (!empty($arrayfields['c.ref']['checked'])) {
+	print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], "c.ref", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['p.description']['checked'])) {
+	print_liste_field_titre($arrayfields['p.description']['label'], $_SERVER["PHP_SELF"], "p.description", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['cd.tva_tx']['checked'])) {
+	print_liste_field_titre($arrayfields['cd.tva_tx']['label'], $_SERVER["PHP_SELF"], "cd.tva_tx", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+}
+if (!empty($arrayfields['cd.subprice']['checked'])) {
+	print_liste_field_titre($arrayfields['cd.subprice']['label'], $_SERVER["PHP_SELF"], "cd.subprice", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+}
+if (!empty($arrayfields['cd.qty']['checked'])) {
+	print_liste_field_titre($arrayfields['cd.qty']['label'], $_SERVER["PHP_SELF"], "cd.qty", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+}
+if (!empty($arrayfields['cd.total_ht']['checked'])) {
+	print_liste_field_titre($arrayfields['cd.total_ht']['label'], $_SERVER["PHP_SELF"], "cd.total_ht", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+}
+if (!empty($arrayfields['cd.total_tva']['checked'])) {
+	print_liste_field_titre($arrayfields['cd.total_tva']['label'], $_SERVER["PHP_SELF"], "cd.total_tva", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+}
+if (!empty($arrayfields['s.nom']['checked'])) {
+	print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['cd.date_ouverture_prevue']['checked'])) {
+	print_liste_field_titre($arrayfields['cd.date_ouverture_prevue']['label'], $_SERVER["PHP_SELF"], "cd.date_ouverture_prevue", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['cd.date_ouverture']['checked'])) {
+	print_liste_field_titre($arrayfields['cd.date_ouverture']['label'], $_SERVER["PHP_SELF"], "cd.date_ouverture", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['cd.date_fin_validite']['checked'])) {
+	print_liste_field_titre($arrayfields['cd.date_fin_validite']['label'], $_SERVER["PHP_SELF"], "cd.date_fin_validite", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['cd.date_cloture']['checked'])) {
+	print_liste_field_titre($arrayfields['cd.date_cloture']['label'], $_SERVER["PHP_SELF"], "cd.date_cloture", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+// Hook fields
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+if (!empty($arrayfields['cd.datec']['checked'])) {
+	print_liste_field_titre($arrayfields['cd.datec']['label'], $_SERVER["PHP_SELF"], "cd.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+}
+if (!empty($arrayfields['cd.tms']['checked'])) {
+	print_liste_field_titre($arrayfields['cd.tms']['label'], $_SERVER["PHP_SELF"], "cd.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+}
+if (!empty($arrayfields['status']['checked'])) {
+	print_liste_field_titre($arrayfields['status']['label'], $_SERVER["PHP_SELF"], "cd.statut,c.statut", "", $param, '', $sortfield, $sortorder, 'right ');
+}
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+print "</tr>\n";
+
+
 $contractstatic = new Contrat($db);
 $productstatic = new Product($db);
 

From ac6705a7f6832c1b547fe83d19b645a50c1f5e07 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 19 Jan 2023 14:54:11 +0100
Subject: [PATCH 682/816] NEW Filter on amount and qty on list of service's
 contracts

---
 htdocs/contrat/services_list.php | 60 +++++++++++++++++++++++++++-----
 1 file changed, 52 insertions(+), 8 deletions(-)

diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 84ee5b3f88c..e1ab25a2030 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -58,6 +58,11 @@ if (!$sortorder) {
 $mode = GETPOST("mode");
 $filter = GETPOST("filter");
 $search_name = GETPOST("search_name", 'alpha');
+$search_subprice = GETPOST("search_subprice", 'alpha');
+$search_qty = GETPOST("search_name", 'alpha');
+$search_total_ht = GETPOST("search_total_ht", 'alpha');
+$search_total_tva = GETPOST("search_total_tva", 'alpha');
+$search_total_ttc = GETPOST("search_total_ttc", 'alpha');
 $search_contract = GETPOST("search_contract", 'alpha');
 $search_service = GETPOST("search_service", 'alpha');
 $search_status = GETPOST("search_status", 'alpha');
@@ -180,6 +185,11 @@ if (empty($reshook)) {
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
 		$search_product_category = 0;
 		$search_name = "";
+		$search_subprice = "";
+		$search_qty = "";
+		$search_total_ht = "";
+		$search_total_tva = "";
+		$search_total_ttc = "";
 		$search_contract = "";
 		$search_service = "";
 		$search_status = -1;
@@ -280,8 +290,23 @@ if ($filter == "expired") {
 if ($filter == "notexpired") {
 	$sql .= " AND cd.date_fin_validite >= '".$db->idate($now)."'";
 }
+if ($search_subprice) {
+	$sql .= natural_search("cd.subprice", $search_subprice, 1);
+}
+if ($search_qty) {
+	$sql .= natural_search("cd.total_qty", $search_qty, 1);
+}
+if ($search_total_ht) {
+	$sql .= natural_search("cd.total_ht", $search_total_ht, 1);
+}
+if ($search_total_tva) {
+	$sql .= natural_search("cd.total_tva", $search_total_tva, 1);
+}
+if ($search_total_ttc) {
+	$sql .= natural_search("cd.total_ttc", $search_total_ttc, 1);
+}
 if ($search_name) {
-	$sql .= natural_search("c.ref", $search_name);
+	$sql .= natural_search("s.nom", $search_name);
 }
 if ($search_contract) {
 	$sql .= natural_search("c.ref", $search_contract);
@@ -398,6 +423,21 @@ if ($search_contract) {
 if ($search_name) {
 	$param .= '&amp;search_name='.urlencode($search_name);
 }
+if ($search_subprice) {
+	$param .= '&amp;search_subprice='.urlencode($search_subprice);
+}
+if ($search_qty) {
+	$param .= '&amp;search_qty='.urlencode($search_qty);
+}
+if ($search_total_ht) {
+	$param .= '&amp;search_total_ht='.urlencode($search_total_ht);
+}
+if ($search_total_tva) {
+	$param .= '&amp;search_total_tva='.urlencode($search_total_tva);
+}
+if ($search_total_ttc) {
+	$param .= '&amp;search_total_ttc='.urlencode($search_total_ttc);
+}
 if ($search_service) {
 	$param .= '&amp;search_service='.urlencode($search_service);
 }
@@ -538,19 +578,23 @@ if (!empty($arrayfields['cd.tva_tx']['checked'])) {
 	print '</td>';
 }
 if (!empty($arrayfields['cd.subprice']['checked'])) {
-	print '<td class="liste_titre">';
+	print '<td class="liste_titre right">';
+	print '<input type="text" class="flat maxwidth50 right" name="search_subprice" value="'.dol_escape_htmltag($search_subprice).'">';
 	print '</td>';
 }
 if (!empty($arrayfields['cd.qty']['checked'])) {
-	print '<td class="liste_titre">';
+	print '<td class="liste_titre right">';
+	print '<input type="text" class="flat maxwidth50 right" name="search_qty" value="'.dol_escape_htmltag($search_qty).'">';
 	print '</td>';
 }
 if (!empty($arrayfields['cd.total_ht']['checked'])) {
-	print '<td class="liste_titre">';
+	print '<td class="liste_titre right">';
+	print '<input type="text" class="flat maxwidth50" name="search_total_ht" value="'.dol_escape_htmltag($search_total_ht).'">';
 	print '</td>';
 }
 if (!empty($arrayfields['cd.total_tva']['checked'])) {
-	print '<td class="liste_titre">';
+	print '<td class="liste_titre right">';
+	print '<input type="text" class="flat maxwidth50" name="search_total_tva" value="'.dol_escape_htmltag($search_total_tva).'">';
 	print '</td>';
 }
 // Third party
@@ -647,13 +691,13 @@ if (!empty($arrayfields['cd.subprice']['checked'])) {
 	print_liste_field_titre($arrayfields['cd.subprice']['label'], $_SERVER["PHP_SELF"], "cd.subprice", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
 }
 if (!empty($arrayfields['cd.qty']['checked'])) {
-	print_liste_field_titre($arrayfields['cd.qty']['label'], $_SERVER["PHP_SELF"], "cd.qty", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	print_liste_field_titre($arrayfields['cd.qty']['label'], $_SERVER["PHP_SELF"], "cd.qty", "", $param, '', $sortfield, $sortorder, 'right nowrap ');
 }
 if (!empty($arrayfields['cd.total_ht']['checked'])) {
-	print_liste_field_titre($arrayfields['cd.total_ht']['label'], $_SERVER["PHP_SELF"], "cd.total_ht", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	print_liste_field_titre($arrayfields['cd.total_ht']['label'], $_SERVER["PHP_SELF"], "cd.total_ht", "", $param, '', $sortfield, $sortorder, 'right nowrap ');
 }
 if (!empty($arrayfields['cd.total_tva']['checked'])) {
-	print_liste_field_titre($arrayfields['cd.total_tva']['label'], $_SERVER["PHP_SELF"], "cd.total_tva", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	print_liste_field_titre($arrayfields['cd.total_tva']['label'], $_SERVER["PHP_SELF"], "cd.total_tva", "", $param, '', $sortfield, $sortorder, 'right nowrap ');
 }
 if (!empty($arrayfields['s.nom']['checked'])) {
 	print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, "", $sortfield, $sortorder);

From 97dfaf267e99160bd787d3ab7663ab60fd6aa0b9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 19 Jan 2023 14:59:02 +0100
Subject: [PATCH 683/816] Fix missing total on qties

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

diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index e1ab25a2030..fb50283991b 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -737,7 +737,7 @@ $contractstatic = new Contrat($db);
 $productstatic = new Product($db);
 
 $i = 0;
-$totalarray = array('nbfield'=>0);
+$totalarray = array('nbfield'=>0, 'cd.qty'=>0, 'cd.total_ht'=>0, 'cd.total_tva'=>0);
 while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($resql);
 
@@ -819,6 +819,10 @@ while ($i < min($num, $limit)) {
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
+		if (!$i) {
+			$totalarray['pos'][$totalarray['nbfield']] = 'cd.qty';
+		}
+		$totalarray['val']['cd.qty'] += $obj->qty;
 	}
 	if (!empty($arrayfields['cd.total_ht']['checked'])) {
 		print '<td class="right nowraponall">';

From a092654ea8cf6b0a340a30667ae2edf6a869f231 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 19 Jan 2023 15:17:40 +0100
Subject: [PATCH 684/816] NEW Add filter on nb of generation done in list of
 recurring invoices

---
 htdocs/compta/facture/invoicetemplate_list.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index ae9e4c2959b..0471b97c038 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -94,6 +94,7 @@ $search_date_when_end = dol_mktime(23, 59, 59, $search_date_when_endmonth, $sear
 $search_recurring = GETPOST('search_recurring', 'int');
 $search_frequency = GETPOST('search_frequency', 'alpha');
 $search_unit_frequency = GETPOST('search_unit_frequency', 'alpha');
+$search_nb_gen_done = GETPOST('search_nb_gen_done', 'aplha');
 $search_status = GETPOST('search_status', 'int');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
@@ -236,6 +237,7 @@ if (empty($reshook)) {
 		$search_recurring = '';
 		$search_frequency = '';
 		$search_unit_frequency = '';
+		$search_nb_gen_done = '';
 		$search_status = '';
 		$search_array_options = array();
 	}
@@ -334,7 +336,11 @@ if ($search_frequency != '') {
 	$sql .= natural_search('f.frequency', $search_frequency, 1);
 }
 if ($search_unit_frequency != '') {
-	$sql .= ' AND f.frequency > 0'.natural_search('f.unit_frequency', $search_unit_frequency);
+	$sql .= ' AND f.frequency > 0';
+	$sql .= natural_search('f.unit_frequency', $search_unit_frequency);
+}
+if ($search_nb_gen_done != '') {
+	$sql .= natural_search("f.nb_gen_done", $search_nb_gen_done, 1);
 }
 if ($search_status != '' && $search_status >= -1) {
 	if ($search_status == 0) {
@@ -458,6 +464,9 @@ if ($resql) {
 	if ($search_unit_frequency != '') {
 		$param .= '&search_unit_frequency='.urlencode($search_unit_frequency);
 	}
+	if ($search_nb_gen_done != '') {
+		$param .= '&search_nb_gen_done='.urlencode($search_nb_gen_done);
+	}
 	if ($search_status != '') {
 		$param .= '&search_status='.urlencode($search_status);
 	}
@@ -561,6 +570,7 @@ if ($resql) {
 	if (!empty($arrayfields['f.nb_gen_done']['checked'])) {
 		// Nb generation
 		print '<td class="liste_titre" align="center">';
+		print '<input class="flat" type="text" size="1" name="search_nb_gen_done" value="'.dol_escape_htmltag($search_nb_gen_done).'">';
 		print '</td>';
 	}
 	// Date invoice
@@ -728,7 +738,7 @@ if ($resql) {
 				}
 			}
 			if (!empty($arrayfields['s.nom']['checked'])) {
-				print '<td class="tdoverflowmax200">'.$companystatic->getNomUrl(1, 'customer').'</td>';
+				print '<td class="tdoverflowmax150">'.$companystatic->getNomUrl(1, 'customer').'</td>';
 				if (!$i) {
 					$totalarray['nbfield']++;
 				}

From 84436e1217327fac1e27c395613d41c8abf75ce7 Mon Sep 17 00:00:00 2001
From: hystepik <lucas.marcouiller@gmail.com>
Date: Thu, 19 Jan 2023 15:31:47 +0100
Subject: [PATCH 685/816] Fix : php 8.1 warnings and dolibarr log

---
 htdocs/barcode/printsheet.php                         | 2 +-
 htdocs/comm/action/index.php                          | 2 +-
 htdocs/comm/mailing/cibles.php                        | 2 +-
 htdocs/comm/mailing/index.php                         | 4 ++--
 htdocs/core/boxes/box_graph_nb_ticket_last_x_days.php | 4 ++--
 htdocs/hrm/class/position.class.php                   | 4 ++--
 htdocs/modulebuilder/index.php                        | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index 373effecbe8..56361b948f0 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -226,7 +226,7 @@ if ($action == 'builddoc') {
 						'code'=>$code,
 						'encoding'=>$encoding,
 						'is2d'=>$is2d,
-						'photo'=>$barcodeimage	// Photo must be a file that exists with format supported by TCPDF
+						'photo'=>!empty($barcodeimage) ? $barcodeimage : ''	// Photo must be a file that exists with format supported by TCPDF
 					);
 				}
 			} else {
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index e730243bfbf..9d84e205f2b 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -2048,7 +2048,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 							}
 						}
 						if (!empty($contact_id) && $contact_id > 0) {
-							if (!is_object($cachecontacts[$contact_id])) {
+							if (empty($cachecontacts[$contact_id]) || !is_object($cachecontacts[$contact_id])) {
 								$contact = new Contact($db);
 								$contact->fetch($contact_id);
 								$cachecontacts[$contact_id] = $contact;
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index dde6e3204d6..c39e4fbf834 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -675,7 +675,7 @@ if ($object->fetch($id) >= 0) {
 
 				// Date last update
 				print '<td class="center nowraponall">';
-				print dol_print_date($obj->tms, 'dayhour');
+				print dol_print_date(dol_stringtotime($obj->tms), 'dayhour');
 				print '</td>';
 
 				// Status of recipient sending email (Warning != status of emailing)
diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index d3ebc379b55..cf3d18adbac 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -101,7 +101,7 @@ if (is_resource($handle)) {
 
 				$qualified = 1;
 				foreach ($mailmodule->require_module as $key) {
-					if (!$conf->$key->enabled || (!$user->admin && $mailmodule->require_admin)) {
+					if (empty($conf->$key->enabled) || (!$user->admin && $mailmodule->require_admin)) {
 						$qualified = 0;
 						//print "Les pr�requis d'activation du module mailing ne sont pas respect�s. Il ne sera pas actif";
 						break;
@@ -176,7 +176,7 @@ if ($result) {
 
 			print '<tr class="oddeven">';
 			print '<td class="nowrap">'.$mailstatic->getNomUrl(1).'</td>';
-			print '<td>'.dol_trunc($obj->title, 38).'</td>';
+			print '<td>'.(!empty($obj->title) ? dol_trunc($obj->title, 38) : '').'</td>';
 			print '<td class="center">'.dol_print_date($db->jdate($obj->date_creat), 'day').'</td>';
 			print '<td class="center">'.($obj->nbemail ? $obj->nbemail : "0").'</td>';
 			print '<td class="right">'.$mailstatic->LibStatut($obj->statut, 5).'</td>';
diff --git a/htdocs/core/boxes/box_graph_nb_ticket_last_x_days.php b/htdocs/core/boxes/box_graph_nb_ticket_last_x_days.php
index b75d0752334..5a6dbbedd37 100644
--- a/htdocs/core/boxes/box_graph_nb_ticket_last_x_days.php
+++ b/htdocs/core/boxes/box_graph_nb_ticket_last_x_days.php
@@ -120,7 +120,7 @@ class box_graph_nb_ticket_last_x_days extends ModeleBoxes
 				while ($i < $num) {
 					$objp = $this->db->fetch_object($resql);
 					while ($minimumdatecformated < $objp->datec) {
-						$dataseries[] = array('label' => dol_print_date($minimumdatecformated, 'day'), 'data' => 0);
+						$dataseries[] = array('label' => dol_print_date($minimumdatec, 'day'), 'data' => 0);
 						$minimumdatec = dol_time_plus_duree($minimumdatec, $intervaltoadd, 'd');
 						$minimumdatecformated = dol_print_date($minimumdatec, 'dayrfc');
 					}
@@ -130,7 +130,7 @@ class box_graph_nb_ticket_last_x_days extends ModeleBoxes
 					$i++;
 				}
 				while (count($dataseries) < $days) {
-					$dataseries[] = array('label' => dol_print_date($minimumdatecformated, 'day'), 'data' => 0);
+					$dataseries[] = array('label' => dol_print_date($minimumdatec, 'day'), 'data' => 0);
 					$minimumdatec = dol_time_plus_duree($minimumdatec, $intervaltoadd, 'd');
 					$minimumdatecformated = dol_print_date($minimumdatec, 'dayrfc');
 					$i++;
diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index b685147a9b9..caf2ff00b03 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -395,10 +395,10 @@ class Position extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key . '=' . $value;
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key . ' = \'' . $this->db->idate($value) . '\'';
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
+				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+					$sqlwhere[] = $key . ' = \'' . $this->db->idate($value) . '\'';
 				} elseif (strpos($value, '%') === false) {
 					$sqlwhere[] = $key . ' IN (' . $this->db->sanitize($this->db->escape($value)) . ')';
 				} else {
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index b8810a2696d..0d2137928ac 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -3739,7 +3739,7 @@ if ($module == 'initmodule') {
 						print '</td>';
 
 						print '<td>';
-						print dol_escape_htmltag($menu['leftmenu']);
+						print !empty($menu['leftmenu']) ? dol_escape_htmltag($menu['leftmenu']) : '';
 						print '</td>';
 
 						print '<td class="tdoverflowmax300" title="'.dol_escape_htmltag($menu['url']).'">';

From b4b6cba9fb92b0bd55eec00848e20ec5a7d5a7e6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 19 Jan 2023 15:56:30 +0100
Subject: [PATCH 686/816] NEW Show supplier invoice ref of direct debit
 transfer tab invoices

---
 htdocs/compta/prelevement/factures.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 0ed75b5c3b8..378480ef0d2 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -21,7 +21,7 @@
 /**
  *     \file       htdocs/compta/prelevement/factures.php
  *     \ingroup    prelevement
- *     \brief      Page liste des factures prelevees
+ *     \brief      Page list of invoice paied by direct debit or credit transfer
  */
 
 // Load Dolibarr environment
@@ -174,6 +174,9 @@ if ($id > 0 || $ref) {
 // List of invoices
 $sql = "SELECT pf.rowid, p.type,";
 $sql .= " f.rowid as facid, f.ref as ref, f.total_ttc,";
+if ($object->type == 'bank-transfer') {
+	$sql .= " f.ref_supplier,";
+}
 $sql .= " s.rowid as socid, s.nom as name, pl.statut, pl.amount as amount_requested";
 $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
 $sql .= ", ".MAIN_DB_PREFIX."prelevement_lignes as pl";
@@ -251,6 +254,9 @@ if ($resql) {
 	print '<table class="liste centpercent">';
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("Bill", $_SERVER["PHP_SELF"], "p.ref", '', $param, '', $sortfield, $sortorder);
+	if ($object->type == 'bank-transfer') {
+		print_liste_field_titre("RefSupplierShort", $_SERVER["PHP_SELF"], "f.ref_supplier", '', $param, '', $sortfield, $sortorder);
+	}
 	print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", '', $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("AmountInvoice", $_SERVER["PHP_SELF"], "f.total_ttc", "", $param, 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre("AmountRequested", $_SERVER["PHP_SELF"], "pl.amount", "", $param, 'class="right"', $sortfield, $sortorder);
@@ -282,6 +288,12 @@ if ($resql) {
 		print $invoicetmp->getNomUrl(1);
 		print "</td>\n";
 
+		if ($object->type == 'bank-transfer') {
+			print '<td>';
+			print dol_escape_htmltag($invoicetmp->ref_supplier);
+			print "</td>\n";
+		}
+
 		print '<td>';
 		print $thirdpartytmp->getNomUrl(1);
 		print "</td>\n";

From e6ca13ca65b5339102809ce50af657765828936c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 19 Jan 2023 15:57:44 +0100
Subject: [PATCH 687/816] Missing column

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

diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 378480ef0d2..cc416d7d530 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -334,6 +334,9 @@ if ($resql) {
 	if ($num > 0) {
 		print '<tr class="liste_total">';
 		print '<td>'.$langs->trans("Total").'</td>';
+		if ($object->type == 'bank-transfer') {
+			print '<td>&nbsp;</td>';
+		}
 		print '<td>&nbsp;</td>';
 		print '<td class="right">';
 		//if ($totalinvoices != $object->amount) print img_warning("AmountOfFileDiffersFromSumOfInvoices");		// It is normal to have total that differs. For an amount of invoice of 100, request to pay may be 50 only.

From 9a40c966bd7d4cb67b8f16fbbb97b01d345034b0 Mon Sep 17 00:00:00 2001
From: piernov <piernov@piernov.org>
Date: Thu, 19 Jan 2023 16:25:59 +0100
Subject: [PATCH 688/816] Fix: don setPaid sets paid field

When donation is classified as paid, paid field also needs to be set to 1 so that accounting reports show the correct information.
---
 htdocs/don/class/don.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 181b3fc0ca3..3b09e8cc178 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -758,7 +758,7 @@ class Don extends CommonObject
 	 */
 	public function setPaid($id, $modepayment = 0)
 	{
-		$sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 2";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 2, paid = 1";
 		if ($modepayment) {
 			$sql .= ", fk_payment = ".((int) $modepayment);
 		}
@@ -768,6 +768,7 @@ class Don extends CommonObject
 		if ($resql) {
 			if ($this->db->affected_rows($resql)) {
 				$this->statut = 2;
+				$this->paid = 1;
 				return 1;
 			} else {
 				return 0;

From 62d0b7b97299964cf85c5cd44c78eded7f92787a Mon Sep 17 00:00:00 2001
From: "T. Mulzer" <tasso.mulzer@beuth-hochschule.de>
Date: Thu, 19 Jan 2023 17:10:50 +0100
Subject: [PATCH 689/816] Update get_attribute_values.php

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

diff --git a/htdocs/variants/ajax/get_attribute_values.php b/htdocs/variants/ajax/get_attribute_values.php
index 1867eb368de..3950a262500 100644
--- a/htdocs/variants/ajax/get_attribute_values.php
+++ b/htdocs/variants/ajax/get_attribute_values.php
@@ -83,4 +83,4 @@ if ($res == -1) {
 	exit();
 }
 
-print json_encode($res);
+print json_encode($res, JSON_PARTIAL_OUTPUT_ON_ERROR);

From d8dcb0d1012278aea36f05f29cd4dde52a1714db Mon Sep 17 00:00:00 2001
From: "T. Mulzer" <tasso.mulzer@beuth-hochschule.de>
Date: Thu, 19 Jan 2023 17:13:25 +0100
Subject: [PATCH 690/816] Solves issue #17181

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

diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index 5128f31d0c5..e5043dcd7fa 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -511,7 +511,7 @@ if (!empty($id) || !empty($ref)) {
 
 		<script type="text/javascript">
 
-			variants_available = <?php echo json_encode($prodattr_alljson); ?>;
+			variants_available = <?php echo json_encode($prodattr_alljson, JSON_PARTIAL_OUTPUT_ON_ERROR); ?>;
 			variants_selected = {
 				index: [],
 				info: []

From 51f1871dd6fa33ca3c569f996dfbd96699e1b109 Mon Sep 17 00:00:00 2001
From: Thomas Negre <tnegre@open-dsi.fr>
Date: Thu, 19 Jan 2023 17:09:31 +0100
Subject: [PATCH 691/816] FIX on public ticket list, only the page 1 was
 accessible. Other pages were 404 error.

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

diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index 3c5dfffba17..fa4142ac260 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -211,7 +211,7 @@ if ($action == "view_ticketlist") {
 		$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 		$filter = array();
-		$param = 'action=view_ticketlist';
+		$param = '&action=view_ticketlist';
 
 		// Definition of fields for list
 		$arrayfields = array(
@@ -386,7 +386,7 @@ if ($action == "view_ticketlist") {
 			$resql = $db->query($sql);
 			if ($resql) {
 				$num = $db->num_rows($resql);
-				print_barre_liste($langs->trans('TicketList'), $page, 'public/list.php', $param, $sortfield, $sortorder, '', $num, $num_total, 'ticket');
+				print_barre_liste($langs->trans('TicketList'), $page, 'list.php', $param, $sortfield, $sortorder, '', $num, $num_total, 'ticket');
 
 				// Search bar
 				print '<form method="get" action="'.$url_form.'" id="searchFormList" >'."\n";

From 392773968561c70c3d136536cfdc55ccf928b636 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Thu, 19 Jan 2023 17:27:53 +0100
Subject: [PATCH 692/816] add infos needed in the main sql

---
 htdocs/hrm/position_list.php | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php
index 7a6f7fcc417..dc427fd3aa6 100644
--- a/htdocs/hrm/position_list.php
+++ b/htdocs/hrm/position_list.php
@@ -73,6 +73,7 @@ $pagenext = $page + 1;
 // Initialize technical objects
 $object = new Position($db);
 $extrafields = new ExtraFields($db);
+$userstatic = new User($db);
 $diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array('positionlist')); // Note that conf->hooks_modules contains array
 
@@ -218,6 +219,9 @@ $morecss = array();
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
 $sql .= $object->getFieldList('t');
+$sql .= ', '.$userstatic->getFieldList('u');
+$sql .= ',u.email, u.statut';
+$sql .= ',j.rowid, j.label as job_label';
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
@@ -229,7 +233,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
-$sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
+$sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t, ".MAIN_DB_PREFIX.$userstatic->table_element." as u,".MAIN_DB_PREFIX."hrm_job as j";
 if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 }
@@ -242,6 +246,8 @@ if ($object->ismultientitymanaged == 1) {
 } else {
 	$sql .= " WHERE 1 = 1";
 }
+$sql .= " AND t.fk_user = u.rowid";
+$sql .= " AND t.fk_job = j.rowid";
 foreach ($search as $key => $val) {
 	if (array_key_exists($key, $object->fields)) {
 		if ($key == 'status' && $search[$key] == -1) {
@@ -612,14 +618,18 @@ while ($i < $imaxinloop) {
 			print '<div class="box-flex-container">';
 		}
 		// get info needed
-
 		$object->date_start = $obj->date_start;
 		$object->date_end = $obj->date_end;
-		$job = new job($db);
-		$job->fetch($obj->fk_job);
-		$object->fk_job = $job->getNomUrl();
-		$userstatic = new User($db);
-		$userstatic->fetch($obj->fk_user);
+
+		$object->fk_job = $obj->job_label;
+
+		$userstatic->id = $obj->fk_user;
+		$userstatic->ref = $obj->fk_user;
+		$userstatic->firstname = $obj->firstname;
+		$userstatic->lastname = $obj->lastname;
+		$userstatic->email = $obj->email;
+		$userstatic->statut = $obj->statut;
+
 		$object->fk_user = $userstatic->getNomUrl(1);
 		// output kanban
 		if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined

From c6fd20deef77fcb35fbea6dfde66dfead889c646 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Thu, 19 Jan 2023 17:43:20 +0100
Subject: [PATCH 693/816] add columns needed in the main sql

---
 htdocs/hrm/position_list.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php
index dc427fd3aa6..4500d3d45ec 100644
--- a/htdocs/hrm/position_list.php
+++ b/htdocs/hrm/position_list.php
@@ -620,7 +620,6 @@ while ($i < $imaxinloop) {
 		// get info needed
 		$object->date_start = $obj->date_start;
 		$object->date_end = $obj->date_end;
-
 		$object->fk_job = $obj->job_label;
 
 		$userstatic->id = $obj->fk_user;

From 2433248445abb5ddad889534c078a4b216ba5595 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Thu, 19 Jan 2023 18:07:18 +0100
Subject: [PATCH 694/816] fix problem in sql

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

diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php
index 4500d3d45ec..308e48e153b 100644
--- a/htdocs/hrm/position_list.php
+++ b/htdocs/hrm/position_list.php
@@ -219,7 +219,8 @@ $morecss = array();
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
 $sql .= $object->getFieldList('t');
-$sql .= ', '.$userstatic->getFieldList('u');
+$sql .= ',';
+$sql .= $userstatic->getFieldList('u');
 $sql .= ',u.email, u.statut';
 $sql .= ',j.rowid, j.label as job_label';
 // Add fields from extrafields

From 7a13ca65b503a8161b73f67d1d47e7a42bbcacd5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 20 Jan 2023 09:26:58 +0100
Subject: [PATCH 695/816] Fix missing empty value

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

diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index b20ecd8ede9..adb525c7d5e 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -632,7 +632,7 @@ if ($id > 0) {
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editmode') {
-			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id');
+			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', '', 1, 1);
 		} else {
 			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none');
 		}

From 31002317ee849bf1817c84d94886c52093917ae0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 20 Jan 2023 09:38:35 +0100
Subject: [PATCH 696/816] Debug kanban

---
 .../compta/sociales/class/chargesociales.class.php | 14 ++++++++------
 .../template/class/myobject.class.php              |  8 ++++++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index cacc2280f53..3619ebfad7a 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -759,22 +759,24 @@ class ChargeSociales extends CommonObject
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
 	{
-		global $langs;
+		global $conf, $langs;
+
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
 		$return .= '<div class="info-box info-box-sm">';
 		$return .= '<span class="info-box-icon bg-infobox-action">';
 		$return .= img_picto('', $this->picto);
 		$return .= '</span>';
 		$return .= '<div class="info-box-content">';
-		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
-		if (property_exists($this, 'fk_project') && !empty($this->fk_project)) {
-			$return .= ' | <span class="info-box-label">'.$this->fk_project.'</span>';
+		$return .= '<span class="info-box-ref valignmiddle">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(0) : $this->ref).'</span>';
+		if (property_exists($this, 'label')) {
+			$return .= ' &nbsp; <div class="inline-block opacitymedium valignmiddle tdoverflowmax100">'.$this->label.'</div>';
 		}
 		if (property_exists($this, 'date_ech')) {
-			$return .= '<br><span class="opacitymedium">'.$langs->trans("DateEnd").'</span>:<span class="info-box-label">'.dol_print_date($this->date_ech).'</span>';
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("DateEnd").'</span> : <span class="info-box-label">'.dol_print_date($this->date_ech, 'day').'</span>';
 		}
 		if (property_exists($this, 'amount')) {
-			$return .= '<br><span class="opacitymedium">'.$langs->trans("Amount").'</span> : <span class="info-box-label amount">'.price($this->amount).'</span>';
+			$return .= '<br>';
+			$return .= '<span class="info-box-label amount">'.price($this->amount, 0, $langs, 1, -1, -1, $conf->currency).'</span>';
 		}
 		if (method_exists($this, 'LibStatut')) {
 			$return .= '<br><div class="info-box-status margintoponly">'.$this->LibStatut($this->paye, 5, $this->alreadypaid).'</div>';
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 5ac7f8c30de..c60dbaa7e5b 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -880,9 +880,13 @@ class MyObject extends CommonObject
 		$return .= img_picto('', $this->picto);
 		$return .= '</span>';
 		$return .= '<div class="info-box-content">';
-		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>';
+		$return .= '<span class="info-box-ref valignmiddle">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>';
 		if (property_exists($this, 'label')) {
-			$return .= '<br><span class="info-box-label opacitymedium">'.$this->label.'</span>';
+			$return .= ' <div class="inline-block opacitymedium valignmiddle tdoverflowmax100">'.$this->label.'</div>';
+		}
+		if (property_exists($this, 'amount')) {
+			$return .= '<br>';
+			$return .= '<span class="info-box-label amount">'.price($this->amount, 0, $langs, 1, -1, -1, $conf->currency).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
 			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';

From db2d40c93df6173f32578fb2ff98044a43e7ef3b Mon Sep 17 00:00:00 2001
From: marc <marc.baur@ptmsoft.fr>
Date: Fri, 20 Jan 2023 12:17:45 +0100
Subject: [PATCH 697/816] Add translation for hidind social network see #23583

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

diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 38b6892dbae..51a909125aa 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -500,4 +500,6 @@ 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
-CompanySection=Company section
\ No newline at end of file
+CompanySection=Company section
+ShowSocialNetwork=Show social networks
+HideSocialNetwork=Hide social networks
\ No newline at end of file

From b78eebaae279df5a8817bd12f360e8d57112707c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 20 Jan 2023 12:44:56 +0100
Subject: [PATCH 698/816] Clean code

---
 htdocs/langs/en_US/stripe.lang       | 10 +++++---
 htdocs/stripe/admin/stripe.php       | 37 +++++++++++-----------------
 htdocs/stripe/class/stripe.class.php | 33 +++++++++++++++++++++----
 3 files changed, 49 insertions(+), 31 deletions(-)

diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang
index 2a3f988cebf..b5dbfd656b6 100644
--- a/htdocs/langs/en_US/stripe.lang
+++ b/htdocs/langs/en_US/stripe.lang
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestBankAcountForSEPA=Example of bank account BAN for direct debit test: %s
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -70,5 +71,8 @@ ToOfferALinkForLiveWebhook=Link to setup Stripe WebHook to call the IPN (live mo
 PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
 ClickHereToTryAgain=<a href="%s">Click here to try again...</a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=Due to Strong Customer Authentication rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
-TERMINAL_LOCATION=Location (address) for terminals
-RequestDirectDebitWithStripe=Request Direct Debit with Stripe
\ No newline at end of file
+STRIPE_CARD_PRESENT=Card Present for Stripe Terminals
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
+RequestDirectDebitWithStripe=Request Direct Debit with Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Enable the Direct Debit payments through Stripe
+ 
\ No newline at end of file
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index b115d0453f0..11fb6c6e442 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -427,31 +427,16 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {	// TODO Not used by current code
 	print '</td></tr>';
 }
 
-// Activate Payment Request API
-if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {	// TODO Not used by current code
-	print '<tr class="oddeven"><td>';
-	print $langs->trans("STRIPE_PAYMENT_REQUEST_API").' ?? Not used, what is it for ??</td><td>';
-	if ($conf->use_javascript_ajax) {
-		print ajax_constantonoff('STRIPE_PAYMENT_REQUEST_API');
-	} else {
-		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-		print $form->selectarray("STRIPE_PAYMENT_REQUEST_API", $arrval, getDolGlobalString('STRIPE_PAYMENT_REQUEST_API'));
-	}
-	print '</td></tr>';
+print '<tr class="oddeven"><td>';
+print $langs->trans("STRIPE_SEPA_DIRECT_DEBIT").'</td><td>';
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('STRIPE_SEPA_DIRECT_DEBIT');
+} else {
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	print $form->selectarray("STRIPE_SEPA_DIRECT_DEBIT", $arrval, getDolGlobalString('STRIPE_SEPA_DIRECT_DEBIT'));
 }
+print '</td></tr>';
 
-// Activate SEPA DIRECT_DEBIT
-if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {	// TODO Not used by current code
-	print '<tr class="oddeven"><td>';
-	print $langs->trans("STRIPE_SEPA_DIRECT_DEBIT").'</td><td>';
-	if ($conf->use_javascript_ajax) {
-		print ajax_constantonoff('STRIPE_SEPA_DIRECT_DEBIT');
-	} else {
-		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-		print $form->selectarray("STRIPE_SEPA_DIRECT_DEBIT", $arrval, getDolGlobalString('STRIPE_SEPA_DIRECT_DEBIT'));
-	}
-	print '</td></tr>';
-}
 
 // Activate Klarna
 if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {	// TODO Not used by current code
@@ -608,6 +593,12 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/onlinepaymentlinks.tpl.php';
 
 print info_admin($langs->trans("ExampleOfTestCreditCard", '4242424242424242 (no 3DSecure) or 4000000000003063 (3DSecure required) or 4000002760003184 (3DSecure2 required on all transaction) or 4000003800000446 (3DSecure2 required, the off-session allowed)', '4000000000000101', '4000000000000069', '4000000000000341'));
 
+if (getDolGlobalString('STRIPE_SEPA_DIRECT_DEBIT')) {
+	print info_admin($langs->trans("ExampleOfTestBankAcountForSEPA", 'AT611904300234573201 (pending->succeed) or AT861904300235473202 (pending->failed)'));
+}
+
+
+
 if (!empty($conf->use_javascript_ajax)) {
 	print "\n".'<script type="text/javascript">';
 	print '$(document).ready(function () {
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 2d6c28ac8be..972d2e25c23 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -906,7 +906,7 @@ class Stripe extends CommonObject
 		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 = "SELECT sa.stripe_card_ref, sa.proprio, sa.iban_prefix, sa.rum"; // stripe_card_ref is 'src_...' for Stripe SEPA
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib as sa";
 		$sql .= " WHERE sa.rowid = ".((int) $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)
@@ -950,13 +950,35 @@ class Stripe extends CommonObject
 					$dataforcard = array(
 						'type'=>'sepa_debit',
 						"sepa_debit" => array('iban' => $iban),
-						'currency' => 'eur',
+						'currency' => strtolower($conf->currency),
 						'usage' => 'reusable',
 						'owner' => array(
 							'name' => $soc->name,
 						),
-						"metadata" => array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>$ipaddress)
+						"metadata" => array(
+							'dol_type'=>$object->element,
+							'dol_id'=>$object->id,
+							'dol_version'=>DOL_VERSION,
+							'dol_entity'=>$conf->entity,
+							'ipaddress'=>$ipaddress
+						)
 					);
+					// Complete owner name
+					if (!empty($soc->town)) {
+						$dataforcard['owner']['address']['city']=$soc->town;
+					}
+					if (!empty($soc->country_code)) {
+						$dataforcard['owner']['address']['country']=$soc->country_code;
+					}
+					if (!empty($soc->address)) {
+						$dataforcard['owner']['address']['line1']=$soc->address;
+					}
+					if (!empty($soc->zip)) {
+						$dataforcard['owner']['address']['postal_code']=$soc->zip;
+					}
+					if (!empty($soc->state)) {
+						$dataforcard['owner']['address']['state']=$soc->state;
+					}
 
 					//$a = \Stripe\Stripe::getApiKey();
 					//var_dump($a);var_dump($stripeacc);exit;
@@ -974,17 +996,18 @@ class Stripe extends CommonObject
 						$stripeacc = $stripearrayofkeysbyenv[$servicestatus]['secret_key'];
 
 						dol_syslog("Try to create sepa_debit with data = ".json_encode($dataforcard));
+						// TODO Replace with PaymentIntent. Can use $stripe->getPaymentIntent ?
 						$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
+							// link customer and src
 							$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");
+								dol_syslog("Update the payment request");
 								// print json_encode($sepa);
 
 								$sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib";

From a6534cc755f744dfaa3bdb0ac7e8b3e251a0de82 Mon Sep 17 00:00:00 2001
From: Faustin <boitel.faustin@gmail.com>
Date: Fri, 20 Jan 2023 13:31:03 +0100
Subject: [PATCH 699/816] Can edit service name

---
 htdocs/admin/oauth.php | 42 +++++++++++++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
index 217dfd63cc9..1ed4683496e 100644
--- a/htdocs/admin/oauth.php
+++ b/htdocs/admin/oauth.php
@@ -48,6 +48,8 @@ $action = GETPOST('action', 'aZ09');
 $provider = GETPOST('provider', 'aZ09');
 $label = GETPOST('label', 'aZ09');
 
+$servicetoeditname = GETPOST('servicetoeditname', 'aZ09');
+
 $error = 0;
 
 
@@ -72,15 +74,24 @@ if ($action == 'update') {
 	foreach ($conf->global as $key => $val) {
 		if (!empty($val) && preg_match('/^OAUTH_.+_ID$/', $key)) {
 			$constvalue = str_replace('_ID', '', $key);
-			if (!dolibarr_set_const($db, $constvalue.'_ID', GETPOST($constvalue.'_ID'), 'chaine', 0, '', $conf->entity)) {
-				$error++;
+			$newconstvalue = $constvalue;
+			if (GETPOSTISSET($constvalue.'_NAME')) {
+				$newconstvalue = preg_replace('/-.*$/', '', $constvalue).'-'.GETPOST($constvalue.'_NAME');
+			}
+
+			if (GETPOSTISSET($constvalue.'_ID')) {
+				if (!dolibarr_set_const($db, $newconstvalue.'_ID', GETPOST($constvalue.'_ID'), 'chaine', 0, '', $conf->entity)) {
+					$error++;
+				}
 			}
 			// If we reset this provider, we also remove the secret
-			if (!dolibarr_set_const($db, $constvalue.'_SECRET', GETPOST($constvalue.'_ID') ? GETPOST($constvalue.'_SECRET') : '', 'chaine', 0, '', $conf->entity)) {
-				$error++;
+			if (GETPOSTISSET($constvalue.'_SECRET')) {
+				if (!dolibarr_set_const($db, $newconstvalue.'_SECRET', GETPOST($constvalue.'_ID') ? GETPOST($constvalue.'_SECRET') : '', 'chaine', 0, '', $conf->entity)) {
+					$error++;
+				}
 			}
 			if (GETPOSTISSET($constvalue.'_URLAUTHORIZE')) {
-				if (!dolibarr_set_const($db, $constvalue.'_URLAUTHORIZE', GETPOST($constvalue.'_URLAUTHORIZE'), 'chaine', 0, '', $conf->entity)) {
+				if (!dolibarr_set_const($db, $newconstvalue.'_URLAUTHORIZE', GETPOST($constvalue.'_URLAUTHORIZE'), 'chaine', 0, '', $conf->entity)) {
 					$error++;
 				}
 			}
@@ -90,14 +101,22 @@ if ($action == 'update') {
 				} else {
 					$scopestring = GETPOST($constvalue.'_SCOPE');
 				}
-				if (!dolibarr_set_const($db, $constvalue.'_SCOPE', $scopestring, 'chaine', 0, '', $conf->entity)) {
+				if (!dolibarr_set_const($db, $newconstvalue.'_SCOPE', $scopestring, 'chaine', 0, '', $conf->entity)) {
 					$error++;
 				}
-			} else {
-				if (!dolibarr_set_const($db, $constvalue.'_SCOPE', '', 'chaine', 0, '', $conf->entity)) {
+			} elseif ($newconstvalue !== $constvalue) {
+				if (!dolibarr_set_const($db, $newconstvalue.'_SCOPE', '', 'chaine', 0, '', $conf->entity)) {
 					$error++;
 				}
 			}
+			print $newconstvalue.'_ID'."######".GETPOST($constvalue.'_ID')."\n";
+
+			if ($constvalue !== $newconstvalue) {
+				dolibarr_del_const($db, $constvalue.'_ID', $conf->entity);
+				dolibarr_del_const($db, $constvalue.'_SECRET', $conf->entity);
+				dolibarr_del_const($db, $constvalue.'_URLAUTHORIZE', $conf->entity);
+				dolibarr_del_const($db, $constvalue.'_SCOPE', $conf->entity);
+			}
 		}
 	}
 
@@ -270,11 +289,16 @@ if (count($listinsetup) > 0) {
 		} else {
 			print $label;
 		}
-		if ($keyforprovider) {
+		if ($servicetoeditname == $key[0]) {
+			print ' (<input style="width: 20%" type="text" name="'.$key[0].'" value="'.$keyforprovider.'" >)';
+		} elseif ($keyforprovider) {
 			print ' (<b>'.$keyforprovider.'</b>)';
 		} else {
 			print ' (<b>'.$langs->trans("NoName").'</b>)';
 		}
+		if (!($servicetoeditname == $key[0])) {
+			print '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?token='.newToken().'&servicetoeditname='.urlencode($key[0]).'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a>';
+		}
 		print '</td>';
 		print '<td>';
 		if (!empty($supportedoauth2array[$keyforsupportedoauth2array]['urlforcredentials'])) {

From d3b5fa2983470940d9cf75d2e7d09dfa9b2b5cd5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 20 Jan 2023 13:42:13 +0100
Subject: [PATCH 700/816] Debug v17

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

diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index b6ce3d8b9a5..5a5c2f25c0e 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -165,14 +165,14 @@ if (empty($conf->use_javascript_ajax)) {
 		$constante = 'FCKEDITOR_ENABLE_'.$const;
 		print '<!-- constant = '.$constante.' -->'."\n";
 		print '<tr class="oddeven">';
-		print '<td width="16">'.img_object("", $picto[$const]).'</td>';
+		print '<td class="width20">'.img_object("", $picto[$const]).'</td>';
 		print '<td>';
 		print $langs->trans($desc);
 		if ($const == 'DETAILS') {
 			print '<br><span class="warning">'.$langs->trans("FCKeditorForProductDetails2").'</span>';
 		}
 		print '</td>';
-		print '<td class="center centpercent">';
+		print '<td class="center centpercent width100">';
 		$value = (isset($conf->global->$constante) ? $conf->global->$constante : 0);
 		if ($value == 0) {
 			print '<a href="'.$_SERVER['PHP_SELF'].'?action=enable_'.strtolower($const).'&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';

From f054dabbdfab4a7e5c4cd6f4b8af7f495739b809 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 20 Jan 2023 13:36:23 +0100
Subject: [PATCH 701/816] NEW expend/collapse list of social networks

---
 htdocs/contact/card.php                       |  56 +---------
 htdocs/contact/class/contact.class.php        |   3 +
 .../core/class/commonsocialnetworks.class.php | 102 ++++++++++++++++++
 htdocs/langs/en_US/companies.lang             |   4 +-
 htdocs/societe/card.php                       |  52 +--------
 htdocs/societe/class/societe.class.php        |   2 +
 6 files changed, 116 insertions(+), 103 deletions(-)
 create mode 100644 htdocs/core/class/commonsocialnetworks.class.php

diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 66cdc1ed1aa..4fde1b75552 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -856,9 +856,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '</tr>';
 			}
 
-
+			// Social network
 			if (isModEnabled('socialnetworks')) {
-				showSocialNetwork();
+				$object->showSocialNetwork($socialnetworks, ($conf->browser->layout == 'phone' ? 2 : 4));
 			}
 
 			// Visibility
@@ -1128,8 +1128,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '</tr>';
 			}
 
+			// Social network
 			if (isModEnabled('socialnetworks')) {
-				showSocialNetwork();
+				$object->showSocialNetwork($socialnetworks, ($conf->browser->layout == 'phone' ? 2 : 4));
 			}
 
 			// Visibility
@@ -1584,55 +1585,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 	}
 }
 
-/**
- * Show social network part if the module is enabled with hiding functionality
- *
- * @return void
- */
-function showSocialNetwork()
-{
-	global $socialnetworks, $object, $form, $object, $langs;
-	echo '<script type="text/javascript">$("document").ready(function() {toogleSocialNetwork(false); });</script>';
-
-	print '<tr><td>&nbsp;</td><td><a id="lnk" href="javascript:toogleSocialNetwork(true)"></a></td></tr>';
-	foreach ($socialnetworks as $key => $value) {
-		if ($value['active']) {
-			print '<tr class="soc_network">';
-			print '<td><label for="'.$value['label'].'">'.$form->editfieldkey($value['label'], $key, '', $object, 0).'</label></td>';
-			print '<td colspan="3">';
-			if (!empty($value['icon'])) {
-				print '<span class="fa '.$value['icon'].'"></span>';
-			}
-			print '<input type="text" name="'.$key.'" id="'.$key.'" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET($key) ?GETPOST($key, 'alphanohtml') : (!empty($object->socialnetworks[$key]) ? $object->socialnetworks[$key] : "")).'">';
-			print '</td>';
-			print '</tr>';
-		} elseif (!empty($object->socialnetworks[$key])) {
-			print '<input type="hidden" name="'.$key.'" value="'.$object->socialnetworks[$key].'">';
-		}
-	}
-
-	print '<script type="text/javascript">
-
-	function toogleSocialNetwork(chgCookieState) {
-		const lnk = $("#lnk");
-		const items = $(".soc_network");
-		var cookieState = document.cookie.split(";").some((item) => item.trim().startsWith("DOLUSER_SOCIALNETWORKS_SHOW=true")) == true;
-
-		if (!chgCookieState) cookieState = !cookieState ;
-
-		if (cookieState) {
-			items.hide();
-			lnk.text("'.dol_escape_js($langs->transnoentitiesnoconv("ShowSocialNetwork")).'...");
-			if(chgCookieState) {document.cookie = "DOLUSER_SOCIALNETWORKS_SHOW=false; SameSite=Strict"};
-		} else {
-			items.show();
-			lnk.text("'.dol_escape_js($langs->transnoentitiesnoconv("HideSocialNetwork")).'");
-			if(chgCookieState) {document.cookie = "DOLUSER_SOCIALNETWORKS_SHOW=true; SameSite=Strict";}
-		}
-	}
-	</script>';
-}
-
 
 llxFooter();
 
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index e55f123a540..c9d62c410b3 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -32,6 +32,7 @@
  *	\brief      File of contacts class
  */
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonsocialnetworks.class.php';
 
 
 /**
@@ -39,6 +40,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
  */
 class Contact extends CommonObject
 {
+	use CommonSocialNetworks;
+
 	/**
 	 * @var string ID to identify managed object
 	 */
diff --git a/htdocs/core/class/commonsocialnetworks.class.php b/htdocs/core/class/commonsocialnetworks.class.php
new file mode 100644
index 00000000000..eeb6583ca65
--- /dev/null
+++ b/htdocs/core/class/commonsocialnetworks.class.php
@@ -0,0 +1,102 @@
+<?php
+/* Copyright (C) 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/>.
+ */
+
+/**
+ *       \file       htdocs/core/class/commonincoterm.class.php
+ *       \ingroup    core
+ *       \brief      File of the superclass of object classes that support incoterm (customer and supplier)
+ */
+
+
+/**
+ *      Superclass for social networks
+ */
+trait CommonSocialNetworks
+{
+	/**
+	 * Show social network part if the module is enabled with hiding functionality
+	 *
+	 * @param	array	$socialnetworks		Array of social networks
+	 * @param	int		$colspan			Colspan
+	 * @return 	void
+	 */
+	public function showSocialNetwork($socialnetworks, $colspan = 4)
+	{
+		global $object, $form, $langs;
+
+		$nbofnetworks = count($socialnetworks);
+		$nbactive = 0;
+		foreach ($socialnetworks as $key => $value) {
+			if (!empty($object->socialnetworks[$key])) {
+				$nbactive++;
+			}
+		}
+
+		if ($nbofnetworks > 1) {
+			print '<tr><td><br><a class="paddingtop paddingbottom socialnetworklnk" id="socialnetworklnk" href="javascript:toogleSocialNetwork(true)"></a></td>';
+			print '<td'.($colspan ? ' colspan="'.($colspan-1).'"' : '').'>';
+			print '<br><a class="paddingtop paddingbottom socialnetworklnk" href="javascript:toogleSocialNetwork(true)"><span class="badge badge-secondary socialnetworklnk">'.$nbactive.'</span></a>';
+			print '</td>';
+			print '</tr>';
+		}
+		foreach ($socialnetworks as $key => $value) {
+			if ($value['active'] || $nbofnetworks == 1) {
+				print '<tr class="soc_network">';
+				print '<td><label for="'.$value['label'].'">'.$form->editfieldkey($value['label'], $key, '', $object, 0).'</label></td>';
+				print '<td colspan="3">';
+				if (!empty($value['icon'])) {
+					print '<span class="fa '.$value['icon'].' pictofixedwidth"></span>';
+				}
+				print '<input type="text" name="'.$key.'" id="'.$key.'" class="minwidth100 maxwidth300 widthcentpercentminusx" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET($key) ? GETPOST($key, 'alphanohtml') : (empty($object->socialnetworks[$key]) ? '' : $object->socialnetworks[$key])).'">';
+				print '</td>';
+				print '</tr>';
+			} elseif (!empty($object->socialnetworks[$key])) {
+				print '<input type="hidden" name="'.$key.'" value="'.$object->socialnetworks[$key].'">';
+			}
+		}
+		print '<tr><td'.($colspan ? ' colspan="'.$colspan.'"' : '').'><hr></td></tr>';
+
+		if ($nbofnetworks > 1) {
+			print '<script type="text/javascript">
+		$("document").ready(function() { toogleSocialNetwork(false); });
+
+		jQuery(".socialnetworklnk").onClick(function() {
+			console.log("Click on link");
+			toogleSocialNetwork(true);
+		});
+
+		function toogleSocialNetwork(chgCookieState) {
+			const lnk = $("#socialnetworklnk");
+			const items = $(".soc_network");
+			var cookieState = document.cookie.split(";").some((item) => item.trim().startsWith("DOLUSER_SOCIALNETWORKS_SHOW=true")) == true;
+
+			if (!chgCookieState) cookieState = !cookieState ;
+
+			if (cookieState) {
+				items.hide();
+				lnk.text("'.dol_escape_js($langs->transnoentitiesnoconv("ShowSocialNetworks")).'...");
+				if (chgCookieState) { document.cookie = "DOLUSER_SOCIALNETWORKS_SHOW=false; SameSite=Strict"};
+			} else {
+				items.show();
+				lnk.text("'.dol_escape_js($langs->transnoentitiesnoconv("HideSocialNetworks")).'...");
+				if (chgCookieState) { document.cookie = "DOLUSER_SOCIALNETWORKS_SHOW=true; SameSite=Strict";}
+			}
+		}
+		</script>';
+		}
+	}
+}
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 38b6892dbae..911ba31bc25 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -500,4 +500,6 @@ 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
-CompanySection=Company section
\ No newline at end of file
+CompanySection=Company section
+ShowSocialNetworks=Show social networks
+HideSocialNetworks=Hide social networks
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 6ef8d929361..02d0b042aab 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1663,7 +1663,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		// Social networks
 		if (isModEnabled('socialnetworks')) {
-			showSocialNetwork();
+			$object->showSocialNetwork($socialnetworks, ($conf->browser->layout == 'phone' ? 2 : 4));
 		}
 
 		// Prof ids
@@ -2381,7 +2381,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			// Social network
 			if (isModEnabled('socialnetworks')) {
-				showSocialNetwork();
+				$object->showSocialNetwork($socialnetworks, ($conf->browser->layout == 'phone' ? 2 : 4));
 			}
 
 			// Prof ids
@@ -3299,54 +3299,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 	}
 }
 
-/**
- * Show social network part if the module is enabled with hiding functionality
- *
- * @return void
- */
-function showSocialNetwork()
-{
-	global $socialnetworks, $object, $form, $object, $langs;
-	echo '<script type="text/javascript">$("document").ready(function() {toogleSocialNetwork(false); });</script>';
-
-	print '<tr><td>&nbsp;</td><td><a id="lnk" href="javascript:toogleSocialNetwork(true)"></a></td></tr>';
-	foreach ($socialnetworks as $key => $value) {
-		if ($value['active']) {
-			print '<tr class="soc_network">';
-			print '<td><label for="'.$value['label'].'">'.$form->editfieldkey($value['label'], $key, '', $object, 0).'</label></td>';
-			print '<td colspan="3">';
-			if (!empty($value['icon'])) {
-				print '<span class="fa '.$value['icon'].' pictofixedwidth"></span>';
-			}
-			print '<input type="text" name="'.$key.'" id="'.$key.'" class="minwidth100 maxwidth300 widthcentpercentminusx" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET($key) ? GETPOST($key, 'alphanohtml') : (empty($object->socialnetworks[$key]) ? '' : $object->socialnetworks[$key])).'">';
-			print '</td>';
-			print '</tr>';
-		} elseif (!empty($object->socialnetworks[$key])) {
-			print '<input type="hidden" name="'.$key.'" value="'.$object->socialnetworks[$key].'">';
-		}
-	}
-
-	print '<script type="text/javascript">
-
-	function toogleSocialNetwork(chgCookieState) {
-		const lnk = $("#lnk");
-		const items = $(".soc_network");
-		var cookieState = document.cookie.split(";").some((item) => item.trim().startsWith("DOLUSER_SOCIALNETWORKS_SHOW=true")) == true;
-
-		if (!chgCookieState) cookieState = !cookieState ;
-
-		if (cookieState) {
-			items.hide();
-			lnk.text("'.dol_escape_js($langs->transnoentitiesnoconv("ShowSocialNetwork")).'...");
-			if(chgCookieState) {document.cookie = "DOLUSER_SOCIALNETWORKS_SHOW=false; SameSite=Strict"};
-		} else {
-			items.show();
-			lnk.text("'.dol_escape_js($langs->transnoentitiesnoconv("HideSocialNetwork")).'");
-			if(chgCookieState) {document.cookie = "DOLUSER_SOCIALNETWORKS_SHOW=true; SameSite=Strict";}
-		}				
-	}
-	</script>';
-}
 
 // End of page
 llxFooter();
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 29f400fc778..2e633126f64 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -40,6 +40,7 @@
  */
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonincoterm.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonsocialnetworks.class.php';
 require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 
 
@@ -49,6 +50,7 @@ require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 class Societe extends CommonObject
 {
 	use CommonIncoterm;
+	use CommonSocialNetworks;
 
 	/**
 	 * @var string ID to identify managed object

From 7df07b57ce9d9925abe2f092c2db2263444f9bba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Fri, 20 Jan 2023 13:58:04 +0100
Subject: [PATCH 702/816] fix missing global in template modulebuilder

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

diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index c60dbaa7e5b..4cc03121988 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -874,6 +874,7 @@ class MyObject extends CommonObject
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
 	{
+		global $conf, $langs;
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
 		$return .= '<div class="info-box info-box-sm">';
 		$return .= '<span class="info-box-icon bg-infobox-action">';

From 0721c8b5d8e558dd7519a56e47cf6fbc3571df69 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 20 Jan 2023 15:14:44 +0100
Subject: [PATCH 703/816] Clean code

---
 htdocs/core/class/commoninvoice.class.php | 27 +++++++++++++++-----
 htdocs/stripe/class/stripe.class.php      | 31 ++++++++++++++++++-----
 2 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 93d125291ef..17c9c7deae3 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -865,7 +865,7 @@ abstract class CommonInvoice extends CommonObject
 
 
 	/**
-	 *	Create a withdrawal request at Stripe for a direct debit order or a credit transfer order.
+	 *	Create a withdrawal request, from a prelevement_demande, to Stripe 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
@@ -901,6 +901,7 @@ abstract class CommonInvoice extends CommonObject
 			$sql = "SELECT rowid, date_demande, amount, fk_facture, fk_facture_fourn";
 			$sql .= " FROM ".$this->db->prefix()."prelevement_demande";
 			$sql .= " AND fk_facture = ".((int) $this->fk_facture);		// Add a protection to not pay another invoice than current one
+			$sql .= " AND traite = 0";	// Add a protection to not process twice
 			$sql .= " WHERE rowid = ".((int) $did);
 
 			dol_syslog(get_class($this)."::makeStripeSepaRequest 1", LOG_DEBUG);
@@ -1077,10 +1078,11 @@ abstract class CommonInvoice extends CommonObject
 									$stripecard = null;
 									if ($companypaymentmode->type == 'ban') {
 										$sepaMode = true;
+										// Check into societe_rib if a payment mode for Stripe and ban payment exists
 										$stripecard = $stripe->sepaStripe($customer, $companypaymentmode, $stripeacc, $servicestatus, 0);
 									}
 
-									if ($stripecard) {  // Can be src_... (for sepa) - Other card_... (old mode) or pm_... (new mode) should not happen here.
+									if ($stripecard) {  // Can be src_... (for sepa). Note that card_... (old card mode) or pm_... (new card mode) should not happen here.
 										$FULLTAG = 'INV=' . $this->id . '-CUS=' . $thirdparty->id;
 										$description = 'Stripe payment from makeStripeSepaRequest: ' . $FULLTAG . ' ref=' . $this->ref;
 
@@ -1128,6 +1130,7 @@ abstract class CommonInvoice extends CommonObject
 										//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 payment mode ' . $stripecard->id . ' stripefailurecode=' . $stripefailurecode . ' stripefailuremessage=' . $stripefailuremessage . ' stripefailuredeclinecode=' . $stripefailuredeclinecode, LOG_WARNING);
@@ -1179,7 +1182,11 @@ abstract class CommonInvoice extends CommonObject
 											$this->stripechargedone++;
 
 											// Default description used for label of event. Will be overwrite by another value later.
-											$description = 'Stripe payment OK (' . $charge->id . ') from makeStripeSepaRequest: ' . $FULLTAG;
+											$description = 'Stripe payment request OK (' . $charge->id . ') from makeStripeSepaRequest: ' . $FULLTAG;
+
+
+											// TODO Save request to status pending. Done should be set with a webhook.
+
 
 											$db = $this->db;
 
@@ -1549,13 +1556,19 @@ 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' ?";
 					}
 
-					// TODO Create a prelevement_bon ?
-					// For the moment no
+					// TODO Create a prelevement_bon and set its status to sent instead of this
+					$idtransferfile = 0;
 
-					// We must update the direct debit payment request as "done"
-					$sql = "UPDATE".MAIN_DB_PREFIX."prelevement_demande SET traite = 1, date_traite = '".$this->db->idate(dol_now())."'";
+					// Update the direct debit payment request of the processed invoice to save the id of the prelevement_bon
+					$sql = "UPDATE".MAIN_DB_PREFIX."prelevement_demande SET";
+					$sql .= " traite = 1,";	// TODO Remove this
+					$sql .= " date_traite = '".$this->db->idate(dol_now())."'";	// TODO Remove this
+					if ($idtransferfile > 0) {
+						$sql .= " fk_prelevement_bons = ".((int) $idtransferfile);
+					}
 					$sql .= "WHERE rowid = ".((int) $did);
 
+
 					dol_syslog(get_class($this)."::makeStripeSepaRequest", LOG_DEBUG);
 					$resql = $this->db->query($sql);
 					if (!$resql) {
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 972d2e25c23..942d5d8d275 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -602,7 +602,7 @@ class Stripe extends CommonObject
 	 * but not when using the STRIPE_USE_NEW_CHECKOUT.
 	 *
 	 * @param   string  $description                        Description
-	 * @param	Societe	$object							    Object to pay with Stripe
+	 * @param	Societe	$object							    Object of company to link the Stripe payment mode with
 	 * @param	string 	$customer							Stripe customer ref 'cus_xxxxxxxxxxxxx' via customerStripe()
 	 * @param	string	$key							    ''=Use common API. If not '', it is the Stripe connect account 'acc_....' to use Stripe connect
 	 * @param	int		$status							    Status (0=test, 1=live)
@@ -813,8 +813,21 @@ class Stripe extends CommonObject
 					$ipaddress = getUserRemoteIP();
 
 					$dataforcard = array(
-						"source" => array('object'=>'card', 'exp_month'=>$exp_date_month, 'exp_year'=>$exp_date_year, 'number'=>$number, 'cvc'=>$cvc, 'name'=>$cardholdername),
-						"metadata" => array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>$ipaddress)
+						"source" => array(
+							'object'=>'card',
+							'exp_month'=>$exp_date_month,
+							'exp_year'=>$exp_date_year,
+							'number'=>$number,
+							'cvc'=>$cvc,
+							'name'=>$cardholdername
+						),
+						"metadata" => array(
+							'dol_type'=>$object->element,
+							'dol_id'=>$object->id,
+							'dol_version'=>DOL_VERSION,
+							'dol_entity'=>$conf->entity,
+							'ipaddress'=>$ipaddress
+						)
 					);
 
 					//$a = \Stripe\Stripe::getApiKey();
@@ -898,8 +911,8 @@ class Stripe extends CommonObject
 	 * @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
+	 * @param	int						$createifnotlinkedtostripe		1=Create the stripe sepa and the link if the sepa is not yet linked to a stripe sepa. Used by the "Create bank to Stripe" feature.
+	 * @return 	\Stripe\PaymentMethod|null 								Stripe SEPA or null if not found
 	 */
 	public function sepaStripe($cu, CompanyPaymentMode $object, $stripeacc = '', $status = 0, $createifnotlinkedtostripe = 0)
 	{
@@ -996,8 +1009,10 @@ class Stripe extends CommonObject
 						$stripeacc = $stripearrayofkeysbyenv[$servicestatus]['secret_key'];
 
 						dol_syslog("Try to create sepa_debit with data = ".json_encode($dataforcard));
-						// TODO Replace with PaymentIntent. Can use $stripe->getPaymentIntent ?
+
 						$s = new \Stripe\StripeClient($stripeacc);
+
+						// TODO Deprecated with the new Stripe API and SCA. Replace ->create() and ->createSource() Replace with getSetupIntent() ?
 						$sepa = $s->sources->create($dataforcard);
 						if (!$sepa) {
 							$this->error = 'Creation of sepa_debit on Stripe has failed';
@@ -1007,9 +1022,10 @@ class Stripe extends CommonObject
 							if (!$cs) {
 								$this->error = 'Link SEPA <-> Customer failed';
 							} else {
-								dol_syslog("Update the payment request");
+								dol_syslog("Update the payment mode of the customer");
 								// print json_encode($sepa);
 
+								// Save the Stripe payment mode ID into the Dolibarr database
 								$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) . "'";
@@ -1034,6 +1050,7 @@ class Stripe extends CommonObject
 		return $sepa;
 	}
 
+
 	/**
 	 * Create charge.
 	 * This is called by page htdocs/stripe/payment.php and may be deprecated.

From e2dd443c584aa1dc21c7ff2b3396008fec6cd6e2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 20 Jan 2023 16:04:23 +0100
Subject: [PATCH 704/816] Doc

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

diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 942d5d8d275..6a6ad66a96a 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -804,6 +804,7 @@ class Stripe extends CommonObject
 						dol_syslog($this->error, LOG_WARNING);
 					}
 				} elseif ($createifnotlinkedtostripe) {
+					// Deprecated with new Stripe API and SCA. We should not use anymore this part of code now.
 					$exp_date_month = $obj->exp_date_month;
 					$exp_date_year = $obj->exp_date_year;
 					$number = $obj->number;
@@ -1012,7 +1013,8 @@ class Stripe extends CommonObject
 
 						$s = new \Stripe\StripeClient($stripeacc);
 
-						// TODO Deprecated with the new Stripe API and SCA. Replace ->create() and ->createSource() Replace with getSetupIntent() ?
+						// TODO Deprecated with the new Stripe API and SCA.
+						// TODO Replace ->create() and ->createSource() and replace with ->getSetupIntent() to get a Payment mode with $payment_method = \Stripe\PaymentMethod::retrieve($setupintent->payment_method); ?
 						$sepa = $s->sources->create($dataforcard);
 						if (!$sepa) {
 							$this->error = 'Creation of sepa_debit on Stripe has failed';

From 343922210c66ccbb87ac1e5e0eee1f7dc94ff365 Mon Sep 17 00:00:00 2001
From: Randall Mora <50120822+randallmoraes@users.noreply.github.com>
Date: Fri, 20 Jan 2023 09:12:58 -0600
Subject: [PATCH 705/816] repair security issue

When reassing value to the $socid  in line 68 clean the filter set by $user->socid
---
 htdocs/comm/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 67af97cfe12..b748cac3df4 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -65,7 +65,7 @@ $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 $now = dol_now();
 
 // Security check
-$socid = GETPOST("socid", 'int');
+//$socid = GETPOST("socid", 'int');
 if ($user->socid > 0) {
 	$action = '';
 	$id = $user->socid;

From 210410775982614150ee25f26c0d4e1e22c8d353 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 20 Jan 2023 17:38:47 +0100
Subject: [PATCH 706/816] Fix warnings

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

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 12a82c44180..01a72c6c7f3 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -784,6 +784,10 @@ class Societe extends CommonObject
 	 */
 	public $multicurrency_code;
 
+	/**
+	 * @var string  Set if company email found into unsubscribe of emailing list table
+	 */
+	public $no_email;
 
 	// Fields loaded by fetchPartnerships()
 

From 56f0efa2fc3142ee59eba51ceb8dfef0fddf25fc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 20 Jan 2023 19:09:56 +0100
Subject: [PATCH 707/816] Fix greek language

---
 htdocs/langs/el_GR/main.lang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index 605ee14d77a..68583623c45 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -7,10 +7,10 @@ DIRECTION=ltr
 # To read Chinese pdf with Linux: sudo apt-get install poppler-data
 # cid0jp is for Japanish
 # cid0kr is for Korean
-# DejaVuSans is for some Eastern languages, some Asian languages and some Arabic languages
+# DejaVuSans is for some Eastern languages, greek, some Asian languages and some Arabic languages
 # freemono is for ru_RU or uk_UA, uz_UZ
 # freeserif is for Tamil
-FONTFORPDF=helvetica
+FONTFORPDF=DejaVuSans
 FONTSIZEFORPDF=10
 SeparatorDecimal=,
 SeparatorThousand=.

From f7302232df71d2d276984d4bf4d455ef77af39a2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 20 Jan 2023 19:34:26 +0100
Subject: [PATCH 708/816] Fix rounding

---
 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 c20f58a943d..0d4e30f4a2a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5743,9 +5743,9 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $
 
 	// If force rounding
 	if ((string) $forcerounding != '-1') {
-		if ($forcerounding == 'MU') {
+		if ($forcerounding === 'MU') {
 			$nbdecimal = $conf->global->MAIN_MAX_DECIMALS_UNIT;
-		} elseif ($forcerounding == 'MT') {
+		} elseif ($forcerounding === 'MT') {
 			$nbdecimal = $conf->global->MAIN_MAX_DECIMALS_TOT;
 		} elseif ($forcerounding >= 0) {
 			$nbdecimal = $forcerounding;

From 439f8d4bb429538ac16ff07c275ae67ef410490d Mon Sep 17 00:00:00 2001
From: Christian Humpel <christian.humpel@gmail.com>
Date: Sat, 21 Jan 2023 08:45:10 +0100
Subject: [PATCH 709/816] New: REST Api - GET /setup/dictionary/incoterms

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

diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index e06cdeb0312..34fed417e70 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -1682,6 +1682,68 @@ class Setup extends DolibarrApi
 		return $list;
 	}
 
+	/**
+	 * Get the list of incoterms.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param int       $active     Payment term is active or not {@min 0} {@max 1}
+	 * @param string    $lang       Code of the language the label of the type must be translated to
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array				List of ticket types
+	 *
+	 * @url     GET dictionary/incoterms
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfIncoterms($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $lang = '', $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT rowid, code, active";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_incoterms as t";
+		$sql .= " WHERE 1=1";
+
+		// Add sql filters
+		if ($sqlfilters) {
+			$errormessage = '';
+			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$type =$this->db->fetch_object($result);
+				$list[] = $type;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of incoterm types : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
 	/**
 	 * Get properties of company
 	 *

From 3c26825b5d86e3507f31b23c68aeee3ac20d9f6a Mon Sep 17 00:00:00 2001
From: Christian Humpel <christian.humpel@gmail.com>
Date: Sat, 21 Jan 2023 08:49:24 +0100
Subject: [PATCH 710/816] change description

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

diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 34fed417e70..c79a3e63653 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -1692,7 +1692,7 @@ class Setup extends DolibarrApi
 	 * @param int       $active     Payment term is active or not {@min 0} {@max 1}
 	 * @param string    $lang       Code of the language the label of the type must be translated to
 	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-	 * @return array				List of ticket types
+	 * @return array				List of incoterm types
 	 *
 	 * @url     GET dictionary/incoterms
 	 *

From 6ab5c79c6b0ff4ab70033743bb5889f16a1a47b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 21 Jan 2023 11:46:11 +0100
Subject: [PATCH 711/816] box_birthday_member doesn't give same date than
 box_birthday

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

diff --git a/htdocs/core/boxes/box_birthdays_members.php b/htdocs/core/boxes/box_birthdays_members.php
index fc8dc4c6745..64a1f16e624 100644
--- a/htdocs/core/boxes/box_birthdays_members.php
+++ b/htdocs/core/boxes/box_birthdays_members.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2015-2019 Frederic France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2015-2023 Frederic 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
@@ -115,7 +115,7 @@ class box_birthdays_members extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="center nowraponall"',
-						'text' => dol_print_date($dateb, "day", 'gmt').' - '.$age.' '.$langs->trans('DurationYears')
+						'text' => dol_print_date($dateb, "day", 'tzserver').' - '.$age.' '.$langs->trans('DurationYears')
 					);
 
 					/*$this->info_box_contents[$line][] = array(

From fa185e9cf0118ff88b91f6e968d63cd5f9414755 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 21 Jan 2023 12:24:54 +0100
Subject: [PATCH 712/816] NEW Add helplist property to describe fields of
 obects

---
 htdocs/modulebuilder/template/class/myobject.class.php | 2 +-
 htdocs/modulebuilder/template/myobject_list.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index c60dbaa7e5b..9544e9c25ef 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -96,7 +96,7 @@ class MyObject extends CommonObject
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage)
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
-	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
+	 *  'help' and 'helplist' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
 	 *  'arrayofkeyval' to set a list of values if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel"). Note that type can be 'integer' or 'varchar'
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index b28a7a5f955..58231ee7de5 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -634,7 +634,7 @@ foreach ($object->fields as $key => $val) {
 	}
 	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
-		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
+		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist']))."\n";
 		$totalarray['nbfield']++;
 	}
 }

From 7d6c802085854529144946d274cbc60a5328de87 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 21 Jan 2023 12:25:23 +0100
Subject: [PATCH 713/816] Fix image size

---
 doc/images/dolibarr_screenshot1_1280x800.jpg | Bin 140952 -> 175013 bytes
 doc/images/dolibarr_screenshot2_1280x800.jpg | Bin 159669 -> 185341 bytes
 doc/images/dolibarr_screenshot5_1280x800.jpg | Bin 135317 -> 157713 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/doc/images/dolibarr_screenshot1_1280x800.jpg b/doc/images/dolibarr_screenshot1_1280x800.jpg
index ac238d39c1f8d5e022217ad3a690ccee819cd100..6d2c431239430a9949d125120f24abf215d66e0a 100644
GIT binary patch
literal 175013
zcmeFZbzD`=^EiGkozh4Nh)5{iASDe_5+aCnw_K2rQVdiYq*Doz5)c7JLJ6fC5v3au
z>4xu~d(p?|9iP|x{rmU#-p6~+?C#9$%<SxJoaH(Cd^84;swt@|K?snz5L^&+G)@<w
z=xuKUL8_|fAUp_ya3OL8CWHVG{G&r)quv$(ray)q0L*cWg8^WE1O`M5-tOQh0ANb+
z4gx>>2UsZDSODjM9~WQ<^ZfNzR@KmE7U1FM;}PTolzak$5`6p;0{qN;0x%#b2(S?u
zf5`$!A$;f%LUV;VK?pPqvqc=k8K4*gNQVjDG@u;wSW+C2$N2-MI)-691O}Q9Bf!Tv
zhOg3s3Xt$n{~i5lJ6H{Xc{B{kLwGnixH#B&xVX6Z_;>_Fl*B}YghaID6eN_V=$IH!
z(J?SEv+}Srvv8eZVBiqt<l^HO5)xu!7nc$fkmL~*5`dW?@bU492#IKjiD?8*Gn^Lq
zuhUT-M1}`tAb_$g5C$0nlMHdx05JhMvEiOZ0AbMyfq{vIjf0DaPe2F|%1L2MVParm
zVq;@r0c?Lz4`GpElb`0lh(mGN9GB$=rNHf|OuRF4CG}J~-9K3cE!^+m6HuR|p`|;^
z#?HZcPDofpR7_k#UO`bwSw&S%S5N<n!Bs;eODk&|TRVFPq=)BCFK-{;;Jf$kKL~mF
zC^{zgNnCtFV$#!RS=l+c&+}fCmc1%}T~S%}=KY6;#-`?vpIUl)`}zk4KM#EwpO~DQ
zo|&DSUszdPTi@8++TPiP^@8>MmHwq(WI!(rEG$ecTv#szh8Or@l3`(==Eotwcp2CH
z1_g`2Z9Gc3sLYaj{4;_&KdCI-y9uaSg~rdWz^b7%`_B}+^Z!Y+--`XE*B6Kg69GC8
zlMIr9I?|PH{_L;jpOc8}r&j;OK4eT><&s-Vf9pnYyE4!1yi@|p>jXE>eKgD=Rh^Mx
z@(A^yrCK-i!5mYLT1*O1-l57BEAX4gxgGFEeW3H1N^eWc;)RPGcFmqmUtA(G9YiXk
zz8Tw<ePx-VIa?8lS-<>hu)B(BO7|)2R8;V7<yVAE0u}elJ>6=}-Z0P3Q1_SxPL|&s
z{qQB0+DltHjH^fE6>GaIk3|zQBEBZ@qN%+6*<KCaL`F)ISldDkik60lr$6%#x(VG<
z!flK3wloaE5E}j@IOLo)c?6xxmxy?<!O3%)dY8M+flR;pt&hsbh34}kHStd)?A|xG
zdmS?MF?M{u`1BiV6wjdbeI<cglXlI4onNxAW9-|L*m$UF)W?dw;k#5x@?+9fZCCn{
zN%y^oMCPA0g{x}2p52J5u)-;<pulg-2M$fy<4c+gtG5z75;K%9#L*N^y^pxKI@sf(
zyBW&mH|RM2O${$+P3Yl_Kx4VrwU0zrlQVno6y-_od)gKC)g&WXP7__Mh;dx&{V~|9
zcX^5C>duF2-NJ;euiw1tVk?h;d`Rn0L%XX_GpoBiPnMRE&Q;j6+P{{2sd6c0merYN
zec4p4Tltl_<t*0E!;Ck2abch<gx(I!evJ1GC5fl^y|LTt(T;if_7A#A#Wc6>S8A+x
zF1|_&mo~X!s)8b%X+N*fSFph=Fe#U|z>4LRG$I?e!!1wpU_+r#UiI1aYPG#b$vzl-
z>m6SwY7$WfY@7V><%7f7rg({<y*iOnAAe-1W%dQVE>A<3(5|^bys#b)=X3&@<tWoj
zmtomv-kB=)u>+$C(N}6Kyl7=0=VQH*rswYPVE@eS-~k5j5%iPx2zp=h48^`R{b$6Y
z={jER5maY;1QE!LGY!<vkp&(>L7j(G8>c95DN#!sA3=8mjgFuU#UtntQ)c_}5rlVG
zegw%rK7#gf0)G}ie^|##l=PrI`Oy0an(TvVtp0&Uzx{$j&Hc%?>aGp^%WiW1Pd>W3
zJXwE`$h*I~bg&>fR684SD5a+BeAQ7IIZI!7;^wzaXWXmuX`%`Zmg$=TPps^s4sOTq
z;Tr834Al{tIoG)ONJ&^ytzQ{m-qFTqU0KgvqA9py9b0mq4L7G-Q+9!``Nl@mIZo%P
zsL~3Z<~7WFn7O$uPpNh9$V`~K2V}}@C$(9(rK@@PK(o=<{1^4~SxYc!r8J~`MSFrc
zTl1Qswo--kWf9I*(;d68>9S?4u)8;#^BBwHJ+tdQWfJyopTWW$C@wGXB5S&;pyq<<
zJx7uaT@7DQW!2vkdO@Fms?xMr*f!m?C(nK}>a)^H6SK-EEWCJzNnFW2f~t2i)iM&0
ziGQHlBf}&~2wN3ZP>8&bnRdb_16SF-qmH;zs_`P@^MWx+0i|5bTU5<5^7^mxX<p3@
z&?Lluy~Z6eZ=^w7MkJu5ba9S@zI>g0WOL;E%ZkcyorJHHv$T0T8wcm`xR;z0lPJRo
zA^cNybLX7r55{+T3|?pK2SwvJl)N#My`bcKtN*_B8R$+xd5ly>n%$J3M8d~&ID8~B
zlj@2?uIlIRHnmr#zfq>yjk;V^;zWr5_1Y8WfS=*Hl5YNaGkCLMqGH#x(t?g4er>I+
zVa-xZ9@>seW>x`uQm?S=o;|cQB>Qj%(tjXFd;yrE>^oOd<EUsM*EP8;D~Oattrn%W
z>g#g)GjUfUXrNx|@x-9InPd;lBK)0eXPEo1owqBbcd{B!X1~$SPku`80p|A@QeTD~
zne}r_`k&v{baF!EZn~j?b$K=~!)1qEL`vpv=GAY^Us0#dBDD;eGD|sOhml=VZZBDL
zIZ|O3q5rX!;<MR-48IX;l)hqEh^INxwb&oHUAz5vT9gpDD_O;TzEtf)SeUOUx_o<W
zYWS22ENr<{-jm8CQeC-aop#lVr^P}X^4jg68#oz?PeqR#R!3*SLRa`AXMXxB&8ckG
zGt7rLg^K62Xrei(y4KCR`gm=vPoJF#iFVhxL|%_2Cw7O0SMd}!x9gM?muhG6ysVUe
zo@nmYgIT#qcV+cnvKS;=T(4RMMN{b+p8bz{dG*7)wi|h4)usC3G({HT<A|8EwN25N
zLUio)zO*z@5xr;lF*cdDoh5pM`P-)9PYE)h@Rm@1cg+(9*BK=S9B9)#Scg|>R~s9j
z_X_9JdsC;UJGvJmj-cxj6PGfg5@?WbZ(8uqhu^h$P;SVodW!Omt$n9j1^zH2-m)xZ
z;4AA2qOvcYf>Wdxk3*UA@~?<m?0!~fPGU%LO1xPyeMK}vUTI~{-f(1cjtBdqU}+?R
zC1*s6_@Y2uJ>$WA$eoTAo_?!G*H>afAKkO*!~5hhTM_w9Mxu;}g$<#vk4z!bZOqP?
zcM1NPp*F$Y^YperrFgwXrE%ZOuNQBmpVPCzQOn0r9>{d07m>UFO)kai1V?$vtFox6
zil8%<h>#!H>;b{tqL?gYHhmU%^d1?$f4h$R&MxL{(7Bl5^QC1?p{-l0^(;vgwX$iK
zGU;eeU7Wo+#XUc#C_l46gQb${raUx!1U<^nr*x$;)E1GlUumW^U6>?X&#<~_Gah@8
zktas;B|9)NUyL%jIrEwKx)6fsM~f_0c)3x>ip%?Imqui`(z%9~Ygo6oo^uyQ4--;4
zJWLs*!!B%DzVZCUlmJB~k95bk?aq-L`@zA%-jCOb$dvE1*r`S5N@AuxV;Fewxlk~@
zEGHnA@WREEYtKK{*Da|QdRU&lmTViTRMud;u06^AGmixGQ8r_uCFM#-+?Xn(+G}6i
zLSyc?q1wfLHhzPxSS8A=cZG8Cn{{>6x1@Dm5g|T(t0KIyO{dCrw<v=3Vv^t!_L6+J
z`wI2CDZT8v)U(=sg}X{UV^-f^yWBd0e9H^cR0}5Jtk3<ZVlL{DAxQVyV~YpBC#g*|
zlqZfLBhkQ8JCoT{^S2o}8Y#6AkM!q8)zsWWe=znT;<?%xR+LJpPiS7Xoj%|kR523!
zXs=Af7dqLySC0IiyEnO-XBqbF`rF(4oXj>ttvshHTHh`cNhWko_dMY(zvxk8p}6U$
zl^8P2jQH~U<w*X{<@+0^E%%EE<?c%KXKksvq}gnBe9dLht8lt}37bonm1DvG#Q=SO
z;JI*>OOrFu0f)hYpy;J)$Nn|C5f#2^xk~1!#gCM1i5^*^Ney>ML<Pu<2wn7VkBDvN
z)wo{X(UoInTVr4aQy`eC?io}`yw(~T7-q1%spa~7+29ahTwe2yXnFABC5u>fuQP25
zM>3|jN#gRO54C+WWqn*r(eLeh#v*$%#2!ZtM)=O*S@wncpCc(vUyf*b@`@Jgb&s*a
zeG%p&Z*l=!vGo@xC2r>SjK~M!h-%JONHqs+RL}`IhSeQXE+_W|=m~q8lYQaJvnA+^
z5Mmy^qtY3mp`o$!PI+3neL?1&nL!n^Sz55LvPM<hR7o6FX#NxWYi{O?T~}fw6ZzMm
zfY|<ub9KuMx3san3yU&hOCygUPA17V<>^P&$v?gBb=*R!5&^daEhx=Nze*Q<zW@9K
zV-}p}cp5}-{9}3ghy%*yUGe99HML-e$u+!iYnUP^_ea=+GaFf?4wm#erpQ-EP?(c0
z{Rvt;Y?XQ}&!=Oy@>HvFf~wUw!k*C_I9!i8f+~(6f4w{J`#kRX&@8LlaT!g$*O#2R
zKJC*X7}|@Fd>gTO1TDWnza{vIL|gLgrd#6H^aCz0rEKIsAC6}w`>qJ-tp1Q0-k(D~
z7Y=Z9DUAsjuQ%@nZuQf%A3?5%yLr?t0*%>vUhJ&*&g}NqG`haK)?ys~AdS-)@21w_
z=)s0+X&|a4kDHs^f^yIAtH?!H?^n(5=S4NT?Dc+k=P+ne`+4IlvNy@xJcqu$;eivm
znAAPP64f4Z9(v@D#ic6`)Ho3_lD_e2Gi;&CX_&S$9nbg|sx4IBZM&`%Djh))5!)mi
z&*|Bw#?&z)#hQB6@w$0lhwXeDwHM1ClGzJPH9kE3=x*pRIiZ!+eyYYvj8m|AcDhl5
zNqAP;xLxZs<`DBU+q<D#d+~5PgJ2leZS5IYH7y-_>}8+B%uP`hYw$iS=eiW)eu-Qu
zAmG`Tp!46;4{AHYP`vsx+d9)73aD!O%MO@1WV|Qsmu2zM{6&BjX0Hr~r`>;{a{s(8
zpZ(W+o$-wL(jSD3F;NY8S`1lXSNz!g^xXVm;^(+jK3{$s;TzJ+ld?olA8|suF?l(?
zF?kudy~s62Vu=?fBZM5)gBnAg>X@Bvb+#KBgscO~`yHm6<3~{Wxs8p9A=$Im-0^yK
zlKXAA8wHQgm)x3&5y;f$8sgL1vOcq`uV^=<O0VTe8GqibzPj%1#jmnW{^zU^2ACNe
zF9ru6TjM>6e0^OPT3h2|8YtxKu%|G$d-_P$(h-NPJBMHOofrFsvVFPo?TvzW&X4T{
ztqI0sk%vF?y$rgIC`nocpE_e%xj11)sP}s?$rYx_RBZ4B-XWRlcfX**V(Zy)eJed-
zqYf->8-IT5t0?<w+#VrtmD#4Qu7fW7RkdAtezNo1yIb6!WW1bI0t-b_zl)TMDqp;$
zB0*quN5wR8Gm^hT*f1;6hW~r8_?T;b{d|*D#I$ZZOEa6>P_ubbupgT)Z|sN-^lh49
zvO;VtgHTOmNeoIWr~P!dk}yrHy)OIy<?|jcGSyi+E`-!>YP*&~2&(EF+j`Qd(EW%s
z63tPgm(2t?IHDGr54&o}2vRIB@HbEEiim{HUU-f{J2YYarNmj%Zz<eCWwjgET3e;F
z#r+&@R#>uAN!fRC+R#Xn3My6|e9C)77@OxK=4G*RbUDeMitwj4Q{gA+d&))PvLpOD
zYO}S@gnSF9f9)oyy%QNfIxVu&;rA?kT9%^8nC&{%HC$$fK27VZQQc?GS8!KOQVF@R
zULO_V^9|J_=CYCDj2a@iedq2Syj^XKhGo`{%DYcf$P1%MDjTn9z117An`A9;$*y8m
z@;Nv+;r|7)ro1eREiRGd41Unf=?$h-Yg2nN6I1`Z9J666KBx)v0n_t*;(Vj?&h~mD
zH}2Fi&0g&PUdP&&a4O(N^P+~xYr@a@KG|oN#@={&x;<uuXzKjyHa7S329nfo8r+`|
zH%xiPMnhzt?zJZDVbV}Xg%#Wts&h~x^QP~|lKI!nTUpslb5%a4j9GFhiOi(ON52#s
zUCVx%OcKLYc)CN3Eq>|Y!N4>4k?rM3=<eUTAR{5l`+R?a<Td-2Q3U*mBr`QSC}q2s
z{a!=@@i|z(NT~5m%}JLZ3|PiQmIQkbeBW(094=mlAG#VDRhKk+dN1jmev;1daP4+C
zGW>8oScA~lr6Fv_)wT&o;IhHsmtucdKGfsK`>7ULZNfXUQ@g#laWh|}f8oPno+6c<
z?du!ZBKz88BKQQCHV?t{a4WDZR8Nb{M|3AT{Nfi92Hoi}tJs3avFF1ba9&5WA<Q*W
zRX=4A%1%F^$;teZu(+&BdAYH{F-TKGD9AaH;J%p5c@H6IuCGbca8zbwNz?oZ?m<Dn
z<JC~ts)=v`JzIPBw21;yX2#)r(3u%Uh}zUMo0ja})R-k(M)Vgd+VHd7X;ZxucR2d^
zWJ@hmY-^36_#Z8^MK{#H_<h?OW%|}hxzbRi<)?=sxLL*?m(WQZla_w?0xH=m8xFoq
z#qB(O-}<Z@t=5_Fr`eM0>%wH=;@sU<*FR$hFFu0YIhBy{&dp-%xji{rZ}pusRZ5$L
zmF8Dx_c!uYw*u*oy(sWevZiKE5I^HB&nHg`C&xorD?4%LH7JIiorXWui_tery7~Is
z+w>JrR7O!Z&G#DzT{-)KXeIc~GrFS8^4bYgUrkLJk5vBVmED<eE9oohycP_2eMC3o
z*XMPHjk#MVKU$f5H)hb6f3YAwsaf45GaK!B1l7E_<k)WH-71MeF81Z;#@60C67#WA
zd_2ikt&wD9;Je)(`5PP|_!&22sub%EJ<ZRasN$E{qr<v5{o!DFAcBW!IiTFu{Rr~t
zt_pl(hf(ntVSj4tL9f#E;d}<ch_TGbfrALaDY=|6E%uxI241{d8VZNzW_m$YQ_f2}
zUD((@gyRKuG#!53gRA+Q=crGxkWIzBV(52^->XXEuADDBf{G2eKZMkJ*C$Ix@@oX;
z*xjzb5v81da;s4%Ud_<PUUE>Une}|sf&DXOZIb1z`G}3ML!qGB*~Wtv6qaqWRhf2<
z^67`-AB3R>CBLTm^bMN?Iz~U!QA(ecKtFwzjJ0_8TH5AwiZb7w4_0=xu_L5;mmf)P
z*Vde?{X7iTchCN*ydZ8w=cMhJFQ@Pc3z^mKcQXA+P}kbT;r6r6$9ofH6^aL7ey(-a
zQKoCzqw4r>`{c|c=q)UgrYhN5`Rzs>Xa4JnkBQqLR^Jm2j@K?a^pFmXcrg_+v!WI%
z?7AAc?7Fg)VO1kqUzqY_7NzEMpcg|`ZusnMCW#Yewy(mn6YoFm&bxV5;hY<CF~Z32
z#*jSG#E-yNcdE>~14#m)nY-UM30ZbtvmQas4Qc6%oOgQUlz4MM$2V{5J~s3TKJ7Id
z5&zD>GAp5DoN;6-Z*nCEC-ibFgZZVCXSNg8v~~_ot`*#*V?22y_*B`YBZyohh34ju
zQ*YNI7FCD?M*=+pJSt=Mo~^wYU>k06EqSuK*3sQ`<4Wo1NCs9z`ZuOj8n`yQHPAP-
zV(U4ApM6VtR^x2*^=B)&)3xvPjfYPSmwaSh`Mi;V&k#518}Ur<=Rt?2&qliqSxzSF
z3*rXb=><o*wg%_ssIWw_Mn3lE9}j-GjT*1$=vf79iMbYeXJI~=RCZY>(EP@MkviQL
zd40Gk`u$_JrIxX1w+j}9?;B%S@A%)l+&dk8tx(m<;{Aoxy!3H;%E>jhSIW8?a~R!<
zltE!4?o_3Mi<*<+fkuj~F;C7UnQC%CSiXnlX%+6tiwV`+BF$wEOU|v4$h78Mnyvhf
z39+FLw`XjL_BT#_D=^^4EY&Bfq7h?Bpx`~nX@4@Cn;E^<gu4)|H#sn(?WyNIT;$tl
z$Tf)y4APw@3U@H~n%4?C%f7|48W*)q(kn9#wF?cKoC_PY!<XUwEPi13ve44tBh!dX
zDtly>SxG@A_K@5A4T4=~rcR-8`v4UgdmRa~m&o1Tm+dmA1FP-*?j5eYNK<(BTqc!K
zJ!33lAcz~)#xoQTUArmMYT4bS%S2gLL=lD57^9Ig)qxU{w+|+F`b}9}<#)QLH0A;&
zpz<k_Wu}e@=0NX5PlJ!iU56e%6uwLyLEJvDz`0Mq({wnBefj!>l^=>~G%R^!XMX;|
zvhz>}e<L&Z6_;YJ$hrtxPiZH|N=Ck`80VFxn=<3@W}6f4-M?5r-^`M9)52k);aN7j
zL#Wb+?Fg6VeR~C4JFMs%gSfqmD%QljhteA^GSkaPkbSnpiJbhx(%b|~dL#L&5Zsth
ztF<Lv=Hawlq2WsYbsd*YA@DEgh0ErGqt!*O?nL>U5Gns|f13AmjcS|8&LMD)cz-!`
zDq>pgjCp94lwkc4MCXfd%!Axi4g4z8^1@F1u)g;QTD%i@uF|4qZ0Zi5vgF~bkA)3<
zS(o>p2SJb+L{fONr_ofdZvK*n=@Z$hiCBhBp}T=cLr3F8UUnWHZW6q_E=V48D_09^
z9!pneUT<?ZUVa`vUPw~L+s)k4(b|LA!rIo}MT%wlZ7mD4y_FP;fv^UjhMT;#oxO^$
zyS1*brk<s*qoueNi;Oh0q_>2(vzxQEhdHyivy%%_!dr?3#asfwa4|0nGYZASQHtd%
z_zWfQ>Tb;}#3RJR#|=J*-4tK}Jlw5pBy<#%jyZsw6w9%wUS3{2UV=QX?zX)A;^N}G
zd;+`z0^9(D8|mZXVeZZCf;{t!gMu~E(%s(8!`{_}8Rlqi;p*uj#RA$#3+C*mq4AsX
zzqEm~Gb}9%8|k5V6A=Gj7DMX!xLNb+SR-9M-7T#ZZ(6%}ocTp=W%--d&C}fprGS+s
zueFo4GeAQEi}U|(3jR9x8yi;G*526-MFA}P8w<d{k^ZIdaMM6T2?bY6Pq-0P1t}Jo
zlZ2J4rM;B|3KX#v7ZI@$5a$*X5EtPV5)l#Qwh$Jv<Q5aLu(1&q7ZS7P<Nw7+)dlHc
z?qX>T^8uWB>;V%2erqc+Ykn(ka}gV1ZXqi%0d8|~enD<QK|y|TYf&33F>!%k^jhxr
zz>UnE{*(viV+HsK3s{&7@QI3Yi;G)Wa0?0W32~eA@d<DXiVN}!ii!wX3tL&TFk4wl
zD7m^jn}dF^cQ&`R=5=thwq;?4?Im$hTUClhfQRomtL<d&VFPfbSk&!ZJiU)g_3WLk
zbv?{s%khhd3JHh^i1YFD!AbNO<BGLA68H<u3iWjqCA@^ZyS2H8tGk}7tCJMV?~kXj
zpP@~xVvhvXKF6M`YklJwa<XSe`Hh6RCG3S#EJ*X4)>bUXg_d^aF1FTSJb^w%quKup
z6PpW)@L7q9S#S$jTH0_6@!N=Un~PcsaNF?nTiA&43jz&ne$gXcZ9Kfp-K{U$g8l}Q
zg5E}b=4IwUS%LExo|m09tRndC%gx8nEx@mb{_ZQpcOHEG<>O=F1@iO4Lk6u1?>}mZ
zs{3Pj{Xz$076yNZ0BPp`rT<yre-`+k1^#D&|5@OF7Wn_41^(JZSi69gju+S>98F-n
zRF#)E)z;BcQdL(3*T=xsuM8(kXCxN5jOOg(;jW`B#|&;VG2_mH%U)FQg)a!Kppb4C
zwYAmJw~qeRb8`TN3H5Try#5u&|4~M41vU%d9u_mek+pPl_W-aNfJMAK++a8Xz?5LY
zW(D8^0CTwm0Rj9OF1J9#-(lDm1;dx~AWC;V9eJP|C4iZ2|9~z2fGzFZodJ#zz+ts=
zb^-h`uA*Tp81{o<XD3e}8!ExJAhLGR*9C7@@MD0KAyr5N(uSBJ3&<0)hnye}h#S0J
zKnW7k0rhhKhMo>ZuMMay0F^yt2`CgGSI8MMN6|xY9{?PX{<1C7Mo<7%gdmcGAncK&
zqqVc(>S7E89Yh`-?PVSv9XthB|Gq*{oy%YJt{Gq}x&g`~|0-imhai%>5cIm?uQH2x
z2&#Aht`82mnY){#+Q9@*3>$Dway1u%hz%i#q6>luuA%J)>fn0l*&qbz0b8lJLr`K8
z1hLry-p2n%Z}_g|Z@c}UILG!wT{pzUz<~dOga!U#<G~mAunBN+aqx%;h=>RY2nmT#
zkdqRhAUi=wNJ>pgMnOqMMMXq%l7^a+hMba$5_R1W6VPB`<6~pvQxX#rQ~uZK=smb@
zh{=o%uHk{3cE7G0G62WNfG_63ra&i5ECdF8-4I;bqx<`XJ-8ly8S&`&;u|R@DJa@W
ze+xlbY6_63kPgIJ)-`G3strM(%egNAv&ZW}o@e4^5jN+wAu9vN6Cy>V5KdDD<Yag{
z<T=8Z^NK7EQ4oS7<T(-MIav|5xSFTfle&fupK;Z*US>du$YZG>S_qNMtq31X;As`#
zsLAE+ta(T()z>*B>0isY=Mz-i8(<skI>i_YU5IDO_B(Y1vG2W<g_x{nFQiBu25yW6
zAvTCK<9TXNts^lu(oNTvrw<sorwHG4E}D{<wx`ZUE=CHF$ac;JGMTp4R5zMIHnkc%
zrYRR(;(kJ#-vg3YJhyE%{DOPiumf(dNuM0n7mlP3c(>}fwx!`M{TT|lKbg)SKFYj4
z7Ca{?^HkDbhHcmNOb)br#a1+3i)0w`Rh53+Y|1k?`2*YkL+A{0ag|q#52$sVfTr9l
zqqoNWO)clf$7%-Ki~1Gv)xK_2k04zgn@y#b60~Z3mfcM|8AI2eoATJK2t$mI1s)r}
zlf~}atS(>s@e&d+dwr9?SiCw2T4?H76(yD6oD*M6H3@VhUK~W$xT;-2ROR_xFy5Hn
zZGdq47k;kY94KQ$cx-sr1XS(@kvuh@EUNnQk>JO8>+A9$62m9r#WK~m?G|T#dI~|`
zn;BmsVtQ?M!enuaTg7W+vLGVR7wGg6BB&Z)zs2-mW8T;ATW8hk%ZJ4jRrri+yR9FJ
zI~l7sO+{+Oc8%L@^XZ$JE_TPiOB8Q+Y+sg|_s7wj=$A{oU{I6>bU_;buor$`k~i40
zu5*1dwQA_m(1_<Fot@OS`StK~WhUpd@@?%UDk}yOTgvX`zHWcO<zW1%b>`Kwv6qi)
zOg6#1s^qKnFDBGweoL0xjzZZHx+TdCMJLvlsuuFN+lKlz#FRyKiy1Q_()M|c&woXh
zbCqy8mZv-#A6jxx5;h6&oPINIGKeU04V}lm#?xkG%9QOWWn-)9@X%k3*k@_#R*E4B
zb|v)jm)gJpRH2TwD>b=s8$P`LBy6!zyEFD%hCS)rmP}a|wN1a}ka-A;N1Ya@`!r1!
z_Gx*$fjb!Y)$w!$)Z}bl+EC)05xS>JPZ}LXAgd!_Mj#hN-h|iIg?EK0M29kL(JrJB
z#4ZRU5(3o_0ch3&-7<)x1hNn|GbE$pvkpP0Wg!SF5j_6;bWCKGKqGcH*Z9Auhk|D4
z=`pqeq4=!qCqBucc6O=DmpkH0P7AEB!4uqnk_<S>>5`J~Se!xXvf2>0onnS?h2|kS
z<fG|mIhY5_SpjttX>Gn+n2A2_o-H25Ci&^`MEaj3{c{vgF6MdkJy%yZ5EWwKp?)X}
z1*Kq=WT1#$T-5PG>EiwqMkpK%5be<EbL25d%l512zk18MJ+`)}H!k%E0$1=mGNa94
zYSeTO1AnA@(7iu${|L(J2xHx~xl{*1d{&?MY1{Z9?C8GJPvxQv2>>e2-Lq~G_M}~X
zEH;?jfRiXRi`79C)LEPaiq^8A08>ujIfU`ug-cB~D+9WiEQ=wan_>px6GoPBQayo5
z5VU3(RWvXJ0b|L5wGnj$;p0yOk_Yc-r8GTfxCXUeH-S|Mgi(TT3?X_V9(_`ESd@Mw
z-IPrWFJ8_kr~HJlR(-fe)0YNp;zYlel~vzr`<|!|>IkM3fq2_HY_1eKp{fO&IWJSQ
z*Iv6O+dY(c(%-kskmt@J=Y&)b(I!vv8;$#l{P8Aloy|W+RWIgT2B2<?!~;w~B8nkR
zd7r2%mgK(pb!HREA>3Y8e0IoYz&h4i4^(4YkXN3Uu;${Eu&?`CLVb4phazwI{)4{4
z*4+GEY1hod;P(Iv7S!Q}M91<u_A{m7ITmd-@-LQ8d3S#FSMgc=;vdNVZZC}w*uyxa
z2#bSo<>S{9GQ;dr)$H<uiewwD^Zoih>9M<#%e;n8o2J)3eXpral%udrvMPMSCGm|Q
zwms#WqQ?zCW!p>19|A-dZRzSaO$YswrI=yyK4P(*RwYd4t5W9xeWn_sX+GJZR8~6A
zBp09IZQ}d$T65Q$G^bb3d_=FIvrq<Fr7Hd2$u|eMo>RL40etf*sTxkvCReg3jG5Z@
z#%GHvo~3uy96=!f*FaQ!Y{E1B!ba!wZO>br?M@ReS6jZ<$P~Q$5P)2(IrK{RAKBhC
zHTdNC+BYE08dxHVs)L<&wlX8ad7<KFEu|=j;aOx{LtLEDosk^d<ZsUn_GjO<tonWP
zkLX{$#alds0V_Io!)H`-W8`h`7hR7r&*avjhL!8C@+aF4ug!gWz|=bUeYAMzimxoX
z-$*b!ucsw!6V)oWuO)SC6uIi<<^AY%&wvDgixG%;AAZgH@!;OpzQnL-<Qvw<rB{tV
zYagqvIyhyt_f55Vp?Ca5BJ(|Fi!#{LF{-LMaogWj_IpKSd2fh!jQ9=e?ZgXupF+-+
zShSD3{H&$e$oKJ8?eTBjtYv^8s*jJrvS5wT^PLp?)1jXIv}>iW%UTDdaCvGjJzHSB
zWlf$(P@kX;!Ty(a>+VX8a@FSB>rT0{a3M43CX5m*3`~`F3(k|59n@d670E)hY^TNV
z$LWq(&6PA?oB47krn8l;j7NB8LrTNf5cWf;K+XV5!znpqJ{r!Ug~kb@kBQe|xk{iY
zCBAX8V@WxD$)hu8R}v^?z;ZrB8#Ch)4ZhKcbZ$mFDxAUsC4_t;>dTcy@jwYu^&AB|
zIl%*z-|)6w4Z03-^==Ua{n;D@X_}zxpdtkW2=c&}MP(8ACG7$b)}Ks|qmh8Rl6xqG
z5C=O7IAOAaz=8e242B`d&QLrDf+9=NIfxHzEsR9b8Jv61k{lqM=?rw1h`Nqh`bL<C
zFLGzVvuD6Yx>*QR;HcgPu>}hog@cL20m!7_2a?s-PylCPL-*j>jh+@@V{xD>1zhaR
zU=&pP{27C0YEUneE?0UKY$_l`w8fb;Gl-Bg>kTVge)0u17z?8c6`RCwywR5Ml)EP4
z8P5z#sXm>sgD~p3Qmjjm)dR1UYz(>DUbj0{Q$kRY(iJ`k_oBGYw8*uy<c?=T!a54C
z0uKb%2e#n15XZVZPj>q0_a}oTRxO~>tEC9zI+Uc4)#rqe*&v8Z`Eldg0l!e`tbwoP
zyx`Tl*j9l4JQ*o;5AzulznD?yi&<~q)U%6>V;mpxUP0JMWEupeNp8AE4%kx{EY9@y
zM0G#n?<(tc@XdP)))^lkjgvnoTv?O+A`#c(CMD$EGVjROx}KcYY6d}fKhGpW7&`Y&
z@G`RthQG9PeQTwV5MJj=T+{%HUf~Lo1+oXBf=jr!xa1S06s|89!@}gv*&0vjvTJmc
z4r{eiKc@Cw4MguB7}P!(tTkK(dJ!}zV2E$s_C4|8sdvrL%j70}WS-%yqmFTZd>^vB
zJZ)6UrVFBK@9<`+$}cc&mg~?jJ*9awSy=|z^K&qLk-ak7HUF_S?<{B?cpGl?`u<@j
zua<85jR46&C(R10@r7B5oxySGrfRPx>CTw>Bk0-A4&@zg2u~y2J|?+_!KEhf@`rEL
zrBV9a7OAhfG6u=3n<u1esw=#TqzCs%V!(C{DlmlZ$VgiTY*jGvc4ptL$O|~1?O2@o
zbu%Xj%nW1<KfOCy$K2Dkwiey%%VWz~<1EvS3;EYBOt#mYd{B!VY901ZX9)s*7!t(Z
z<a>ClfA-stl?_}a@eA=R%*m}ucjG$rOHw++7J4Hz;{yUJ7IuQ*XoJ66`|RiZa(dp{
zt#`FC^BrdGu?r3Qr46M`aZY8eENU4jol#hOlJ6Lon>Ppp#4p5U@d~Op<BshykN1`>
zk1rmkCxzYE44(3>stJhqog6v{<UmE!)sYC2`<wf<+55{CgR>(#Lj=eTcB5QDwIhgd
z&@_CjZ)+6U1e$;+K@#G4FCE43vw0I36nWNQ))r7#KsNX=Nsg`fvw!o-$L_-7K&>p`
z?vyk+bj?j0E_*(gF1egs$`w+Pirf%Twb>p$>B2q{@G8J0vFt~B#r7D&`0H%&<KfoX
zTR#2|;zyBEwx^3+)>^-aE!tT7%SeI2h>B3b)27PfH+_7iW+N6JuS{H+$cg!+xmX-J
zSdm_ZJU^7@7k|xQh3Sek{jB@^F6NdgDJs(VbR5c%eBTLF{OO-oA-$Rkc;UeT9`t3A
z19*cGPfr25j+x^sPY@~(U14E{PAe;l#v)>A_>H(!Po8Q_mYyD|f(T}2C9$w6;-hE;
z%$4k5WH5o%K_@?{*A2AQHCBa24IzrT2OHCMww!`ai-_mQ%01LPW(v=}II=JeCYX1_
zy+JtefOBwsCj*69F6bQG28e;)=p05B8CdFcoki!c*qVhtLgcUxaDsc}%%u3>^HCXb
z(ZNe}?S6~$mY!*|bEjo7S)1-*f_0QS8WT~Kc@;2yiOvagGpzklS8@j|%q-o|bq+=x
zbU}y`F?0^+5;G|yfk{(YkzG<d_0{`T;-11%V%pFr{ySiVH@&AsFC*#cqJkh%K>{=p
zePjZJX=w$!B}hbfm?4~%Bse61#EN>N9|SX~Hzr#{gR&5Wu$xr$er&kd+NK|=ko&R#
zo@WXaWFcrS?WD*|*%jlV&ss`dFa^BIfbb_`Z)o(qPF0y{wfGo!E8TbipdPRC)>g7*
z(`rgHVC2)RBJk@t$)ev@2_Z8<5I3W)NNQ~2G8aa^f^XUnqY=##o9PRT9X=TlRY(W~
zoub+C8~D;tRlXr5;X722fFQ&_rN8R&n0nUFWH}1>>}>+MTrqdIf$#1w+EdyVmgD_W
z76*65Z}Grlf+;l!;%&aua$SvT{Uaw~6lfcR0(op^SPm@sfew^*;wCc6?9Fo<OxNmb
zvY$Pvl54ru7Co<bW@y!$M6sgNMEPgBsgrBW?EKad^lksbK`E)?(-Ja-u4wDZ{NTu~
zRKB86zrF6Hz4jlzJ#A<EibcCx;-(#zkT*Qd<C_9Vmadi_LB<Ekn=-7h^;Sj#sylo)
z1JbUan(>}>(4Uw5Q5+~X`Ax^MHGpEV%3)L$T&EiL1G2(vP?DtmQ4^AEe<n7EeIMyE
z4V(MfpUkC1&o}jLN^SxLu-InCU`5ag5B-9}VV7HgYuUrGjaw15t7Ul(LN9hZ8WWLp
z`j^Cv%03y)?4F){b9wQwHaV=SV}G_LBHjPQ*Tb+~CQ{Jt-mapir)HLF$~Kt-(;OxE
z-yo<iL0Q=BqH3-3Gh4;2*H3J(2OP41;7InfIPv>Rio`+j+>X?8e(3Zh8F9ineMdXL
zj{Y6j%u(rx(K;X!=#Jp_owwemB+urVE`1tU48P4vo@yL)`Ty=0u^JM6CK*%3^?hBB
z_UQ5y>6dXVRQY*Gf(!4QW~1H)p690=j2}+l9?eZzsJO6M`*}YT1ov>$MDM+=H<m-b
z;x=!T#?TfiazWOQSHJUScylXIi%EW%B0dOR0WX3LPHlIxKg;iB>>Qdkkc~xGkR~S|
zqriD)_<@eNvI^L*A4kPN1Z|u&cm=JG<fxL+9((54z0gCXwGKrAPv~QK1ass;sO-OY
zLI|V#KM6@Cw10*q*86oRwy4MN&ZmnF0&z76U8CjzmVYY8t2&HNDs_KVsSwmb_(aEe
zhTyQ_cRDWn#P_@8zW^}MxR|VU{{_)+)W5VyS^Qo2kHFl_l1jdQ!9N!N%2O!zlcHf-
zHX+IKsD!>RS9SGYsmt3~51qRtGONY>3-kBe=iU-scG>;w#n-}|2t<4qd5g%6l*L_g
z9;r6|GcuqmeJ9zCCPqZt^;D<&c!a;@RCrOrm1OkVbIqqDCsj&IKJqvFUx3)G+1M$H
zJ0?<1o-a9u*4jp{WGOy=@~&;MbEwGh^>k+!=P%4Z-`G#)XF|{gL@{&>*Jb~#{1d)l
z`1Vd%tlghQf5JxLu}{%?&^fXoc-ZKAc8gwZk0C5IS50cG6xQfNRnrKIW|{RhCdPA?
zWR^U64?bxKiJk$|ASVG0pMx1dp{EswU4tl@Mi{(sG(u_MtkviGU^uIu%%&#`0FbN_
zzyq^&X6Jlz=|F^HuOy@I@=#-8erBgJPxan*Ke5sL7cGk}6t4K^8hXQ5m-`lN*5WG|
zIGR>Q9b0U6xj9scQ>~|`%iqoT^$f?)`Q8J_G~#F1nD5q$K{V{*ia(JZw`rLny0{be
zR$pIOl@hDd2g`j@?|W(X-1sybL`RJmZf=$GHMHJ1_9Zd?!@tHds#WlREik!8i3YK(
zG1*nXPTl(@2cBw>igi*DDDRs*<#s}K`k|J>O^BJBLAU4xeuI!GpZYCXStD_F*{{<K
z7Kz$(^l2YSsUP7qX880zQn&N$RKO#|V#j)VMTm`?Ql*t$=WP@x$L~1@uq9|{x~~yN
z+)k8CN1sG1;K(*GhM^5wL*UOo4DUXj8Dpu7)AUrdkT{I>b9*I@DqNM<Br!%KNb}NK
zHt5w2%}T`Sv)6S!F)+G6N#Kl;-Tm5f8)28>WCYdIxj1FWUOmm3N{SbQ#A(t~P*Fnw
zdYA=#{zR4(Lq{tj1nxFD*}2$Rh3;=`2E_LV*gno{euC^pM?EZs93Y-LeG=WZH)lN7
z-j2QxXzn_|T#<H_e04Ld?pPQmi3nNbp3Qz*a#|fqB;44gG*RP?O4o>CCZ*N&W7*i-
z4iY;~?Q0n}XP|9Ff<NCZ?rIXS*ZLWl>8#*W#LjY!bavS4R_oxz#?Cq!IeCyQ5Emra
zfpBT&D2^pQGd5~Dx>X!C*7qr7Y-3cHri@lV4TVUiaMxz0KQ9=mvQt~zTkU`H!^}t?
zgGur-vS~)+x5NyUiR=Y29HeoYoP$uYje4t5>(9#wyQx%6H-am!wD|(ZHq5hnj47HE
zboZsKt^_lq&xOZYx|wnRXh;llOL?}Y`!n~|(-WkRp#B4ypVC)yRC>opUDr%ic1&Hi
zn2c?oqV~yj41$&gIs-Md8wcPIuWLj*KKIpEWv-<M=K9q<m{@ah+x0mV-K@Q^IU2m1
z=KD<|D+nl6uU7{l2r%4r@}7fT9fpnt1|OvG0#eabG7tc}cAUl-oxDg;BVZ^3!T2D-
z5gUQe58Ou{DbJ?W#uT`4n6ZBZwe*x)XbF$D4ouILh*q7hgmD>Onw)dk=l$+a(iM1e
z*2%%_Yu8S5ZEuaK!irA?r}59XK5zG>t`*HRjRE9(1$ZQXsyeL#&ySy?E%IWR;pNju
zy!JZyWG;zHRTeZY{_;;JHw#JV`c#rxl^Mgo^I)Axcl`*OJv4cO7LFLufmIoKPVxK0
z+O7lKm71GPImGQGDYp(TOs{K^B>Mu|=X~(WoLG~85I0q<@u|S4uM*JRQsDgJ$_$Y+
zshFi6pu^za^L}rM(`+?=2cuhdnyO`{2|ujm{%j_fs>NplTZPqWOZgn6+N{$$mcrc(
zQn+0RoZ|p_KS)>|kHf@>w)DV-faGl^UL%yuk!ZgneIgt{yK(qnjyG)WwJ@KHJ(Jkh
zu2;-l8k6(}FtfJVSHO!d#j*%5g!tp6us8=QMi3)(s1nk0u&|#+dl1)ae|rA#g_*1o
z2N?y3oI+s>C7Cukk738Zaz>a9>$31w7S^->x(mB^9xNYd^^Rgr&l{q~EUG=o&bw58
z;4HW6_^9b9Se3$};WU-36$j?pOFtN2TQUl^)V6|q3YH9#G`_klWlM$*8@QtPD-T^>
z*QBRE>A7V>cRWTJ<!5{)MwRbNtSwo>lG0NLN$y|lZ(eL2-SOonrN&dURlp3U_E<4V
z3zS=PXy^)wjKzS>2*NvS9hgd3f7wxn|6n<9*K5r0-FfujK&?a&K?-{P+pYt<Oc?<(
zDDThmn;o4W<;~o#9v*lw3;y(BT}F04J?(a|8{p}1BfJt@ceZ3fqEorUIs;`>gaLK#
zg>)tHy|kFLprBXonzt))JF36=E9a)Rugy*VlDbA1S>%1-v!_YV5mbsAzFPE4>&;1v
z=?0%%?EWDZ{xO6TrMLPH#D7Zvvwwc5spvXDtQ^Ar8G*U5Y>>0nw#)Rm{heKa>t6b$
z^@tBUdDLUDAJB;33kKU)Sr<*DYFiK@n7O{n?5UFzs3BC;VFB?S6Z@$^lo`m^TYdf0
zeBx76Mz1`5_t#1?O|OI(UHO6BY5w6a(<_7S_wx(g18??!qIaTrYDu*xc1PvcahrFB
z=_0SO2Dktz=4+TlcGBg+&@CkCka3;&PoD9vO!f7rXq>5shdZAFyezPa{Tk9$2L^03
zIaw4uqFK)hv4EHXIjNi71?7lnB=eu+Lpyerv1o*TaBk1E<)_OVM$z8k54(F4qsXbX
zecOdwwHo^*@!3|Ndn8@+EADUlN)N48i=hG@X4{hpZJqw@2+-sH+egp^OWkQ1`N84Y
zh$sFerak-8&QrT2kK3y<cY2o&m|lPo#hbW1yjUyR7%dCLF`J}eJuSj2f^(mcbviiI
z^P);nNJ2=p5td?1tcj@D-Mdo?R*li!WL8g4_*fMf3Ug87w_-KkA&){-k?~jM1v6Kx
zsr)(T;ms`UbSj&YeP7-zelk8}cWuW1l%H~OckovqF+bady+E`gUpQQL(hlH?&A|Az
zvA(LX=Rg<;OHs-Z{B`6tc&J6Jz4Uf92w)0Gt&u#`UH4DF^mC`8ZTBR~9o+W<l@~^3
zT4&yR?k;z%pnQTZ#mt>BC!6BU<@3p@m>EW5xyF>5=FdgBPXUjG7Z7XrbcXOtsyr4^
zlcQzaRSx=70(qH!bJQvXR_u}mo*HU1_s7<;{vNr4SC62P-9V=u6JCn%>;Ab@+aeWf
zxFfsij-Z5W@rP7xOy^2O{*MDu*rgNN1I+hob(c(e8z=nz4`U{_Yx#ErDSj|fthd7U
zh7`|AE&oz6Z0%Y9{?cYZMCIzwrPbNh^vuOwgU6jUwq4aG&fmKO#Se;~ZMfpbx8Gdc
z=uDkNxtFk5voQwEqpEj;w?q!@NU6iY{7U&yqsS)dIKWVb_OvEupd$<OJ^4H@q2sAv
z_R9+g&zD0A{}7qA_lLIva=!$aK4{pxaF9N={aUN7HgLf|ecHQPtGIG=#Ds}<H*K_6
z26x6TF)V(KcXT)1b|-*|Vqtkb;$+iKdhd3v^LA}^OAycwTV-<dYxhcL-jBWIrk#?7
zL!Uhv<zXN1%^l>9LD$9sd*jTg;G8tC^n7-J=U(8Yg<7}|J$AJo%rx8Dre^>aa74n5
zYkFmZTl~O__d2|kfpugLX}**eYFfRQBEf;~PRvh}H{Vz=Rv#!c2BFmzGpxSu$QU70
zxwe6UQID@a7v%RgLd$<xTE2qmTD(E}MY7X>TN@$?4h;A?7e)E2jrB&BCiDlKG!hC6
zM`n}Wv_I@><X)Je@=O*Vcr)8Oi(0PZa*SFEJIuJy=D#y+?++2qzpCtR`1Cx>+Y;83
z7cM#2%=iNFi8aLmGOH1mbxf!yd`L`29e&y4D@00(_gIkv8)%5Z@(Ew12At1fSv3Ux
z5d$Fc#%PLIPlB`2c~0{w6Q5N2<{2z@jDvpA1GZpsCN`H+db^J!DIVbwGJ7&KWnw7v
z>T(dMF}vFZo)qMy;Cu=kTI&eFOjXqFWWkI0VH+t8cnfGc{T`;4Sa8k1Oyr4BeLEMX
zrLGwwn605%=oP{^<s(GP&Jq2jl^JyJoxDsAoSZty?4^<}*BuNu2PecGq#GWZ7g5Z=
z<cTh%OR=b*Y{g<%f9haWaO(s1vqzqFl9x-!N)|6Mqvn_?f}EKL3NtbErzSJd(;{cd
z=_QDni!`<)L{jYhNjwr8!+)5*|6O~i6+8y(6ALie!z*~`Zo+9WDTA4;ik2D6p5=J)
z*+n0O9vfiw_YVt}f5#a@jX%LQoBnmnFE@TonC~}yyhrZUlH?SvEqOcP5h}CJ(FgfF
zPj?oMknj98U-}w%R2_x~^oG|3y_5s1U9x6I$FTWnnBXD4EHk=A0S!6>dhLJviTeA@
z50q|nDaP}Ir)r$OfQ1h*B!?^Myo^-uz^$uYV6>=qi9(Z?UT42ePUyLd{q%N;9mWHx
zYx8NEYhRj<SK3r8oc5c|$h4q8R~Oyc-mBr+dUq>$RzKt+&(RrZu6+4tJK%;&@wZAS
zr}Hu{OMJ$}rf>r&>S{V7;DvQ}T2~h}Enj6mEdt3!W(XJwaYn<VfGasj7R}2lNvK%d
zR#2zm4O^CY-(Gul)#gV-%@B0upHI${YSzy}jHOIGUqW@D0_S27cp^|vhROU_2~p5*
z|D#I*_on_$TDbJ`-_(HO-yCSfulwkHEe?NM<|=w!3%^%-FG7XuQC3(>|0$F4yn>7h
z@^O3FKlxy)f4Tb22^_)2Cogv(ldHZ>dKnFPtS-#{4eL(|@EH!BrDfyuX-7`oY}?<R
zuXg3t<;9<$U6(oOB4ddCRuIW!GF;dxyy~bOpW~0?TBZFr7GpjK^lZ^z=F|DVuc^De
z(YpRVDZ6^BYGg*}Z)ktZ{5Ae@lV@w#(TC=ky`X#kOnf#}!E8hcIG3=y2t+Pt{Hq%j
zFgo?KY>pr_9XKYh<|L4dd<yAcgeJhJ27ji9diU<Byt*ntAmTSF`mCxvsr8D<yG~l)
zZk-o~e(ODvf8wHG(lmbmyy@ObAM9OqkL=&3!j<t`bh*;3QBW0o#fP}lvhzligDY3`
z#hm;KQH7G^`l6K%%}1>^Er0SOQ>M=kGhOPu-AmqoO0$#OF^_JY^<64Lse`jK?nFYm
z1RcF$S5mgkCkqM6pg##wFu~c0+v0Unch=Vw&~@PB>a1|*<5B9J&0gcpjyEN15e72P
zy>H#{ogws!{$A}rd$Yi2`S!IdTEe#CvrC-o3d?`%4#~mv?m*+6>Rpq?h_g#;AFPSB
z4Bz*EtDoB$X%fQL%a{Ep5zqw~7VA&Z5ZD3i#DCgNC*PLIfJ=xFralLOlS>{m;B<uq
zy^lg+Vo;yeMzBN=m0F{+;!3OBk1lzd7={{Ry*2pdO2h(_3&wGJc`mG_Zw#|u4hfaz
zJi&UKdVv7Y{N7!LQn?p%Xv;#_SezJ5Id)(>hgx=`*rFZ?KGe(IvdQqKQTNE#HRI)s
zzGw6f9uewY$5=>#wH)%ewc(D+#CNUYboP$}eF{?-kza~TJhcpW5tTroKb-S|-+0e!
zuVfx;DxY^+%3;w`>a8W&NtcRv4cR$c-7pB*e#wvKjzDNP3{bm)neVpVB4qXn>;+;V
z_!;SB1!K75x8A>qD*T8;6pW)z4$4T;r0@WAUY+p0VHx4?)#*3#%CB}1Twau^B`k7W
zXg&LRVo|Vy>10CFi<2j;<B@qA5k9%kJA%-($4^9CPg+?K_ctEv03a5@lvM+~w<c}}
zCprnDLZ?r^{+`H(-bw0V2gBPmPz&mk>8Pj`URs650yf7C!7$3iBF*3=fKDr@Wrno>
ztr?IZ%@hYpLiKk9z=_q&FGfrv8@rOC#kHRUlsm&mZug`21hQ72yS{>h4{%DOYazDn
z+P}HEW7)SY`C4-Y-XjHpA4s6Zk{}fH&kxMAG0fl&nxbxz8hl=H%uJ5Wvh?eK0Tc-n
z5F_C81t1GhNh6HBJh}0Hsgeq)kcDgE6D6wh5a)*H^@W$HUVQZlPh8*MAa*ABa$Y|n
z{CaeQW=U3DhEfv6lYvHp5+~T_;6$Y8cez}DUet!FJ&Ef*J68)R16$s|Y^p($x>sZR
zc++pRz)!1pqB!*oY!!s;Y-$Xf1~?xT0sHfurl^&O;+>IBUgfNvQHS|Ko}fSa95;Tx
zwbNI8U2JPq@X3Hz)riKxaI<O5bijzrl@(v{w;e<M*C)$ca|tUXHYe|Oa_?N{Hte2t
zm~Sq7#zltIt$jScC2<)i_i0m2dO<7d_7D&NLyS@Ljd_@e_^5oCbi%5CZq`K9i(RL*
zvhcSFU0~rvp4W929BSCP0BeGdnZ4z)d}ErHzjVRspKTe^Bj`QyE##r>AM+AslV5~E
zhm6!R2PSS`t?BBm8gMBCf-bUdHmF2h5=MlCXUheFg5Qb#ECA2bQBcqUKNJN`gNFAT
zw`$VoM}ybUSs3^4od_S2M!{cDNZ~s8=!VaI+c9ExK^9ut6E}i)-v6BFDL@$wpOX3?
zj<R+VY?*QcNZL?Ni0YxdyqG`zUp4urkSGf*Br}?&fVx?3!NMDb`;W=5Ugauh4AiYi
zwTt0W4K|8niL;8b=Ci`YvdU7($hwZk2Y#W{ZkTMKVT^e-Sk>(9*&$hQaGtXE{7;8n
z6aBUum=kakB}X(sfDo-L5;pLGFlvMfi@g(_kV=bqzQ4@YpIJp_1~7ua52R20!5=p!
z>(|%be&~KEp2{A0Lf3b_*)nv;;BCY}wMm-ETByT`gdeN(vv1b&^JUULGzSC}EQ?k-
zymK#4UeaxUTd>RJ*x=xCjy`#(*79i(iYbKU)5*?gw`PHC*WbK#u18JbI_srU-ya4&
z?w<hyY0RI!^=V5weZKa=zv(S-%9z{ce^^_!pN`XXe@Y?a&!EjHDy@}fJDXp|-Yen%
zo{}`{95v-V=6voKL8;7!?@y9Z#hk-9mI#6rxB+S7OW?$L+A+ox0}_&ZWAKot2g1k*
z9*pMhT8{gnq89puDFZ&wM*DHz%-i*y_}alO-k32Eazg$V&w_)+-PjQ~I~DzbZ2u~W
zawmcg$-KH+Q=2;DZ^BgQS6my6JdP=yZKGcEhl$&!f~XKv2N>Yo#R5mnzq(FxFd$uU
zYxi(+Rg(V7KN<ku^Ze@s+qpitaZlPSX?;7OY_;a_cf6Jn^zY2wwH@C_I|ocp7JDMl
zmDe#M$NE<c)NS8dT+<57Um87A|IW@u;VQslhEd_Kmgx7tc}~TK+ZNCIq#Ha~ID*bE
zqil?d(Q8`3OS5bK@KQ)f8h5LfeRKKYZa}!i+;3~|dF<qZZFKFFw@4xJ$G=60;~Dgy
z+eXNOG7_rAoe|gG@!i_iy={#_dGCRjE)M3Rrfo+MuyVqmR))H^c}Mosho#x)cg5zP
z{(yV>y~~?4*IKQlTL*zIJJP^l6X*Wc)tR6A{<&dv3EtwRN(egPqbXKXd-7y$#MkYB
zS33hdEN{!Giq0l~do<9QYB4#UZaU{bI^~^jd`a}JaCo?<KoFolf7W`3WN3f3KfqwL
zD)!`+v$w;Bqmue99F>Gz<9h=zzYQ-k33euT5a!cfDJu?x-5A{_j_NbD)wnC|xxIo>
zE%!_`FPh&x!_j<oREN{LecYq-nn-)<b2R4f=Xe~!tn65P{;=gWP*$X*ra^U{|F%s}
zvu+G2y<C2ripq)G3Ue?zA~W-j(97z|MJfmKp*#!b=RGaGBJ3RT#5(X1h%Af(CO@#t
z`G3s41z23Wwm8nIVr_AkqJ_cT3KVx41}T1UcPoBMad(%(z%UF2ic6uixXUm&l;RF;
zaj5(^v_1F8eed4i|H=10Hrab6D{GSMEJ?DG%~8^y@}f^aEeCf}{zc}CRa3gh8@d>(
zcD~vDqZ2-#e!D{aJ<y^D5#Pn|YzgH9I1vpP{Fs{;nVt=^5-ZAfb=)kVEg55?#JR$T
zVabtfrSvEjGCY&aM=~YiQ;a>g)&r96UnK+G(AKr~`{O?ex7K#h|7KkL#QUX^>Hha;
zZe>i0T?Jo5o<39~88K}P1oe)^c9_OXfyYvSwI4S);}KzEUu3FYDi*6Eiw=)&C2Qx-
z$WJnWCG?NSzdca{8({>2s@%N(3$QH)4cN$YwO!_FBMcrs?kyYwE^gxcG_;&NghX__
ze2*lh)o=ewFX1f3zz=MbK?k<h{BrZ!{*o@S3pylnuWlySWj+hRx!@O$a;0g-zSvU8
zH|#1&%!`^=w$hG0x2~QT4j3D2O3sW6_G7E%_wO>1kDr94rq&1}r;Oc<HtA7L-L5RJ
z7T+eQyEHhx0x4UWw7h2E)?8`sTYmL5MWuxK@R;c7t*Z7{l+rIcJ!-l4cH@h?;N$!m
z@P+Gp>Lq)Rd~Iza<COQ*zoGG{n^;FJd_#*hEznr0QJ>zocMy@NBZvaOCeTtzBeW?V
z**a`5>RrI7@-ZVgHbvHz<MW=cdp^5~NYTz`YkDY0=$5l(p4Pw|C1Byj&+!fIa6p7v
z<r`X0SCP`5eLr%OSHXqy*@Ff+_PEJz2q{5ioSP}KP+fe5H`nk2&yf+nHBDPO|54?F
zTpp5Gm+LQVH@m?%X^pqV7ulg>dnCZZbF%aBx@Si1E5Yyt@zHKG&Vn(prk5qOZe`u(
zp1@-*ArxP`sOL)IL`7=esT-H}&TtCO<{q%{5zubV|K!*Ok(`*JK7Y&iaGHGr)<WE<
zIs=Mf$c$0c0)P1&tbiHDFxUVWHhkw>(C>pkF8VxAXTJ@hR7{ZBF&*txtmc`)HHgUG
z@#%C`aT(mut!vHNCRtPV@rya93Zm$~FAsMh$c&=gdsJ7BkdzMTd*Zr)XEs9bx2sPG
zs%d(a(^a=sIHrZMhg$Q(H7eoHz%xwUcg?9mmL%AYHxd>(#jtHS`n}b}(#tkF8eeHt
z-E+I=Kv2I)*=LDTE^IGxP@XBIKD2h7$`V&GfxpbL%&4tJ1bg!5EsylNl-kR=62LMN
z_$BFkqVg4(Z3d-Xh51Vg$HufXVQHLFi2h=jimCmC7i5q*6KVR2P@y<~bD-0aq_APu
zPRV(P_E{2vTyp9n`A`DG6h1|4o1nto!sQP#cziH0T`%LWB~4ilbzhiK)hxU=PeYe@
z{mAbypya%9$IZ(5aBUP#$OpQ^P2IR68JAs|l?^3I&09LenAI2}NX?WmV$k_h$%LWG
zbtc1zdi*<uEpMxy#i>g04#*&M?-!2DF}AD9N@6tFxhg5xv?q`C3C1gQVdB4Ck$hB=
z0rH^qyeSu)Uns}?iOd3DPon`p3_TaloTe}7WDqR##Q9^nBZZ7O#nM*j66+QlLq-rN
zgDI}ha(X)kwn}DzWy-A%&VN})9<<HSR)~n<o(`_X1yACUkz3#jBBF5nm{#x^xH}Vu
z2v#~B#kTa<sqExq&+)>i3X7QH?=vTbPu{T8d@`k-?j#}v!^d}BuUp=2T>Ki{uklp-
z{d2qp*McIl@j1GYJ&`?;*nDPb5x$bxL0hwGz4V<4*muB$`eTvodBtaM(kaSJRJUa<
z*L0b(ryb<4z}vvCS{}*_R9ow^52D-BgKIiR+0zOF#QX)QmHK<!KgGrZ7}>U;ePGM1
zS}}cR2qwZ?68i%{!bEt0l7g;MkT7xp6Ew&c_;K8@)6)h*nLQr!`uD`kY~KNn(+RlL
zB`qNP?~%U)CatGyFZ$*#NtIXphgd&;@gMo+K09eSr~)T)X<4OB7b#!<e5Pi%WeV4S
z1ON^A541l4-}C%v+CLEh(Ee$o|HrT6e=y}6ngXTqXMc(l(hXwpsC8DN4scGTkZi_7
zH%|%_P8<u@xeAKJQ(jJV__eF@YNkpHPThoRf%I!i)c7>5p%IHCp`uXf*KwM5n<7<O
zhemHBq1~C1-Um;PyGajmneSfD9=)mTz`$s9g91f=ifk#_)K|<#Dn*a)9Y#h!DL<hM
zRbzHv(l@v-ZR%i@z#ZIxJM5wV7F$}W(k9Q9L6X_gk7UFi>0A;?!@d5cWDW0>=|=p3
zJ&Ot-#sivL_cP`09A?D)CU9N$30}+TbT^ugvyAQiDMi@*x1HlFg*_Lg7I!(kQ`&K{
zrMYlAr2ff`wuUZuwI)nbPf{a%w=VGb^M8c+m)wsMoVMulz5$zYI|W!_wzyyhCRhl{
z!@d|VZp5}A%<_iYH?+mA@DQQ5&!e7NgFr->_&(0olOrRw=xY?B_%1QZwq_8rbX2>T
z*~^e%RvHs5^v9BIL^xeiq}b+M@qfJG1bC$^!%?<;WHFK&vRU8pUWRg$^qA2^|Mhm4
zFoNgPmKpdG|IR4_p!l8qUy1(s39Pr>ah}jiY@9^ismlWVsWbrads%exz!hl_uB(Cs
zKlzuGg+!W>iX`z|_e~#lJdL=HcZ(id{!idF1$w%4FK7#OsU6-~L-B%vXBJ!l5=RTA
z)H+`2)u3zn7?Wj+@Gu5b9nAZ$9P)ec@wZukq*yf{yV8s&s2}AWkMEvjY|U7^K49B&
z(2cO%?kTDoJNM(v&Z$z+qdhO$Zyj!4kerD(L7}Fy@F-1bNlZ;MV@Qt;6~-}Ttyb*)
zwWGk%jRUG+HJH+GVNZ_fk*kUk9Om)chU+Z_8~Xy2H41vqYws4gE?4s`mW1#`P22U|
zF8eCC1r+<a5F0ESA>U--r9D%s5}MBaq-VfG%T9fxY+$Cz0GA&&K&Y6EV(QTqjMD|m
z@0&zZD>e`;&(^cyh_KN_K$U4qcA60_G8=o6c`QpT<*35(*lOL=&_S)DfwWEW-O|}P
zD;t@z_RQlopVeN-FMR38pKaL=R<fVO4CijqY63?vo{#InKKra1No6tXBxuSN8eM$8
z7(DcoP<hxCb*EcPTUgU0yaZb_D~V<4Mbd3ur-;)UyQxf6vV4i6<_QQtLw02MMuV%B
zRw)h+BE^KEnot1YT;H-wEW3$E9y#kFKeX>uZk|h6XUF<ts1YZL`7>()RH*AcivF`K
z`-m2Z2Uqt6$UbsakKAQ$pd0$5S=1D0l}c++DokW|j%wa9rf<!h4$*j^Bk$W6d88%d
z-jb0(1Y>XvvKt{p*PA-3>)6rP-07?4rCfz6U^H)58H$n!P;!Ra*Y`zkVONB6DP>*r
zo6^!*+nEO$DC8!6ooQ)7ZYAhy(KM)oxGeeje#tFyQ3O+B)N2mj3B}AO)G*~!%kDFU
z&}Y@0CNWiJJ3<bQJqkx|cQY@E%Cgp;-`sB<(6T5e=U}t*6d7vs!H0cTUy%BMbJm|<
z$xYpc!!Sy!AfwDQOh{8t3k&TdKl2VjcVCe(l@Zne-Gx{RN4DT8rGT<+Lu6T!XR1T0
z3A#(-ui9*DqM5mFYaZ5^isMwSY2N3+%e|yGz43yFQK+e3^K790){TmAi1k5<sR1ZC
z^4THiMe1^WNSxf~*i}W?imp2;OVX{(!)L*nFZxmk8S6CDYuTVF!VHS9xC!OfHWhG>
z>+(VT-Hn+U@8mf5AEmZC@vbs-3O1Pzi4cTQI?HYOK)41=SYPAw3qNz!^C)~B!naNL
z&i94t1-)3JA%@P-Tx=XNa8{?jDN4u3&@$w)kA;%u*1l>s={ADuw=InsDYs%aw^dOx
z>89ZI<&Nxw#O>l23=B2B2nj7EJO0Sb^jI)5^|)e$!~d(PJ$Ghg2x({Qt>mr8vBP(J
zoC+k^StDF?7uAd3A+%FoU?}I~Lj7CeCpCuTrIA(S+>Wksry~o-zz&*(IbMcGi3&tG
zAvfW;JF2Plj}vUL&~b6SMh8Sj2z2mBL@|Ol6lmwE5oVb2fp?NZMfsKllh+H_G%-{W
zDZfm``M^(dx920!;*<B~<i7KX0_}~&`wFyk!;cw}DJKllj`|K@Gv1XZ0^LNNs*xNf
z5z)KZfcx4Nd$>C#P~v5sVn33}_lfhB8ExnX$Iz(=2uz*_t~ha({1nPvFup$m=s)Dt
z;po2T<hvigyU#OuZgDAMCgnCocZub^U$+7W7SbKz4zSj$MpBuqU0%N;V{T_#k#@QK
zJ!tn=OW0m|C>Q>bimroU7fTR0p?vvo0YP)H#j2?MlQ`T<R0qqXe~QHuy+~!zEY<M?
zO{%W=Z-lOh6Rd91e##)dcSY<YI=D#ppOp-VdoZ-_=CGZ27iM2dh>qGgs)z6L)YQ^z
zlFpLGDjtpwdu$RH8YTG1{ChXtE$p6<e-HILQKIcc4*3?^!zkpxb)!R(Zv0z_KS(x;
zl+*mXWd{l*K}zku=@MIjnMV**Qb~{s=S+wDSg%oR?DGssZ;T9VaVZ26Kl9n<J)W31
zy<U109|+zn|0FENaSK_}t`T5bgyZOE6|{}&iXYS_2y2mR#wm|I5LNQ8o5%q+#ECwB
zN;y7m!oS{i-`PUHn7LDXb3?83eMX8lUQ#EIpF-u<9iN-~qL-@7j+0<HB^|q2%bIbW
zoFb-gUKHwDijiKd`<q%$KzeFqy{fv!+6v!>$opyclgw?GwP~L6F@^4J-qS)vvb5Ns
z5q5fCNxP&`sbq99;wAK1`ItQal93z~I1+!Z!GN7CDx_`E8F(PZ3TfNzS)<(8=Nhj;
z-L_Lp?Hz3Auv}|KMPjc?gEWscMa_MOJx-EFI`Q0`-%Xuu<6Gm=lk0PVr3Teul=l{0
zA;w44SL%6tM$bMn`hlmZ`k8jYST(<q+bCf*GB)wJS2zNgw;Oh;KQ@^#^0M5*Bacuh
z;nYNTHL2Vn1~vza9r)j_8p`6ZA2{O>sy?8KdSJ1|qB)ogZ)SXxzHQ7n=)n9OmB81M
znmz;H5hcsn_|Ah(a{><_{Z<d;4E$5zZ;~haRifL;1=tW|o{|a!vcsAX(w4jo!U;HJ
zHcruE3UKX|`y7V?M5^p&QY>h?G~ae^So5qjdQ)ev)>pzh4B}(Hbuh%xELq02GD1?U
z;FCm<d_m5=HD+)K24q2FWAI9kMxUK;(&)$H^qYp-+-1yc1$EVYs1*TP8H0=mcCK8o
z78ijU_L5@y60XfEN`KLlFSWkD*&f)>*X0!Utjb~AmCIeZ#pbjP#mTD<^3pK{9=Mat
z*6~dTQ@W)MC{Me_LY4S!wl)tn*+Z;_z})px*l1_&T(N+_$dSp$#_3k1iWqF=m_?Ok
ziNK?bkW5z|F(A0lqcN4i-W;c}Z`~xImhtAL)~sd<9+G?;A-wYB4oXuawxK|fFDP@@
ze;sE=+d(PUwRo3cii1ZZzv<8)df3{t=P<75t~k*-;AyTGFxA+>RdYmA_IaE|RHNYY
zZi27Pq^wew5--Bt=PBy_rR*MUdR^@>N#S{4P2Q^Hv`hi7#9q;UGeKDZBQysNG*IAm
zUxinK8YN{&1Y3SteB#^DV{gsr+(^I(I8j2Vgos<b^N|#Ikl*mqkb;gsS+G<*O!oc`
zBej6Z%d-z$${+#{M$=#4*kpFd8Tne<puEQGoJZVuiy|Ni^OsufRRkYz4Ih1pny?4w
zut7bvE;PgRptwz55I1_Zu*;#{At>3|ECZ28YO74L!Po83!9SxXcc~Fh<RuK1T?{<e
z&gsXXinLEDY1ld)_%PMT4l%*)0qjExzcK8f8mpKH+`&CcnRAR|HMq%$*fD9Cy!MQg
zMB5D9t?-2EI11`Hnp1Nmc)^A=5U^Q%T~DqAU(D<qq~(#1`=wzR#caV>2L~x_KNp)<
z)gD$!*Bs0+5RNPQD(6~V$?NmE&jF8;rfBqe!<f4uHgplE;?&QPP%~UHKJ$*y9oc9U
zzwZXXi}QxD+v_wD9EpB-BwJs20sh-7A01^{l5)f%Pa1K4K%b<VsqF0L?nrT%-B68j
zIA&#bYQHL?qTi`CbM4%GQB>eM`>ytgX}^rF{LJg^OH*nHY4(aTCyl-gmt5*?Zc`E{
zfYp+o@p(GrPAp!4Ed)<D{7^>+e53?)yG?L0%#bhaHC^NDu=^^^?2iz%q!5_Py;{Z_
zR<!;8!R@&i5hWf?esx-y1YIjSz-iPNCp?6zB2K%Gql>zd?uEM?E|;BAC*2_YHkoc)
z5kCxQs4I=>og4ItIKDY#g@eW$tH((44*>2KF3`8$nU((3yn&DEkeiGwOai}l`x|40
zl7@D;?X?2N^6$!cLG}yZJ{yK}BptIre&zkI#MpedL@@XMtf2oy^2&(#J^!DTd1EcP
zg6JLlU5~A(QO`^>E-??uyr^0`|L)RlCp$!~4V%_I`xw@iI_Vj*nf{fNgaM{<Rwa_`
zpMU5|;l#r1?gkr;qizN3GDA^0{}gm!l-;(>k9hn0-y2=|@_(6&TkmaZ34bb=;Lkt2
zG(4|=<JTlr*VS!*mhke9(U<t2mk&sN{)x5b1AkiigIhoTuBk7n{>L@?ogTVkjQ`;C
zsZ1keqtx_<z9_B;pXwvkK}eSIoBN3i(^Gg>%K4IT1ve|^p@RI%4@E^SnZ>;RD{i;n
z^WY3fabb4=w?{d2mkMdox%s<h`l+Jcq`)<L>AvG!qH=u4`k}vmVqH}KjnI>3qbn8n
z6XlXn#2*M@_(X*){Y?CaMg-=M$u|DpN56O2(57IwyN6!sTZqZ!(Ydsm5Bbc4FM?*P
z5Ia)IzA6M!Yu1I0<odVhux2bZzM;Y50OtMVgI|}tDraYFS}tu^8N%6bmo7N6ov_}2
zWc+<(TcU-la@WB?Hu>Ec=Rui6ikP(g(Zou>m)&AjYsPZ^r<opvvPz+)eVlyDdgDpf
zhG%oTi_r|p0NWreHpA%EJETwGBor87H+O4~*pKQMyP4zF2S~@NX?nUNG+rAxXS!L=
zc@HNi=Bq*5Vfl^rO~tnHQ^sA-uf31}pIn)`YLcF~g=BR!>@_)2ij4IyW1P7*>?}*)
zc^psQ>9-gc(F|?-%7-SGMWwrUDTd!!Azn#?kVex~H0#HP&@5`x1RSXSCuYd}w7lye
z!jPRF3LT?Xp=EXTMFIl}e?aQmzp8jS(T`_AXNCb2^=c^uG;+n2I`-hF3FQw-DZx^L
zV|!?&_te>PWNJau!^D`*gd?L1U%IWlJkQa9%9y87qAO`VasMjT$etda(wKmp=e`%s
z{^@dfnV}+OTUk@4ff~1DNjP~>z#sw6jnGIc?p)v%g(Oh)`K4yZsi!Uvq3F9@^M#eY
zzB02=cQVqKjG2qF*LgLE_GZ>726mJlFbi(Yawf`-I$l<?sn|%9G>@kThv8$Tl&DAQ
ze#Bk<FoEUa5AJ85=zA(ybkb>Mj3~w9%2i;r3{GavECC6=`v>zZwgYS6<2S`3fB-!T
zV|38kK-JqhG04Mvc|oOoZ0-Jzl}a9Vd7CY}4~oC|2!;6wXd<%)nQOumC1Oi>^utLI
zvVMh{%iUH{reB#8T_9%9V~cU--fuo0r@G1PIL7Rq`y4{4^M<L!$Nlh4w8vx?VGhDj
z*e|Cv>kgPdRT80}urE5nk5FQY({fE?(_n<8+)PtAmJ}AqQh?-~xvyD<A6kFRF&ga9
z4D-|`U&@k*Q1WuSR1&jhXQ}F{B30;&`Jp~1+<hcAbvUE_#XP)nP`TKxV^>g~mj%sh
z<{FaZdVkuJh4rSU4k=i%d9u2Vymyne9n=ebLfmlQMpS(J%1$s8)yO$z4pn!kAzcTt
z#EKmcuiaHw0cS#)i|I$^0~C+#`-tBXzUWg*SnMfcI{;l<PJ1(uILPcEqHi)u+c1X2
z)d_0Nuv1jt_(+z(|Edv~TrrVXY|p|;5t5y*(a2tHq@*tVhE`YM<Y8wSz{arxA<$EM
zyA<m44NbY_<Sa6dG&KL(D-Dy@xP`{@IHd24n%eo{ch<d9swWAf=V}+W#}@-fUo(Ig
zx6cQ_z6!wD)hO2FUF-p+F)Yq|@AW5PafNSa4n_;!xvgVYeYr_o;YTe=Z4Cq$qn*11
z%_z8HN#1f6M%$50aJ?{l+*KK4M%KmmPeB@@F!E;SH9<EDp;(IUyJlfrG3Ng&kJ;l6
zDA^MVm-h6<f$v#^Or-yHrmmO4dK8Wy|B)+};w^90zb>LF@XgIiIq|Pzv4OyRaa%K1
z#N#Dx!IW4Av;R{M!KbO~+5Fvjl^ri!SSS?#FFo*nO05`^<1Eie>?6YkTlZ#Wd+B>V
zN7B}6naB=W(!JT@(r{EVDOQCN(rg7=@41W)8k2;Y=BZm2k$(wMEngLyify>STXi1H
zH?K<4VWfYX4T;aqK}y<!Cz(|lFd-$9CnD;x9l>nu`Sl|ohJa6_&UJ5p;dR5@gv%ME
ziroes*Eu*OGFN;S?IW+!KDs3xmRHbhKM?*oGFuUIxrH{nc;z$c?&AXCwi5U8N8-nX
zf~Cnl@UesN1YBG^ntm0<ggZSB4~pI6S9Dnd__!s=m@5|FGiJp=EG+UUR|icqXkN}U
zO1a!k;f&bw4g0z#ZoCOi*HOKiUj}BcW&i6BYO0&!hk{=MVX*<3smV89q%^WH#Oonv
z(DxXa5+4mA8StWfG!;2U6?-jO6zLO*ROwL)w4z=N<~93@y%OvUvKTht5W!^XB3J>E
z4Ce#Y^*2xM{qp|d?cY97f%CECt)>0}14(z#^`s>Kh;#jowd7y(U4Qd8q$dC+V|Z*p
z?uhiVnTwlQ)!7hzQdPPP(+a!(oOGR4)A<9@4swS^zIABBMeyvWsSpVBL&?1KXYm;z
zg5>6byb-uyT|O6;vfvqg{yjA~fi{^3A0nbBzEjtUlOen4?Sls-q060GakK`4gxu+4
z9Iv?2=wbS!B{2=CF;@+B4U6nd33!h8`upmXb;8Z`<{_=iC5G!7c*`J1DeWI~{5Po9
z=eT`<DgOWn?xe}Jmy<u&Ak>07>hIhL-pWFk_h=~NT-E>sDP-~y^eHd^ds96Ts$}my
z1FQ{D_@@E^FYkAX_XE@=#zxWonM}gS5<~FRwQ)WfmEyq)IS=(`xc~}GW%QrENV|Q}
zA(29S;d_xK*8vTJcZ<tR;GB8kAoaCR$dtl1)79QNrKaK2Eox*bX{KO8SWMZE&%(Yg
zyX`j5)!*-N_Txf=HHa2-xITZ}ERCac@hxzocgM^EPDD6YSkn^Sj>Jcjt8jKOu~$EE
zZE3^%0)O4L`5`C3M#B)&S1jUZYt~r8l^tC+6m$=8G*FYuB9ngEq&NtA%Ai)BZYijX
z8NSQ)$;7=rIgMG>MV&`FvXv;I{|I+@R8jtMd@@mJ@TRFuh(`p5gthhM?4`~hBX0!V
z3PK|3jwl(JYexrBeq6F!;n9!d<=Ip)kR4I@h<NR(1QUZo!n*JIQtF86=<%?Wur$~R
zH%WkMuf9^31I`XL`G(f8$FRce6QrknlGeodNlx~tjI9WyP#CB2uEIIE)s~~O`SW$h
zd{knDVYkHXmIg!eIS=e&jS-a0oLfFcE12TTH9bw6xm?8+@t2pub09dW6|qL#QO#HJ
zl)=DT5YR1oxLiCuDcZYMF7*w~Zi9NZR1qho$n1hJOtX_^%_rWYvrb0zfC)koAa`<A
zx>@hC?jrlosjEn4&P=6Q;ULGfmaDQZ7)&y-9PG+Dij9uYrHC1QI+1=Szp+5O%s_a-
zRt@jyI`R!>xB&ad9Iy+Q3ANc-9eWD3Wwne*>^l<6o~J0NY3Id8h;VPS_PWLwm8Ucg
z1-k;h<nVrnD@z28O>kOJ(xOew-EC!t2L*{f)@EyDVWjz&vF{5Fl%BuUn-1>B&QGQ{
zm7vOXGB_dTSrI>e{q&1N_q4tERG`TOE<;?}uh&hmXdUP=FaVVukP!T3@65d?DTRpO
z36m6)g9>jbq~*1#+?<m~=mNS)-8kSS@FoV=w|^ern+_UytFu3P>;)Gkylh{m;i?*2
zk$rPYY(-qZb_eOt-Jm*Nbazr69>aq=U^<-p*)VZjn_HI@3MdddXa2_<7{XX7SM!DN
zN4jZjj8P`ZN>8GewTP3U>sze5iiloGu?Nsd(VG%7Z|u9*Rb+}f*x57->XwKJXB~ao
zr=B5ic6xMx;<5-9GPZu1G_a3+ew<*@uu>qZwOLZo)J{b5vNM#G%Onc>u_*v3*fcue
z#r`!`(S2^&yfXTah(Ip9n0}ScIEkNGztahlT_q}t`b%WgF9C?ZRY_5$*J${yOP9?K
z4`sv7^N;-TeqXd8)A|;wR$7>G%g1I1#XW(${?{*N<Eo|tUw&<`9Ak(}eScHN2B~xh
z*f0O=>z9Y$&~yeKw*TRJ`=ETCx-#JV1p3bqLmcN|>M2=t^B*za#B~U-@#b4D`Ta4r
z9m3YHRpKyLbTtG2lK@%9wJ(}(hmgjHDLsKEmq9juuR+)`5X9w`=Yu~73<S8J-TPAU
zJkZza*cbPhdPGj{YnwN<_&$;|uVr4x!=4!togAXYuraT)rV$xktx0;DQEcrjg4(4C
zQ7fRVRMD;h;wFM06_ft9(-<TFlt$z6oY6*BFC}>zvkMg{`PFO2t%cJU*)?aN#GzH+
zAmf@vbA@4-AQ=r^d@Tiu$eJ{DkK2g@q_Mr}^LmQioq0SFbPv6Lx#aI_h+3Le)V#}~
zHiHnEWJ6kk=IX;)K5wSzhzf!?KYAO^ki?)$yVi~Qg7UF}hm+nxj-xs@Yt(CJ-yf*#
zn%@dom)3looK%N@6}J=@_6z$uIU-(Ge<2!vac_eTm<2X@7?*d&?2h{KfU7N*8ukbi
z7t$uQO=DKxf;?-D`XZ)Z(m<jx`jq6f58D+i8Jk?wM<Tm)#qjfOT)r;4<`n#QD9DL<
z`$$w*FWFwDYW8D;Ec;^SSeUf{VQO@~oT6T2|1~zD@EB3$*pJT2*6;71)MGstAuUF!
zLyN4gaTQGsilxZfSiI?`5Yd&&L0>%&U*9Np^=63&-UbWsd0E~EiH-MmfPh*Yte0s3
z@0F4fokMV`^StM`I)GUfb@7R6S~+y_iPTLUg;mOZLwi~>?-HCb>lM?5J}kw9YHFdw
zxENZcZCaHr)`u$;6Mq-E3u4B%#u;HHYCP-;;~QF5TX&r}+*MX$V~)t0(p@x+6K<t2
zPul}RK+?FDcxr*xE?S{%FyJ~~X%*@3!YsR+Miwr3p)6kGO8$(}a+^GRLyiL_CoUtB
z^rNqZo#p@RfM@4hgw)+T!|Q55rDo1=AJu(Bv#Jy~`EtWu+m<^E@u2AE>u^dAqli(Q
zjyRl&(a2$R!L`<(y?hs+=n5d}n?2!vq@NWTge4h&l=mANtNa6csd)DuY<6D%t&<y<
z3Zun+ay~^pf>8nywB#ELC_m>WfpHrSRHT_&gF?Poo2eXAf|t-p?4{Kb>GiXP?;S|~
zX!nGJBNRwHZaQx$j|TYS>ftTVCZ4L}*`4DDJAuz*BiC1xkhyZh7l+ZNysdw7Ubu80
zxRbh`!Q=KfUj;lpxPl!G-XOzYGQ9OprgowwAFug~9|YIZONq8d*1~Dlzc@YIku6Yo
zaw&1K<soqllFAb%wU`xnwu3T7E9?ir5i$JvT1zSheI0^IF?<=(-_WwWZ<M|nU-ZUm
zMp{<ifonZU(zat`M}6_YjGM9_UcU#tkJ){i!u*bgbn&#=!0M^I%CAAfEP1Ijq(fty
zzHE<^AWzN!Rg#f`6>cE8M2yoA(!oyS0sxQdNu&N673Y%vd-@M#^b?Z5MfJP<HK*j#
z&2#wr1`i=FDxntmQ1nzqAHW31tsh<yo~hJ+hV=yCe;&Ei?=2Od**gQkfFLUco2)j^
zSw%{QJc|2mx?+fwDwAa7Xtv<v6!II|8D}6{UC}qRuu5aI{Q3Oggjs{n<rCW<RKhND
z?rCftMiak7m^LKAWfjF($hF34>WWZw{1lmE(h;K*3UJQF6h-Fz64vHrt0j8>u4fYL
za@aFg{L)P|n)kxHcw9?JZw-VNvPeAVaK7Z4>x9<({PP+-F)%+1=u*NpP&BKbBKwP8
zTZxT(Z%vJB$)^KcrxP1LX5Ae(t1HMO8D8RYaD}ioHPvWHpb8547}8L!Xn=`8Ema*+
zl%oie+)6-x)HH=B@uiWdNODggf?aQl34(&n_zsKH08gBP4Eyb?Mrs8bX=%E*b|GY{
zwa=k=m0#{d>ss(99h%PSB)e9u%D`k7>EPthY~ylM=rK9pS^G+nUb?S7nR!{$*3?3$
z#OJzM|J+XhxI^60%jWrtZ}N5J@?`^d!)AwbA#LQ6hUU7yfsY)vnDJ<1{Ap3n{nV4U
zD$+*`uBxmIa)}F^z^KbHjbepHb6wl6h-q*}Z$gY}_hmi;bP{+T(VQ?shg3<841eK-
z#FWUPK!q`b^pX^~1=Yt1O^n{B?aCbAy>6EpsT4wka2>HJ5KKCy$><3xE+k~LmeTZd
z><EPq3!{tfwr%+2s%g@K8?;hxO84Dwu(QmDEtbdII=DM=w52MiFi6)6<6c>=wBOJM
zX7<~5tX2toY`&r8)V7994fi?Z{i9`yzj{u5B{mahuAvT_4nkIMr^CO54hA@%iSCTF
za@33Jlb^!HQ)Zp2rz)-(AuwfTp>0PFaIV`2IR3%DK+`67ss-<biVn@gaJP)ycUKmB
z!%p2aWWSy;)krzi>$@F$hBq5Nmk}dv%324jZ82KJ2tXN|`BvaF*{nQ7Da5GAo_sfF
zS5$0ilruYSnU61ZNNOsnu79t}h^>+n{Pn(FAXa5-vJTBx$IDU&KBzNJn&xQxhL(=s
zb9V2*v;M;?@-yHl%Ee>51FGu8ESugVc=CE~^4yH<Rh@R#zoD_!Q|eRxp;B$ac0i?u
z+ji9EhT%M_(wJF<9LjA02LU5u%Un!yg?J8p3YyovZQotJT`v%XTcLvcb12;FGqv~C
z2*l}y3gcK_NTL0?L)6cT`KwxCqCDpVEsp)ZzW!0O<B+4WtxU&a;nx`MuoS9{pVls&
zG(V*l(Y1m1FJW1Q5{kK@1J5k6uy2BYWgWjIR1^7-agsKNNTIt}E|OU0x9ayZ9hn9i
z0*fy{SYmOt!AFRSBw`(C<1lLFL#X6Uvxq<~HaOMdj5$QQwW_ggm~q$X;?tjG1hvz>
zf9d3zM|#*@EE|0{>c&KqpO=1|aums=a`e&=xnL%&%X+?0!r$teP|Y|aIZHqmo+7lv
zlG#TVtIgtvg!?J(?k{kj`TPD=)-@a8W4*;>`7R89M-5;B#$nx1fq%%!%Ou?`pc}V;
zD)^)Plw88%=7nDJGZY$`MssT!XG-wnx|H{HJgMMFX7sr&AyY9or7+8`sJc{aCz)W0
zD~4sKF!y35IJS7!I)<$tw__l;w<qM9NWxGNp(_F4=JBbwGyW+lcvKjFSUKozcL*NK
zPCvZUf3l=9mV!6GQ^g&XEF+l}>+<e2dLm|HWCXTcP8Y@xC69_w1x63Fv~yWoWFCKW
zwYx6^TYUijoA(_Cn*gcp?;dkMo%kLl!IuA~{kU%gv31?4`YUBTbmA>&`lLh(9Y|I)
zx`b4NyU;?uFX4X|JgLg)(Mcwbn86xgBZ`uF-iM?Qrh1k81i4!<YV9!b4xAb^YF(qp
zh9S<GxLK#b2FZc?TtxuL&x#~Yxbn*k9D#@jGO(*?%KOhEYgt*}sT7RN#x#3INq9#B
z@zlwQfr!|^!z7H0-hr$S`zaBQO7fBQSxT{jgIss}z_gIFm^1BGMy254nk&9@60CSH
zkgJG1gz~+cii8?CbnacsQzd;>K9EF1+iLSVK7R-E5hN#p;bqtgc`W}XD806vyX7s%
zOw^8(!wF_mhmwHCVXgeTE29(YLKdpPSU+*Ft%P)C=vA-;#kf5CZg2ulv7C9$du%n0
zugF}ToYDgUhw7TNsHQ7>{yGq)Z{r~{zK3%ut_4b@gNtl*Jgx?`as}Vb@o#8IWk4`i
z<h$~g?UEVV3Q-mP7%fBMw{KUcB$YG;c@WN+h)`8Dw~PuT3JahX6b&?VxKpH>7k@W0
zbu$Yid9sy3muNo*%tzMD_4LaOQ{(e{?sNd7q#LVUc@X_@{ke1|`fq%sp%fVassS%o
za!;mJ?i0b!*%KHLKOtY~V19s^Jx7SZw@bK{IB*mAChXDWaM>@@)Ix|ca}Lf0{m}Ds
zvZAF&xxsQq1;>W<jnT=~c!qq1tAm!FzMU!AlLlCZz8dfYbCk_X=m@NE+#2E=lSWS<
zTWcS*tb6<dw>uH+;O=t7aC)#_96raF6c=t?O<C=BLT1=gJg}nFe!owNY~oJn*w`F@
zKykKr_aCk{eAqf^qmj!x)gLYlwQ%nj&t&2c;spP31u1M%%1ReuO8hB*S0tx|O+(^z
z&7VmWL|-zgj&gWU@(etI05gM<Zjr0TG(D8D2g<nxR*0UN2_6H1C?s#nMao-VXBGY0
zr>WWhD21emH+e?GdRH-kfIvdhCvcl-jj$gtlmT0jB$<oJRJ|iVLh64P!~hmHUO;m<
zlQ7ACMUAnovxJ-bnb(4ntOyD5JaW=!CCds7mLs>dEEgatuvwF)l82j`Jxh!Y$YhVT
zK0ZD8I8}CJwoKXiXGW=%C#+2ab@Uux*fuAW+oG*BfDeT;LezHYaMxtY>luaXDwBCY
zFXptfOX}u|CNk`o`j(Quq3Owqj)&jYh?30*W$|g!>RUrw2(4j#^f0<`f-jMlIe-_d
z*sfS&lV1rz*hIT#FDu)*&R1ckxO^3G9+L+`e_XR;T0xm1CON*%28FSD+p5mr-K!N@
zD-}AZs;LuW^V@6C4ISDrxa(IsH5iKa(V4c!<5Sb2<RhU~70=j<wi{lg-_XjSxm$?j
zgcLJSmsT{e|Bd^F#pAxpKZ7ryiTwYY!X{sRtqQ$#_5O=j;h$U#{~Lk0GGKu@_Sfz|
zi3PIskHGccB^;LL5-CbvqgrG2g0*Ab%=_0%Ovce}Sw-k;bP3hUNXm8lneSeUWF?C#
z2OL36Ki%otEXmwiCsN^`his#$AUJ9KZme>b3lsAoJyQbVM24oOSvHnsHfyb0u{<99
zIcAo}y-f$)h?}^m@pRqtnl@4u-Fga8mK9DZ7*#ki?Odo0?T#X|)0i2Ep{kHImDLQh
zt(@`VM#r5q-dIQt-=kEZC-KK4_qERNP9F4Rc{y3jnPqaGrCfr5IyE$Pcuo>&SQPsu
zv<a9Uh8i+5Mb}bnj4CI|MkmlFra?YDu9FW%Jzu5efgzMF>QF=(Iv0$l3}J0FMR@d_
z8oH;~B`+5?a<}GgYMP9|W5=w@Ba3xq*p<CzpR#5t>)<d0gBtdHcHvx~EG5r8b{Tfb
zbjv)D@H<!;mp)WMqFODBGO~=z)n;@9vZ`ukL0?T~)Z6PPQeAZvSCypiP?i+$sJ_Ua
z1GJqq;MQ!LNXPbTNuLn!>Avg(_*jxAh`xlt>o}lb6PA4;FGI5yv!xuSnA;vx>f6H?
zjYUGl$@=T#H<eG#u65n~Uj@k=<aK~%*?pD$napcIi|c?;*{>5q&86A>?*SdUP9Ooi
zjU_`0C1`}Z3wtcXXh)M^nv|<yuS-<4f$1_aNkeBBJJ<g^K>m@#2&!S5+6Kage`UZs
z9e<2ekBAm-sAc+uY#g0s7vqZ?&+k&!OTs5UM}Y4`wP}08y1VE>5GD*nhs)`a{HN<l
zW>pIvw97ulxKHsa$m|wyEI>lh^gMix_Xzc9vLl}<)182a-69;2i>9$eO#eneYabdD
z2NO#ltvu`=qgM9kI_&HvrZ-4%mH98-yaPgHsmW&Q0!--|AGz39SgkZ=8nV7`1;x>)
z!$(hHD_|<fR{pC{2EH!yuVu2rtL>-cg@m%+w{~x7WLah|6F%5<s+nvjaNv^);Hs}K
zuS4lc4fZ4`c}l*%@yT2=^w5T9liU0@Ge?!Q9`PPs?j~MVB-n~pV_Y{p<+CZ!lGzw=
z&ShT8(l{eiEroPPLPf5S@q)U^PP5E0jaYb*cBJj;fRu6*N*+AzjYo>RD!?WJJdk}u
z(_AjGL#3ZXId_&N_t_jTUBcQv5np<Q0W&o{1{^fbfR7kEaXj7Rcm@~vE^m^11>i7t
z6?KIf-|z>_RtJg`9n(f`O3XA`N|`>93eI$HXs@)*;{?hMOtDTsMkrTG(--#a&!km0
zpHz9DR4q3giLNaPC?_XH5E)p)q*4bS&vNnMYgMPn(FjSv!)r3MaLO`s=bl^$Fau7h
z3}f)tE$YzaAzI8B>)<Wp#W^~Q+B&1C0a{5_I@yX1V!p$;od*dAHwXRcE?gza&{KOe
zPWRO~z%KeOD9-Q=H3nDeDK)w^tju$X1B{hM2m0B>+2Z1GvA7vI(IKi3@2CMI(*xr4
z=FT+^uD<}$A%BnikFoz%io}*tMD8;UnlIPZfOV7LPh!6|Ue1Brkxqj>9dno?Q4>Tv
z!R^io$|m3`H4ZI<?=zV_XF+SPfAeeecCg3bw#~xDJ&kgui;{+`GT*^VB0f$SAVEcY
z%O(HMUb2NoDH2fcFla-4YZ*2!RViJ)6dC0Vi2_xqTzM#ZoL0hYe$3s~O!;2<NhvBi
zDfHE?(!}o*n$(;IlOy-i)fm`X)L{cBEYRbGVK*dsEO?Dpp}^1MwHEr?B8sl?H5~=W
zjwx_yl#5oMUF_Y2glh?-KA0R7?8Yu8ln+@hvLCcK^3!9aA2e|SK}m5JhvU?3obroq
z2&Q5A%qiJeO1a`u#Lt4}4q?#JW6JnYjA?XpniWAt6x~>s^aO?PQUa#3Pqr@jD>K2Y
z^68cbK(dQofSD@q5a=1VkAWEtpq+u`tY>${$*uC`Z7aC2^mn^lB(uYCklsGAB{l)+
z=kFquM6t(V2r2>F=dwPexlM3eANbI`CZDK>y2^}$wA@08y}gxL$wamWb@Uo9-WWMh
zSr7k^p0Mf>df5_2*3j&zJE$V~r*zkcUfPV3$=kuI@z3t`eA;@&*htt2p3@#u3Zq+g
zGZC&*;?CB&!*HzUu)<C$Y$hL&L0{*vMF6vcBOK5_AQUWI=3(~JkgeGI$md~cc%_U6
znf|hpLu@+0CovKVHQp<iblEhG_6T~U@YLcUcr5EmN6*Je;^ckY9Jkq6>hYshX6(ao
zIWZ8yTMv7!6e152aTFmV?_akWhh9X$@M4Uj>yz8rhajqU1?Be@*|e|L$R=?Vqolxg
zF4w@ewS@IJZr04Z4+|up(!8`I#%T@`@<FV8UkH^O0GRUn8h)?JeS91FuTKvHkV1Pi
zwpoV_c>*Z8!6V!Qe`&u3F!gspK6j^~@$Z}F-WGw}Xu^2Cg|MHPUv0m;V`<VtD*N|M
zdw-h*_)k&p<aBPdP~xF4@!EcU>Sp}ta^dN+hk{z;ftABYjm2q*a)p(0sSAu1zqdfT
z*wqTwuU}dLX)#7C1E*V^kw5cH6f-Q0OSAa_ki?OJ`0Q<`#w$zBw7be;^vUWj!E>|C
z82u}K^F2;1{rr!~f5HBL0P#kQ((c>RQjf3$%gH}v+fAKMzX0nU#Jr!5_-^?WeP8;B
zO9wD+4_qxWP}g6`uQyI+nP<d@wJ~xocU)K!vISp<%RIO%Wqv|UP9**A-Kd05J}ra`
zC!%sr*79(fgn^6yVfFH|=~Bi6d@=4RQz?xsNQA^m{F34QdiCi&PkT?JFVPWzce;C`
zfnwX7l0r|`C&o|y)pC^N)OZs{3@>6H&V_y<RbI1%+<nDzKJwNM5xzUp73K+u45>*&
zY@#N3>^!!XI8A;K-KaFM<lL?4dc@ErFoch3QIoJyAj-=HOrHnQjT}u%-7H4{Lg#jQ
zZ3%lD%zoa}LbAYT6A(JP*rZhAz{{DH3^NF+9#oJ4V++n!nv&RX)T~&hE~>^}RN&G>
zmdNoDuLNj3&dSOLvoa`=Wdot5=(*lDHYZs&{0LToc+}d0uVnzf81`6(CVh93Mq4(j
zC0lW8sJ0uWpqQi;VDL^%eHbD!swJ5BTgj2<G<+O&*7u?$2Vt=~F0R`Srp@VMgRz-j
z!%c`HB=bZ`F(;=j79lQpk6(*OM?_x3E$ng0wl3_}8&moyu67P6tLr~|7~;z*prdXM
zK5Wr){e!al<zUA6?T*vhz4)(hF9K^~ed}Uh?9y@!9fS=X1Un#7ccNk3>6eTF<0k1d
zWBv&N3pRZw4*V<8Fe*iJf#lAT!Q?IoDR62~5`Fsa<uVTdSa4m%{TsJGWB|Czf-}Ux
zC_0Q_%#|^Vqc;`B+li3LECAaU0m7i6ydg+ak1R?*94|_XsjMLcvcGpfg(wni<AN0h
zyj88<KX%Dsn?Q`pg>*5gi`%<jkwVW1(Q$2K{7Mw5K^o6|#nl`FFRip6#@he%jZ;zL
z+M#Bmo)%$kg>5Tg<$@0&4ghzKD=CIqya23d+&38ON9jdiIIO%z{!y#tBERCBwQ~A}
z9p9V%Qs_2sgC(ygi6n}z2`OZw`5y+15^{r<Xljk4roN%I{811<_Agg&*=<(01fyfR
zqS~rfO>cN%c9U1qcFdbfs^{FfSr&04Xk4DfUY?iem3-nUV-HcSn}p4kyUnejZa_?Y
zLsNxw7RNVK7}pv{Pv2`{^DwI0FzedK$#EC;_;|CtbOPX7v5SrehJ@w0beBx4)mMLJ
zZT#!cX1l&#(;5sEtUr(D%QN76H8vFA(6-1Sr!Dap$UhiAT4JYwY`V6VYlLXjZe_#z
zxcq}D<i&gyPF3PQzx_l#CGG?mIV{C=&;AemJrxxTZp8dGMg8N9p<zfhS56e&lJdKq
zx{+B(=94)%_iVQQlTomF`vJLy%76p%G)dqUTMa*IEmt^)T@U7>vMi&JbZ@{Rey(et
zBZ9|Qv4yHIt>MXTZzCdFU{y0SG5qCB=GdYZk@`B(JN_-!7vg*{%^$c`SxPD>Qulc{
zH?kD8Y<(d>x<M!a;~(YWD{e!u<`1zo+rYUO0Zkj?K9C4s=YBCKfLp^=V_A`FF8nMG
z^;(o#Y6jgry_RwH71=9<K}EN{0)q67igm_aoz&S@^0*g@uOI}Ovsk!WgZ)hU3Ms)l
zORO@bJX{M$e56<weQvM=LX6KsvdIw&3F;{yF*U~r9Yn>ReYe8vvl+>-dxo6krPyT>
zBcc(C__Ru!k?pRtK2k&Ycd$zawuAc}1l9OmlR5-zYG&`P<5}?$cI0#nbUfTg6ec3a
zm@F`ylehPi(3+K&?Dt|A8XZLVV1^cL{x3=f$eeSfs`M?EKQJL7%=da2uiGiXLC+r0
zOmgwJcbo^>P_#8!N-rT-aqsq;hKJr|qiKkvy;GH)U-dqzdUQ2QbETGdW0#bW@KsJx
zeiyN{gL%_++4cTiqj5IuQ0u{(UH0@HD~jo<A&Rm*Q&W5uNz1^J03O%t%K5<q5gqw;
zNTfM3+tW}O<E^BRKQr!Wa`;E`XhtdJu4P$e?X+L+DtI)*!&DtHdg3|?`N+BpyP4U#
ze}&dGm^X6prp;JnOL_=3ZYt<0w=)_XO~r+1&=#nVNqm5PdiYKoDlIJ;kQ?^Sq`)K<
z`uHG%uP9U@bm6y%d(;uKk>F=L7W`R^dRlz7iXP2nFW+(+*Tk9_3jRy~=KtLL`M;8C
z`dCeMl`ORUjsaN%pR?`z@wcVVbZ-4`f*5?;=ho{@2G3$sEz6w3Y?XN!)<-E>6{Vly
zSqk9z8HqjikbQ73R=P5>#^xTZg3vh@)@EpMte>c%?uv76;LhL`I<M3@Hxzx5of!HK
z`*m2q8#m5{I7!UY^Ca9EM?DI;FHqo^Cm~$4U#?%fe(NUinf709TnCPV0=|xpdz}l9
zM&bs}eeOqKd|FO*69UO!c{E&ZI{)@G-ZkNQ{@c;Tt8<=!W1+-<*?6-V8t`)X`Pt%Y
zLuqH*Sffe2YD#R_@uFk4T9p&$q1dWv9AU4{dnR-6{+n&aid@>DhYqT(ST%FrPxKR#
zpXi&*VS(#^dA)8N#6=<(mc<#7`%8unRnJ=n2n=(E<XY9~A}KU6dilv>Q}%k;DWuH}
za(gsa#5rf?m-dG)Ab%_u*-frCZuE>rOf_`KCU!%p0so+~F9VhN1UBd;PVKzAQ^T~t
zu3D3TYU}fz`p<hTyW}ww2)|c55_)vav(BSfw6#*dO;x=5?V~l0&U>%99FN&k!_;s#
z*~NkK&{FMhXrS2|^4B7c9tm>N?hD0eFJ-7>+MiT0w@Z7xC;JdRGEQ|zy+7FZzMvLc
z;jIX@((t6QZfwU8@_fk<Oai7p0m+!rCITk)@8CS9KsN=`0+65%b^rc<nIIq;CrRKK
z^8tukpumBK{=gRwSHFA)H;H$qy}H3c*i=E9GZ{Jb4Q+a|nt}sUNIm}=!xPeH-_YpU
zs_0k~26~Jg>35PY?xxSRVLi&RZ;HW1iV;?;zLqz%8#~cebaJivh9(b1P;^?yzIv^d
zZ@0aXV_$D8j+~r5Oo6c{zkJF(z}9+Wt(X~-%{>2p%z<;M86@Z;Im68Ln@|fwJjmnS
zE$2MN6fW~E0)0|8SdtBHSW${d(M=JU*UsVN<0V%M5Jx&zdqKc>4TNC+`b0Y9%@*&}
zh`ekJ&YXIdWYUVHz;O<~D|H_=O!A`bLVd$#?R}*%9YakTndK8Rrg`!hS)sC_-nc^2
zr(N2kT5)JRh5X=b_`AEV2+<VmK0=!}H>P#G;z+K2$eSh-G=_$Q(W8?cgSj8co@?nb
zrxL2{m}D!|G6g-H(3g<_BNvQ_vKF*b?)TYkhMKTT)-v`cE9V(&&h6!;-p@)=W`;K9
zv3{mytp&VQYfFykUyMA6++Hsz8p5soR92iY?_E_HlDpHd?d?c}5%*S7i!6OcUkEYw
z9%G|chkDm)^+d%B*i&4o{t~`W$kC)7Zf=1kDX>x5h^JN^S#BN7(yS|1{qFuZwD{)6
z<XNb<T$4xKvGe-)cI!IgbZfxrZ1I*4i}Pn-cM|5=-s$nd3p$H=8%l{rInKCmXyo&G
zDxh}uzM&MHSI{i5o@AAyj5JmFI@22N<f;wj_$rnpDzJ!Da{O-8;vGz)N9)Xuq;fps
zOct5fXvp(-h1=|^lJABKd+o&B4a_jLiU{RaZM%~?GP)S{%l4DRrE!(hjt_*w&&}Ji
z6CO8LHwY;@T9b<9(-bIv)LnR{GDgY_!BT&kE-`IcJn1=pV<kiL;o^G+{E+KRE45nA
z5bLLzpNPWH>gqx}e2$D4`PFAa^RI`?zfTAH&AU15LMllct58GI5Z$s5m3N=^Sc0j{
zn8H<iuP22$EJLH?aiIR7T-=nHoP?Ro?OLshC4qZo8ZCMrm{Zy7*Q4T8MqwM|FEXk{
z+i{E)AktrQ4m<LcsQ0D$j+>sZKZ*BsY1?fQzCG8gsnGq_|731!(2w}WeEthZoN>MS
zs5gT-M>m4`b+X$6hK{l2MrXNUQMtGH9wjN`x8qsJenTT6x+SQ~|B75p3u4_h$2BtR
z|E1n$`q}5V5Eyga?O(u&*9V{s2%^Co^u_^n@3BGA4MZuAWk|%5;CyZPo~$d$%(cZt
zU+ymF>IVtsM(mVCFKRyaQ+O}*VkDc1=GTx3TXd$qQLYa4UiHqK!Ju3{9DmA^BGe*$
ztn?W+=uW%x_0x9(SgekFQ4y`LZsVF(zG`BBV7w>TfF39C<wPwFFF-x+*V+(b)lchR
z(vq)Dc*&~AWo|7Ac!86FFUU%2GV7`CK5*eew(W%4$?$J}eWC{T_!PFNQNgrUe!sK~
zSK6il;yrM4QFEtRAVwI^d}vn@Nno)N=_J(l0pTeV>(E_N$g;N+$#Co8+O-b|eN5hd
zQ#plsL+h~jH5<YOo;~kzaen<^TUgTnWZ>q4+d@#5ocm13VX@{IyEF6T;cv+^7X29S
z1!O;kTBvzsCacdgsh)`6yq~3Q6NqK=g{Esl-iXXOX0217ZIHfW-$R)o^O}R?*5i<g
z$#b(w2VBzPk+uiVG+ANWTA5gTpD~|ut}+H9>9dE?c-loG`gCG9g89Ru=xSU2*|Iw9
z6SJ!MmLycC-&k@!DGAD?cn%$TG88Ul?Q5T>d*t1)`Dw3Y<McA(NtM49s`p)sfC!Ee
zzw^o|quiqV)~RX#mYn(WgWu4>w=|gsf59XSiesfqHTi{<X^u7h<NL+zaSrAnS5-HC
z`Kl){;wX&a+>(km;>heBxe|L-YvFi^a>epDG_?HI$8vO?RHv?7uM`#zPT@L1RfAZ)
z8a1+S0-4slyw0R(_VZl7f(Jcir|HZc8aBVS_O@uv)pEb0LyS^_n<zHSiNc|X$$awA
zrMRxOIoQfLTt-0Tc^JEIEWDzT5<L0&l>=iu0-HUyib3D^Mgs>%i@>{(;X-Zr9Gex2
zqDX*_3d)|9?Bl4slVJ&a?CTUd_fT+t9$(Y~E5&Hpzxwg~j^&o<<0IArQ6;8P{aN?L
zlDcubIii6BjdYhyat}yaY)Bul384BV#4U&#1<F6`%6?#3s2ra;^7ampu9FlSGVZ&7
zUr@qWNvVEa+(~m5(VXqhUb=9wP>*mJS2YqQ2DN-c6TR?(&1<eM=ew3JAcSZ(`5GeO
z159&l{``=R@Su<{21dF^5~BiKyRDZLvYXx6wR}Ht#jxdOo6{jlX_r<U2`oi9Po?wI
zidj}zh2&t^w67u3_Z+^HUE&SLgB$9!-V~D#<Uq@!Mb3UeQ%SIK7_sq4#`QS<2mmGy
z=lnnc-bc)N6JjAw-WT_!a|sh_-<tij^{}s%<0h4daf*6X=}^rQbf|O|dRg*2d0NI9
zA}Q)k6#<xjh&16D-p_TI(1FrfKSH@2omEYH#6g+huZV|zEeV{@GVOhc=0MG_25D~~
z$PjbAa|obaK0sDA8^`^{*)Fu$EsSRO#+7okS2bA?2W)}?<4PIYRWq$J{U%==Lz>@e
zt<JF{TtWZH%9En8u64M{a9s?}lUK?!uB!1g&+I#$!$I)+|Hs-}z{T|>i^3#9f`{NR
zKnM_gaJS&@?g<WqyOWUMFu1$xKyVl=xVyU(+$~t%B>%g6_ujYfzTNkIzdkd4y1Jz8
zNcHKiQXl<Y+|(K6&g&BX{g#C3JD@J+fiwC?m#A0Us)_c{;(nCCl6qE$^AaxgV{XD&
zT%e1gxJs#|*|toz)%oQ!;@k|`<4n0{#Kq@#HZSx$o{}^iZI$=xI7If^tjuYy*><3I
zF?}_}6<-OSMMb9Uwd%edv#kmE3V*^eDM9@9yIlkG3v#|;=T*jN3oc0(1Qct;_q*(0
zi4Z?>8$%~veLxhk?{?<Td5#7*;P#uEfgCGz7mZU(e0-SwV-+J3`x@X)L1o$YFSuBO
zem>@)eC_S1B6SWk<p!PL%Z{g4mrG=?#&R)amG_qM)@fG!=+dz+2Ze<j+$4O9NHgB%
zOBOPR0F^WKb9mq#C8;b0;{ETlpV7?2jP;q07~!RcrjC?KX^uYdc%8me!(`?{l1U3u
zaK#0qQ6yM71<*MKaB0OA{EQk>tmy!;ST!@n30wMy_<xQMQBVPEzx}AVIf5Mil_>?i
zAL|!f%{tXbAbB^j$n5JGkr&8O+2T)1lj~@ysA|C0rRd?w!;$hEX4P>dwAqk2Ixwb~
zbpJEQtmS7fca*VXW)wF&dhbVH+h=FUO0QmTXo#}2G1tU7V&8gY5IZk?{)s-pg)h?c
z4ofvBzKm8SA64Pr{ODQ!d<9w#^D_2JLM{JvwQZ<*pi|tO<x3L^->9}Y*1DrN5Q@_q
zWH~b&;1^B5xV11!|A@q8dhPeZ@q}+#DOz{7rkN$y?Uf9la#N=6iA(XBnX}eY&REp}
zBuQe@?+ug?O(m3a`a=3aLXm!o1q1Of-3_IypQbNUg^vE;Po`YuGp_@bMEf34wU*Cj
zR>v~U2+i;)mW>2v{_lUk;GS1aTh;PKY;z6Nij39l6|iZDQsD)ZOrtWAD_F4_5?{r!
zewoMo;M56BSv#<eQrij%2sXh@P(@J>2kwi+G18bnM!Uz$C&{2-RsK{YjMD`okg7>0
z#g}D~_n}1-lEu$+#Va^9L8l;!_u^JQCG3)rFNe&K!_6}*$`>gmI|<u|>}g|5({3-Y
zejawukgv`;z@shB$$qi@98c$_@KY<`Mq%&z8x@>P!~}jvJe}w0KDt-(wk|OpN{-~W
zqr;;86<wyiVJ`=xYy1#s!4Q1<@-MhJ$z*+>iNIhqfA_8>a#XY6en7we81y+Dap3#o
zCpW9@5>9cymk&&h7EO#;!wpLH3bSyt&r?KfHMQ{|uK-0MG|xk4lwXsBrfzM8{0}d?
zB}Ee_R1Kx&eW*At<7WSysu38xzhb%-^^jbHIG83zszT37+zdDr4tk20-KY5~hzgyh
zUCqxV&Li7pKdJ5-k*)?~(RbN7zvR5eJCFSMAyK4Mj$P`S_Y*<9bdof^m{aU|BrEj3
zT7E(!LgDogIVy#TtzSTfh0`0>mnNxky{6}F`?t%bQ6V~S+X7bbR{}q}E*-xQlCv&y
zZ@euM)!7ry9tIyEn@T_9<BYSNE>-nC*>(#kqU{hP_l72%-=hoKm!98~j;l?)#-C~N
z0ZnqwHhz~}xAU?LaWpkk6I9*jN}RL2Krl?4Ta{DWF_f0Ax|7k5nx{qEJZ)*a)Vw@4
z{)6F!pqqF>@^?VK>!frLYTD<tM_#>ljqQhC+eh3-zNEW|?LF7b8OQuSf&UIC0Z!hH
zs5K%L$|li0v?U!`JMD>TbV?67bYZ6vwQ8_1r`hkQD$p|+4NA+~y9)EPCmPZd#BWr7
zl0m{vAUDm+T05ZTW_w$4a6~L1sZNO?Ckmf+DhIzAxL5e9-x&Ml78Mc_H8<<7n^uRQ
zGF|Lv)=~`<k)OhANn#yHuc9hl&Qb__Hp-Mlxpm@Av-z6dP@x^RDiMAP^lBBVoGc-<
zrTNjY>N4}y_VDvGCf%(nMpQtq1EJ)t4t&uDk8M1il4{)X?e1sQlFR`=m^#jf1+%sc
z2mb;A>9;!m{Et2kQ^#MEv%q5uzk0*W`X1*ko09T}j|d_v_70z;aaBJ>WmB+=j-UQf
z$e;gK$WK<?E>?%h5GPN$j_VR04=SGZGm+j8&$Lp7+`9P;$5(P_d_8GcMqXK^a+EDf
z@p6xi6-i5Y?6(N>nZJ5_eIk(gIb<6+;qw!!enkO1xY>(#b6e7lF(a<IU!-uAY!jGA
zZ)&T({%CvO(0c7}d9)-3VZ)HWaq#Zz^u0J%9MENcXz3rM%R#<6=15kGF*u+Av<yk+
zP|$h!N=NXA_HVESb-7Yo4T_g<M%D79gX*!J6|@5uZ&@p@mMx`}Wo>U5HNV6I@1>J9
zopO0Bm2zTRkHshx{obCkmgiHg^kazw5B#k|mGx(FC=-_F85W`g+=LqAQ4$^UmRm0(
znvNUhqpAHUH=4iZ9fz|DDvRa9Zpgh;kx`n7j$G<<6JDXTuGQr^59wZ{-3MlM!>Na2
zbp%)XVd@k`O;}S?J`xl<Bs2ake6K=1#7b-5xg6?Vx4>+r&NXp(h*x_0#g>{zidntY
z#m~OPo#ZmDt}x5NH&=FLF)(3bveW2d%BF`A2+Wg6t!&w-9DzhVaj#o~vhGlAd#s#~
z$DX7%@`{tvD61EkZ~ZEKn^?<7tQAZYtp5Zno+2&qh=~F$-s$>#$W6sg{u5HMQ^3Eo
za{r3D{&oUG_<M#CPvu`2)_>;$L;o$piYNLHTNw85@OKI;7{y=Vcm5ybzsVQd$xVXM
z{>F%w<N(a2O*ttK!%qH0oYa4XzrjO>Lw@JYrTtg5|G@s&BTnjnhHH3TRm)mU&)T-T
z?`+mGv@j1dlS)aZd>rr-U+j*oi56X{wKbVeTJUR~@dc`%vcYL<#kr4ABN<(_j^Ene
z-pn{`&P0cgY8=z=oU!kc=se89ck)1VA>!nLgx|L%vthTlexRs)rN(8zWkBCEEhh|0
z1d;0LiPsUR59!_@#nC5sNCS0mtrYGx!<-7zN@Djex!cm+hiFG%vWBVBu?Q^j_kG{w
zZY3Yc=piHN-Y{&g5t7?D<BkWKD@tpW4IGD;^;0m?vo^6>43#-pD66TM@AKON5m`Gs
zS#Dd|5X*IAHX8a0E+A!(d?A^*flCiabZq4?QwRbhdZDa2(o_~5o9^WlxIMsV47RWg
zY9<cs&4x052yE}mPN*N%Y~%EkG>DP+^=$$N%oupK$I+eS(vZ0q*i}M}vm_dW7$4Ee
ziYux6`^E|v9|pT`dWX@Pj7s;xX3y(o>|vU*jm<VIX9gLGkGz0b7L_>G+`#p-Q;I}#
zLF~|B9tl*{Pmz^oKcLpvOXwE_-V%89MY3I832M5r*bXN8rAI0*B3+jAX{xS)i-20T
zv>qO<{A`Pj25V^tSyH;)4QBUnchf$_z|D6leYHXg>xG@`Q#Yq9oHT)@wY)qjfS$oA
zN4a>@vGrSPUlIi#Hx_PRs*MX{c*V~fm9G^z#3*9u1bJaj9%Hekb|qH|FR4#2UfX@F
z@L=l4FZ~6FBz%b<?+((SDNvz|IeH-BBh84vD{iNG7cNE9)$OlbyNJzTP*xNzOOuP!
zORz8LJETWuxw&M}OZ@3uA>mB;y1)u&?uHCc$hzQH=4C6Gc}!;qiIm)BsmP>*-AeDA
zSmuY;dS_?ZakH7BM`^yJ1M{QYqN9$WTVC&a$6;@r-Ju}`Y|PglcQKEAD7s1f7<lm2
zy?!z^Y(kQTtSv%^#Y-z{^1F;h(x^I5U`9cQpY+pK*N2{D;3Li42RF{isum{M!@E@C
zqw|%vZQ|+Z@xn`?$Ti*T1-7@7ixZL(ZSc;&;C#|mAEIHF&I?ohifSWRY?B|v8(MRg
zc7w_+S_EE?i$y|#{;T(>GE|MpRyuegOou{ZH)_rnFasrrF-@dRD6pMcFCdyz^18DQ
zLN4SFF{%R$YWE=)Bg%vOGAOiF$gaNCAq@N+aa)^$#L3A!%ooGd>6rx^qYI{}wFZ&2
zgEM7)CJ&*U<=v<@gmj1Q&W?N2ks{L0XRoU%o5Fk~Nf@^Gj6M%&my8z2o^$Jt^=HLb
z$z+CpD~khoMf*F4XT~V?Px;p<4w|D?x`*@+C`2_@re)K%V2+<rb5K#cY<BQ0W5O@i
z@g;kP;*}+k>b_}W@n~2Ab*PMGkka)ksf?%Ly<^~R)lJO$(nOUf^%Ebqn=aZ-%w^8k
z;z{hn@`_%fcVp91jf)bvm@S>l#>OHO{)4#lUeDs%_H8K-*~Hn$ni1?z-hvd}vGtou
z_X&fh)oj2p)2g{@HhPve)%K1IX<NU+HEOjX%qixEkgdpocxPP5HOuRMpFuX(`SfdD
zHrCZhlIY-;m5taC>qb`A97Wb#%+KBJt!g!9OnY+;)uXgl_Imi0h2@VS+EKlaqDVm*
z(wJA)FQM^CLd7386%*=D?fExkcDvN6m#WzS6~Zz>Z}k8(?3MQ08b<cqw-CK+ZoA1w
z?xlH|)hwBylJe!q!p$+G?v}v3?)})~g?%$Hh)p6aIHd%T!$U`<z!<f(JM_)3NJc9i
zgNc%bA`HJm_47@`s9T3t1Roie#VDxOma{53M^9SS6U(^;$CPL)Rog36xvao~r5_(}
zkLcZCaGG3yM6U{QD#4sXBH1sv{>omHVStu^0;%@x70uDw8Z_DgW<sRVa8aW-0GZEX
z>!aUmZl%CV1CobwEv1azztZ4hKjnn}SlD{@UvO)l^z=I9km$Qg>*PyZp<SpNm#L-1
zeado}{MX`DQ)`#Dz0jL<SnnNF7ysn)2{V+xA`Kl5y?nH&x(gSXHZ)!dy-cj%dWgT)
z8K0}kwqPVl$zvolm32%8(m%&!D2NrP5BvpJ)Hc^JLb5j`eut8C7w<5@W&41BPu2ZF
zc&Z@!sF~|g{Aq~ao8OSKqU&*n!i&pVR|Q8$DiQZH@z*~LY<~uK_I7qR$FxbsYpy|N
zr&@e_dN;nE^7oMKGsl&PndFrVeA{QI=^6+km<gc9aTzoAJz)Oku_QscUB%*Vv390S
zS!2e}DvF->(F6bMioSM8Xbywe^bJ5-giAD3LhYKhgtY`m^)+j0F5Q@=depuUZNR6q
z+hQK;a0Noq;F22O<U)dpg{F&c2WPNz>sJF)pUNdm^<>=G(9p3@4`uD`KOC^r>R{h@
z06=;Qg99Nc*mXR+etWTDrIrwgkDFd|AEp&5c!h!zUNnf6J?#_FEy0s(F-YRPPZ={=
zOApY&(REhkpbZficNEyO@IoXtr}B(_WJAIpwl>VOzaM|;%nC5vSA2n=h-*f@?>^@^
zNJAi0EaN_i;;`BhKA{uqZYMl|PN$2!aALDY%dSiIA|Scnh3d`~?O`EJ2;oa7|D4Z*
zA9t<U^YI(&N?taWQ!VYZL>0fn52M;v_78aYXcwZrJ>jhUy;W0A?>m}9@9VEQxzHK3
z4UFeZAHvx;iEQsR5}ep`lX#ZHu&5+Cmy^3gQYFl$c64}x*ks-gGi)%IM(ikXf?3MM
z@n7;ups}!UH*A<Lwn#??%?$A~WRzkf@m0@<^Ye$cD7^E$kzU^%R()G}_t<Xu6D22<
z=HEPy$Hj4!|E<HIKq3B`?cBNbxYJnuB7bF7F{4ds##C||e95UsrGx6s#O5~#_E#%{
zyrwQIOK9VjR2YsdYF-F)uw}7(>W2Otym#>leCk;|DFEi2?=vxY;T4<<Il?sPIbY%Z
zk(^g`mkeGOY?2h&Br4UVWbv3zg~q%r*OFP_ub!xdj}^0Fiqm!%dV-{{L(SM7M-t1V
zTLM#7>(TXM$j}253u0|3UN4@0o7tg`YI9P>+6nVhM5oIB1-HfGa=KX=vLiuXyT0xb
zRy=QGHejUTX2`fD%H)<zl^;=mz%4)D?QyS~n<`K->5I5{S~m4SnC|X6>_*&%u_~(E
z-}0b0bl}JM*s>&ukD)9N^J~wUm=~0^AxP%;^@1(*;(EPoE`)8K`RV6l%XApWluiHQ
zWz+>l@U2~2hez^n)({0>>e-Xb#r^CZNvzXVzpu+_nyDwN|B=3bcz3wbylS*M!s}V&
z5giFb2>6XK{jry?0uvuQ9?*;0<pl9T(Y8)=gzyVegu1KbV#rv^#mL&dM&=UfRQIK{
zy5f<Un>HNuvnvToCin%1esil2t5s8yyZ!cl(B4PN+FU~vWmRqMpa1|PIF5%de|-><
zb;)0O9D>|D^1%CcVrhrI>fv25EM`omPG0>7PMMfguo5(JS8zF@u4kXzcpGi)z3z;2
z)9=P-#DdLgI!j`xOp|waPYT(2vN(?a&N2X#nixL_Zpa@h3k8l~yE+)y?%;Py;HaI^
zrbz(o_gjzGTgkgU_|k;BxGQKoeqvB>kkz+zdW<mj@2>Ai2zC05VBY{VyQoj+J8Vbj
zhnG5TE!LlCyANBB21bZC0GhG&^xS^I4hEtD=K#qrAv-sEZaY{~*vb?%);SdJ7kF>l
zIlwaXn~UN<<MLRDd4@sXzu2rm2ICgB?p=s=hPk*rN#6M&8hTDZh6T{<ykx$hAX{(k
zZVZE!!gn*|BKFpLoy#2e$MHvRcKcs&I2+dnv6La=y?(f5<(a|pyW9;Y8#OaeZ#A>B
zRx&C75;3@V|3^gJ-$XnH{gyoN!CTD15OYitLv>E3usHJc9&ZQOV7)Hn(Csbahn~ii
z3>yHA0jJ}z@`TO5>U0O^C}L=N-60FGQ@9j+D2J#e2F@cUly#RIS70daGVXS{832OY
zii3~b9h<OrhQcMCY`h~=Ii`k=dqb#mjclxWI2p7d$;r!U{en4Zxs|kywhY?k`PKYi
z7XYbCTGje;!&dy#9P*(Gd>D=iCu6h&zvCaQE*fSQj@CP)Ae?Oy*ev7Hj^aKoM<wlm
zZm2wA#*SHc2>0R8@u7Q+R~1{FD<G{N_DqeqWG)_5u0VZ(!JUxYV?P))sOaR5k!IIv
zw3P7#&;#xa4Jb12bvy`sy&&Qi(w%J6kJFrUF7F%8y}wmX1^2vTsO0b76DwFad%L8c
z-E<0DC*<UKx=<+*#3QYG)dmfl(t*CJh3%={(t#4+=u+<A<CXk^%UPY9pR2Dfs;LI9
zemU2)dJ3C2P0;>#4#UOMAeLjJwPwmx9ER;=muykB)<UX=M&MWDr2hQ07K{G;WRBc~
z5rY~55)$!>0Y-rkg>=Bl_w+F2hIxMe^0KXiMuHs=abgV`P7Xsmy7{D76*cpD%-2KX
zICXfu;Zz7yx^q7qlySzklda6BMuOO{h#E1~1YSLKoIj*+zxulJb{UK@qCfv~Tck_d
zGA2&<0kB<-Q#(Yff^(oEFVMQ;DeV*aZ{4)@Ycv;khh<r)<2eN|`!dQ7M5b&b;?pg3
zp!b5W+*1jXR63<Ag{u>WDn1G?7^=pcHv;{^#`H^l$Kl{I`<d|YzMiV)mZpd7fpoxJ
zY8ZO0ac7JrpjaQ7D?1v}jmW)y{I(`XmLpPgUgEsYS^zdH(OOXN$L*W(4)`{OZCYt3
zBcN-zgaVu$L<7tj2WujbW#yGQD!g;C9;pMwnq0-l!}ii=bQeB_j*}^#GWCypg9+%c
z9pxOH9sAzJvncQ=7^$j6iY5~cj@25cOsPs2NSCKCGE@!zTL;sWZ*~YjH#MS{hS0e{
z1=&y1>BxsjtKKKcTG-bviiL*AEiZ%LIl+H}+`=G+SPzk)4WZ~GcbK!Q>t?^L-_-cH
zk#)wHS{0QQ(_A{$_cwSYPioW0riP+)cZ8Z_1FeDTm#h`p@jhs!yZ;Qhca41r4h08W
zKVa(eD&1V3DDMZA2OYO|Z%cW$AYN603xCvSUl|%kb-Yf`Q^Zh`ew2&xOs4v_F$5kT
zNYGmqVR4)r7>b!EG}!#25FWl=xqIF^UFDPNCu;n-+tW2tkF%e&l@UCqGL6-v+?ghr
zvobUbA3)`|Yr{RBthJEW`ZX`L%Jz&wSJP-rm!8)zH|y%BjI*K2(R|iHVQJwxkssrO
zPj06SOF|)52oj3o7C-wYfz=3|a=hkh+g#x}iDY4)F+O96aIX`6X-;x{vbI9mAY)PX
z$Nmtm%6Q0tnFjkrooTe91I$U}?Nv;gaU+9NcOK01(zn=zZr*D8Qh=TtYu~_tR|H2}
z$vRPZ%VtOhabPC-x+wxu(xxdPN8%Q<jrEYX+*v83%2W5j6I!2*6*bH!vSY+@5<w}3
zl_R5hrL<`dYz2c=k&XK6G`))K;0qb1dsjcZQS(ztVY{c`C&fYD?4QVX*;jZQ7iPS7
z-g-QPuUQqvj3pFBaXBZ!TgEh_#+XhV-O*_pI~4LIrk8;DDpu)&e$V(XoDkr!uXtOZ
zpYnzSw*~F{UvP;VLP!s7*tbI4x0&s~;F!9eFn{_|pZX1+34IAl?QRcWIdV^RCr*8U
zIkD+$?e1z1WGyZg2nu|9c}+@uOEKqew-)(vz0LpcAgs{Pf!3+cbEZl)-8lz`rNTzJ
z0#({%ZAr#!Rob|LTzc9_`6orIvZ1dhAL(hb_Zs8l28`wH_U#|SwzwTs;@QX$2^<<8
zBGCr~HH=63Em~f;1{^%WkF9K2GWI+!=tdmd--cqVMx`5R<)v93i$BV$N$<%=?8+A`
zf_tc2Xnw&tJ_X+UdXbKCK*V=oo8w&ZYK>YLV#_#XrOEnqqc2vkFVCT4U~`m&ojHra
zZ#B*z27#1X`N!;B$K#<FvRrGhf$FyvR**{lSDF4iD}NHR;Tg_5grye6bf)nScERcw
zwFY~{87Rgmi~A&YJcx$RyC?aIp93(1!PNaXk*H@FY^EC@f8ytBse0zAySu~KD8`<U
z;%@-V{*cRlK8+S)J3SSA%biKR!q3#jJ)9U4v}KTpwEouDeEm0bLB&Q;*LsHbB6o4|
zG@*7pm=Og%Zag|!mvtOAG82N0B&oC}Sy{xZ841a<I=aH`C#++J-*J!S%*Q8d!TxgT
zVH0c;5<^0+mer)nX>@NRz>I|2a($0(%7c=k2Xl4Uts@E4IlSZ3Zx3~{p;L)Xjh^Gw
z%9VS@lXqm|*NpH*^Qk(A^K(~)b2UV@afvOBGd<N3$<t#K=DNS&s^)odns9VAl=VZj
z<6s@#Hx%j6USMJrW;HM|a5~XCaAXx8!3M11o?RA#O@u4Ff~`w?29F4jiU3=ih5!e1
zK?wU{!NX?4Utzyx6^>?8c8I}wL&5y<b9QC>#5%%z5vOr>6(h&kQ>737UvfmN&TuJ>
z?K?PfRpU1P!zm%6(DSqYhJ7@UB3^{0!~TmN5CM}w&nFDp3BgW!t#K8p!67&V>9tqb
z9k<d0_m(>^?HMUPpBY+$ky;V$q!3^9w9aMh_@3I58tW_qdiYQD1V5yF;J%%DURVSS
zRM=DVl2y!euZW>Bq_kdf(*1N1>2AqrcD64b!(Q3>`QrUE6?b^!<Uk&zbywea<)hdI
zKJ*d+YeOL;H5w_E>8d#yY&a3a<!7j6r-Dk%RN1^dL|WHtI_`d7IJ)yV=1JRltbMBZ
z?y44Su;iwK4pZM_v)!093s{~t>wBS3@PeZO_l|y(!N-}>8l{s#9hSs-AK+`hukq1$
z28F?Y(>gpsuSS&GH4JgJJeM`EZnrp%`GH50Ly{Qw@!{HQx}`ggDEX`ttmoak02k8_
zWapGP;o?tRST&crS8vmNk;k^+U`!$t>gjN{e4Xe2@QS-~7#`(gi;53TpP`%5@+SwT
zk8U>h6=bhzh;>?~=5b-Pc$|ZvDI|Tbh*;OgvqRwwmCY2uB!e3!(`!UNmkD-KtFgWm
zt-h;l2>fJd1_5DdFyeUI9w|Gsyr0_stY(G`7w5Q@HQL-;vnbku=Gfp3Z!dO{K~(bS
zXakEN^wQ}Y1p08BuZgzoN|<<^3w}p524HaOnzR|t!LU}?q6^HG4sCDEZ7bUS8>SkY
zPVm(RBAwJbn|@<<`!i!u8M8FfdaLC@Ke~Por?R_9r)~xfBL)Z4yQ2|!mr~+%ouhiI
z6BHNsSb{l#c=~N-=N>XNRs3efc6iObRR8+rGQ>q^DNyjuy@DforM7F>a#zV5A-Pk=
z9%X`FKR+M8q#`OTX&ZI9T5CkKT6JO=sYTpnI+IsBFjIL_fHp|y9xJ!;gLy!=6#5df
zbWZb_MVWlgtHY<OIOgZizcqu}EqIM)p)p#?XrO|OaIN|I0D09s6eN1Aw#KKL=Rz#9
zCOiVk_t`%#zA5%hbhkveC<Vj8+YrrN%@(i4pC?aJ4zkQek76C!bL7;rj$X&Hjhe$l
z>A|+zKMIc&FYiM$maS@752IfM$`fut*y<7cDbjfMtgkIORJo{CN@Ur70R1Ho0E4;s
zF1H2rRC%3*T;<D_y)$@qv$P31DtXU>!T^VGPzrZVDsCr+C+&K}Zw`Qm?+M8IIA6}#
zvl!VD*?qA-ovkp;1a*;p`LvOWHj_*l(uhR%nokX9rZ?VEqfZ*V4VlfGzj0J<opi0N
z+lA6@AhC~spTfCzw}kFb>DiH~I9~@HP`TO)QdtHD4r4t#I>1F$xo!uTv)~BVp6$0;
zl8u}1rZW^=g1b^wyG>4oH0inYr`qg<Ce3$K?oE2k*_B?y-MCjuN&zUIL4c8DCkRvp
zRv?qE$!>I;)`^*LxYuzeDU!qF4~iUuOkb+FDI-Y}_~v(T%*=WgYqLV)x_)ec-Xx#4
z(T_s|{2l^I@5;qTs7APB+;5}j>?TG!b#o)_BFN^;8`p;NIUUaQO@lOy99kr6Q7NI>
z=yu8xzu@3&YV2NNzRju`rML>RJ#fsqXVs!~x{4&fY2o(PTySbknUvQhPGCppzR(%K
z_N;Jr-f%IAyls@$)h&1jwyx^2?@DdFQw={w&i2Ky!`ib`R`7P<e0dHc{!UXNVTvEv
zDUTXus(UZEy{>zePd}68JeIUE>uk5c=!R((zk0`5j{GbNI&*u?%E1Ghfm(i<N42wd
zsfmthlQMQIdh-RtvQpkEK`KxV*eOSKAKz1)QpYihJC`Bj;z}O@rta0SNldeH*hntv
zzO~WJ+_*)@i?9Lm(l^}c;n+7<$xBf@=dA47d1Y3@7awfkH0(eu$>C|E#EuVat-toe
zo83+6=_a9(*L#3@65Yr^put1{flL|BU7k1Faq#z-+A`YMouH?jsq#w_>+Bf2%9k7<
zJ})d5)sXnUQ~Mn%r{J-9N3#g9hn{f&U3FjFLi;t-C7V!=wm&^FeU_gNWXGEc=P0bX
zANPuYi}*=IGLf>0%>izi5W<!S)nu5AAcyLR1!;%LBfcP=ZbFOEq~OE{rGw`398BKq
zFN*rz@>aN9mtx_AN?p%jCi@h;%U=)P)&)pB&kS2r&3hKToT@=Y>R67ktzOet?AD)p
z+s4qnzPGQL4brW>pLXcF^Chxj4eH%aPatM@ui&5Dek~1M*Z<JgDnRI?y4B=*24NRC
zrmBgUCjvCQxxn$9)y(rXc_y>HCvpq#dvwUQP%tKOXrBP3MiiJZa>a1JDykKZDC**v
zzD>u(bY>Mz&tN^9K17}hrG~D%{#@xqyH`CH#qKj**GxN^NWNl7IrCTzo3LNmFT~Wb
z*%6z;oBk?<&zp?pRZ%Hjf@5lrVr?1b7+qF$l{4%FOflK_eN(;^nw{lu*m_X-B2pi>
z5@KO7%{*R^Wm{z3YgtbLxj977JPB=)&;!kNFnz2QoqgD6G;!$G2;w~eyA{jbMLp*<
zaJh>)ENYig?hTErVQ1d}0&s4l4ssGr(0H!mev*`Mc<=!WH@MAD4KEid>b`2$f#g&<
z<Ud#%*Xe-1-^qLcOD*Egf^^Q=4!1t#@fg>C>J>OSDaL1KmYQhSNYevu9t$_1q!@k4
zamI#n?k~W;(o9BT;L7KcGZY}{hPYrL0ZNh-iX@)Rpxa99US3UGSK+B2m9M-P;=hZ=
zf7?8^SnK<ffg0dBxiAwL&Wza1u2>F##QM1$?o6d;cBa11=FEQc#Lz;j_Z!svQvr_q
z&5we^lZZ2AXu&Gs@-<!XI`vaU{8H!XW@Ihgb=UpGWL|%L3sNzDV+3ZwrhX^D!PUbz
zR9}}I1A2|pCJ?=Mq-^ztSUFbTFl5|3cn~`s7a(q_vqQgp4XI<P!t>v$owq(+I5-j>
z?|sP_3un@iSUp;7Xc?)c#{#N`fO^;1dltoJlZ$XmZx4jTcBD(dy3<&dSGM{sGGl#2
zBRE_Qnt|h!gqRKVAtlB;4I697(GxcKvlP2I#(=pBjf>pZAJF-{xQmGv^fB0*5(0yG
zJ|DkBht*bR+!=ZX7lTBE**(3hI2Ta0RGb%&&b=LJuCsvEz<G+}>ScZ#gg~5wZdq}n
z-ixt1DVt-t@S?xv1P4@px-VQH)%6wKsdF*2@Fsw_t^K6|CWG%QMD&Aa#EN3$4J&zi
zo0<S=K}HD#gW?vQ70nVmb2Z_bA>lOxXXk5$`&RYIdA{SHnu;bTP22hcv8^ZZ{{U8M
zv#3Tqd(-fMBlj&`y?~|pA@4|EAhG#3lEKAqTCb5mw0ys5{{sIb%YOj>!R8zJsnlXo
zm4bp^?_FA0<(7V4p3%SJHURaa_E@FcJ52xa&%rm|MSjN&4SvLbiu;$yKgInc@;_?v
z-%FzKH<7<9_n#$!fz`$i<l_QE(d%K>mT_VA|JNyhx7L5fMyeV&#Q@mxZ7VoIIF0l(
z7At?jg~DnAE3)J|r|zej#N~gbk{#owWCwp5!smZ#i2vF?U*;{VYC9u-co((Igwdxt
zas5l8{#i5sGofEnEvo#5LRRURd<q7Bkp90j{~x>dzt-sgJ`nz$Ve{|t{{IpCPd}{w
zLwDZ%8Q1>+{_kxv_!stH;QtN#ukQH+zDb7-r@=qh4AUR%mLJ}2j<Ed=N_<^&rn^11
z@)0!*6hcp7PUvGZS3hLTDvp%Q1EtmukqKSQ!eDz!jtPi}JnG-i&S>l`0NDAYai_m8
zjp{rXNa|fbI1+IWc)wz<f<cIDZb?FaJk$6=v7Nuq#n~%~d%GKt(DicxIyGrNu~=3z
z9OKpY6UZs>TBODD>kE%rdD?gxr}tc<ARV(1%fa#8l6>?9fMs$Kfs?2gnS|E3_`9;B
zDB7uXnKk-^j}H9yq@fS$4m{z{`w}N=a_l)e$1~W~vI&*O*%P2YUzmk9OeB^nimO?p
zbEgo6f2#oZZTrl&IqP%ZHYrdgFJCF^wYrD<&wE&wR+7d|ss@}`R-`(A&bj{v96Mq-
zQjCgKYSDQE%%98j+`}!0_f{QJsZBfy)$4#cvXmnPR>eJ`)+j?SNQsDbhk7x}V3Xn;
zHGFtqbX*{bc=e^T>YiuZ`Y(zoL>w%wiX7ON?KIvzU>j_1v%qfG72O<(;Qk`ItVAV!
zi~W}<2_z+xMW^bmwm;nN4|Tg6^aVnCe)f*>?tf}_CzmGisd+Z&F_ka0DPGnr!BxDM
zj|Z#>@8!vAOsctZ&&(NK-l%qSFI!%r=W+}ER}xnWlXYXq)6VROS9G<X$SwkHPjFM4
zy3LNyw40hW{y!!3e9Vu*zu@+e*qcmv<C+41v+RhF*%5h_HGOA;LZvK)G82_tmK2|!
z4Wdnh=b^mp<3GtHlYNp{g(=vIIz`*=-ZxB5%^cYegmGzpDGmLu8dQ}Dzdwtub~wBy
zTzsHssWZ{w@-t<U1Y=AC#E~*=R;{&n_t@Q8tZY`TT{Z(^XMglvSN`GK>RmtT<NT;O
zD>>UsX@9Y5DBw1}VMJFivW)7?IQCB>1_bOHGC)z<+>Znj)#EzU$9KaE%e{1)F$u`o
zb?cxRIYK~E?*pazzJ|&zBp_GAcs>>pWHPj^n+Wm%F>2^4fptY0bs3$%K9|=OPQbT6
z($JiTpS6)cwFLU3z6j<TRYy3s49}pK$b!D-q<Z5a$9m~f#Luh)uhnEhoYli&c)oH`
z<?#t3;U!QcZ0W_wZnLoldp%8#NNo}tYKEjt&0SH7YsmRw7teQkNa8PG>6%rG4RX&&
z%*I?F&AJhVKQlC!r({d|VEiT_Z_|ralE~WlVZ|@8g^cCeS?RfO^6Z(t1yTJEw@GoU
zY2L9L)bU>K7R{#iZsvg_P^6Zjg|Jz*ZkKC%7~{3zg}$@7o(_H26|Tjss8v>N!=Ov7
zfwN9$qT%}TT3HM$J;?Y}TVXQY^OUg>)*~A6svJYfS^UbANHuLH#*#+-XNRJ_C@UNq
zCm1bMH+9!#z1~V(0k)<t!j|7etvM}*phYGa-Q^8ScAm0e0qN8Fj;%7pL7&-%LEx$l
z+zEn>@p`Shu(fB^j{JS}ETGMUqpr`UJF8i2P~e>4{?SLR0NAc=FlY0QkMg{q%8DsS
zZar}$*B50K-eDo2j+>M-$4gH?0(f;7`vNV7O_L!=We=m2;Kp;g`MqGg4OZ2RjdP~f
zQ4`qik*_ta>asNQG<ji1>Z46mbMQ8M6WF&p&}xaof0i*vgD0`i9;7Gx{^>Ov2casi
zdFZTpt^b@pf=;g#9a)uZv0QOzP375wZCI<u7yxyI<NMhG#fwe8A^61{O-YDl{I{8(
zrVjZmTUj2adGBXg4<hal%^IgV!Nc@={#7L64dPNRNAWRJ{Sk*;#R*#UVxJQlvRuEh
zjIFkfqo9^|mS;p|kO0b_i@NCmm^>{GB{Q#lrWY_mdFHMd#EEC}Oc?Ba<voc;83bsn
zmYWP-76{Ign_fr+erxQVVo?U!a7(qnaU%EuH+dWK;@KWuA1UAjIZCW!1xjm!Ex5%}
zcd<N$Z7`|Ppyu(DUs41!&Y~E(hfTMfQ2;6uYe)b-xbl@tjIq=!o=Vbj30UK)7v@$o
zK2iiBQ{^-jV(lI%vtrA3G#UkDxCKqY?#0CnV?%F0co2Uv!Jz;C@CL-B4{29eiZ2+o
za*yimLUFk8ZrR<V+<FyCSiye^^_E%$c+OL@Kd*U7h#Wjg+=-ZGU#^FO)_mU^2$?g@
z)c7cKZO55h(4a7e?(_n|!lX+`qn8huw^KDS_Z_$RL)N}xWJfabV*3%GO5?Ky`7t=o
zg*M$!k<;tdSx0oW#0*Ofe#*uMC;>;rQNNU5RDq;LDr^K|yVe<U=>oZN!vszje{iu~
zDaP59p`nbaJkTy1r~&xw(=4D*khnMI>1RLBJQuGY76(;X&`9-0iw`whScp$5?_U*m
z0wN-^CSO$~Cmoe2!R44>U<FB#x`I*yMr*#50SK03r$SD5^(73yqd8rAVz2UGcp188
zsdl-A_=>s|Eyn^Y^WKQswTz&F9E<6;;=xL`jWtD<5H|JJeU<C=!HP<mofD44s&@Q3
zv-MjGx@J;ym>mX@>0Z8%mc91MpLqvt<iHXsHZ{JXw1$=uM-Fd4=LQu^zSB&>O!+fB
z!rik5j9wMtB1ebQS)`0)g;qZ1nt3(9Lp`hYf5CYAghObWQuPSlWz4{1fMomApAEo_
zZ+1Op_xl7%Njovh13`%B^YllsFX@**DP|rsS)AVy@_sl<X<0nJ3^1MM)MZR<|A@zh
zN(pA+CMgSU@JkKKjFl_MvrZFPt(^+J^Z;A&MP^zP8QMIXzz&X)S}~b1Fr`DM$w7D8
zz^Y+0N~$lKt>hVw-bz@qvHT{0LP);A08lkg&rX!Y7@&8Ks0<S|hX5#_e=0g+o)cpN
z*=EvAdg$2T6>zdquOm(F{PY^1xTTB=QhhapE%wv<tq4VXhV<Oj+g*M47oq{|)i!4W
zfe<e?<l*QOmyAzV2O02c7h3qHaw*(jzI);fSr)s{pkxK)sio=h7SBL1lMo3Bc7Dv{
z86V2K{O~uKWjBpU(Xx)xaB$sAB2}YvuuXvtkGPNS5CqMmsGE)^w6lTZf~KL2E_ROb
ziTtT<Ik7mG^N9^Nq5|l~jvmm)p#&^x$8CY!bCI&4BbxgC>mu9Iy?;Zf+AM!Zhh++r
z;RkqYQp%4fDsuBcnS<Ks%XK-B-0rLBx~9==#EZabd8?dIRo|_5*mA+_6^)2N+)7yP
zh~a%4-&Ie)4xY<WF_DxQ>&ylf`cI2(us|%vkC87Vu}$Eo)C#KG=e~0X`KTw1<Gh^&
zSc7DlRH-Np?`$S+R$Iz#5u}7JZxOBoKRkT;1*hUg{j9?2M5WOkd`2jz@Qr%qD?hi&
zaf7<pzUr8~GlFx>!mG8N9TXsIbC;+zE~#>R_o9}oNjfnTVgkV_IsutVeD>lH6bZrM
z8yD|NOJobG*dbb>@};tl?wZJW8NQ3Z60-r`Xtgouc$s|S#lf&7roSXM5vXeYu4wad
z=JQUA0b>q##yFMMQ6pSdXGI066jZZz($K*kRG|vMpXU@XF7IY{g_t_MCW#)^?qjN3
zwVGoV+qK6jU0AMn)m$p{o4*d^?6@ERtJafNYiyh%v#+fh=IgF|S0X|O3}$+kmxwbs
zHs``4YdhDOCHV*d1Mb2YrUVF1bhEw|0fVzCgb}F&%lMTWEZvHH=AT#z7CmO^Sdz~Y
ze?*}-7x*^Tg)Zcum-R0i@YRqYY0(jbQBhUHm?==!iYxND97h`7@pb5}v2`-|U1ViZ
zMpw?>gu0e%wC-R)9hE06Myj1aUX>t13WL!V%M$DCMT~6tJMV`S^CuD5x}4R72_lW1
zlhaZHY(ik=v?&*RWaIfwZh^(h4BY<A7XYhj<<W;y*@&4l6f=P`xUikw%>vY8FLI_u
z21<MOE>9&aeAzb^O{l3MINX^=q-s2$G_q6Y>IF^Zr8DRq{ddV5pMuAs{R)ty&?5vp
z$>jB9CHCgVa$5>b1%PLqmu7Q;_jIfVa4KBDN(xcp$mjX4(t`FYYo>VyLbZ3CEE4K-
znA?IT*W}p{V3Vj`{H^PkkvD0vi)=*zW?MH^3W)957|w}t9<I|f2M7BPJSiq+)rKtn
zl1F-wL*~wj9OrQR^DomO3X3h<Jf1jA9|^*J=$N)iT~^-M5Aox=@8`I>g{cX)`F_4p
z)C>y~)`G(mwlab&BogoB#ipy%&{Uy1Q+(<+!6R@#9&<JqWBTYaZDFSgPn^!uZ3_0!
zwtHm0AHAGpvcZMoO^2rkK*|!!8&-;MK9qIeR}TEp_d1DM{HoIIK<CQNrF3e!yH9%A
zPU+AX0kWdkonm<?-zoI|dIZzig}XM7p7ws^opB*ieR)42_+xMdoaX<X0gjX+4G}on
z-T0<xm}9*l7a%j+EKoI(n6ytPq_@5o1#xEJIxmgz?uWhPkdlLiH6XKY@%#tPavHna
zc|McV8^`fbjXm9b+y6ZpJ3{Iea*iFs{N3F*)pJ2$!JQLk!M*+a(i+_VB+{xJbof_7
z|Hwc|P013yJ*1-^1r}uid2IiMpbwR_%31z96{MH(UkY#cl{GmUG}d(kY;hYj_S71-
z|Anxn>oRw>`=7!}mK^`J&?3UTxdH7p2f8h|emAP_#k=x+l-X`2u&#%*w(mHYdcmrg
zSFA_nQZ@d@bRMloD%0b#O~e)RbPYS*!Wk{RZiIvSbS3%-2=O7^8e&)|J+!nyyf~4&
zy>{5Q5Oi2@`mHSd(I5WF$sSCt_$S~$6r&3NM>1Hx0MGxxw(Ro%%=Wh;<DRo*gg8ZP
zFXfK@dSVzeevcDz)lLU${Vid+QIueL|4?FPPKV5)3}hQtmi-RWiN5)RB<ptj8UI;_
zR8i|1a}gQVu+-|y(8~{rVVfps`}yX9!k+I|qoM5@7*&O!qdHe8MjRnh?9sk5OF|#%
zPbg=du;#VP&zneQoa56zS|k~lFUIx726#oXwjerEF3)@HgX{R%{xz6CnB|OV^!^Rs
z27}Op_ErHB%M-r^JdHXoJrCBp2mx_U8i;*AeX38H^`{u#hZ82&9-bpmCKP#?$S2p7
z9Y5lot-gggW7W$oAe3Maj&ePy#z|G;Ko8xUv5i8`zl_AZnAk8-cr9yEzYL!~!3q!6
zC9T!k*tSOfG2Kd&ciG(H>vB}GMEgG72tO;z0xwn>sp?P9sbjnb)DL?K-#i3Y@~#iG
zJt8pe%inML1jWqE7l6m{G&k(+FDN}>Z-X%`)}Q(ba~CLaEg>vd1>ICtBmH`|fxPdL
z>7=^LUr^ejd%5^SsNX0N?d}_v5^Fb=*2<CDR@bWvGnx|P4zx%oBrdF(rr&aEN&z!<
zyx%RFV@ogz3VdiDmzfFx6ds|{go=ogL2O9mb_?>MLoNc;@x%a@efb#bI;kbPS@tP1
z))QuIyOy$M+qy!wsamsDvl-)R2=4bNpWYZmkWI!LOWE^h>6XX*Q2{eaV%_yurW;qV
zmvlxf-8V6#qz`3Lc=a`~jm{m!Dhr9>Js<G~LH?{{rMX)#tl|r;h!)jYrtc~}-_sqJ
zPcuC|4R1wIp64198Kqpmy5?5nHu0V<?d~fJ{U^t+>zB=V^cN%;Wxa14Mye!yhUqr*
zOu){^pq0aAa~C>3SCN|cGaZE6%Ygd2%(6B6j!d}1YEELFyz&@6@yBZIFMA23Oa9f0
zB@s1HDzCg|DTF29o&DPkUqxoz3<~pVd~Kk<hws#lB7pf|Gc-m+kW*p3$;%8JJ>tZJ
zb%3&5>K<lj9cm^}Qv}la?nKt19%^Gkel3Gm8P(XUwf{uqpZ~2DmCaz0xw=Xt1uEmf
z{h|3C_l8Xx^kUhwcCJ9JeI?5AqPb=FXP`Twv5iA(nbUc%=}L#@f`(botkw~}sBkO_
z;x{AO2kOw2lvGjDcfq`pTeB}ar8|lARJCEBV>!AL{2z-^=Vbr_g5L|O4l3mCjm=KK
z$aZJ1&C+RnDfKsAi%R8YX*~2GRXadkQXnwb!%ca+Bf8eX-BsqI{{|DXshmMNwWBRc
z2EWjBE^}0XH((&uNwjiFYh7=Bs%^puQK&}k?nx#Ba9S0BwX$kLti!8$j$`7R{D?g5
z5NK)w*%PO;h<oA)q5iF~XYOVIfBwyp&JSr+)S~Yk*_VS6<1^`eX>%1ZKfceZapQk+
zPI19_sV%3(QaLb-Dr&e5;K=?FNZ_Rzo&NdTz`dBxa@EZWyxQqN{AE0ID2>s_D5){Z
zO$a9Y{QUJsnPU~rcFH>eaHu8o0^v+129*>?hgp=)47RZT`wzbA2RN4nI-LZ)_}oyM
z?LPg8#)Qp=e6QmLJDw3^z&*5r!LaK6et}EBC`ryvgT~cR^#$<anZP&I4g#@ggMm{H
z<PBay9tP{ry;=x{^(x}LD@nIqoJlz>`?=AV^H_Z^2S3Ngoa*$_)Aim8yN)pivmOZ;
zOkd|mpCcF6yr(dUeB+Cv&kjIWJ!#B9<tt>ZYSvep5RfG8>Zi2H@G_~C1*}0M5H7nu
zPK{;kbeq>91@-9ieamhF8-&M=6D<6Kd+aQT99+&fP$1?8xKC?uX6!VUJzHol-Dxp&
zas5)j$;k-HG+>v1&8F_r-MB|nTT_rD&2oVAs02xRz3Eb@o!mT=L10I|<>yXPGTw2M
z%NYN%(GiJN4ipy5xZSPYZHupQYN<%HXK#9aUJ@A7fX%Tm8-NWV+N<rUFt#JoCoJG!
zutDh24S)y+@IQAOd}X=9v$>OZ_O5!lhZ)^VHG@c3GGTLf0$Z0tmvS_JZUM89D0J#W
z+JzaT%|SSZ>$uCpSm?*8yy&qRnhHaES8jto&$y4*q9pn*BMxuSisb|Z11utydY4@Y
zw`l_wQr5~wtlbuwk@(+J`j#LQntuT6Knvt-mz;voP8FV$(G3_NEGe8|P~euG>b7q~
z3u<EAn2i0M7h0l8?f~~R=@3Q-e0d$(RN)H%Of_fn`l7=fH)du593*=sNR60!Wc#+U
z0ilHD@aP$p6XW;wcAn_@&dj96EXH1<$?+@A?vyg8D~BT^DRvH=&V_t0>v}0--rlj5
z>D4Y}y*H{VCU0CIsf?sXZA#K0`3Z4(A!rsEVT##d3ZMJ_$ra58o+C(hyOzsJYX8z9
z#|93RNpFnAk37sW3R`e>L0yT?Ix(czx9kkPi(&a1&Rs7hF{U%y>#OlH5MIB6?DAgo
zODcUh%!lPV@C6pwAX5Z5^>WprilhEO$+0Jt69kyiCoa*dXdH(7v5>K6o~SlvNDhjt
zlZLQy9$5&FqTxa+qDRr8;+u;*%Nrmdh_ig6MgjZ1QIpJ(IuiR7Dev<Pi(t%%fR3Ez
zSD%NPnf9;ZA2jVur^P^UxInC*@&^@Aci-aZ{V>1|h(##y%ZBB?hJ$WAL{z3)FGjxP
zH9)P-Rqjk17z*$Y#M62AN>QYjr#}j0usdw;RI2QnJABuyG$@d>4Digdgs-e^J6DBj
zlTiT>7f+aKVGolcp3U~`7TF9{&B$Drm0B8aEFIE$ecx)5OnUogLHQreZCjyV@S6Hp
zW|qojbiF8Jx-Ei*UXlgu#H^G_pqRB%>oA-VQdn0cRPh|y9NPEmGe?+UDUiY2m6EO*
zHAV1dB=ewKQu-4q;0R_iA0f%7ck(;oYT7Z+T7+edWoKnWBC1qx{GnRJH6%(x!F-Ei
z3-g<u&w_4dG%71OD)O10JzgOY>m2D1eG_vxfLA&!(5{`;n_X=Y>#1ACC0NY;1!vc;
zAyfl2_Ii1Hp;*&zG27CST63Y|9{ZW5O*elQk<MJ8Q&WFzjOAbgyURM@l26mpzp2D#
zv3;tLwANdkxVk63tyumXZGI5*q!^o0-o>d%j#aET!FI|d%td*YmG<#Y84>T5r5<mU
z{Ok9Ng>W<V#T?mSOV?p3#p*ih=|Yg&xJ(Hz@p}RB+$){nu5gboL&Do7*g!{g!~dqk
zz1hxF7OQLd?#%03%P#VG;|P@8w*QdmeT^U|dm6`Ago=o==3j7k5gX-66!^EQLMJ$z
zMW*^0C~o@;M|RIy@kK2U-{VKvmhXa_`CgqfwAVYXRS*!!(<T<P2dAJqvMYd+Q1z^Y
z4}`;?K?vaZVd{c>t~PfFIKDHd*`vt2)XaFnVS1TYq=xl?m@=Hv=~FM+!@CJQ>y&UT
zkc*8C@D(pKD!K}G9Z~M-11q~+Xj9GVSSqC)FhkF=rR{9Lq1IZf-4^RsU`taW7Z9N1
zZ$VhwpGihazifXKJxaJlNC&IBU_#_HD`E)2jj6YL`Ps84=2VO3f&PHSTwph9dNKfk
z9e#%&iKF8yDZQ=(baW-houy9X2R=U5gStZWC-lIcna{EifItan?Lt%Xhh&N$ZO*eU
zves1#Uln4%<TmGE)_=2#&~_zKT?i-#X|!zKTJB!>R^WF)X5^h`ZC7S^8azY2UA2xm
zVCyFYuK)^FUB(fC?>LX2wdf~d$ZRr1bF>Jzrre)tHWTs9R%oPw3_V>^RYs9qKqSl@
zUB%R#THzC%2di%Q@Dw(oSOlO{*B>u38yrPwD6EykQ^t2lvi5>BI_@;72u|I?{L?Kg
zV9HgO$&hhvetUV-)K_H`c1x6KF>PWC;0k_lFPt!eX*!CaiYP_iv#$PI;3vgg2>-J;
zQ7hB^ka@Ff;~5-`CfdbrurE5XQ1`BYl}C<sjD{Q$<pXbt%hS1yTz$ym`4ZizVs_sO
ztJPUP)x(0rWhEzV*fNcA*hp3Gsgg>`aFuS$=PP;^g5&3fr-^mk$>bhw-P%XW^29sb
zQqPb`YbYb}@CBwXmHv!FXH5$Xj&kuAlwI|=;#hI$RkS*=&7V59%<8jq9^5!L{DQ|T
z^S*<D_!a^$)nky~=cbviuycb;3V0%-A<ee6=b9P<+)u?F6Qp}|%oXNmIK3~gnQHGA
z!f9R>-pu}pG$Jye=KRoc?y6?zL=7ddGUJ%Q&6(;!H>sV+EI5&bZ5>XDuJxYOh;XeA
zz~BJ`3yTS5N!-ucqGs5yuGBdudFAzcR*3Fi-&d4#JgK858IUs6bpL{j#8kBU1y|}`
z-`}Jyj8$5V%dtL_8yr##j@ZuCe&1OcvcRzsKoP4lOFU%V&}P$%=0h&_6ZNKhzhBu+
z^MdAD);oJ>79xU3$(b>Ay+BG4WZKm*kpr89Fv{Q>Lbe1+acd&Hn6E+mbX$G~?3uVR
zAb_9a$CKZW4GoCI*F$`>OXhs#-s}P7Pb8I%r0R{??048|IM@3xfbHxBOt9}BbrPvr
zq=o%Hxq2l_VHt-(%*!n|-6WL97|gu@t!yycOwZ>{$Nx~p`KJM6>r?7tEMI1bN*P%C
zJXgjv52O6#=*Qauwg(`%GyNT;Wr5!>5}TP&=^dmc*gWL@JZutx%*ie3cahpGg|A%-
z`q9n=!b5t5J==n9KB~d&zz$NR!rLJtO*Kq{rq!?Y&R1$d3`BbbV+cQ1KC~nd#-qts
z3CfNKwG6qeEvyt64wRwCbbL6i3#x%CN8iM+nRz8BjiE~6%SNL7@WO)?Fz2Xj-uhbg
zWn*zGWn20o9n!Nsh4>jHt2wIZUM=PbFjW8YeO;e{Y}$8@xGuT3`%iSG{J_ej|3%(g
zK*hCei=q%L0UDB^!Gb410wKZO-Q6W<(`XvEAi<pk0*$+N6Wk%V2k%B33+@mkLGn7;
zXP>jredoM;$GGqR|K9jxRj*a6YOPw;CDUroS&Iydlu`M_1Ox>*rm_1%WLO<216HgK
zOOzx?S)cpgU!>9p|9H~bh*bRFKlZx_ZNSsw26nul<zJ_PGUjqfmEFI;L}ft!EScmf
z>Ho44`rK+0kQceX%Uv$}&x@`Q?1?#VKvE5^5y9ZCzVX$w<dV|vSy7E8CFm3j*Lk0M
zoB8(ErgDAEp1V3UvG=d2$DRx7r~jBvoqKP{2Z(c+${x&Zn4CznPb69aILGq|ciFlW
z0JY|&j*v+;0|#i657b_r6{qY98$NQObi9_yr*a`#)+%I9VM^KuXZdxz#`qMog*YCm
z83%kP()lj?8f4H+UGCD?=aJf3MqkDD?*hZdn}3^!dWYjxf<DQ=4X6D7K2M+I<7E_T
zg|m>yT4AShf{4<NVqD?<h~Ye)pS_ZO;-VAAG(6hPCnIJ)?=2YpMy8B9)1b~!oh~Rt
zGSX{$jy>2dOm`v;;qC{F;rucI^soG;?KbWMC)QL%t>~idc3a}XR`ViI`d>{0#&|}(
zkz}}txa{u(LZ5Z?0~3>jX)PSrDqFQNU&?Z)o>orC!fZ(Z-N$NnYngjcP;k@>vZ#Ox
z*W#ihMH86LlJ)1F8YoyLh;(r0?NnoB5^(=?A>s5sj`XuHsTbrkA<DL@9dcd7Kep;u
z0c2_67;%&xJk0w0?C&W@8iX<c02g%wdbr$x0o53MEebYSS5oJ$zfT6M{lfGC9}4ap
z%S1@qmdS(MdHX%h3xyr;N<SkF=XDa0iF{dG;PQ>mol+hQTZq$@6%wd%{$`dP$tIk?
zo5E!O5o^BH>-#UM9chc~vtT1LfLV7_&E*rBa|I@ctWG5lm*(lY78*XA8q_Y~-Q!b}
zh-=9Mf}dy)esS6OkQ)_fY+PQ8dr7zu0j|6+tFnE;T&D{G*5`?&F523djFIQQiIUah
z{0J76q0FgyrR1<Wy}1$Nxqu03)S@>6tCaL2Jmu<$S4Swd)#ovCNB3*J@I@Eqnc2xl
zBO{h+$Q?zMD(3s-T{KDrt&;HageXtXY6He}Q@(v1ytXoAk6U78Uok(ayj@7#qc9<k
zd9&MWF+5AmTeH)LUI7s4l4*RvVwY=8ma!}ou~SWGcnEeOTe`I8F<P8K<k)k;4?ocg
zVhMacad-JiTP9nJJcUR)cDPQ}eT?O=0Js%?Z+72`=4mYoKfcbJ8{J^tWwMA<d-E)D
z8jt1`fv0I*$BkHQq33#`2eq*fieHc7nI|`UugB5nOP%=gtYkfL+6$hR>jJjwfMMk(
zbul1yyvl#137R{M(-dA%Oj!h~OwBnW1LGTE(fqN^y_rdX5_tcBy+hoP3<rfSgV8I^
zaA?Br6SvJh9Fvp4wYc1f!#aa!iK=Dxl4wH#x^$+iN)BcFp3vu3y=aOuT_EvH&&@40
z0XBR0_gGo#l`8)BzgTZZ?3pg~tWJtPaRUkjm5XxC01&)E(2rNS(CEHDSH?hT_fP~!
z7_k|8vpe<eDEqPVo5!mJW3J-|D9;qGta4qCi@2yJy^3Ok%9}OnszNi2VjaoPNPq(f
zdiDZd>e$f&;WTa#TllasbjQ66not#4xBh5ix|>E^7MfJfZsuRD+g<OTQL5`0Mj3K2
zko&FGFVKMxCq*&pPQqN-%(7iJKADRnF5HMimI!%)(MR<G;A=L!N!QVcu5I&P-Q_^=
zY}i}taq^N!9CL={=!5F=Vh9{G)U!t|E^YH+kb&p`$8GzrNz$m5Z+<LeU~7tCVNHk9
z@_DLho!-WQ7c=Bkg<kCGU{&R}hUT);K#^~s1(HY{j~gb%1QodB4_o+}Z&TpB%UV*C
zI!5q`gCpL$)<6T9sxz9Cv5gJe`SP==5=U3%2hM}X+#)@6Eh8X(wa<gdS?GbCz5!-O
zy;yV1&d0$0ru<05X0kvkX#yO0`OL1}a32X8{`Be#ozMimS%%Ep!D9B#Ns^rUE<SwD
zuTX%6;v<(S;7a%;N<5#16N^2#TOZ+@lX-T<i1J}j*FB&pNd>m`bQ89aqnqFgtIqRD
zy9{|FbI0A#*NApHTVuPT0K^?QZK1qTjkY6bGebQ5;qELYMun!}OsrlRKlJ!b?XEhu
z83z`Koh&cn&?j&$Rsp+>bNMuWd7)YZJsFBT-WYvNVHHans=wT;pUJt0uJZgrxL$|n
zeNUZ~(+T1e&J%R6fW{O45!6Zuku=I7{MlWP6=VT$<ngo5i{_vaWHbmv_R|NN@0czo
zfOarlETVz{^rlU@ip;nGJ^OoP$b@ixx{7I(01JA;!4jOi4?FEjIK``v?v@tCmZe!0
zR-xJPF?<@GgE>YgVPl9(+}Me`QLqIJmjKzYVf7V!W&&44nO30U5i^hx>&lk0b(7#h
zF`$K2J<e!ojR)Dy+T{7Ui#JZ=MXKT3D7I@|zg@$XXVdVHwVg@o3dVJtXuU`hZmup!
zvJ>7^<6$05RotgUND=6hL0%TTv53nIl6P$m)^7`p=Du7gc%$@EVyw@N_)5sR_JT!Y
zHHE3NvS7c3Q(fPI$GX=9ShX{$1ThcNqvlVVr-K!mepi>-er%ISYQ$^k*BUway1LDC
zuQwFdv|`dWHGr)`GA1O`5>xoqx63VH%H^)y*eYt1Xy1{S-4~Dy!>!QD(*advV(|c;
zv2UbypDKs9fa?0YUNY=EK+hwcWE`B(Vd<4V^wl~ZymH&@d+T{*kaW#o1!3KzpfY+{
zqM?9LB+9hgH{5E;+w>FlRw$Cc>vqDTOM!yop=nadDZz7a<PPJJ#(<UEW7~HCt*o&7
zU>$cAmREWhH2_}ry(PHKWtr*Q1*)*i;2LV)+Iq2m<I?RgQyC(IO;d*0pj57xcfW$D
zMhX!E{!x!ATQ+q*K#dU2x7yDD2~f+J?sy~doc{OQY7d^~>)~@ghsjcDO<anRL6%1{
zCLH6zD{k`Ekv`>al6Jg?3YsF*llVLCZ@+V7&-mt@3B<E&Ich>>B<B`Wx=QB`n$GW4
z_8#qg>b3OSG?!EnNdoI3Ug+#^tVQ4unM#Bz+q#&;^p|CO@SyFo2uo*mnP(?B_#AxC
zee1lesvjb}cuZjTnwps^jAroyUnB&g^mr~AE3v7I<mPmhAkrJbN~P)2#Q~}ZB~;to
z7d=l6^ZiCYwo=o(h!ij8klD4{qgdhFl5r4slH1Nimb-AcEe%!)96{{{RMnUoS{7*T
z=;k@+Qf^-+V~gRi%J&=Te;Y0+emuI!c#3i0+q!kLhXSy1jg5rIIJP4ESNWM{exq>V
zKa-oQuchZal24F^LtakLXmsWNONYL(q9=5<J`&0H>oT~F`=1{@)8j3Fz7V;@mj7Ql
zSo5d0{`kc2FP$_={O3od7sIvm(v8^RZMJ(*y)1VVKXiP=F&5+sHq3)8Qo*-2{tr$B
z&<B<MUs2IN8#D*aZ+s5dyvfAms5cOvLgS{%=gPt5aS>!uTW;>^JrwIs``m}1HGk2u
z9DWRa3R76IfgC%Q%Hpp4L`xV^kQ&CfI52H_y5>s7p9?6Ym4szf2JT4k4)@CKL5w40
z>QX|eUH7AZB*P4)T-pU;&R8<s$8d2Sy!pjQ!Q}9-aDiP%J}RKrK#r#~?L+huC#TDB
z>`}k4CrD-Agq?_M?$ToG%B2R};-6@pzV!E)z(B)@ubkt_0^0<Vit5#2-_;z)Y66Y6
zwZ@Fl-2pg}7V>lc28MV`@&G;xi)5kuK6k+?w6SdFh!Bj@mkhN=t-3n<I2a0R)3++_
zK`<_vYZuEds}B8LL8JZy2$>)*QCJaY7RqCwWp?#(<2UT}g{m{CVZLKy6^H^%P7$C=
zGtHIQ-@!PX1Z(a*vL!y_76IbxW-42N7APg)v5$xLbzl2B_+2#cA@Gp5o#AG-;oU={
zex4!?-dZZ`pjuU87oT*wzKUn?D(E(Yzi5{hrN6LY6kgmanXwO+jkB+1Z-1KVIw8*O
zdd)@_9kHHUU3<l46viw2z&ZScPa^i%<ICZ;1#6z?CC^{n9a+Yn)ri0l2Op{z0G?~q
ze!4I8#E6ldnEp^`iqI_{8EZJ@<wzqJxrvZkbO_b05jcmP$_O;+`alKsi9>o{_9;^K
zj-je5Q0$f<Tv@Xh-ak7J1sVw}d{b+-{lqs#zA(4u`Pf9E>v0fi9dqx5f%Gfh%N(-c
zMyS0y&#od+-M>MXs?)ucT4|IwYVPp%&cZ2DE#+CF6ve8PW4z|k59cAy?cJYf%+2CI
z(dYrsf1<H9f5GeKDNM<e0KDKD*NK<S69<QbWGqXgB}%wxGD!Ha)a(c!Kg^!;7FpMc
zUx5or$Y)cjf#tv|QuL^pO1yzMPWUn4E>{=k@?EBe$1*|an9(;B6jWj@w!$J{rjKa@
zmQ^%POo>AyU#s-JhLcUe98Jw%#7W1>_j(%ZC!mgC##miYJ-M<adccEy4Y^q;Nwcl9
zEx9&qX1S0Q%)NW^v8HA`&w!KM?O_%)^)RNK%$e3nFjL&fEA@;s)j*ug7)nkk%{G8t
zJ5i${tY_iu(pqb(P5fHlffy_qQ0Um6&{Z0dGpR5)j4_8k+kIT9xQ{I~#N1JU@?SC_
zTkPBOA(pj&K{9>L2e4#E&th$1FjE4KF_qktE;ya8e<vuosek!tC)cs^v^8WT{s#+h
z-WZI3f;_!XB(9%w^Wc>Lows2##$<;lrQ4^wL+Ok9Q0c)<Rb;7cGDs{sVD-EX)(U>s
zG&$o2tyTXrYi**qp#&GOsS>uJ*z}ep+<{gSy~;Fv>gqZRxaPXO{LtIIZ7@y*v+J?D
zW)CWW5AZ$oly;0|z$O^fmRq!}goG}FRQ5MkU+ie~ZVp~<0o4PB#&1?3m)sL~Uz@wC
zI`EWAkKY{OGWT)S&srz+3}35~0gpBNpfz^0J~~HpiM!FXR&XPz07A*>o_Mq+i-P7{
zx@7*eJYzHaPzY|c)G0Z5lily$e0zv3aghEKhb&{U<pnn%y^BwKMFzE|?Ygb`WOW}~
z(uiZCOsLCK7vz}Fsf1bQm|Y=tgQGYtEXM6=1cP4lwX?^Rj|3et17}fQXa~sc`XYlj
zDA2p)EEXhV`H57JP^_dm@&r@zm^&c=Y<X5nwHKHhwiPn+B!%3Vz>)zRUea{&NoDMC
zqRdn$!CbP8OapXx61ukP)fg-hdE+W1>o>~;0}C~YlFzo!U}Gc&ng(Egj=L6z64JZK
z5E^0T1IW$nlDj$BiIj5W+v6rOLE5kn1>SSc`#b%G`;dl-kfQnN4Fg7pWx&e(YD<k;
z!_;L=3!5vFy3ONi=a?=dAr*$hRhzF%;dahk88bg+cUE6Dv(hIz{qS`>K(kByIadB8
zt5uJYuXk&n%nu>SoF*$DI>bFa_{LKfqwjf-0uhGg-Tckk@q9i4(`#1P<<UYsD8px+
z&Dnt$10-_K3RIL^?D#2|wJVy&WsINC&WYk$mP^O0amEmG6O&W?xcQ+HkT#q9)#qXc
zG;^ex$;KA#H1Cqr0zA4GYn5IZB%%L+KAKV_OMD0_XCB_mA*g33RR7@yeH6+aSKVX`
z;XZVp8O5^j2;S*p0Js|p3bAaT0V!}D(_ZCm4dgEdAZeDo1$u=)59v<T?S>rqPKijs
zfL5~{fB>rUi{)lYMa2#`CqC|JkC)TJmj_%ENqq17exeD;1jTfCjU-ewBP4L!m#2!I
zEu3&GXVljz$L`_P7A#MK>`8ryVN;~F(=F%@G#oX7i!eKhd8YZ}8Z$$6+4m}1UF`Qp
zn%{^M6l8T7jW#FxvPaZ~pAS*e^p}uZds3XL(hw-+^MRc3rRUI~m^_Lh`LA>gu;y!;
z;lY3p8@3b%eCOpQTUXUBlg`Ukc(kYxif)M#<&lcx-|2rAgbD+{Zi$>vVfb!{Nt_1;
z^nHWu4eA&Anf_S{Z~-%;6TGeAZ3RuLmqy9rRKMS02++rLzPtRp2)Y1$tawzA$pl~R
zoZ3hV>Anyy*dNLMTKtLjGE7W)?-(zA86L}If@!>~=NT-neC)*8vA+u}{fy|QAbc&{
z#<bbM+3Lupy<B}vxR|kFgc10BnBZOpMA%!_I?g0vHV=_=6FJs9DpMzm#_h1Xr&Oaz
z3#XV~Z}0ZR?4^XV&*nVtGAMh>>)78*<{tl63c1wajoOQE`{}u@a5&Q0$!^x!<25ye
zDIqitbPwl-$sgq&^sN4yTIhp_f;sE5>U0|pq}$U%i)~lOi||W^*-g>5iu-*~KuWy9
zC=z${jX5U>!$j7YY@XDNpv(k|gW{Xg8U$dQCsh?7y5JG+`l`DsK!u&(`$JaJu0~^a
z(3SA!L(t_1&bRwEh|j3q0O%XmBwqDVAi4$aIN3xv4UZk8=zwZjaos^UnuoWFNQhl{
zXzloyWhtNF*wJt<;-!b?x*A)iz}9Ir(<i!_J2jo>oqap6-JZ?7imTsV1>jWDEIphh
zZBQgznVZ#$*WwvfL%$`lvMPZ3Dt{v55@lV{D0h7C+dYS<mPd8_aD9f}g8ZG@Rn-z+
z+pm8kenZC%dz?sGbdGg>87FRDQiFaI(zFe$Q5iPTjWdZBPFuClE!<2S#ij7{;0dAV
z7|z-a_%D_F4rnTK7Mm1=A%w51Z*4kMzqg}>Sx3e7<i94{L$#}Nd#=Mq*y7-ktR*fa
z{Q+GzQ7SskDF4lwXCOR^OS8cYZ(hsLCM3QF65k<p!JPy1DhpqIqpLU8I|U)Uzhx87
z9Szz}(l(?t@cwKtpQo=_-!LwG)Ip`<e+&Ye-ru^{n#mAblH~4b9nBsC3%|Yd!l1#z
z-u?z2`Fmt>H1T{qi;t3|pa7%MKRc?r4{l&t1z^!E-G5+K9VB|$$(bDWPU8@l`K2C1
zLir+r190_mv*5_9YS{|8z46`2+s!`N3dt+tJ^SY8UKoT54mpR8HE@`_e({{7^giT4
z@4j8RM+*Be{40`+@#?*g?>4Q8uzcLJCWLHx_Z2C0{QgG#<5=wi;oZa<f5X<nq1%cp
zl|+<0=qFn0k>;(_XS!T@a@+Gy2?MTOO}P&iyC>dhB^kWp`(i}3qpnOG)9k9tA%FAW
zG-(y({q`^6Rbh*cmGxhP>uR+=%F)N)Lk1TcKIvZ{vFYx@`b&ON>Q!^gq#&2~x7ZPy
zR?!1rSMP5R;87WO+1(kTV$tMpT{?4cUNUn9y52|Lz26%&E*>h*TR+P4@?K2tM^F%s
zEo3Tj@5&2n7kBcz;{_WBsC{4HpGHAwjNye`k1IN_KBZ-If)7XvNGYwn7HR{f;JUM?
zjBR`FHI(kV<z$*!0qK+0Uik>=6KBmEvAD4DDs;C!+oncM_qPj|TYtnT=PwBLbh3s#
z8ufjQQQPcIsPB#WkYt^T;JzKX#1!Nr=;nIoBeZ!jT{yr%V?fEY8Cy37FZFmeB%tr~
zLXdVoH{h)w@Bl;ypy-m-X=b%at9sFTfwTHp>O3V6l={exaJ7%%sqj>*1^}JPPe3IU
zSj(SZ+xg_a>}y_%8}Z)v4UIE*lsWg5BI9>WC8%TO?yGi48F9Zu<K)X?@Z&NGnTnOr
zTk4jcv*_aX`qoBeV0-tR`UwiuO>%t!=PxzNPKRcNrr*7Mf+N*YW|8ks-jtzN7>ey>
zU^l?L&${P@xjaL0)KMeeS<hiJ-SO~;DF_C+BMgxVDzAJ*O-Zw67~7=cse3hm2eTi4
zxr>+4vU9BD8WXyW&%FQkVax;%TbPdWAOa}0hNp+v*S&Onud+bI<PXa?C6m9ITMc+`
zSzE;wm_S=kf&nD?4!iG?joqFbj@`{Y^$hAR&eg+xknK)8ITjie=NNEf(XC`<#DLmZ
z3t4o()&~mb*-Z<j7`$KG6j}?*3l!E8Vv9AIwl+^1m$}SfvhZVdUfWeCeBy<8q>GU;
z)cs+C9)5SVY{B~gUiviu!FU%BLO@p>1$9P>3=pB_Z<<@)D1WwsS5d(wA^l)|0$Vfw
z@-XiBjo%4B(ZH+!B4^V1Dy*DMb-j6^ycLGp%i%X5j~xA;g(bRieTN!?^O{0J_!qMI
zWyLlIYa%5*BZb8@Ai_+5-Qwiz#O_~gYa~8Tuqd|N2T_oZe+CLX%CG&*Uv!6%_#O!Z
z6Ih*k5Wc^_3fY(PfII~(G|-M?n&;M#Y0u1%BMW1Gb>qb5j=tXvKLTu`!u$%?jARmz
zeT?U$Cw{y@vKC%#bBA$EV9btfVM2CcoeYo68J{-yT(XI6Ht!o;NZlj>wLaa~`4B!g
z%hLXo1yF!=F8M(wneO|D=v#HEULKykNxPKy@Ft#^PZ#RVi^X2#N5qROH;JLaGjWcg
zsSKc@H|&q-kMYgBr_$PLWO4<FG}yCe>Fr}4;o#;{Q_Ar{qQ_1iEYIiJglRmqn=dCf
zDHQmHHd9e}GXK|1LbdAJAJHu*rwlGGVY`=)y_GeM9*M6LaDNRpw1vMs!gs?->Zx7V
zOdKjPa95Q%d{cGad^=IEu=sTEgZr;@l1<m~HSwkH;Po9!CdUsv3aE2ZliKXl71dwB
zyl#js1ucwT5Tybt!B9A4GNBZ^b4#;Ci~`^Y|5F&EL>^;jllKALDseK<kUUDe+-gC^
zwda9Q3<!ptx)fY<K5JOpIVM1nYpZhoN3JR)4!oaG#_()ti3+Z%Ty8(KAoC%^3FAxA
z>ae26_ib6)m{PNA_xvzAhIJXOW942)Kp9ghj5Vi&A~_fb!&{;P+1=J+sN;*mxoEn5
ze3ij?#uD-t4RI2!czIR?lV35%-0`O&pfTxk%Q!fHK?mYZHjHFM<^m4}7H25?g(Uw2
zWc&pq0sH@Q7^0kA{e2wPa@VCAjGc<nsEs|?JIz|sjbM1~U#c<3{SAuC^Zq<OUU)jG
zo_DIUY7DNw5vOy`pHx)P#xgc~zjBT64F~l5-5igtn8I@ksIjn{`Y5o5$AZ|J+1TM;
z3CWZAKU&9-@n~o?;{sxIuOTG!o<4pJfFoxphEqAB^TnfJDT$y=+A&RExpkkl+2?$^
zfhH2}l`wOQR0b!4sn@aYmx5;=hjp;oLfI)H@$7Sk`Bl;g^4?W!YP(l9DN^T6%@R=O
z9Tr%q=UGn`_r+S7`=aNVE>s$gsgoykYFpIZ17h<x0<7p}H1=<#SZllUSqSjD-Y4l}
z?b3M$6U_+Voivlt^58NG$&LPj<Yu$o*=#n5xiEc%*3X*ib#@jF%iJ8H(@piRVQ$Y+
zmw%*`<>UTSf-$jp4V3gBFX-$HiQkQe|23gNWbg3RGe@iW58V_$(cWq;ob1TRXO)?)
zN<0fPXE@Eq`lSvaDIz!U>dc->PC8zR(X%&z<c-%mC;A#%s3iyd#WDKZ#^XN~1{hy`
zjeakx)6xA-AG1?-Qw(=)fcM*f=z2DXeFyKsGAb%zT*5CjXEwKQgR)Nj(FsN{Dh)+n
zK<%01TCiE&zbr4qgPz`(t-kI&e0ef7FH=~-^r}+yd)lFfzxqWC!{4LtMh9t5Qm?;U
zR9uJ%pvc_UZ%=uV`PX@e6qNIu>05@nq{f&>$o{ijH%AahO;7AH48c8M;PMl#@NYA<
zT0bxH(@(UDpQx>RHb`(b3B9Y=E^mJ$M^62m$U1*>{ac<g-II5mvR~f%$&Xjz?O6ny
z9Jyfr5H`mFN#7+nqiXF@)HTL;c2ER&HqcMLvJ+LfN@!)189CGe#)5+_z)mKjO9fhT
zqSdP24t<rMAwKsmY4<@ugC~`71Yq#pE$etmj@B;#lnt8_QH&IftHB32V77ZD{=ov2
znv0>w$@^w4v0!)O(u#a;!#174*~QWOH+%L{d6wq$zKIQM@sj`gxhZ-V1?>uLlV|4O
z)qCIKIh3wfIqLzJDfVT~ESC}meEK`MsFhD<d3E6%0E?USE=Hci{AhbDbE-Pew_v*u
zU0h>S)b%b?D_L6s@On}t^@ma*Jd#Li26=>NriE;@h<wkJHQ|zaBrV>&s|uo`(oc~T
zm#vlS94Ty!xzmhjuO4{J`l`@$NnNd%3h{{V46k7NoH^m?9Ivb+@T7P7ynZSQGrOtY
z&n-7Qp<t@`ZZLy5pvCWArkcaD@RElI#1<iIpz-njPqd7-vnT71JtwdmlLmj?r~bOn
z@>IIcIb_KiKJ@+@R0e?Ak~p6HM0@48qdF*Z6u}%^UKrYspvm@M`7330Z%4gzrhp)R
zj7Zx2Cz>fr9&k9!`Y%Ra#aXREdpvENP5SMR_e)ec(Fq-g#C?R<Sju1kMK7<}GNsSt
zwZav%!;fIys`k*G*hDQ(MCIda52CbkV9TJ%^KQzIFM4El5sp8EQReA1mV>e_f!#Dz
zTPchw_u=8^hRSKM$G7jP+17j@cr0bJw3Cxt8uGrz9xJv*#ICOt9h-J%md_I-T$fX^
zW_dhy8r+x@Xt8Qmu01|zeK2;qv$R?Ya)ahO0<HVhVXPXao&q0i9|2K(kaf6zIkb;!
zJ%dt;+|r^Y#Y#~XT_IY%JdGKkPP~TLXF2ns*z7%j2tQlw6I~J8l^IIk*gI>5T|Q~(
z$IHs3azbh(UUf|6i4BR3X=)aE5*9n4uP78}ZW|a<vj-sWw3h}vqR_uLOXgB=_p;cx
zS<!;HC+oA}aVgdW_xGq+%(~FbEC~+#K&ao)a$R#_ZX|P^&I+Z4n_&h(liDkdum!LH
zjD1vMWP)dUDfVl~hyz=d^|);g-QM&;0+3FLe3T6dviL6F3MH&5+Iy<wWL-=XWj_8y
z!*d>t)Kdy}V#TKn%1(~GqgZ$#J=#K88s0m=-W6EDS?n-%S(~S`=i$;S{^RKaP49g>
zMGEgLbrcR7yB>}F1qiaf+aS4qqBS0?-dbNxqKq%DI&Iboy_9Zkd=OVz)W4~B&A*Q@
zovd|rcfrMfrkBTVdn~R$mz$#GmM0nCL&U##A^#(E=6?$<oxTo4foK#Ny-G$ghWo+N
zqQiC=!Nicpj_+{l_0AkFa3j}7_7FXX00_kSbQvZoq;rpTej}zsMBn%g58fA-Wg@2N
z={T~$Z=Qef`Rm1IpCQ^HOTR~3y{%FDL=`+W-D<%zzT(-1m$Be7x7@;TxjyZ%NRE)6
zVeF5vctRV~KQOk~c1D@aVKbvujU0Wn3+oeky8NJ1$4~E7TKH%;Ai?1RswfJ_1Wu8>
z8T5GcAMMhcbs@s?6K#0O`|bZc*HAd?@6Ab4R4F~<hx9847jIexO@BE-Pzbu00&{uu
zTpe?COb~D9TtzGOMPIOyS^Px1F7h{5^LM@|6Ft2q{)v`$bl2S$7x6vTbl0x-Ev<6m
zYf1USJ0%+rmFF<je^W!5@(2^ZK@V)AIyonkex0z|Q|{P67<*C%UT_7PsH#NW9FyBI
zSI};)2P=jc6eak|eD<O)&deD`WtY+`2@TMmz?*{d$_n`@^!Y*R?b38IM}Kp=bm8jV
z8HE!K>iP@k@`}+Q7`}d}o!`Za;gbPIVsM}SF?LYesz}%%A1<K@tGm>EwQ#jD2EP28
zc!}+ic&RU$=Y+l4y3>CX80b~{8r0)KVdtz<ESjY##;PzWZn~-4ViqW<XI7pt(AEzj
zbl}Qr794I}zbJkBq5w<&vfREBG4{09F<L<Ap!t4OUSN!{eTSF0&yBPW&*Y7?g;iu*
zz@NDhmH><PFf4CdeYyhH<(3cLZJm`>eJ0%&O^!5Vk;T?;yS1%IR$6r51D$?E_KuJo
ziW$_)P}6vrhD#4u*T&vbktI7E5VMPqi}mukU_2Ii?7ubJ!jb`yXyw9>U)RMn=s&25
zG+wUY8KpE4^}wV!hX-Fo&NzrpsX156P>H&#b60iFVt6>MNq@D#ztsplvh8ZU6H)G~
zoDkD5N}~7r!A~?6Z7}QJMP#FL^hIP#ujY+35mP3w(5f;go6c5O9@Me@euXTC-r-7z
zmtNQCF|iaUkHDs@*XUu%U+lJICI9Ak;+KIKmn-Ii=d-^Xl8qGxrD^~2N%4pA81a}o
zjQlV5U~f?b6$uI*?&}JDh<TJ8pVFle_*tDt@6(BQ73g!i)`JHUz1U+<=BV9wcjoh6
z@cH@-jKy^u9^!gA5WiHQG_VTskCa<;SYuEG4~dmM?M2u%e$Axsl;BaAY6>YA#B^g`
zv^pWoE1Q4-*i>-OmU=gLMLi#UyqGEs$Nl)JF4BdW{=8$C_+C8&;f#;VHRD7Gfv7XS
z1qVhdOmE9=N2{?9eVe7KC+z+7dlMXPd?~fcz#3eA6LI^Qgz4$Mi>FN0WAgXi*pj(^
z6iU3kCvsK}X0MHTj@>vFH?AGi=3SbCFxz?E!eD){&bL^!d!S-QR@K?|0p5b$Ooe0D
z?g2pQw-jr9xcxDid$Wq<S|!eXjTilH$_4kx+Pj_Qs)o6J;|cHwNACaQ!4tvv%vfbg
z%$<Q7(lNdFyR$TQ2x>Ev>!GN=E8^i#Ia%mZwyks{{cY=4lC6%RU5cnSy!sg8_4nQ`
zwPmE;`85XcjMY3te)oD#Y>@gBEXW9-ESsqZhATXZ8&d4{Yq&uD_YO}?FQy7CJho9=
zO!Hz9kF=uKEG122L-~wwrpo*cgeOe8T<?i>-EfQNoTB^n3TK=`-9Ta5#00)oI3hA8
z9#ksw2jC5S^k9xIziHum+hC>lCbJDJE!^)cZa?_u=b@LEp-iVOUkq?(8rsoQQN22m
zI&&L;^@$-TlYxmwuHMY9cN(vgwoMTc4mRQuYhk}4s^~wOUzWpAHjEg;JQ=VqgHe9L
zc_29;wQ15~z~&?TixD=pby%2lv9*`E-Rdvok!K<r&;NwaVanSoA9&I~Kbjwyy?5wR
z^g6m;Z#!DBX3hCp>qFAlR0@h^z%naa%D$#)(jLHVPHo*6?aj_bxhePDcR<EXd(Td8
zq_O4Ph|#?M*oxAFcF(kK?fzd(UP!{n7d6~f%i@lsHU`ev5=RTgVqCVuMhc-7J`}qZ
zB*4`*H9svB*o$+FHwSgiQg$IJlgBo|8l>`^5i#JrE*}q3yCm4lovyh9J`MG)9mz)+
z6?;4f1QcD~ZTa&PLp8m8iG2H7R$*8~8Q#aX(7kUc@!$1F6i1tT1O@nc<89YTv#nC&
zAB%YwqqKm=h<v!nCha42yYoV1{C}}p5=OQ-4?oeKd*+Gn$<~kj`F8A{dLLz!w4-o3
zL5KUj^OS;g@_Cdn^qc+LUfI>XZ=OYxLUL!;F*)qJ%g_X4H`?cU8QT?Gh2}N=8v>)A
z+*5fx4J>A^@00B+0KOm3LYuqFs{fD{Q_(AHotS{B!?4eu%GZ#y!kgqN1B<9U>5Vqq
zUY@*u32EBIz5FFprx;P^<VLE`o<C9c4wZO2*`bJ$pI)u)3HsVz&W)rtMlp&$5B85a
z2Mow9UvgKVcB>>}c&W0rL^QH(*)j`|kvy907IjDIDr6wpycSpge{gx~*}kM3E~BlS
zKJ+XO*jgjwTBO0@<=HYHhwp|Nvm^3bnlXuTcf%@_nwu~TMsBlcoEo*CWV{M7+B%bR
z&TZ+FJ9S@ki)(djmHgdX;U?P!PC4)V!}X~)>*&O*Tsn;51002troSZ^ik?%Gk<Xgg
z)1OvwP6#bFELt2IJE{E|%uW#=dY3oPQ~}^6&#8|&4EUj2&n=90Y6FgF=&q`3NHARl
zb++>x{gayemNST_GWMF+DMOq@w$6%0&%cysiv&*R$!D{Uz8QX0?rP)k6D@H1e7XFn
zwZ703GfVnj>t3!4=^K4rY=QG*5G=E&<j4bLuv>)<S?tYht7UMbsJA<dF1rYkJF_hJ
z-je>FGO=%1CLzAEqvJtp1Q+V1Z%zA@{f#A?(}?q|nd(P-_x!V0jZm-VH!W)RiH}Ts
zddT%mDYvM7d0I3-(eJ__ku3H{qon{_!CFm_sc)5H_C&a6eeZ8b`Uhgnj6b0J6Gx(u
zrM3X)_&<<lpEL=!;y(<tV<TC)|M6_)uhw`Yu5J)XabJ^%x-yoKZ{MV^f~FP#Z)_@D
zbU-A8sqZS05q!3F9PivNR!&jl;j2}T<ytLh*5SW)qGGiJPA7sOG&G#8<!&n6eNY_k
z8oH0Kmh)!)7z)PA-ChhKqa69CS2q*iV2G;8=mh(&L`D2WBLcWdQ&F+xu7K0F9qj@I
zG`{O?+PF-qfbcRrkxc7^CzCZKe`>P-saOA7x&FU*y8jdHxuBvv&`tS;Y82i+*{8us
zi7iWfi}az(*9L4yx<WL@Ui5o<T2n+uH#mv0KCrw@hURWcgx}7@dH0bySJO3Hh(Al)
z{h5{Y{@0u@;M>bN);TA;%3}sHu1_k)qV)P2M_N76lK{ds>iw_Z17Ti{Bp|~KbqhM5
z*y+j8#Yu_UA4QSvI*&r+TcyU!5>s%}dG5J5ihL?a)8qt^Gohi^EV!JrI3$MgC&a*=
z9*e10cfN+pVWd6sZ1GdTfLSIC(8cNXMU~SP%*#%_bE=!2rQ>yMQUiE@h>o<D+Zv&P
zHx;!0S`sbo<!#W&k42YrQ)%img32)0NXR%QJtK&;dkKXH>U<1EHu1qDbyKWDZ3lqW
z0-+LOFk-%q3V|Wphj*@y_K;={97HjE(I2Ypz9v<E5=tgm8n=rw7IRE}(F9<VW*!=L
zsQ5sf7fzC`I^*hO0c(t1xixgp5Cec!j=&{Hn#%4x-1`M^zRZeogQ1x1f|ukwr*8Ej
zFLjqa6Gogp5kio?Mf$dBV(DXYH^^qX9kpje;Fit=`}<diT#wf=XcYLDt7i8uEFann
z_br!KV4@R$9CeM0^c{YFGU}D0D<luxUxxGw2&8<CxM)fT-&==88`<X)X{Ie2`4H3N
zP+Rh{<FqXDsy;Z@YNZ~aLJUO|(@R_noa%%dZSB}20n}{quqTkJ?t!xhRf>nsXwB#$
ztSk`pNvYMY`<AI`<*f=U8FzJ|8ZYI#Dq3WWR%J?txw=qJ*4s<sKkaVXpAm4Z#4i_u
z7iQV25J(qBlP47GS%gP6^YbLn2_9W*a*N56>>fTGbP?jCB2LsG#e<>Myxuu0q1Z&)
ztn`+gb}{l|!fN{bYvJSvYCrg(y0?f<_lPvI>24>ghP+ZY2wA&P7m@gM?<_m~(7mnJ
zu6hb&P2ixSuip0gfsc}R9&HMe4+$s`e5q0Q&B2^KAzvq_r)C|JdTI<GzWVxN3LowA
zZSrCv#Y4{J`o$5aX2_BUciRETZvlSQ2)zIs9&G%Z<g_@zqrVW?e}OUo04RTw<5^jb
zjP4{Y2Pa4mFDJnk6oNDSa`=4HBl)y>$ZK)^|H=$&)ry1I$)-Pia{Tfi67tLG$O_8$
z$ltt){BqRsFFld`cN2@c?b0KZps}wfu{wg;b!v4NZJd9pblE4e;xt1*(y6^RXe-n!
zP2$`YC46;Hj2`TYv){>0TAPQokUMhm@dual=hp7@=o|GrHI3QAk<?O~J1Rc(J~MC=
zu3N?1uY<Eg=@zcBw$8JF0>ACyBb(hc4Si3?&|uT=Sir=)Y%Z{di*zcn(&R^ZT?QMK
z%du$Yw~QNMq(mq$w`@!`O<$ipRserdCg~t+{K6@+54Srhg~*s~)a8it*WmC-ylA}8
z1p=L!3)5JRml++opw6l-vls?O^B2xcx%tm5J}9bT^18>kT%zXoal-|+RSZbgJ5vTH
z;a(0_y^6_)K9L7jKKYzGhe+BV&g!4Ko`p)vB%^1EN@TYh=ZZN1UB`;o^FNy4UAUn1
z!iqQ(`Y&)Ng8f57Gono2h;i&3Oxi*wktsaqC7K>@3WM4zr9TZAIX8_hm;h{L>B~<i
zWTRvrR7RI&grMA|^DZBIVg!CI^Q#%GRSN8sWLq$xcr=~X%qeSYp82%L|2iAT$gCuX
zt5ndTYoe6%@p1wuqKvNTDRHKXVmYsqni^!>)VxgVlkh0Ez%+u#j?z16H#c)aG1rm=
z&Lgu3wq^VH`k|l^r!$z_`jmY`Zl@cpYx|uFDAr*BZ_iP(w@=syV;lxnq3>!0dndpv
z3J0>GcU;hipYs|aBJcakl%y#!m-vfBGAIPQ2is26WOJ!k_H2mZe1KCdvt)6*uQa>w
zkFAM^yf|ZM_s&PQfl@@#%A+kZsGM8caVRnpU!4`b;2wz?Y1rWYdWS{z%}G!*fweDz
z|JPN6W#d#(_%cod=H(C%wRdjo>ku3?ClihmA=S(D2`<QxgiP3wSML$!6WT1IGPlmq
za2?<R)(iG7!lq`G{5z7>O*<r9UkLDhY%vPjm6Bjr5k6TAxmNDd(ro(@X1;X$KE`#n
zijK*PXF8=%sb&s9QU}iN+iga&MM3oxI3QE6-1bhKj+Z{d={@UGq1DLS%Tpa$-ltz%
z4z?eYFlJAwT%@A&J3O4Y55kal)#%(wub>)#4ib8AJ)Jh+b5N|t^W<ZSBA}0oS|U8p
zad<;`<9wY7eB)JC4w6hGdbZLrGo}O6@yw}~S$VXTL1*sxIHZfdz!K7aH%_;_4&m5T
zs%DmpJz$f(&6}NQ9OM}I7JD;n+90OiNgj|B!+7jB-?j>^w?EevktG8m_e&^@023@q
zXlq(?eON!Zh<x0WqrMGY_zeW<mH((~ZR#@E-8yj+#Gm5v7$enEZ$vi|{k-IWb+LHK
zVIK_7&5J5|>W@Gxa4+Pk?U?S(l~5tMw--Mh>@ojM6~f$onf3~*#O}}3%l1*Os8-oJ
zbM$Vl(kzDo_s6>QS3}b?g*BlP&q-rIk7=s0aYAw7DF;4UFVP-91DiA`v(6U;&qh{x
zJsnyFNfr<cquI@|=u!0YoUWU<cGrElD3eO8;hdEB-r_Dq^A!@8PDJTH>OV_XWcqJM
zEG}e$fpD)ZyyzOH&~)6JHvjLY^`lFF{@BjHU#<HuiJtw+`SF+E-=F&R#O_~y>k>*8
zjGtVL85&^;3kbObP`(HEgdk*_dc-w$qe&L5d=fkQONj7a#!3r@&!!tp9;tVhni)MR
zWu)9l)qHIC{HWLo!yVEALG9SSsPF6v4l$IF5sC*f#~eIwL38eQ%Xy<?GPu5?=KaBH
zvU{9)g@e*KT(pzEL3wO<_1zhZQgTXYvG(d^vBpb&3X@K8hZPg#X!Ap7bZOwryB6=C
zyEJM4M7tZgzFS`rsarxhQCahOdhn^fZOn-RUJAtyJhcd&&0wS9Q{@+uFOgT9G0{*C
z{$<=E`IQGoz`P7!H4>&PDY44>h56O&Cw){<4&v+<o{%v+{t~Cw$|_!LQ=eiEHwOJY
zVyJr<{^Xi@s~gmBB>|;_km4z2p><=pv;5RM!EK}I;E15#MWmu#P?_fQ@wIa4O{VB}
z#q8QG<i8o&>T`2^+w<>&)t<f&sY%br%Ky!gg!PNNsZ|EE6q`6MxVCGFEO_0O!3^Pf
z#_s8_W>qn?eftDK+dexFFuR9fJ`lY%UAWq{a~IRI5U9gBy4dQTlTf<qDMtqt^bQ|N
zD~G!^wd<-xIacr^rF9}2^>(xBn;H>edHZ?@#dW|lvx;jiDA3%ewpli2N24XV5y9p!
zOWEF|I(abB+2z{LjwnV^=4s_boE;ZRABx!>_^`ZrI``A+A2&B(z4`V;jG8E?d&z}2
zVtR2f%7oqSP(Ca>)E6ZcuG|9|KZ=EUfwR0CG(+xO2^a3xVpp_wFEAjrGxqND^-wu9
ztco#mFCX19y}7nTBEQ)=`b>dEb*PvgQWpJ03*FQ;ND9!|`{GA+@_D1dErcs(YJ9Hg
z1>)#|%G*NV327(1A07lJ3gr;J4XZVf@@}qbJ1QG`i-klt_$p9ODRl=8J~cKG@Z<8F
zuw78@C56_QnznE-PW{8VqMDYdkAY0Fg^$*H$dK-4#+*$TtlBR@x5{79fZfZ539)T6
zpWN<PMq6aJt$v=p3ze{7gq!#Snu#(@#0goh7DPSn<i!tEGSe>dyNJ9y$Kn5CZC=@M
zTu5%QBQx$bm%ZEYDcE4*!zeeUTgpK4z+PV&JmMjd1QrHB**lCXG6-lX&^W@-&?j<E
z(vLat+S%8M1QhllXXA+pz{R{Pe6-s>K}eo5L^3S_wG8C2rr5i+e;S(rZS|mFM*D0i
z^AL2^8!Y?pP1gTn!_FbZ!|^g{l<NIq4fik?S6_fA$-g#p|I0gn7{ae#)B~rbefcuB
zPMvC4*5eh+z_yD(;LZ-~tY<^wcT-|Ljr{wBwLEXS?7&o$#_@`d4^-8kKtjLRe*>nO
zShhS}tlHtIxfk0sz`=#<fCs%HVhX8iZaStz$W4yYOk04ZC7D_d#hO-*H3pZB<|UWB
z^X(lT&Uphg4Q47D$A<28+avjCy5)iju}7VeG-|Dguyd_DypNQaVmX&N;$5EBYrZ?M
z7^)zAB5(AA#`iun<LZ9Z=%;fe7i{dDqf$vn)7CHP%-0?)d&A2c@vZD>mfqGoGn0tb
zJs(6`ELUGplo6vZq;K~T(Yz6wy<^|l+>h})PlS6;?3T(gv{rW_aFfQx_T_6D<o3-@
zYHH4pY*}SGC{sQ8_(0f`Qqv&tO%LTFF$^%Z2=AY(t<Ul`^A6YX;fmjROx`3dUQvX&
zeYnYk;G(VC?={XAZ4Do}&zMQZJ;I(s`rVs=&p(n!0B8-u$bu#&5%A%MX{)ueef3!J
zqx^a#b6sdEkLFcYL2?h)81=@a9i?4m9XMOi+Jq~N(pZ}363;mk&U{kwWtWPlMCp>P
zoS4L<^+~m&k1Mec7l5YL?Mu#{mPKh<_PO6alKFq)WWH_u*Kx|<d7rGb9_!Y(DD}q?
zjK6(|pohpj;-o={;)QN-QpSmXK}^t@(Z+pV1;3e$#x{bB9PRSwyjB2*y+A%pgJl^w
ziAlTg?qBO!Lk-B3H+++1aqn8%;B2go4FUA4f!P`8BUzOx)u(LtPJggapwo>K2)!jN
znt)KZJc>gu7BLJsUXdPFqE03~&A-6!-{XdDs07sM<FCv^6iEIv;dko)JE!0EvGnpP
zgU0E}e>30K@u+-fG&@JTqHg-;?3&beHI|KwQ@?!D1*LSsS3cI`@c0s?c(IPc^51`=
z8JukkLk#D$^JcSc&+-u0Wi}!sPpS_cC-7sNwT>337CJ`kq@ZxEsJ0|Z?%{U2=O9o7
zgXo+1R71HDgg2pv%?C=?CQpj5wahXRZ{0vbbRXFi5aXtAUexIbsBw^DgyT+|Q;b+a
zAbk&Hpq8TzqsXTjww<Xzl<%be*f0*CkTjl1>3T}&S!@T^`_Y)2ZzWxhs9Fb_+D-H5
zG%4r=l-Rfq-|v?5*$oCl;QED@!%&VF(=rG??g<JmnkT{}px{uw#}8r7w!2T8cyR(0
z?F4$g83;Xr@rw?g8Js-w6n%2L(U^xc6)jN*fC>YL3ynqwx9P&W^1#&i7Z4M#+$mH=
z4eMbTF#?l&8{;&MF)bS=-B=Z&?ur1%C17W9yU9=<?(|DeHbo@sxY6X=D=y(67|DQX
z#LE6)-WTs%ieK}?I{ADHrLIjK$w}oHk0j^Py-3O!tsd-+T-|u^xoE*YEj6wuRFSt&
zoff+}x8VusMcK&s6j{ZWs@PfDy>W+jgY$+vKY|GK)v*4iTF6HLq8qW~&j~<j8jgPk
z%cB2zgVIAJuzV=TZr%I-GO`v#@9WmAxL*L)Ft(hHr;Jn2**wzJ_&!Ha$b3F%>(7Bd
zCz93LtUPlVhQQ&hhm|a`B#kGl7wQ=AXsDcj?4vH3;9-7ci@?27_{7&Oew50{_nN|K
zqNUTi`!JM+qo0Zo$yX1l;vRkm!YG(qUTYFAPzKB&CW<rHLi1S4irSIyZt=M1n_7(*
zKwtqMlFU<H`<z&hW3$3536|#xt^3cOS$g_;me2y2O|ct2Cfz(O3{3Iu;|4T+$fn}t
zN^8d}@Q+gRPrQ-?=Ek|Jr0IM^=@}Vl5$|ia3;4?nd*~BwNXPeKpFjJz)dI3-t(qwf
zI)|FI@jZ5>@zD$U^W1Jgp`+3sO9!TQ`uYGya7G!(1tuS7l?yawuhM4(PS@SQL$wHc
zY+`v0%oAlbcnp}zq9G9+R2LvOap+I9Da$aBRa`TJX|>10HJwA7upGbap}O#_70W3h
zr1Q&|Ns|J>yrYJNex@Vq0hTY#yp`RPP+1J+)=Bd8Ed!GkXC!&E?Uehp0r|!}eI#lZ
ztSUZp=(3alp*BfvToBy61%VBs0=cUvv|hDF)HqZ%^`!vm@>J@N*TS0$e0#^`>Al=*
z*FRI6H!G}Hl@mDErLjEVA5F9|X?M9upEL+;D)-2%<=T<7bavrBk)2dn`sO{In%Bh;
z0rMXNM;+QPGLl)frqW4WJx^D7mauDJv|H=9?A%2pGkGHq%W;sAJvf(@`SFq;BlAnG
z0SMh<27?lz@N|fhy%zc$=&0Q#DnVeu+GmbH`NYY!Fs~NzqH#2};2?*{Og7Rza|coq
z1}yMOKQ?-?pIg&Gk}0D##Af9$CBT-g3u{|vE2tj8)EKRpZgIAEa1=pFOxa9>6($C-
zUO#x?E(inAWE|RsKIvjUWn^mPy1ONf(je02QVLSuX2QIs)fZz!{9w~6h>fWl@`8Hi
z6pV?`*tS9miu9Eoz5rS^lh&knFKwT0Q5a_DW!J)!!+5gG#e{QocD?+D;H}=Of17U<
z!glqPCOyGod$<rn8{}dk3oR}GXmfZ4R@;}=B^wu~>W2E+1;f3A=jR?orgUUc;-9^G
z`}HOnoCyjUq!G0hPMRUEAohBF1(QOqV@dL{US2eKB>F8aMvtu>XD%qpZsV)`Kcm9u
zZ&MEavrK|o{eAwaBB(kA&!UJI{2J{3F*_{Xz5T<iY5y<C?>GNCs%9w;we3vOj|Fj#
zSo4?nai?rlQ^74D!{GmqlAH+qow$EBItq;afe><0IwKd`XIpHD%}@V?L{WHOeD7+$
z1}<A0aC@A~t6~fstMgoB14j#)(B#j_E#`^GTFHCc&X+Bf)%$2#9HrF84%GK3JOEKb
z>Fe2I1WD^VUr)pLuU3<EIq<$g=T@Pl%nHWBnUIn9GC!ujuUkIfO_;*HdJ;2yvwSRd
zTJG?uHTKZX3?Zu<Sz|&eIhIbF$q(Bs^W>6Iy&I(im_QXI4S}29Id<3s!ZThua0-xa
z(t0)t+g-n`vi3ivR)bJ2<9)JyB1%*4><oP&KtXjhu_iOM;abP?BqFidE!GqBN873Q
zQ8Pm8UX2t+71J8AV}n2n1&P-IzLQ~Oqo-+sBZB13QM<w-jP)|1ptfLVMeDl|JzF#v
zxFYh-J8wAXZp$N|heUbsYQ1sKx^r6E%gkBww?qJ0$nz#DFo{}!@9SY!pn{gR_bncm
zi!2EQrC0%MC?D^k(y{y1%)j|<zVADAffq*eH+oN|A!T1MUzMSW;Gx!%sB}PF3p#(`
zam|rO^R``BC8^6*+kB{{B~(#-H~Vuy^k!~%V^@d|ZjFEq*{5n8yM@8^3_svxe^*%~
zd^4a|d!yk^k6#wcyQQO4W6%2gljRK6FH#V7@^tod1HQ2;EpNJjdU?~ywE-hFPjL<i
zohp@v-hKIwF}G1O1~7iLU%|z6<i$<qxHwI{Z>n1<u||#Xq$PBF<&Hb)6og>FEN^&C
zYV+1gVW{BblAA>VvS@G>a;`T|vegCV_7{N_IM_S5s;4PA@jfz$<S9gXIY<ySIt3th
zF1a^}ro&ndnJgq9vpjRy1B?fpPyLvBnI;4Y<&FWn$@=IV(0n3x9-wL(*A=R5tk?7q
znLhvU?4h!_JN;JiCN5!T+M6*aCCk)X01ZsA0}3GSD-kbq%Q;}5IZ8Hmd9TT|lB^9-
z138eM-eaGO{o?lV+;&nu`69<JPj-&}gTa?^>@)mekBU1*zAp`h(jPXVGuWCq*&~Zb
zWP0bIRdN>K9LIvsA5Dnc)ssD!i^2uwiKy9RR%R*Y%z(<%4xy?9uFt^6iuoC-p?Vh8
zv3HG*>b}eFNLp}t!Ec3LkZFaEGv$o<z7a@_rjUAv>zx#^>rfFjAT+$8R;L)(>N@#+
zK|A&$l=DmYJ)s1K9Og!i`c~F2n8^*PUTX%g!4d8wb5XU;nZD!rAt$EQwYmElqb*MG
zz%Fd}tmdZWmK`&qc}Gh(7#V>%e?{~n*2c0EUJv(&ULYGYIf1COPVE<qPkmS4iegk6
z_rOLS?)ena63JsTi_}+i?Oe*ewHHPGbWHDOSr}s-Z-xB0bU@7c-Mw>9-s`%j(aRcN
z)bjXA_N2yI_rHtE-R)ujagY3m7Jec>#npIQPLWkEE0tHt%*<DxL%9=0l}Wr8eIJ=X
z@my8BLppcn+uz|gi=Srx6Cd%ffhX?tjPUMFJrHG+^$Ujc(}AcqMGlr;Z<XIn{(wb}
zE{c{$g!0*Lq9>sC#-Tchfk6a9g`y3O$rvq6zU1W@yEM($JGm4^_UBsYQ({q!$3I>r
zgNz+a1hY@sBe{3o?!c9fdXdBD^fOk33{($f#U>W9s7c$0J=%Lj-u?xM|8qSGD(840
zlb-5RhG9Pn93Ss|K-4xXb5s7G0<QlVXPj#By`wSIB~<X(z~WuMR+p_7+nYcxqBy7D
z|5LR>+@xK=$Qk2d@cjQ^?>)epYPN;podzKU2)#o>4Lvj|f+V3=L+?l@AR<*MBB6Jr
zDj;B}(xr)@sG%uEs)&G%rXn^}ELiZ5@9TTcx%Zs=-E+U^|DWf7zUSL}G3=RHv-Zqn
z&01?_Pl+x0ZmID3l1I_+z8(1T2{yWJKDP2(f&ITWcIn&o!KwA`O`Ob4rS+`8+sK#q
zeSUn6k41dkyRXq|&0{BUwTDa<PSn<tI_hyZ<0>hF>=Fj^Wv9_sc1qC~XbOQfVfp$%
zn`WrU$NdLq34g?BveD1AubOOKbeC$?IbrgpMF!lS<F2T75%I0)&ll!l*Sqz(%cnHx
z;;}Ys%H=1Z{P^Rqj-|1v-b;r|&q=3U<5$>zn-Pe+|Hy#**8hu2)cuv%Az||PHNx)-
z2D!vBUQg(K{aYt;&x;Tu)AQXio4h75u>X@hs1Nd2XP;}%+I?mEg58=rr=F*-H$djB
z_VL(LN;c{#kuMzir0Q6PIG=F$<W}?XV@T|L<AcY&sK(=8Ys0?CeYv}5*6=7n;Ykhe
zrPxxlp-=Xsb+Yuy9+ppPnyzQ8(sB2DQEjX|G0bkCNoilLPpi?l(?0NP$-tcT{p%Kz
zUU8Rr@|&LO(fxM5r(PA#UlDLO#6(x;E@*@~q>n=Lj#iRFxS1segv9w6IC_uAE)mgB
zwznRAmHTEl8QIMIarf5SIp#kp$*#|H|4G_orFuKij`v4cpRC}QD5Lc@WNLd{E>^MX
z^66;b+$-?5q0Z}hnz)kgxWyrE7W%<p*LEF0wLiUTO}^>Ynfv78<44pM-C5Qy(y*P6
zd|cgC^VkZqrEccc$+@df*Hx>p#a0xfdYK@;M<2y6*%be<uVL)ZMM`a`hp?h;1(&&k
zmIXquG6yCIc#Y%EX)?Z9NMPCgq}*jcU><6<lTmg1m?py&sdQ4<l)!CuSJzdQ`qH~x
zFIv}MB{__mp1*279QLfvul|OM*zs*wYl42<3ipG=eTS!u8XQWtZHCF;FADYxg?^G%
zFH{}R4Ei*ms})B-)bmP};o_r_BqqjgaQ!{?^;h0_j}=CUizt0-quD{`9D|9$(s)<=
z!Q)b|*&W?S!frp6a}@M#12u*4L*D4Ekr=Kf-fIq1R9r!GE@X?xL6?LF8Z&*8+sg%_
zn&cNxjD%25EHs#x_`G@Ln_hNJ{5bT!+i1VE$?L_eO4eE-0VdvDESX&6(_Q>1Xwf)Z
z)>zzNNl!3!bMJ_2E4P{r@vftCTiD0Ns?8U|MTS<nj_cQAw4O_4t(Jd!(`Tn(DRlS<
zQ1Mwny{4|V>lyob4^C$cX8LFq?#IJ>)_y{&)jDMIsdq<HT|zPLo>Z$d@6^Dy2i)F&
zh-CQWxY|{-aW^RZy9>0S{EEcZBiE@juG<y`*DmoU-8(IJrN<-09%Cq&w{ZDd%{P6@
zng=$xe{-M5zx-4A<ss_DVcXWD!|;nv&5G4(tK5c$EO4#l&sWH@x>t;xc6MA+W~zus
zZE&~!-#S_wy_!FEAYHcd{N-^Kqp_D$*YD}amVAb_tD1a&)46=0Sv7ubjv^4cdb+u*
z|BZ&gbZe#EH_Ojjo9y}qudl4HIJN|RjA;_`EtttiJs0rFJ&kbscqXLFT7Atd39bh{
z)pO-Zw8?kboruqJuggsy(XCdC1I?vT^IpX86?Lip1a>Fg1?4U=+-TdSZTfhzL|$I;
zbqflbZIAm<N2POSN9UD9D)(-zt$WPcRA#4RM-p2IJX2KC!bmoYRs9l~I2UsdoY+V5
z+UHWrx+}iW-r){^c%uFAlX`n#_k!7}cP<u^s}Q3mP?3|z%aQqvm}~WKj)tSdX4mI>
z*4^AKEG_NtYfWt{+);4V2s*54e`(-{Cpzok+Do0eKr4Agja222`#m4!ekXci{_r!q
zMKq!%Pm!hZpj3tt6WTBOo{IN|!zSm(iI=H}FeMeuci8lEEJ;&U+zp3Dz}MraAEQOM
z)%8LnvLAldPHMM)30uAGQ9ZV5eB1Eb%;W1;+&5!%OB4oVNEPC3^GAt6DfQEg0ZN7m
z_Ch|WTWRZ+GI3SwGG{>c`1KhRLb9l-%YEL*T=l|cr2G1f>+7%Xn#ANzt#kT>u#l;i
zRqZ$KKlusdVzZB$y|WtW>w7Hmj^6Y6Jw1UwS>gYi=?VYp@D<m_z-8c5N#Enob0Hen
zcU^Pe#`A2%Ju&>h0e{wqC8XoW+=`2#vf8L}YTMN}=&c3a5k0mcvfSB2b<9(s(BrME
zRs1ejaE3Cekt#o4cSlvXNnKQLX&G)7%<-obka!CfN2}MrF$X;!u#Wm{i-=LZY)h~j
zu*LXR*-u3zo116~aD8(++o3!i7{%&2+qf}sTnBu>QhDOK3EnL#{fnj6*Mbxd5117n
zn@d5m=8iUNw179a)61bcul4PtPnnO~&NXOeJ}A6`7j_YHIvO>4u_rLNRXulTN6tm$
zIj*n6-Akfi%c5XrDSCjJpc&O9B)2&wBy(o(;?EI49tD6wU?>a*`r`rs0K^VplnK^e
z1*ov<&K-2(;M_YLevRZA`f~+<gFpaC5A(685em-*j@_)kc53dU2)X5*Al%mFBHrga
z>(VALjx&}_tcd$c^JAU}Gf8BBk#L^I{58|y3OfDf4u>if#(rT3%9XoG{RpZ!3M!(t
zx`pEomDl>NJ-c8lQpX|2Zj9B7R*_&5z@%x5>RYRd6dlk4R4hE)B;X=dN%<Qd=m6P1
zIhQ_<ThjFs8MV8dhZpdC&TmRMege1pmz1sae=y&<g=<XfoQFxdy`?ev5;w#=Kn7vZ
zQp$ax&@HJKH+(OV&3ZE^)<9Ab!fAKpP^h2J`z=bn@%@X_ewip#y_z8Mo)B*M3rRb%
z)u{mH#jq&}hPz*gSmY$<h#f_v_~qb-G&n#Ml*<rRZ5KX_=+WmW!KwmJ<BMfqH%LZf
z`nTD$?iF05YIL6Uq^J}J*s-p@d<#SuGu%mU`p6ZEu?dCGz0Z6{U`NR(o_D`YYgx6?
z_z2EBwK3x;GE}MDoqmXMau&CHPoC`x7m9`5?6HQ!d)6}%^L7Fbc94cT5u<R<)I$aN
zCRhESSu=5jC?^iAVubuxLXZGr4Dh*KqJ@8WJTXI3@AH=I7Rxpm+(eEW`pCl#7~U-^
zD>E2dV4U@?xsk*pM3q8WjR@#+tDK$pT#d{@BSIVbV5SnflD0<S=+VhpRV2e5#GT=%
zCJGK053t}7!#@F3+IHp}K(K(#*RkZV-X^<`viT>(YgXk#>CgNyr>Y3@0^IemlR;#F
z*0%G}k$o0kuoa5mF6idA2ukW8;L$Ia;lYpO5sJ+S{504pW&|D~Z<^#uWPm_WF9DQ+
zQs)zlU(wC_^UqkLY_TFL?4(Tq84u+!5Qhmj_cEM$ESS_QZ@^l+4J?T=b6gf@NPc--
zD_=3*OY>FWs~Oij`djDEUq~Rhg_c}R<oSH&p=?_|gRC=?%t}lw6OP2k9@ys|U03cv
zVo2hdjRj@EQ)d`GB)Y-uP{Dc8LP|N$ov*_NwO11X2zW?2UJ~sy256#8QGKQTchG{|
zxta>K>dTBBu|$SaILB?H*_kph*_jj<iw_}rA}?W$!7<lo>I`JeOu(=*4wzcbQ%h*E
z@||MIzWJ96+(jJO7ccy%=Ixgn_m5|&Z?sj3Y4?_C4%h+;xznD*Jr^A31w;)vUSx=4
zxrit<@13Fx`<NFb4+|Vu6jU3@<P=bV#ixS{@nyxArOw<Sen^fT%nLK($p_9W+M?VC
za!{H5i7B=y&=NI(v+Ndsn}xGyC=RxELhyuQ*qbfQMW85?*=b>ndEF4s(1e7kOT3xp
z^N2Q9<Msmz<!m$803{R&Y;FBU-f8l9DYyedLW>)w&8{@`B1=pgA1^!Y_!=ZXl?;L$
znqAM7H7M!d?xl^Ma2nj~On!wS+U>A=WE4R7j-#62*Yu=x1s}~Mh~p)OqK!H564A$O
z(_Vo*y*}%v&Dy6TI!cR4F4Md*^~+Ga)CH`AiKKmB4Jb#tQj%C-$7GFMda#9+596-Y
z7`ZY(o3miDY|5GA`O%1E_7K%nNM03^TT1gujfkL7o0o<fMkkwZsfDBmJp*la4ZXAJ
zlp6R58mq9wB%aiufE2p;I+D3LVPLQo{=_9LaY(A}oR-Ji$P?V?0tkM`N$VWVLqmty
z!}thPn}^0@Tz!SIvV6d-5d134+c&r~Pq`4_BZ~o^lqhXg4i_hnQ6j?0?!C&coxY+u
zOKIE?ddTj^^Q}!y$r!4I2`S4lFkft-#0XE8O^qp8y^dR-^S<@mWCUg>R_ZKJh$jiT
zZA(z_K^=B|Z0MtKIq$eqAhV<pspK>dz{Ka+tsRP2P)ym2)tOkg_RvF7zR)tm3e#JH
z8XZ!Jk_fREJ1J>qkOD@W10lQ#vgj1lHc8fXqFj#d=K?E)hoK5OKx1hQ@RsJ}`Fng1
zn?lk%=3F0fQbOjzsRkV+uZ<pNc0u8E{YxFG4F*j8#_Y05@}5~n_;c3-v*U3gjO8ZR
z-QZ5lLs=4>9FVe-rv`X*=6wfw`ey*?FIPd;)7>x$JQ?Uq>l_Xg+_Wa0r)mw1fT{8b
z`F3i$vOgGK9J9mQJyi3VA%AXD;2EmJ&XLLflBD;&StnMhWy_qT2_6OT0y}XoE4wtF
zE4zU2wefr1r|*}^)9}G6UfB#~+TwF4A>~;7%-mRL<8sEJJQal?twBb7k?CM2_Nmt?
zV)#Dx+Zta`IcwB82K5tio2yJ{f`J9+NTTWWI5`f+m0LXbXaaFYFVA9CxGIP@y+*rz
z>zJJ!=I{+oca`HNw#VLoftp-ZnLe7L+<?xkrR_LlB?KhGlU}Bb>2uq2kv?7$oPy8A
zD&9X)oM;9RE#E12Lp?NyXDGPrOv7dMo4jIbXEgyEW$zGZNOR((B_HcEwtexg5pg+e
zcvlCQ9}ugVDA&iU<@;VRg%S}-xRmenvLDKKuQ{GimWLNIUfM|nL*XbSv*rm9)p3A<
z8~WVlyolS);_+lK6a|(bLY>zHTxYZ?Jfb6IHU61JQg|b<HJ;(jM+t*64x>x~HIo7{
z4`(&e*&;EkOjTdgA}MotsKkw*!1E+eDI-u_%-3ZV-|-^M0dwW=4#+Z<$nhe{E))lk
zQ<vTTolFi1lOi#L(n4Po8=*n2nzvF)`@Rx%iUz-9GF5*0EK2Ekg@1+@Nm-QrBKYUO
zf?t_On-oc<WT4P^isxYR!NWfR^y@wfKi0Ta-RzBN`ICL#Tt<kobp&|MAFq72$lt9k
z`EfW(5@7_My!fF>_(;)%^kbtds59{>sFOxw>YLIFA4J0WLWxB9ZvFI3G@ob3L%BMV
zL&LCEy0){pfvh!|7zzM2s`4Ui^s^N}=%po->P0>igGMgympv>HXMc7}8Ri(wtDisx
z;+6wRU)@twv+$wrU~c20AlK@QFf@S7p2T$zWwe<bZR;6=OuFGIfaF`m2Mq9nLoaxK
z7IQ2eQFBDkzJ}tgkIHKY>i3WZ)oXCN)y$Q<?pBe4Uq2u=KVe=-oRU6I@d+j15GkON
z7twgJX&dq~%3dl#>-&fS8r1}TcrXObS?`dX5ep$4>;rS<l@c1F4qmT+Q(}iifF8>2
zQe-9&^%<w%VD1F1%)8~#w~g&Qv@met^n8w!K1!ZPLkb4yQxr9kEb0C63P{4i2)y$3
z=V10u4>=*3agGH<NwqhSOH9>=3+Sd!T>gaCt;fSM(D*{8^z#z4iu7YgG5&7TpsO{m
zdVNFr6cRx6cxG)+PSknq?oFB4>5MZXrkS6s+OJ_Wf|<(3GQd0U7`#&|TR);Yaw8z~
z)C|X7mE;E<^JmfL?)<A@Br2e6`auQ_U?w;Zt;(n$q9uGnD$$<n3_puWzw?2u?3t+Q
zokIbor)F?_RbC(d-Qd9@X#d6Ul~;ZO8K|k~E%%^kGqDmor=%nLyl6N9tnX-JT0;1q
zM^isl+gar%S`Y>^v=42O{xJC^8Lw)BWWJw%?1#`P(Y=a<w+Y*)+)k(O^NKR=yIvb<
zcXOi(0QejxC}h*Z{Ae~Syi$-r<2K5Z!17s=apj_9GpQ<n9if-s@wqG!nQIS1{dvoq
zTFb|OL5XK(Lxjbf0F4N(YYmwXr$e3vR^EB`CO|Jj&FUGs^3L4BvYL~s25<Z`A5L-h
zmrMUWxMAWv5ymZe;9d9ezdNjkm&@o#TGz^^9?_kKf1UK7D1rx;ZadX#6D_RXbsxNS
z=dGaXK=3sEaj?!*yn>#EslUDa#XqI}FES~>jP@b`-28th_9tCI$)Y>-QbwFqJ^!mX
z^i0;AwESH%I&rICQGfaWRsqT{a3_<V<uCru)?Yb%U%_GWoYnMq=6)6W;gsst{~|;G
zF_;#p;7BC`NA(m>yM6E9i+KP1>CEJXbN|7cgo2npND!UHmkmy7F+&?QhQb@_dcn6E
zL(<s6cJ_weT=q^Lijxys=#?lF&u&_3VgwKYU-8>$Z8p+3%e2(VAf|3Z$`kIl38%b{
z{Tl6jQN9@6lGettBVXrz*S#@Y7Nn0PB_!gQ>*Vm3Pb2JcDYIb}!I$v~m-pi{=VQMq
z&ksGws5HC9g733f#yd4h2c{`+Z>36Bn0(<D)^9btVx!>cV2?cXfGp~n)!ms$pAqu~
zarImiQaO5KzY-C7WLVL}*Tfane2?ZzO5|k1;)CFpV^o7^Mto87OIhAA&EEV#)>hZ_
zg3=YW<w4I|`LMUx^GF#cG_%SGUO6mTY=;uOl_?BBDD?RxgLu?{500@s)ViJ1Xf|Ui
z-z7_kdjh5OzSqIO4vRKr0L9>-+$`(7St{I9=qWD$4(qS6{7XrX2Qod(GPpbHNf#0%
zC$x%*U8-a(zz~9s7V+Hl^-4a0du4zhXCG$m0P5hS7(<<N#CLZ4&t^1!0!qiWHi35L
zA*jlTzqCm`igx8fw9VA%rg=gWGPk-|#l&vD;Kog_Is_w@9RsDNi7~Y`F^tXiqI^ep
z!2WEXUmANIbaUC1e8p1Jw<VGEJyw&6&lBW2%W?=+452`2BM5}7pPE{}9cE6S&*GKc
z(;E88yC`0?`G60#W;`dEg6>JtqqcyD$O;6Ob02QbbZT3P$>M!ScSlkLo@suPyv5i?
zG?i*j#_o$B#2a*8#w8^w3CbZwUTW$#RU_;Y-$r}#u#WLZrg1ET2MW$tkI{N1nVg2b
z$Hf_fh$S#kYF2^<v66RZq}3@?m8kq<y|T+0&28wdk(+_=?-I*qwb}D@c>!eOQ1%<o
z6U(UVWjaoj58fCGnnMC1k=_^j3SVHIfAh{g>SKH%HI7tIk%Fh9#twqAcx%r2Fec09
z8;hHoe+$hF-XmOJG9t&iqdbx9ppV=N3UwOd?jVTQ%-rns2+vxivf4{#Ut~TovFl&H
zwave({3%oYWRAFrNrB00RX&mX=?n)_;S$u?(r^0F9OgL?1p^6&Nf;NVF{O2!Uy_ky
z1k=Zl<hZA91BNF>^$BR}pG96NO&D8#MrX>`*M)AidbU3G739~4dSRiR-e3z<3*6bN
zkP&no4LI>}b17%c%5RT>T22rI2c-f}g`7&RJtvaZh*GOAc}-yQ<J18;NoCAc_@3N<
zM1CcGlwt}-hGcmG9PrDKJ99{Bu0a-uOK0?1MekaOlw#ypN1wtB2yo$y$Bx#JaI=f5
z*&S#5Z{c|!WS%f24rGwvN|B~Fd*`d)j$dv?Y*3Brb367=?tPLry_GK4>P5xfmmIrn
zTCeE$6KLayjP1OdtVX7ZDMJM~!+4!w;!sjZ3m+Pxp|1rXaRn~uBy@YercJ88r%vH)
zak7W$$qEI3?x&0PKWeMbGwdj7$0dE;!L5c0j5O+{(|>H{&mdv;<ZmV`T>^_>5nwLZ
zJHAOSPj6<7bs<fCbWr!cN`W_R+Z<A?zSxvfzYVQ$l+k}RB3W~dWZfp78L<5^$o(3|
z>F8hpINh70RjAG>(KA%54-aZEYWE)j@y_8wuw@n&GB%V!=ONaQEP7#1Pj(B+KSyKw
zXsP2uJ1HnAhZsdT<zVH66M%a^FF05TL-B?0Myhtg`kZ)Bce5OfPNY5t0-2x)u*8uE
zc>;Pevkn;A%Pf+E&TwK${Z1vG!;Yb3QfKX2H%I<rN6FQ@b~;`hBe0r*3`4IYUW3!D
zPvFC2+@!NgN%yd-4q%~oe$!;7&EO9SW~Y%k+)!d-x|)>^5?X-ZG$ae>E{z*e84VIc
zZ=Gmdu=}RJF%6*L5SMkuyjXQ6-4aB}FqnNn{|E`k#n*U8sxrrh1PQ(70#sI0g@EQv
zstU8scGN`Sf>?a~mD+v^>Jf4>6`IN2Q5Sru8r%?dYE+gXAITmfI}cEJE1_uZk@S?S
zmINi=69<V3NoKHf_W}w2mh7x<IlQT}cbrfAeEV42QP~cd-~%?&1*pqM5;O(63JiCn
zZ|Evj)7O&zmI2w&qk|!{4nassKrcw&sLa7U@koeprlAse)58v&SNP0Ww1Qp3>W%?v
zHsruIr6+Q1WWWy}E|bZ8Z5!?EX$pt8+n4f~&>D2-`X$tDHoanRe?8{C`RPiJE|96&
zdf4f{kP*(r%VyLGbO`?z*60JP$=?@7M7r@<mwVpudc8w>LNaAZQ4ZiLHcPz?KVY#f
zD;6umAmI$S@XAsgnnl&1h9uYG>+C!Z`o3C2_8Ol`_Ut}lYqI}n?W^YOk36$Hu@c>{
zb#gs&YSwGAl%COl9#bQI6)BxErZ01v8sI7w@$fra>{g>>6KBjd+xFrC5EKM4$2S7L
zy7a291h0Okx8_Uvc21tgsges1!|~v1bm$iPH04sCod{1-3Qh>i+@W~(##-+tZ17kd
zq>ecd2Q75Ib+sxK2oTE|JZ<E$!RKvHJvUp5RmvA#Ud$Uh(YKG_^HmdyJ@W3!^QB5@
zj*&zmTIv$v4&1$XHuP1fli`6NB|Jx<fi(js*9$w%NKY?+;~o^+fsx?p4d=*XTbsRT
z`2FsfJq6Znl*9*x0sGgHuLvOk7mypR37}DTzb`F6+fPE14%v=z{x5D+X`|coW82#U
zv25?7=nQe`i244(@83A<K7P_0r@v#r{+HDJ2{;^xxw#h?!oWuaH{29DlBaZ=cO(1V
zP`6i773$FQ6t?~~$eU>VxBsz+NgDh>#3n=0gueAq!dbmZ(WhtL-`?}-${35Efr~~A
zF+SW${H%liA9_?~*zKk@ca4hnjQ4!LckVm=L0!2j<$s6R?=*a(p_6zN821#ADgK9?
zet(D2$p4?0`)_sC7Y0^SJ1d|cSf23@RX_t9_q_YxDEQyX7dpjXJI{)Hwd7W-#(2e2
z+)iFrK{tzBhYr*#9lmi2Ax1lC8(!+^RML|=g(yc=-+r+7>0u-%LG9lFkZ&J9wVdg{
z2g<XQLr^EFB=Wxj;4z?e))M;P1KtO}Y83QuWRqSLMM}Iz_*>RAHwc9|`&yTTRB$mo
z%qlN7>6(MhPU-%7;vq}ybh%ItbQi8Zc&0RfiM^t=&)0&!ynH)li8a|4oKFx$AB(@^
z!Say9KkeS;feCC))^BJy3q65qyL*3@hDZ1j^b+hEY_u4$N3!_>tCQsfz|D4viVwG7
z5ygDHVL^N+d?VG=$`4A2CpRwI{6!;eUh!MCxHjGVT_{7#@;g^Efjaucf$Y`{C2N)9
zuTdb4;kk+<(sC!x88v`CYOR9gEa%~Bl)`69m>!<241yUq*>oCcGT8QcvvsCVj_C0{
z?E@y`HGSij{uZpPn^cYAw%8xJttJ-=v#kM77`gyJn+H;sW|m)$f`cCA>#jb`UKwK~
zn&N$!GEB$Ezhl(=fp!zQzWI)K8DQ4nGQJ~;%AQPVVDx+3D8Smv*<9u?mpwHCZ@1Rx
z@>GR-{8<zSWiYSB%{I6lIk{C}q<`coWk>9pGoAuLZ!&p=!Kb>iw@byI2`nOd3&AvB
zO10TgzBM&Hns0E(s{jJDuA*BrQlK|4>j(HY5~ABX?d8liU>-0hR`e*BwILmtOw*st
zn$fC`teW~3no8u$J4aMrc_$1d9t$A)+$Lj0MXggRu15<obOz$&Sjq}?i?y!E%irP|
zEhxyCm3js`zd=7q@=(tS&d!%FyicEcI&$L>9HHA$7s}CLGPoagfYvBT&13h6gS`2+
z0yxy`F|hJ^WgcbwCiSd038|*B2&gbL!Szq6C>CQq4}dy#efT=mL!MZ}O}Jmd<5fYO
zX9g6v9O3X+K)1iuTm!Qa7YLE1n&);yU(*vM071+JgH9QEo0u~<;iF{jA{N+78qo%O
zodr-p%8^O+4Jm-a6f8z_o$oh{cNyy7&SfzPJo05%W-bAF9o=fy%1<?|h2PY$_Empt
zFIOk+DSU)YvL*HYAyczP7RK=6>f7wIi)khuuq+l6vwh3;RCNjYVv1=kA4}l|D_7Mz
z5J}{c#QRGnt^4ok+&38)q}trF9_65U8v~Fw6VO@GzAjyR9QSaKh>@U412)>63O7)4
z1HBXMIbcV4Q@N|;ZgNdz*AT^=GvacQoZLe-5IdrCnq5G|fbt5fMqG~aMfj7!*tJ*)
z=8XP<nZgd&&&0urE)`xBcM_B#9DhReF9R9<1`BxU%gbg{h~GBm%{c7Z^e&T5alkK@
zBCQT6dy!1!MVJPy7YgF=Ncp;CS?-ke)`UE#G#<5+xCeYGDb)C}AT>DZEZ0-9dc1sG
zixnw~61;67`!K&J`^z#JZ^X9oOTB6))v-NJgODAYPV34;N%lEgvVxQt%9efJoQ3A#
z`aqkMOoJKs=Z#!{$w_tx_T##=G|#bfP9OcLPZNCCzH_|d15>m@(z*)9)Jfc>H7gaY
zYS?<9hm_fb$2Hm-l9i})LuXcCBTO6@EerF#4}r~L(-OP;ynmS1J5pjOzebeC!LV0G
zCC#O0@=LEDzYB5XZa$X6dm_yp#Nb|?HHcxb5Xk{!^n>{bPYwYKunwj??|a398LUaz
z_n%UggKDXfGQhN#esoezVm%RgubN5Nj643>HnP@cY#wN|bup5_5fIR%(&R6ZGIL>m
z4F>YzHY;5EVWqp?U7iS;q^Mp#mF7rpxCy}SA+}}Y#o_}tcT&^jbCn!Z@ye5^JyD}$
zsJ2KHph$VnFEx(H2DEXubnM6fvLcxI41f?mW#j}`VI@=uREjhfHZ)ViW~rKVjqHDU
zn}(BViiV_m*P*D#dBts6m#a2|x%bR&KR&V=)^O}fOmvS4`1X>q3!#+ny79sRhv>co
z&Z57}F3TY%@-(+*rjP)_p?|lhnZ+_RA5Y5k3uK#dGQece%$v=dg^~scmmIEF^Ijp1
zARqF84`Rt%_W&co38-$vWx&(YLU;(5Io`nzrlJB#c(EtLy}K#zlV)+W;bEsyH<$e7
zT_J4~#HwuOW9AjRgKa}=V(8pl*eP|Dx{rA5#Wl*g%`b`EA9=KZ#0<7**0bnA8E4w2
zotK$RJQM(unj{V{S;W;}<Vw%GFi9WHcok+^Vlu|;#TjXB6GYyaA5O=E!f>WQiyKW%
zfmm-|is|9kfm6dmuB9OqTqirf1Y;z&??j4sin)sc=MyjXF|Md_Cff0Nrr&R756x$9
zJ1;4RmIDidudi~DQ1dhoL>wN^SCEA2F%C7rFG2Cj#$xe~zqn|0`i>v7%sZK0JZAd)
zV|KpUT-GD3BMjPHLj><VZf0>j8D`dUk0nJLnU&cgn%p<kQ3pMHIi8j--kj9PkOdMm
z@a)=ug#q$wCo$m$XJYakO_oo|$ep9w$$l&J_VHFaPo;2d<wJf6nJ``7K~jcx>PY{^
z#*R2WBjZ~#_=|7*^$plDI1cA+P?DA@1xx*;b~)YSsijDC8uMcqnOfHY?LU0F&3@9F
z5(RMK5UQEVg93?o`68ajW(3v_gHjYf%h3X5^q4q90CotZMY?cU{~*dW5$`61`;aXq
zEJP+d#u>OrQ~GIPBVgJcP~X{R`&>ULJf>^1uBxD$gcK&caTo8nfD+%s_A-Sz+|qfA
zn|tKoP|x}NH8fb+ImO*J{R7=Bt>ddJu^^+77PykRtMy|;{9m#IGnU8|?T<xEBMcK3
zm7br}G)d4RJE==th_-yM<_u4YflHL)ISHcShkb*GYk^5UIu|A9dqxG#9v9i-kbVM}
zIiEO8{Rv3B9AsKrkF<ETArYu_*uF_x^>%%7-gm>12r*N~h~kmCMJX9O{8eRv(R6T=
zb&z9zXjd8zL`mbX)l9mA!iTjYFGXTeAp1qHhuh&_WPIG#SE<C5>cS`QC*(5ZLXrvG
zeN!5&GL)2@JhGz`2}U}~;=jsMAoGKO>Lr+39V@VRZTxuTR|kP7!>q4@_RO7YW2mF#
zCDf>Rc=-zJ$l!Dv=_1}QScb<0dyM0($QzhRsJNAS;4v*2^XM#E|7>?es?E7{O@U|{
zn9woY_f*ufEv4&;h<!pxs<xs8VJjTe_JV;o<(k@VkQzf{21;_}nt${pLDFH#eJ`a}
zAb-<#4=z8UG)rH>%`rW`W>kN-I`J&7#L=rXIf+?_7Ak1XJ(r@CMS~i+<hEN{%7Jee
zzybU*SQC#J=NG^)WTtZiuGaIc<vfk&-YSf~9bLg!6-|W53&O?8e0VuO;uwp&3&@G_
z@bN!*BQ<d3ti9*3X``ZvliO~3cX^`ielT5b5Ls^wPO&UkUsKcYPkS}{s9dmH{{%VY
zpMuaY-*COYnX#oe{!0hw#<T4J%=Q&uVo?@xo}g0D?Yx?p3nMb>DW<HCTmIDMx^mxs
zDOsH`2z#iTnU$tIA*>RQ&ft)PbFe%w`)&c=xV0MlYi#ey_N_n1>Ao8i_O1RjB@%8Y
zT=0&px^a6?n``Ul!qvafc9Xek%2h$6i=8<LKMadRk|A=y{XmleiB*o#j1Y!<HAI!S
zo8sgeVtL>11X%kc)hTPWBa8JMcCwvADkYc81gQB)s9YsAa!5zYtUjrWc{JijDWX4v
z_-YcIEbB0UIQ00&gXB5pK;y<jQ!%{Wd-lIB4&xEhUB^qUg{HXFs)P-(zb=OS0Ml3S
zDeOlM)6>9DV9emJi;KEY=MuvIbzGttv#*x%`^u!Gv{SnoXh*jt3I)KY#P?PHA|wmI
zWMj!yhX7SWOVpc*ns>hB<WR2!Cx^w(kplagZq(Ga(GCmgsZ@>wwkxd$st%VO%5^!L
z-hsx+plMJ63e2$UKzd73bF!(`s55}jaLYKy406jZE#d1vcjU-1T0z-N#oizA#Xsp&
zm6y&?Ov(qQXPhI_rH64<ULuF3i^ezK$LLfY#>Dw8Mg$!A6Bv<l#lO(*{6br+`a70%
z(L{EB3U!S&;=ES(FMy+&{-U~0r<(B}sd{)p&2Gy?RqRbwEYo2o6GxbcNqP5+viR@!
z{*?hcH_9~PCon*92%2(kQTK1XSKj^i#}2^e#FNoTjxKMTHFwY6(0!k?zS{`p#<SN)
z%mK$BOSV(hdTpiI%wCjd2INiC7KYP)l`Smm4WkaZrC{O87B(j&!dBhpBH0PVoQaOL
z93y<6i9W&E{qluZbnsm<Ghu}VL!ow1BA-0-CzT2zO_LzcBJEOwTxLruK0|pn%WevG
z`&0i+pIMB^jXNPmylBC2oMuD{q~S7`UDjg1dGI`Fq+(e!(1`5g6}gaVtV}}Kcc^>G
z$dkA-b1vDhi4&@g>T#w65(V!;7_o~B-so@jXmz`wQ5UwSa~CbYt3xGiWJtng#IB$r
zOkA)2VplsuZyoLlrSr#ErlUUr{oZ{!YAWXgG(ni;QtRxho<+>CG3<<tNXZJ4KMIb;
zJ4-NeD4or>mSZ{FxivAF`9-G9b6K*cHU?dKt9+4>50*J`c`?R|qkU9DAbT(}&}U9%
z9BM5bko|pl5C+IbQEndjC7nO+c82anHc?)XPQTCXi&q-ylZZ3|m`TpekW%*k=b6Nv
zK?szSshkF7W}*bY9sLSQ;#vkxA!DVS(OKfH?~at>RLOEz1pkx=o+G7r)d|0}n`90T
zKKWL#?(A}5DOxb2V(g*GT(#Yu7e08m15J|Rm&zRq+8@aG<&>y0n&?R|>S1ham<(nc
zyn<L$p#slK1(KmQfkzV#rD`j!W#yo~^_7#_^G}MI8r)gMT1F^KDadYmv4fC2mp*SL
z>;@crVdSRoifd(=D|(EK$0MU7*^6z|P1Az1)?L0?P!#b8qBDYVmL7E&n<ke4c<~sS
zSTF(0B4&Q(2F*Z*c3>xYnT*;*Pg~Dutr80IaIFvkLF`#N65W%AIw0FO1UvSM=&>Pc
zFoN%k<F_-Tp79*-7}J+1FS1?UIu$#&WOW;|HtzC4Qk3?}?P9dzq?m55=5A-ryS5IC
zG-#a=&eid%{f)22UrIxKi<e{(_8UN*(MfqrFYLkF3TXI{5x$<qc6zq%uKjAzVDdNG
zW@ZVR@)M{jEKMf%b{FNdT9($xGD_NXH2N7vUxK^fqllG5I0oKXE&;q2Fcn{W3@r$n
z+KoVkfo(?v+1whu84t%9IW!frdDGXNkrfYer?P7NVH2GM2@lh}tJFUr7br~9V>$;>
zt4U=GhLPHu+pS0;u&^1g>vbd(h-@nHY*%Bulapbrk}C$_19Nea?4xxQXu_DZ-cJ~%
zu+*J!I4Ja!bk86&+p}NhGxTy}R*Rh_BuU@MH*cuxd&DRV2-waFPpSrJ2bu@fsNAuQ
zNi=L*#T%7*?mC^Vub&Fo?C&BGw<nhYO^w8w9r0D8{8_b6cr;qT{qm6B-RhsfT;-K|
zAtGUxxw*)Qb(o9;5P)VRYIXqip&IYW_n23N2B0+-%X3ax9zX~(I_G-VgIAGu(w^;A
z^$>whfN23G7}IG?j{4ZhavE-h*J*oL5m_TV#)q9ZUr8w)o~pAy39VRvC4MTyrde2(
znjs>OB?O+B<+XDmjq#%eLeQVRZ&2?zT@@QXq)Y#l;FJ2ClPr^k)9@I|`BLCAVyf#V
z4DTSqIT%sln4K-}EbNyg%vso>AtmCvZ%3wG6FN9WyG)(KKVvjy#Lg!Dj~24A8I|bY
z)w@)xa;&YMFx<%o)srp<^RFgIIGc+&q?yeznUym%LgaQkGI9A5!5wAr3H`la7G_u$
zJE1fvcBn2oI)lHFyQYLAq^2sRVVR}nO?FcD*GRpus=d3_esyz)W3EN;kKoOUzeLXM
zc-EBO?ZY6&rr6mTeACJU*lO^ZNlT}@6Yn_-6UAsP;er8t3j)P%1Vj8W=MyHChB&ab
z<S9GpYQ~1>4=B4tO!&o4Z3p>AW~PP6C_z6KY~7qc!`If%JXyo6ExdpeaTsgLG`@20
z_+2Lr@2txV!A|TTmxUz$NTx=(-GWiCa9Pgf$n30?*I;u=P}ZkEyOvyH60-}kBoy=a
z2~M+Bm>Ye1Ct5R7Z{v@TW*90kk^PvAmdy&E2fZ8a+_$0|S|W-qkH`!z6c+!yB7L*t
zWeH_}l$S0b*K1b$6cN}y`hfMBKc(5tKj<7j;`9C2cg<~gw*8#fH?#g`(kOj-`^8%O
zujrSCe@NQZEu!y3sfHl`U%=;iOb>N<g!3KrJK?{7Xp-pKymQxIy7=!m8U<8SFJwrs
zGkr-qjsEW*GH%Nf$KjT6rl)`1a6gJ@;J=gfPaKR%zJ-O+*3KpD;omnNE0_P@z4mYP
zeTroOLc-RGC;Nm4344skXqoyT`jKa5HpTTa|CS?WJrY)Hbmu3q6aMceDdgv2q))J5
zJu7112Ta-$d|)GkAnRcHkj4o?>M&eH@X(xcBB~58c!cbWlz>nq9jZC<d&p8RY@#k2
zxFs5wUe0u9N=CpV>aGx@AV<s7%FVc3HQPmQlNkbBn2{gM$z6gZ`EZnGLkp;meypFd
zKJz7W^VeV6UFKCZgEF}8=J}`ikI|$H(F`x&@MD#%BEO#|$Fz55;*%upAxv6JV&q~~
zs`Lt48O|NazY(m<2$3?ll~_KQc_Ns>^G;AoyS{<bG5Px_51>rWUGLL1z0KEsksWYd
z^M?hK8g+5OBN&1wp5antT`#oGpDU%I&Y=^OXeD8QWu;^~bTz`t7;P1sKP0-`dh)PZ
z`<NXklTfMIg&?DnI+1>(>WrQ*I8PXqzNIn2n$XIRLIBN8kGalwHm|DjFq8}^VxoZX
z^ee?8XmZT*=OaJZ<(W{@pwoa~q6GLNA2x+YODyWDskwHX{)7__KwDinGbQ7D28sfV
zY7M(7<@!#A1P*~2K0H|x#|e=>c#EB6z=B9w2#1_x);d)485)Iz&k8ND9L(RlYynPD
zX<H2yqm=j)Rk)){M#NK26ay`xOC#6_zG^#`VU;&Aw~l&IEJu**7$?0??ib#lc&P1E
zmhu0CdzxPEpTOX!gz*OnW`O{*j7IbfZ5GfH;l>!KMDebwznR3dhI*nU349}$D@=?T
zh=5&D3OgSIFnfD&<YR?JLP}ZN3%>PLLFhOakXVE4g(nBAO5ow_P#%_yJcKyTh>chA
zwW?ZpY6ug<=HiGks{{!W^-@Tan@L0JYJv(c;Ga#_PY#?oP*MBOPBwZ4*?ZTp2lG`L
zyAqyz@n1MpMV5wavhjaKp`w<|oE%uQBGfzQCun8e^YmXhz>c6L&t1zNXQR8t$F%;1
z!(-hucMNEycWI=L{eT~!PBM!O<(MqN!C*+FHv+;&05c>7=JY3tj7=RhTI;CP;yB*H
z1TenM=^gXEfjtFi)4bJj8$3JPoWNyJ-Wr+8%+C>(*v#|}se(d*j1!ZIYSaAlQ1%Xd
zK1FkI+XKrZ4CgxjSV12(sIDfz`&cE=`YawiI4iNb&i#IZhCTb5%_*d&mJwt|+WiSI
zz3%~K-fhyqKd_J@oP0LCBqCI*E7AH{nyiyb4GKY&2@ep0a~9+M8;{<tW9%QNC{y|o
zx3049Y1oPYQO~(J?J}VTpp*TkhVrpQu@SqVscAcI8GG0~^Ae$LF>U2LS(4&;WZAYc
z-J#OusF8Aua^w1lmVivGOI|YL`_Lla429^BQ_IP0l)A=5VPWi3uZnL>_^YghXC)#r
zF7QHmxeq87o-7WH1A?FgA9ryFSj%*~(eW3)Y)@-fVzf4&7o~N`7FLV;YI&6mCI`~}
zRaP-ts~e>geAy|bpXnY=QGzFM7vtX$aU}yS&WmO?u3m|_Qf2k)FGkau5y9;M?G9&9
z9Unfy%-{r0x*{eFhf`2|s32)NEkP2ZaIMuILj2`%MjG&>dmH7;g&!VxA2B}B!GsWF
zs%^`?Sd>0OnJmwUQXQX>)~R?OYAA2fNEE<YXCcjg0<-~56n$+)0Yi;IrBjhk1yUUD
zNKp_;CmW{hw(};^w;bp~fZ|GOU#nf6kp_njI|b`aK1e8aZ4SWv1oFROx@@!CDdh;h
z!8hDF+Gsc^--#DFw7u~q8|V<kcz)IADOo46QFnQbPp_T->iWX`q>3sxUBB2+yf?*a
zuBoAn)h-sE%W+r^(Hh-t;NZ2P<ZFSi3kMHH)!syLUZTplO4XWoCgsLh?Qj-W3mcF=
zk6BLmN|kqxFqZ3lq#0Iq)THcpWJxZ7^=saJlT=}Mv~Ii2>xHYdcu^tvo-@glLw%O7
zs_GmjEmMxghRa6U&u+8?En!RQb6Wt8-Ls_}8m(>?5B~Iwfg1!6s0T^_2eWGERLSUR
zU1V2`*7U|rdUJ0-bIZ(Z&HdHre4R{JS1H<suuhbgJo?St`~B?6ppP&+8&*LRN>FL7
zo2<b`$bpE-05i|0fht$D&B_K7`ARZVg7`tiMg!UfJ~@u@H88@I8p7+j+DtuzHcoDV
z7Lis!_Ecd-z`6emvj-Y|y^8@XD64&@N!DC3$8Y{gCrMu5e2+u(bk}%c65wY>n6+W|
z@&dO?-hBV*$=Egf$%)f;8g`+Jny(K}q#NZ4U3^M3*Ia82Te(nz2r^mwd+boEtc~X3
zq3p$XL$1BmM35Up`qw;A2A1b2UzZAvTLLao;BWc3;3K;UU&5|NIy12NCgOc{f3FLC
z<FcMCLmbJiZ%t1Yx{yCy!K<iwc!K_sB=o7Ctmru;#`Uru;z)0`%YCde1;HHm6F3-;
z%|{la6#;n&8SqR}+l}g&zI(IbwnS1)im`oomZ1vc+>(W~t#&}oO9^c-^emcI9zh8M
ztBT~MIqOtB4|_6;=f@(tae~DeV(FM&=NW~{py-uYq<)z}6hS{4Ps<0EFIZgJ_jvH7
zvRj;AA>iDD)HfmT-$E8ng<hX}?7kX1lgHbCZL*^+;5Fp>H!K(|XF13Oc-q6KGF#0z
z{5g_9iQv(Q+3OGAtLd!{d~r-qq@Igric*A7_tHI~g2e(RpiIr!GZ}t5_h~h7tbd-@
zhw@>8G#aA^DfI<bkihyaHChT(52H<yueKyp_x4YGwU*s>q1+#c2i%KC7(^UW8eUHa
zTJ%BY{wO>390|mr{|N#tfYuw(;dxvr<x}6_jQP)+VXfx%XKFi2tr{X{@XBIh3??&t
z&4I?POEQzzxz#D1<>648n9TXzNR{!;=Lhrlv(-o-*<pQl%w1#IbLrr_jq{5gM>F_!
zdFYJiQgxszQFGr^4y`EZj2mHKa#pUVIuu#RB$K#9L$^4B-vn-*{Rz;UFt^#LIwy+}
z7|c)nVO2yEC4C>9JVeUfi9Za)>(?_Xs8s=9^Hf=#-(T2aYfKQ|juYRxo`2eSK@S%`
zQ!IW;)Fz8!^n}!$U(TdWTf)ETHT#%COG2fnWT@o=!x$z+va7B5KJ!efPx|VZ`FH5m
zbD;TCgO5%U%5{xz1Br8R5LAM2>I;^|XLTGEZVMnPo}MHoe)yvzCq*dn2>!&kJQwbB
zMAX6dkcNc3NFdH!iAWvy{Z@Fmwyo5PdUE&3i$L<kLAwmuV?=MYr%BLJ+e`h2@`k*$
z%kJv(Ju7P?g}z`9e9A!c%`Z6rRU5AGCtF2^z!%Mx?g6;_z9>OYg{`;r)*7#4w>!v{
zH@m55yJT}lLx`(64o~lt$TQYB|C(C(ec;AJrHGT~qD5*qelgjr;dGAA8Zjq0(AB4B
zb!mISa3&8tgsALA?NRrrMyGAKWJaCST$3~<M4IYX(D`ej4uybCzwe{omF=-<NOPdf
zHgrgx_?Rp<tvkPWX)KLVMf!62tVjLlM7rA{iVLi8pH(Q$eF=G|Ub|Mfz<(hlJv2Mr
z&dbI6T%G)0KK#|u)YJL8Ta80dVtcD9%GCEzLRqni^ToG^A78kx7khg5$BS=wKhwP{
z*`X*i<^LG=2TI&N55$@W^Y$N+|A;_$9XSMX8exEE_)7n0a{3UP!<uLd7U~sq(?99|
z{dKb<^p6AZgmb<79!ElcHM{{f>vu!+S~@xVmR@x}?X>C<WgMa+Zi*4t_j<ackqZhx
z%7Rwk!YQExb#mE0325H$;PHl%VHDF2qx#v>0XZF>5TQ#u9NTV;gb&*1PBNUqf7b_5
z7LbF?&zxV~o_PQpFDBi?85*q&#}s4)-w|e<`GD&p+<W!BH!k2GKywYPsN4PEA7EKF
zv2PU(O>!Orfeo}?S1tb?QkiMur9psOz(1fr(Cs>>2Acv{QG<AH=fB~;qNhu1<C6NN
z50#XzFh6|s^f6=Om$kU_1J`itzY6^~e)%P0M%SEIyF;HQP|n$`YO|Hyzt$H?7g53p
z5$-B@q^REX4Bmq=nIKc1^8w5UoAduc;)H)ImXIWvG^BDn^f;{`sC%XoQ0X_H8bbT<
za}t9%ZI7d2TwtEY@b$Qkl@r2W@?+966i9xy;JP>Y_kaK`2kT(_4^o|PSn~<v63ZJ?
z^E^B@c$m}PQT=8vuGVeH?T%97qe|86;-@`J_s$CB+)KnX`f_vJZs`Fs@O0r%xYt{j
zVNw>QxvHA!oIND&4A>qmxpYY+iP`GzK<kJK8ZK6=ZTPA0a0iZ9@zM`rA0uGaPdjrm
z1@sV|ior4#h`fbY7D8FY0D+}Q?jELgS_hQIpr?hu?y1ehPy2kf2*P|89;HV%qxyrK
zz;A;)QPV)8j~HUU=%zxY%=+W!;^)+i(&hMGfU+fm%<ea646v{h-dmT5qs(&63RX~B
zW@I}cuk%nO@94WbpjK<R)SJa99-fmEtYO}WD$3eX!L-N?g`WVOCl&Z1o@Tk}5{EaH
zIC_g{@%sK=+fSLQSZa3;VYJbo0!0(wv6Q8^6iY=PI79nVQu##`wOkt8PYg&Ve`m|E
z%Fr!0UOn|!qH1*-gtnD1m_5`z=)XGg696gJ(;_dZUOE|y{dhr0n@dMd2eox5q4Guw
z8dz(-58st?{mc!g>eowxWfqu^bP23wz%u)AIUSzxZg)TGt{S6AFaOHPb=aF+${20c
zE29U50jcYZLab-wVE9k6wrD8IOLzpzxtJgJN{X|oQZ<j)CNc3^*%)?|#e{OpKp#fg
z6c2XQho6(NdG$glmf!b%L~e)x<)M^jkJEdGXPl{g0P`vug<q<<V8q^W#Ynbj+Y?c0
zk|ZxaUtnIo+<$18>`lDICGWEEmWvmgm3ZoYE({Gf1JEp2kXNc)wHMy?ta&S$>J;Ej
z2!-2^J6d$rY9h8zp8ZCo42iy_Ks!3O#D82Tw=88o_Tn<6KELJqFXiTejZ6QjSuEhS
zxr}PFuLwDIcL<!C2-cjUU=J_{BAFT&rz3ik4|LpPWO_dMS%>{I<AP{}Wx7)TDqEi#
z)vvu{s<i#38qRb}Mi{FV*t)~`@UG|N8;-ARzYw}tzg;jnv{txIJ@RDl!M2gcv+6lH
zZezfuVIIy0Irzfbdh4ZE<;4WNg(vPH)6o@dyg1O>d^VcxD<^-l<f6jWVU8AMN2)7_
z$ZvH5Qx>bC?#Vi6EsQ>Oqlo1srfV-Un1Up|6@%DntIr;m)_Qnym%q@P3}WF=r%8VY
zpu8Hd8EPVe9q{Xl%pTcVPrKU=3mzu$C#HY|eeBVx4$NWm0z>O>O?>j4A4oX!mG`*!
z*(_!28T_(n_G04uJf6K(+@Y(=Ut(qH*zL#v;9cG%Cv;_b@3ihX_u1T}nKy+BOW)c4
z@laMb;5L2q{ADN&`a<$gq4LBG@!o)JNPu!{JaP9ktXT*e8#R$_ACiS2Vzs{<(;j>>
zyE95MoK$W-$wDFc^05i|A)7|spR)?S!)29M{M{@eAUGg)5DBLiPZevWTXwoM4gtk{
zWS<DYaB*&aFmUB$<?RGK3517|vIO;wpO=?fbED8y2NzslGM}CNSNZ2>r!T+oHT;-l
zZ~qxW-Uny-5@4)~rHKN*rkSJ;L;t{NOh5=1Z_R(jH^=`I-~1M*l7EO(F7_n&%5>EJ
z8y1o7jdWsFfY!YEpDi$-y5RR(hanod!@sIZ3!uz^svy6-Sl<mAt4`5Bg#1PrMh!*4
zt;GsTG6^34l*$Wb2KUZoN}mG%Q<Owvjmmg)qJc`+^S{01H_1sR`ou)J-hK42ldR?J
zd>W;B8S>f1_yC@hJDwVzb|QU3XHP0^Q#@!m+vM38*!xmX2<af?X)D;C*=Uw&6R&K$
zqN%2V-f;^HU|4uqE|`A?8x|<!3|QEIN}MQL5moRxQ;52HLjtF_yhB$q>)oM#36uf_
zs7-PypMP-Zg_h5u<UhpHd##b+1BtT}VXcBigRIHV_ezy7efUZ5`hQ?}$e=_&Dw%$o
zqR~U>?<fC<NYIhzzXG2N5NHWSzn+p3${r+e8Azd|LK3lYhn24I0&c6ZXU;fM;C#4q
zzm@*z9o~R~>iv;h1K@@R+=y2(yBTmG<X#OyzNY2TLDQh5<3nLPRqTv&7&%@GTo5df
zjMgu2aZGE3wl<y-6Vf^iuV~=IzYj|e>p=^^;-87u5HO>&r|5kOOrM(UNi5uy1Y(LF
z9zB3Rd&>g>9q}~?cw*yShzEy~QiB+a<x>PgYc5U<RLc_UNb+17TMbZwOKTuDWMK)d
z-q6K^L2<zt9o~h$W@j$b{_OfTyqLuwbyaxXSIk#(sA*eOllcN!Ek!9vRz1vQejToW
z3xl#5J)VV%keY{<{2et#B<2Ya>+xiFjDHqNA)(e?%va2h1?<Iq8s3>CMTD=Uz=fIJ
zb*o<!4*)6mmxODRMgXH{Np6_ND2%khBblbsyyFJ!iE7;Xx)-Gl1wP>%`Hr@j@Z2;L
zc)^Kb!4#vey06}h8$g}WCPeWnRKW2V2X*zO+pEX<g3K-}n+UqMvU)FG!m@a`KzWUB
z@p5Zr#u`-2K6P6YrU2|-ZLMlGV}PkQk*kfsHNjtoVYbU#eT^%d^inh}xzX`MtP+oh
z)O&f@Hry#+DVZG`7IkG&GHhE|%QDQriVMFa6E;vde?~q7cdAX||Do<Z;F{>Ve$hz?
zkWfSDAP^uFX#&y&#Dtnq6p$_|y(3Ko6g3IG_l`*KC?X;tDj*$Hnuvf(6G2fC5wYQ!
zV13^2dEfKgd(Zuy@0*#-ti5La_gcH}*|W3fB=0D%40k#;^h5*gloI&~K)Nl&+)Nr?
z*OzW(GB5LsWvJX43}D@NPN&t+f%+b;dMn4|`;X`-GNs=~x-Ua&^;-uFm=>{m6`M|z
zVE%cxlRuxGgTErRbKukYTyc98lV=Yce?2$yQbXnB?)iW@e%HM_nRB|`Y&|#!KuQBx
z=>or7j7msI{e4-B2>}kAvEW^nWVQC>-JNqB8g})gt0gC}FYGnx@a6}UpX^%a&RCYg
z9vkt6wbS-|_^d^U*M{tu3!N)<Ex~059ZC(j92ppPn+>jRD3`s6&)9akN4yLX-i2l%
zw_5G`Bp#|)eNd>E{U*EZhZ++T*1FvjG&ik?njSefI_UiPV!~gz8qR9dKdN~A^%<&|
z8*0*S|4?O={18plX#Wt_X{?&DS2DPinQCZO=9<pg`4*BnCtXwLZ!dh8?HbnuF7yUF
z+CgodK5fM5`xiE>zj;eqk{3bavra2bsHC7*E30i#abq1E#cx8C!vO5C%|hAG<$g<{
zE{p7hhHyUsb|_l?j{6B!HlRvoscg26Qop9(=fy9yI~iZOcrv*HijxxG!xj(;WpUQr
z$TDOQ+^?)7AEQ23u@{5JqWnFrs@BN{tGIg#W*LWc%%_Ok-Fyuzf<dmXSEIYzVs3qq
z(|i)DNEu-0njX>2l=1D_IBiv=huUe4T*UYZe3H!tG&jC*UZlHEofoC{u5ObgT$YvC
zhs}EVbw+ikAySX@A5y>P!cD1ZrdP1nu0#UI6q!j7m<$7Yc<nwtHBaL(vW<(#LaOW?
znYg2Na67fmEDmbZ`DD%2U=k9*USet(_Ok(I=55D>FH6dbwxbObh;*s`EGx3!EWTK{
z`d7Xm12u(b%<A2O(O7tQ!)0)uM0APCA)Wm7M-vqZ6@>~+cst;7e3z#HE}z=LPo9j2
zpt+oeRrXUAIqXM0{dmS_-c-p!3nl)VOOYElZ)(-D>sX3dB9wbq%Uy6*UUQ7pN&b1d
zcOKhY$5WzP8D{TF2FvaSphYVK9BL}8*rY^;H}@`2$4RU`VuHNa0NbIGg(zLI^m{fD
z8jOa7Lch3eEvls8<nxke#l_{Sm8=wsX=8|b7anx>%~`CYRU=Od4zs98K*nhpUxR~R
zdmG=Z@QLO&?%Sxas<U!Sp$_w#bY)}>*EZXu^?jH?=V`AUXLPX2{`TEB1*_?Y(f%}2
zbXLrIT2kQ9Ve^}1@Qp1bRY__d&m{%Bp3UFW)a-4{#{0b)R`=e|jFr&2M>U0XL;&(n
z6o@h&HsXi6`0xjPfpalFUv6H1+u-4-!hU&_VHe@rD1Te-t2cDX!)bH0JOr!qw>YzM
z#5?}s2c;X~uKwLsZ|FH}Z#&)9<|5s*^6hK)nk7^zv273)f%{*Pl^^1^*Bjg_<CZv_
zQ7!MJ7wf`CS*}fH?4NTp$Xbm9Y|T<$@(Y>^KmDA2?AqP@qmuWGCFbMuIsC(6!@kDY
zZbth?6%v-~Nc+&NW^>OwjD!_0Zm1L3?QpU2@;hUuw=A*b=c<~$v^u<ll}v?v3nH!w
z?UR8fF>OfkOYj3jvfPd{tc-(?BHl0+n2Vkf32H4aNTj97Wd8UFT2y#XVfwDpJEOKS
zpT7`mL4u8YAMAeOem&QFDKDg)LP-B4yr0>b84AW~)goa$j(>su@Tg1Wf-HF$p?hH#
zhGujN`BQ<;4^3<4#D@qk+J4!{Rii)j>$HvR7_znqh(ZM@C9m@|awLd>cO!$DYe~EG
z1i2Qu1$fxEE3#<}qvJWC$VGE>(LsYcoJg!3)(Tw=$O)SX=K3-=AV*G!GS<YG;WUhY
zdJ#U%0;^Zy(sW?K9W}ojBRplXFPd4_%vi_H2!hl}u-}CS<nG}2j^>&`E3p<*T5C*-
z*6^^2xGB`KLb3qX-pVe<ZqLOnD!VH__)v{})Q!^$hLQ<g3TU2eYnS4vDTE2RU2|U-
zbpW;FB`&ptkeTq4M~Dg7;Z$pM4(vs|0Nst)cC|pQE>qd;z!j)CHDDwA7RY!bbi^`N
zTqqTj3@PMMwNGG@J%^jgY8}`OA^Y~MzTcx?q#b3JO-cxXGcm~*LYB-he6lJxXacFh
z0Y)v_ujb|^kS`C+&G^CbWI1zlCYW#3#|(2bI5O#(xjD=Z9E+GWQA}K^4Ki|U_2e6~
zdY#*Qazd^A%H#jWOz52r?x?^sSSY+JnU7tG2*X6vuq<M)#0fqy(c(XL?3isSjee&r
zbeDcn7GN(P5)x7Y3D1&m)G5kI+5>JPu)BtWCK7%TJ&^WP+nWa~*S~M02r3o9OQd}H
za4|T@0mO&QV0u~LmU?d?d>%EciEXde%St2l3%cmosJBHQrkAq<<!Ih=QHD3(TCC~!
z^0iBj!^Hf<*|h+ucT);HU(`Z3)_l<*TD<yfe|wsIYBv@~XDorU1y1;h*!eeW;_3Mn
zB$1rY;RIMBgFXXGBp;yCjqJ!Oyr$iGcNEH9#8)+O2Ydt>(RAiun#naKzCkQ;6gyDc
zRw(&LrOtElbk$p#jJDok_ahz@CpFvcuYmw4$iXWQlXk}UlY@-&bPKH#YD)mAXPxwR
z@LgfC`GsLx#aMB+Q{0_<nU!=L1%+MEjcnD-cCzENr?cD)r;*7K9mQV;y^3a$e(Ci}
zC+uv+tl*k&HJ9n`Y8Al+kMOV|c6I$|qR-<jyXZQv@Y1jhG+xPuQbP-GRBg&3I%@6E
zvPbcj8$r*mmT5$?ysUxI$=1V<O?6s1)3NV%_Gpbho?6&MWy93o0kZ%+NLR>%`Nt}Q
zAhjKtzDNj~?ImCE;Q42-Zg16`#k<Ap?g1**0SJs4>%>&?y&X&kSAs%Xy+6f@7{8a(
z4j{1`G}sqsIiosvbvRc39w6rmlh=kh8V!A=ym0^relOnJd3yQ=bRStc>Mzy&c{ehs
zu+t>PL@(3VxdvTpjI&$#{@jaGQMxvwInyPA9#k<Oyg@i~RZg~$={0u%Y8KHqP2Ihp
zFT68wZ~19HPUybkzN?|~S>4+(m=3#(H2nSr_Mn8oI+NdK7%~iXchJ=yG$V05v9l|A
zlF0Jzr#HVwq~+NkfV0};Q(?OgBO(W=O3?Xv-KU+w{>6-{x>(Zdf&;C=+bav7EB;53
zBcG%<s^^Wfo5MdNOEKVTOZIOZ_X7k-m!%(3aQS60*vl-eVCllvjNwp9+><woTGct#
z8U;}?@evoIhBuhHcH)@7x06^*S{by4VV8E>&JCJK3-K6(Pv?{|9Ppu9hr>o2E3GTr
zhK`YjN6Y`f20bf2Sur|zNf|5VYu|h+*(ejxm1pgT2(}x0uk4KP`>r@-*U3RKScOxT
zDzdpZ5t5ORc*Qea23U4wNx@gFa?RF|@B{e1&J}2@=Fp~r*K<uGzvDp@Y>qfxG3>CC
zKGklrahEOJ;X$xfte6E7$b3*BUtI^s%#mvt>iv~V_uFN13o8RBn1sIphN|-?v68#b
zdMiFO5`;MS8qsm#bQS%$DtF`RwPgcsdenWR3Tap?Hn^HK^h0(pR-_jEyzCi_5s(u5
z?f!9>SFT-%1`Yr`jQ@HsQqcvD;)|zJMf~Xv2rE=jBbMwMo{i?2_^XPL-6zbRQ8QCA
zo0T{g=z=)FD>L9+&=W|{hpl`<LW*=axWZvBsO$x*Fu5V{Kc|($CV8xVI%U%(I$|bW
zauIal<l^4otLgh9OU@j1mMNsS6AaUVvTsFjL2={lGBXjVdmLO4sX`;}K`<`18@QvW
zUX*fH0;_O|MQWhNzO<zrOSo{LjPh43%3=HCYNFHei)HrxmWkhwtIqa`X`-CF!Uv=M
zV~0+TJ^t@Sz!(pFyfjT}q&<%)l^^4}Dw$u^99gf5>x5n^OiOnGq|K;|Gu}Ot2kfRH
zmpJ{S(C=z746l=&ywc5IgcPGc8@5t+L{bZ!Dv4ozXsg|#FX%~wWvb<8a(EIAmAnL-
zFI=(QLt}1wdWwpjBRSkWUwpw64z;0aY<&r5{UQk~Eu@MOh0X3F;_de~3Q=V`Emi6B
z&&$Z`>PrPxK0(up>SDoh-*|X}aF_*ar+>{V+FR_hY*|23_&l=6E-|t{=GwHhE#r+L
zW2`KOCW=dRH<V^qsxNdccS?K#V}-u5Pq{fli~9CnR84)qnO2T@Wca}n&#6eJ(z4oQ
z6_gb21NrHfhu-Z|{HcNw=vJf^iD5h?Xa*{<+ZbED#)LF!=E|mfwqh<q02FTC6$&yI
zFGGOKFqB@27hYl~m&o6P@tL*PGu8U!L||y<rEYc}g|damxKX#Pm`HL(7s_2RWv@Cj
zSpT|{Dz=1Lciz8>hLLV>(FC0`ncV6o;!%g3p)-fL52qKNYOB@+AE7iWkBb|91MJ)$
zlcpm1>zYD*XUvKQgnL{K-e=Bbv+RkX8OxwvKfi!56(;V&y4YciNn(I3r)`l7Pt8dZ
z?4)((TGqQNQ9|yDCX`#<&a=`DQOG?=H(S)gB33~Um2r{RXYp%*ThZVZ#OXDKxdbaY
zkI{7|s?!^x>MyElb?+Ijbf@bite3J~%Q8VCAj7gh;)lA%sG;*5`9JTL+M^mS8g3s;
zmXdP+KU}gu{+HcrhGQP5)7^2v`v3k8uPMJGynS#wBJ#lJsG0Md%+27Oo0;=zuMgb)
zAh7f~Y5goXQO);r(z~<0A2puGYb<=Z7|<i&x9tPUy%zBM224^|;B`i00h}~Xkq-Wx
zwEgyjz}JP>2R`@Cod1vnioT(UKKUOh(sAN|0<VcGFiyiPUms!iN$8ZF$4Kqr-j~{Y
zd;^{!>k!wDve&kEghPtm7^MrD4jNOD=f%Z*F{iSjLb6^gtIYC6G+9@nHLToh3$s%b
zbocg%r$_{n%#yU|7fm}%blxhCeFN}}kLc^QvF&8Zc0Dp4<C5Z-Er|Zq7OZJE95VrA
z%-K!6PP+;wQ^EmT#Jb&5I&w?VI$Euw`6To@_OT7!DLQI7C>6mhxX{;(i`FonorWct
zDH_Y;&$4SOM~@Csw-8Cj8fO@{m)T)?;CRhza96~OgKb#0NgBmboBhqyPccf0QM6hN
zvMM?!!no=ih2nO*HdvILb%H(`m?=Wy=@Kzv$*iv+$S4PVphV2&X|{!-QHOY_vwnSe
z40o+;K!y~5`?emVFGB*GEI4}&99!<{=^l@&0&j09QBeoTa^DbeQ$J+UM$7&{Vx`}V
zc8K-~OsKvZ@GXR$Msv+Pu>kfb42W>4@|25dam?Ub0PU`lr@~BzTPZcGxDOkl!;Cks
z(oheOg=2|s+B)G;XK6H<m`Wv99}yFHvd_gN)6sAbmvuQnhCKVJ+ZMqON1m#jzH|8j
zF`H)d3`3Ew=@mhr*{oPpII9k00!Q+OSDL`OkS7Bxj<x<9Fs9T&u+z2OtxkKSPt%l<
z6Z_DR*vfVA{ztVFqI!jP2&7vFmu|NENm8u!=U%H?j$L#)?6d5#@JU?=4Z6(wIk!%&
z4YdvME@SG*#GXWU@x7HQPS7oj&nfIm3sLtF$6R?=Q4uUT{uc)#vlHBHRM+-ClA((c
zrfM1n$e7eT#U5lxDV1=^D>+{&Z>d;8hS{b|@g%@TNAezgL9!(diBJw1<+~b`ZLCRC
z9N3N2X?(|ZaJqHiu+>5$oC{bqT{|cTpP-9iu#O;UcG%+a(X+f3YkD>C$->R!Th8aH
z8LndY%I-fhZrrYe%S*-<kkvXMYBGVw&MlpY1fX6TlIpRUw7%M2JxWrtgRY7Du2h%!
zB1;vuDgsL__Jgbba67~B%_Ol)X=%HNJ?tb!H&Ixp2lb_Iz<C{2_q(F+2yLT23VHvX
zh!6mJADqjJ+&)toCBu6z@!aKM`2p~fcrJ<jv}E@Bi|5PFm$w)Wwx=E}JM{2AWq<l}
z?}Qq{9dfIxpLkr)ty`)I`F~0LiLL(bRj^b1?KMf&Pm^h?49=nw`ar@2!m1{-MhkOc
zMrc`+E1ZwoGLg$O5${|pwM)-5BCM6x-SP&Mey_#+qjtZf)eW7egzynys`x|ZXEtmf
z)0=l}^{kjVUP~;gy;w3{%n*1y8Z-)^wedhSLqZJ<Cs*38b02JTYm!k+4`bNwwuiOQ
z5hqV<sA&pCy{e5lDJ$twDDHi1Fu1Q%7!KzZWRN)pFyKm-&}m4FZgNqJ?8m|MDk_5T
zoAj1>2JxVfki%b$WmyceS+`$Llf<!h9qvq5*DfCZ=g0a*V|joIKHS+Kk;cPiE!$x4
z)Y%`-C47Wua-ye6@k(8Sm#5?ZbB7GX<m*s%2lj;Env^(N9w!SAxM$jOHMp*pdfP5j
zQ%sYAI`+=3c^s7p2Uj2Fz@j5&z3`A%CH{k8ryjMbAo)SFnhrbCwvZFH60MB1(WRDV
zr+*A+V)_VXRJd<I@5k`7ug1hRBd<w2>-!UdOh7`_#h%yPDmJdLT9wc!w_4uLHhi#d
zaB~tvMoApKpcvZ=U<GsH?>qCCb1xSw)(8+n74jt6WtGCj0Uz2&s{>{n3JPqHLt8}C
z;LXeicM~~XU9>O4+CW8|rjmzR(DYhgpy}}29?#t@m8o3{dn8_T!EIcmGi}XykH31=
z%;mFS<*}KGUWABG%@heNAyn$&(SV!0EQ=uw-_Ia1pvJ&t%*w`4g_M%SpIpkc1lahN
zwK)#!Wuk4&z6>{Lm*ec5*%W(lQ1>!G!G$dt(&2$hr{Pv0)dgY=i#v*{9HB(ya$cdM
zb0GtsOSYfJJQaMyRaognYZlAJON!-+Pu2?8Cnu0JhJ%fr$ySM+^8zp@_6=pHoG{t*
z>uaIQO;&y!+d}2V=JFhHE(<D%*P~8Y&7#Az7IkVk)qZ@-3H`VhPU*h;pR~`9${a~+
zHzw{KkIP)FypiHR11|YkiUxnS*Tsm1)JZS&EfMx9B2LIB^zAG>X4JsNjp#f6GDlL2
zU+WC|@7+!j*Z`4hY-on}LKOc&ZxLXdn)C_0Yj(5`RCVy4&-=|8#-c5q8i;l4qQow{
zlp1aJ;*u+h_jvRU3wcMpwe6U1rb+N1_FK#gB+E*cXM4xe$ys&6sB<_@R?&4@yuVZH
zR$W0OS3Vi<VAQ#rULGEn3w4Bslu?P7a|`d2s410n5fnOXW7CMcIbe!fh^cCg^m8%s
z)*se+KqS`<%#UWA(5;x^(>O<pMmFoE;&&s2p_PRq=B7zofVEa>h8%-^fH;>QPIcJs
z9$iCy|1w9e8QX)Sw1{^sTvg1ee6kW;a4H%#A*yw(BG0ohfYeBKKNWg=-Ecy<KkVSM
zQjF}JL@YN09ko90u(28z&L*W2jm2Mz$;or{vV*5cVZ2}*+k!FOu_@&|tn}@oUG7P}
z*NbH8+TRQ8lDaRf)g5>OoF^1HG1OBm>$dwfGx%RT@ZIS*z+@i(z?VsrN66+<Uh1ou
z&7Bvj;M}Lqp>+jyON$N3na6Y2TT+Wzib%||P!-97Zvgmz&nY(i!Zu&iv^RKINz*MJ
z*ihP`zjJoZUIFs6*WUsSfG2{8ggwgpB>%#eGCOO>UsLb}ZnPCV1}$T1@)*h{Q>6JB
z&qbCS4oyi{b|O*5>K06pTdyF2Qdu_kQ#*Eg+Fp1@nQ93c4qdwnPTgW3ze(Tr20A(%
zc9l?I@xr`fNUJy_PAW?F`dWl*16(+oXh6-}1z*NWKd=CMsF$1O>?3Cjwyr97=iHLI
z`_|=6+}=>@8}ma?Ib61`2K`|A{99(;56PeK9m)USm?uCxJM5T4*#){!RgR#^OyR}$
z&q|C1{adcJ&uAh_tAfKnq5Qe#)HV6FRs0JCkzd4A<cIGgFKQmt+9ejP)fdHN;s&cT
zuGiKGSztN0w@2*chwV!?i*NQ&W;B5B#v*bS-GVQbEnDup(cX?7?-3zyx~S@@KK%6g
zgdl(k>+0!A$fk0*880EeFV!{x$)b9#x{ya{SR0%3__|WcMz$$wgs}!f4+&GevY#}0
z|GM|5eHJj|_I?hGwkS6(T!n0)JitO!o7^>zk1Zy1Ynj4#74q<TNX)B_W1C2p=xeQN
zSap~chPvdKo*UeU@rmTzvBUeZ`sg#rvvb3wmsgmQiMqN(mhiK_&Su7Epl3@WNDlZG
z7QbD71984QVIoZR!~s+nZq+f4ai%^-Ym#dr-Co>`U}St?*>_TjMBPs7t_%m@dHIJ_
z53{DXOG`zv4b&4aC_6slpNFvSQH?pFO(oBTbWmEFWobVGLvhxNO|g$N)B_@)S(-DJ
zY0)~p9|o&@DRW`=_6@&1YCw9af&LJXI&>IQJyJ|%jU$$_glOYss5Ct2IW5=?IfF}(
z=*zV7ey&fzNi<*m#`86)POxUovI|v{TU_@IpKj6PXRIK8BCe1gm#zsM9^fm#rp5$L
z3d7Aar5O}RtJ98apjW`NjNR!L{m>ZpCDPs+znjS1y>>25FB>FGkf+=<8yRl9)rHeM
zmfXHI9W6X*sXc9*{UNr6oUvTC>MUz<x;xDnf&@l^5>NjP`K$5|dQI=e%CLIJW!#)n
z2xfB#qah3Ea%objrB+@gYn#z4F=^eHZ%9VqG-;w<$v*1J#yKfkqL`3dkBG6kbPOej
z&3F{R)x2Vpn9yp=LaMIR%)t)tn5rSr-3ov(Jp5ycxNfKuDca#F@<Nquoq1PSBX^mR
zq0xgj@q3|A_4J0k2@dsjJ4>N{dfDMp-nht5Sty2HDc{`&qgY`X2?M%j$0V8AA?irF
zDpUKk_AK|XBg+BM!PDd3q=AZb{tiDG*h3c4ylCG$=4{YxmQDHIw!(|THi9e;1F@)q
zExysdQ!E2(>oU7IwXY2i-6^aJDnxc^JGsHbIV|_IM@vEU+3oS@UG_!bDnbIMsP9kl
z>xCM_%`QdOUn_t3RkKZ0DlXRy<&(W#V$wQ~1ysgqRlM_Khv-<?%kuqglDoZL(99j$
zWk{5T4&ik|gaE4aN)Cycl&rXTdTz2NLpwGyLvzSf&SfK+SD41&<MF$UQmU!OA2JiX
zpE0_`3!kzXeUWvH##8Hb`xhg(%!aMr*}Lw62A8RrPMV%|;^9PG{n%hydXfte_hUUq
z!_#^0-P2E1o@s46^T<`13pl{}Ec2~dMYc<C7@Q2d1UJtsU_FMJsazj`sShr~9q#z{
zfa32R(X69cYT>z&`&INd;qvIe5O|?s12$fwZ|+xgsxLZ4Ga@!1_og6?g7)R)^&bcr
zx|k`2Q4`AzQT$|dF70^f!<GMYgl5V&K$wS)rRZMj%V_QGM-NB938|-(5`P4enKmyX
z$209V`<cAko7eg&MM!21oLc*%><#Zs-~+3zDC3>hCtY~8RYIfpp@dnLX&IahFbF^W
z*m5u+|M|Xqhvz8QWsnL0zkxxyP`Lkc3XGSf-^P^L18}I<+YRUOX37-n?=|9`?xi^w
zu%hgyl;RV{LKwI~z+an0Q%aNg>>fB{e{TH1!)ae7l6Eo7>+G|`tiCXlE7k^$t@(pR
zzEUZUxOzqSs$D8PUhZh)nNH;Hvo3wA&G-aF+)`IX_A{C{kdap@xdU`?WbA}TAw<3G
z=ul_9FDxA(KrhScH433QJxS}PD0soWp&`NcKHcK0dU#!{SKWOEZ5Wo(QFrIs+o{fX
zozNXUMDIEJpk=6g(FMqK*tsZXNSAXvi>3<NtcX!CXJKTj)(M<Yj+YSQ=!renP_cyE
zl@Zx>Wrn5ij<NGNH1r&eN9ZYC4?98Q8N$*EJesz#SY)`}cvW@+k}fPi;*H}%cu7DH
z`BC4Ft^wp}RdB?N$UCxv<8%_uxW-FXZ{Y&CeMaeT;UUPmf#7hHwXh*dOGMgWO@DL<
zS#U_<Excro&4bHR-2t+}+6ulzHH$Jg(zA*qD&S1WWqqG}c@lYg1Q7E`fApPviZE@q
zb5VgH)w0;`2Fe9}gcQTkg>d9+m*}102o;OQ^@TA7bcvyv1YW*s<~6_!I9;%557zDz
zRX-CIwxr_dKy|<(kt{3X8u&KO!Ih??Q+$<`8W&hE|I#v*oBEk)hx6wF|NBPap9-0b
znQj%HR6F{Lua3DM9n&?+#yS8eR$DYMO9?LfzKAOeLOdCXM+emMyZWM?9WN`Q9N3F`
z_Rc*IQ*sk-i?t(S@E9t!XzZJHaKYdSKbDBQ-qL6@QR0Q3<TH%gqkw`{6RN1>^k9QH
zQ}qNj$Gc15+D~RmH_d?9KxvMJH)xNH<Xd(woOY^da7Eu(YUm&|0d}?MLM<RVYe&a!
zbvOnweyN0xZ&oBx3o6eTDQA`&s-P9Zo+zKC8!bP~-u8x0$!R`A&z8N2Xbg#L)vSbu
zTaO3{8YIB__8D{bQ_q#{>nU;kvS=5cYb=&uJ!;r)2p@%vxkQjqQ(S%v;*6ao==~#p
zf_+YEjFx?!A)Kh)+!gFiO9Y}sHL*VCq$Flp_hw9tD}0P-$4x^Ptn(6ocmcnAmE78W
z&0dFI=TbxYqjU^4yJ*B(nC%-OBaTMs(`j&8@~<wZ48NE%z5GM5a}pnv&%gSwl^gqF
z!+l<pJ-%R3XDR}#HBw_x2Y_PT1s{x6@HTwmFQQA#g}Nh3MTxnZ;OH=T*>NR<E;yHO
zJN2NL0!(Qi62A<-qGZKt`W1@!@#I3?5dGn@Xr!Cnq^u3J-AGU&e3%t$1W|zfgUjMw
zh(h@2PjNg5h6y6bPrF`WBU$h;_)N4;H4<p&g8ED<!dlBdgil1iCvD}9h&aDZ>c|Bv
z{3on7mWvM*i}kxRx`M#}RR|skdGoc-Kj>fTkomSA>t`M!uYc7d81Spc5mi$A?(hFt
zaONF-7vzZF8#WylZIk~~C!{`#m1--WF^eU05SHoFw*K)DuO9VZs=lE=sy_V}PB{n@
zHdcd0V36`31B#(8Aw2w&Rer~WrPdTtA1EF17nCB1TuO5<opM*oH7fsaMGytQXi5=z
zI<YW_Qb6xB^;f$%|I+3N{%&*L2bOw-wVkHTQ!$BPzDn0jBCl{13ev}XG<Gw-lmDeM
z?3!X(X5=}uEk)|VhKm^*jJQ!MEkizI=1Jj8<6kNj-0bh2GaF91^Ytvaem{R5tQe?a
zF$ni9y30+o&gda-?#uWh)R$4{_8ip;+TSt!EnE+y;vct0yco`JpBcHQhjtXZ*oy!c
zwpohNNM>CNdriaBy@l0C4LY<_Y8Z#!<*5AbwRZ;_Hr$WUzS(|KKwUNJ(`TP;z5ZwF
zcmE}Ldw&Oy(xlQXg)rp*ey*EuE4Oy+EItPQE2Mx=3$&ZI(ByExhFEIoA<R|*;jMbw
ze27@r`k|P`i>&`+*h$6>x1-1JK_f7`c4>E#spa|Mcf=H#`;Dyvk+91JX7CiaH9t8y
z^it?LTF1&U*%=5Ql;m}qdta7asQTboP;x~0u#<8#Q6zM|s7FgQu^qcE_pUEIk2|$P
z1TxvA+;q^zYRKdm!|=<~a9bmAYH~Rec8T8%kg*qxNP5pw`T`~>cX`c(L+%Q4QkB@-
zhD>Cma}x~rd3HrYun(6gmuP<1D_=1|LS~J+n*MnR9B)LUbtW2WX&5h*z@sLPu@E`i
z9xsVHfE21O#2ax(ht(LQkJ8MgK3Elmg>0{C(&ZU<E^(TcdpbQwx2d&%11!Dol#z{q
zc3jg46#x*;4n`c&MoQ5E^0$=Rx#vYMrN4Na)QB|9;)*VAX3%Dq6O6aY$ryL&zH<H@
z{RMPD?x<aMNK||qQb=l-bqa#vP@5)3M+d+&72kWC9wc9cR)0twKzhNnhuI|x{49*N
zPWZa{M{A11NW@PKJdP|3FM7Bha!ehj7cmnIRw`+!Lknh0%g~Ep#;ql@vwS#=qaV&_
zjJ~DDa}~Zw`cfiW3V}SbuwSy<hsL&vsT9?+E5hX2J>|!Gtu%Pl8lYDzww0HU_Kh*Q
zaH0)gDD)1MIMvHE)3Xyu2=kd;g68N{2?e85Njd1n@P2ymqh>M@;!#nK=~e3z1JC&A
zvm1JX8@)0k=83(g>xWIg0cmh5v2>9kVK+O7Q#}{#;jTSy8;{bVYl6o|sa%BoX=ad7
zs?+&^W=}n!7%g~&z5V&us96gs?Pj780h8aaOiG)fxxqzpw@#gm<`8$2(zcp0vb<W^
zG{NQ4jX}_LYvwZUzTktOVsRc}qT(~?H`0+@Kn^FL(Tt}7tZ9y!z<rTkO%S8VE<>#i
zTC7t$5=n!eLa4?d3JkcY>>`UI<^`n}sK8b)$^Z}%J!8Mb6d*_wa;v_NtJ7_f_8?GW
zEKYBlT!Qf>cVdA(CXV^nmg*Vl&4L}=nT|yvB8pj>^&cr&*@+dJ<5y%qrveyu?0}i~
zUZ}VzkAxqcEhk?3SOXW&6s<UILnHNJ4o4n4fC^hw%mJiE+uRJS-d`rqNo}gIFGf6E
z-SfT)j-z|VB00yYS#fU+Lm=w~VwrNC;4UN(UqXO)Cb3WJBVmJlh63via8@JJyQ<)_
z`H&iUI$846a60m&`0!L59AyRdGDJ+!JaX7baBZGkQ9b|M7RHvI&kThwuNdFZlM;VW
zY^PgDf=t06X{@zeXl^(Fi6FkPsH6v;F}Ok03NcFj?fSFm($d*rlUbV+bcGY<<ND+{
zLyK7(76D!&tZ^e=>nKBXt49-2BvYDUpHOBS4Ov!}1!G01BovbjPSMGKblpOAvT!ic
z1;~fHMWbw~AaEFLs1`dERIyvjUasgFXPc;pF{ffZk|7~VlOap^ydcvfIBzsWAAGOe
zVaC&$Ms*(<j%1ie8HfeY9(GuBg1)yLprS4?y#b)mGy#R|6YO^hP9<lO*!Ziu3z0P}
zjk&ul(rNQAua+aV;ny8Bn8A@qiN*74em_@t`*&BK7(L<W8ndD`*VhXl{605-ojLdV
zK#;(Vq{qGg_ZYr9)H#QG!8c=q$gA;<8FFUtqZm#qJSkNz?5F<_tHyn>kf|I=gH_VT
z?kU<Om%k>i1WA@Pd!%Cp!Lw=WnX&cNqaBQ?>CKF)iXwD<%jgCmim^z1Q7l_rh`6W+
zW6=shlR7Zf=`c}UoC=9U8<VP23-0v3w%SOtP3EN0vK`e}ATAT_WwlJ8_v}n~!&Zzh
zU=Kr%s~dc(FDjPzXXm`fRZfR6(@W4Rhn5CQA+ZE3A1U0{1686xFXb30O9SJJm_#Q!
zegmq&k2Eq+K>#QKR*eACUFoQI8|#TA%0Eg(D5tOBe@wmspTSR$zU2J|Y*4P>fX!)7
zrRhi4v%PD1Q<TEJn<#?+b$`9*J1;czzIVhCuYQW_)$MOU(QV=LgJ(W$9snObk8dY}
zbK>&6M5kAjRgF6HdYho$VCUdpcTnxL%DKd>P>W&j+eglV2Kg*fWNw~$b8bQ4!_$jk
zK|8)p{01!ZI+agPUnhB|PunZq@diJ1_1As-8?e13k{8eI+LX8AN~fNdEwm;Q>d^A?
z*nTrUN4w*fGIOtbrzT_QSYE1J_P%+%)}_%KH2JUl2hbC5P-Slg91@*s0HeBnD!1Eb
zGwzKKPro{PKpdl_e@5zfDmN+8`VuCWfI;=cA_=Ah%&VW{zS>Pw-c1AynSe>v#lpZ<
zpZ~*=3?>WW?*+(M;6DKW-7Sh%0-8*KSwH%FZ~qGr2F0T(HefL*$agIIe#bw=qM<l6
z6pu;8V~7A{Bjf(L%{u_f>4&Zz%m1O?Kg94bN_eppk9JNJ;`;^#KVAwTf4Y8Lf4jlJ
zQdFbK5KOWY&ms{N0N2rl-k${t0Exg5OIj!tD1$Fz%x*YDqy#N{2}|KYFqAVGUMv9E
zD695^{(xpE`_!d_GDLvL$b9)Rm=IvZ0?D`0ht?)bp)i1I=Jf@Ti35cx2N|o{5gp}C
zp<!wJ5V+fH6f6V|@mkj=QLu1;=JPb9v8fbFoy<5%aM;1}gxXWExLV`=!=HArL~9ZG
zIYSB-FryNgo^*2pv1_E;2-avsCk6^f3-~mw_EYrsh|GEPgL>r)k9PL#U`Z=zoOn0|
z3p0jRF1q<s^oA66ML@|c00zob2?evpj^13I=Q<Rdd9lY026nJ%pq~^1w7CiT^iA0l
zie4<h1}?}6GNIH+=+50g!V3ewb0~536AQ-pcbXDcKbT;`{l;2Tn3Od70RhE+z{voB
z`p(1wzp!9|`hf*+J!zz1;Q(-u2ugrJ@aV+vkXV39s+0!}CMD=pATs_)P!tZ93NjEF
zivy(;EDn?WMsWuKDg`zNDI}7B39E@8^1_1HRJ`LIfyW>dG>^w|$N;1e7!s%l%o_ke
zCH#OD0Q~^~BI@$>O+-J22mth<!L6StaU~9<A9{TU)B**F)cq*e{_lB1fua|n1?+m;
z$xa{^v4+_n>~b{*#Nw#lZ1y23X@ml*U9L4CVlYseLVC485CX>YNZz3W3YI&DC*u;5
zqL&6M_o(Gw;cg6(wvdYN)_EohRw<?E*rSUL?qK@bvE;lsx`VyIpnQUYO(cUK;sCQB
z0iY+s#`B%_62SCzg*dgdAShT~NKEAU<KosBC>U=LfNlp11`6EB0P1JVgK;D?t-PuM
zVgW1Q)+WU~JQ@NKviz8_cOM1{!~T%OfdZ5bjH}<+pXm$U`oa7+d86lD>04_I84G|J
z=I4g~P9U*A84&bN5>uR%%J%yP!DR7a7(px^%n=wYXdWd`3Z;T!1S0`~A<hCjc@>t5
zCsT|k{Ky^@Gz3Eg&!Ei+OtORT-QgVvKtnF15TGRp<^{)gkOcJ>T2XiadB=zE{(L`E
zu#iFKU@0)30Ra58aMN3HDIypRB<x#I7z{5YLo2it6h{3GR!Ej=^WJMI$UXpGicGTk
zNXo|$A;yTi{&oEnEWLeEP%OpfzrzA@c8*trR<DHs0>*p4G;trTS|!3Z08#wXj$UEo
zz1<Q2POs0p^`o!!&e7nylu|HCNui|g11Nx@#1$SrkN#0e|4#3oHRq;i=@)sF@KS&~
z*x%_3DWq_~1GRJhPJcgB;_3(UHx?|UKQj#aSK0rYc*g${qtxEt574)tl3@D&d%Zv9
ze*ynF@zehwp8s<oC`qQLyioqT!y)g;-||6b*LM}<L)$CDBVgy{f49Fp-<R6<{OE!6
z|2x5-_kV;W%*e8F5L|fSpX}R{VZPRfzaID}vJ{ygD#%8E7j{a(8<SuC^_KKcr&sBZ
z@H2v(Y=@AslCwLvyojcWPY=CPn)WW<Dcfiin5cLdD4dJ~)$No_xYG|TCA~ALZdew7
zPk0?Z`_IeiZn5&9bEh9cgaZHqjRY$`ESTqDU{NQ2m)yxu$zV1`$bh{lif>pL6d{xh
zp+kW*9s?jSU?&NR1se$%5rPIYG$;lY+>!i_#R6mqz)IT5qo5Xu5Gn}$9UJoq#0Cq2
zeZdpjL<oj429pfDDWn)rIVkxIGzklfb4OD+01O33%Z^|vG#)dy0%Dg(u|Qh*B8c_s
z2O($H|HJ|Sz=-8VelHswFW{`%=XZR@1NYa!klKKgtbp@Gurj?u1d<`+SkT*@1Jp|?
zli1P>-yOX;Q8HdIS*{R8VS-g3xaJ`ej4QAyfr8JsU{wgNAdC1bmcW)+xr4<E3&8~e
zK>NGTV4_e61dMW~m<ogbASiH3c){Z!*j3uW5`^dBf_U6_f6xE{jiSh-lMxsq4nX3#
zz-odbzjIKqV0f9D!P5>$7z*dC{DH-=5HL`j3K&<(2Bly^b0NS81T_DMD@u5E(tqlu
zOU1EPLw0<|W1=bPI|~LpnQIk{=d~7)|Izecu!P?>Yr<LahISMi@EGJi42m!f>P_{c
zq|uEWbSgg86uh-_fHqU~;(ueI2o=2kB;_uc5796%L_{2=y8)&VSPz0f;Ja1d<H`V=
z*@=W&?SvOAOop`eX|_|a6x()MxSgmV{xo%mPf<<LOC`=&jD$#i$I@!j(jhfxQ6QG0
z3r)tt$T)xqYDb`xA!sN9{U<i%oZ$y=w&*|yiY_cvYrYe2U`(M27$QJPATkyJC~yn~
zj)3hH#vgjqE^^U}C7XC3-jV0&6P>~*B2gd~k1^}VKnWu9U|fMf2*#Mgg#Q`OsUnA^
z1E}3NpHZ;*I)=7KAG6gQcCcA3AeO)brjd~oh?S=>la+o3oRT+S6MWeR5EHXIdZk<u
zNlOu|^B^A!KxD!E3<VGXK!XK-<YzeW2R0cGLxTAYK?wqwLy&M7*rC~>DI6ro#KS=1
zdv$@L$ox1c@$mN>n6e-W6oaMW01)y!jecQ&62E-=P2ka>JQNQ=u>cAz3y__HgNH%?
zu=%&}zxad4q!U0a8jNQ$mJ(MxW<&l=-~WJ30OJ|o1x8vb%OZ&N0zJn&{KAG|+wp~+
z|Dq6dVlgl<u*M-66uuACn@o2S#CG?CacKQZSD5ym0dPd~pY2cZVDSYD2&Kd$Fkm)?
zVu29=jRZu1pW4F?TB;6%A29tVd(+mA8R%ceq$0qiL8Cywenlzc=Ct?r-!<ILzfnJR
z{|kqV8yrP_%@n6R#r-}EiEJ!8CH+t4f1$~m`!9U1;Vf7G4FqKlRa$rdC~<$`{}oO)
z1fvH4E9k#$@Ngs^o!l>)N&vg3f7nBzMH@Uyzcb173S$OdO}HP<pOP}U_c3W7acYA>
z|0G@qw|@G@@b<uC$5bQ1i9a<OHmzwfgeA$sG%x=X-@bkTEu<V|{lU*3r;y32k$?Jz
z-{4~@P5Bple;`r`B2GWB_-U!8X`he3ZtM_7r&7-h?Fj7QU;GuZFYL+CK*!&bWWBGq
z!9lfKA4)0J>tD9-SqEYJCh5DHRKi%z*IBotPCuO(@<Ho;mvkf+c)-V|Urdn5Gx7z`
z$q=wh0roj|ZoxqsK*E2Ekq_Rzew-`#bL{3{vB}V25c}PbwVhkZSc;3v?{`)v<F^Mq
zsYll|{!~h#ce)fv2-wnKjQW4-f}nF#z+(Bs308CeW`lt;WUy@DFkUef;ba8p4>~;g
z54}{-Pis=bfx?C&)59XAKm1g8S?!}lbTUORf&iXDT>zSh$K-AOfyG7NFrQ{-n`A;i
zy7ux1HszG?$q}%n+$obd@F|#rO@@PY06Gi(2NrKic}xdrp|e2vU#y3L@?gD_3W3Pu
zcJzW?K|tUiSUu^cwZC9~IeucPe_#<5EW@8zeF1)+u>68HBn15n1qdUqXNps7-qGv-
zhu)4qv4+Ukv>vVUoEmE*e#f0C^5AhZOi}<35<784^{35ke`0lO3k>R>ob^bJaSd?)
z87_lGaD@O6OLE5~BSieMKlu=J?VniY;NPbHg@S?Dlt1GN%#9Fq-Je+OUjTnPKrGY*
zl&Ae}bFvl@>`Y$-YwPdf0&~t!;uq&nf@K6uVv!$lrA^W6{HI>+KV|=<!$Ai`)=3l4
zfqoCKJ{$$u$-oPL3H^J$3ZP8R@>Y1xg>c4FkWP+-Cq`QmOwxW~!wlOmRts4Sxcuj;
z3LM#9reN$cM)6=z6GNflF75E5RNPKJ*a>+U){b97JY(v@fA;Ge(6r+h1criu{qr5a
zaA+`pA-~rXJAVE9G72RBnJ9mucf11AL07Zv`n=la^=YTnDCc1V%2U|)qwqgqzjXmJ
zEZ`dl2$YHzMg;*kir)|xK{*`K#2zh+^&_Pe8DHsGvm2T7eVa@KUsAv!pxgoEtCtnd
z^LKPFIyYuG@^kvW4L3YCBj79{eQ5s~9w+mr6g5)i=hI1idHW4h${vXv%^(llEX!46
z<v+S`O2P4A{hCT#&WYg1ySgeBRc><Egqb`owh*0EBz=f66`S-Ob$FiRIq5<O@!0?A
z%FD?I8rb)*D)yq{j-=SWl8BOu6)SO>v5^SBVOyC^$eVPV*NrT;9c)||6j|2raZiX_
z(xty@dC%vCSpVix{{zEy>YM!e4Cbe-d%kSLZ_B;yIGv~)Q`K!W5bey>I6ratF*DZA
z@!)=ji~&?q)`;A^R1v+Kw~TH{X!xnUM!JPFX5-C~H`&p_*JH#rq(#k)3@*EfSe+Po
zSf4_jGIqW2L4WaHwav7_$}5vb6WymiaZ=Tf20J*XA4xn~4nH_`n&$NxnVWR)ck^Xy
zYKd%e_?nt9X0Mj|_G|iOj5NLAZCOa@&CL9IaX+EzmiF|jh)=fR-GER0i!a!8bK+Zg
zym_Zzt4=7opGgvY#rQlTs`U%K`#S~E+5y&lDe3uGjgc}HDGkz`$dab<qoc4Zs#nm*
z?G36#KBDg5-jcdf&z~fS!k^B(8p5RdWvFaJ<DI0vh`X25)lWUCx~nc%yp!afkA4HF
zg2J@SDmS$57+V`e4(VS#<#hStthH<QhM^}ef$ij%Y)uZ{fFhN=9LWPyB7Seq!E;+W
z)G|F~;t6}To`psd^A9MmD)QJ?7F%j7*Qa{k`!E^8>ngYqaCyri#|IYEa!HbTshd@S
zKU`-;-n`=;+sA@P!p23Rfi~rR&xcPHP)jjP2QK*9ywl?K(_-W^;?kh!aJ%|k2j!FX
zf^#1^&_y^ukid1IXwnlIKM~m|bF*AMlNsYg*&MViP37g~mD~im#!jTH=~}}4iWAJd
zj3;Z?7?mu#@wz75m0nxoMWYdT^D;IQuA+l9*<+zBDJdy^y1M3NED8HqtRzNDdF7jh
zcjv}77Ryt<WhyD<)srV)EYGO^UXUwI7^I^626$Q0jmMmVc|mRRvBHh<@$tnJS@7oH
zZ_VPM2t_6y>=8+I-4CM9EqARSUf@QJgR8bDR++4>oX8X5o#sZ~@;}$JT%S6YH4Uy7
zuA0X)cY&#-H}bIzkJIqeJMUF_TIR1WwA8WAJmF&uKDoPG9r`$Z*=OU~evaEDp3ME%
z4}UpdGKSke&``@$w_mq(BI}c^XU^K~))QZ-SM|-6rA{Mw9$Rk7lLZVU2R|!X-U;AM
zZOKjBn91=M34K?X(E8O))$LOQVSVk5*|CD@PZ?>Mw`va4jt6{5E;wF|IqdbM6~|AX
zcW&7IsHDTl?Jc{OruCU_qm|pUR)c1WKHwA<_4y-DC5=6g9?Lyfw7hivK-iwLErj#r
z(NK=qEmhMsC%-E$)OQs)w8sc*E3=2W?Ndh$x)Zq>RjABS1=?Ci4E!#uY7|FgwVU@=
zPTkM$<ycP7cCO)x_OO&ZlS|^?SPJWS&zo@BMA$q8;l-PCM%dK$O-Jg!tQXP&l_~Vu
z{k2@idt4kZ*XQeJ1RUFX*;x+$?`A;hnr6t!T+=UkFSNNU#_b}F=(&T2#u#Qs9u{W!
zaXRq$tvp$%FGxHXXYu6ugOi-X6*Jy<TrH=V4WC_<uOR8B&lun%)&yA`v+PT^5P4mV
zzVGciV;|E{o4%PwCC0opSmcjBS&{nzy_UB~;2QSG&pGs!Cv$JEPQbYyX9u?F8)dAk
z`>hJU^s}At#%YJ%7BV(@w=V4TX%upa>6CJj=OYE4n41F6sdApSou#QJxL-_VM<t82
z94$|AHR_5CTvXRm>XN(kS-&UE<)h=h_&J(mo~!F|CGIcvOQ+>dE9<dwr_8x(^jg}6
z;D@SDSFB}!6u7(fdOFN;S-IZ+?a1NsrHl4XsjNo+JTXrp>s{j$Uq8i2m0MnpnY@%2
zbE8)`V2i!RD01Xjyv0b9fUZ*9u=<$j-l~KWTK9k_SNxU~tuEaz%g?BKqw77R{^8K|
zhj)%tX1+NLZTy()<{9RmQXU@p>VvzP!aZ1A-2D}j0$Gvou#liw@^I$nnyNGMac<Zx
z3E%u<;dOE~i73aYy$)JMmU_jKUr@pOz`yXU3*ee(-;x%#RdRLlYtyh}L))Ji=FRWV
zpLf)iIdS^X>cPv5jKP6#`Dl|khpgu=Gd_>C<_LaqIedKOP6hi#Na3W|mEy?Ds<Gv>
z4-CrAeFL@#bKKn3(sz0C5)>9BdV1&i>qnK;m7X{T-wIDCYF^-s$os^@klVsAA17k$
zqb#$#4b=)C-UChvoDAzUO5%?)nTsjUb&GQ~{la5+y~Eq^I!_#2kvy277yD!?M}J)+
zJ;&2eZMHS|<or3KGtp@?v8YGVQ|CJG)V=9je{8joDz|W}JZIIZyWHSp_wC(hKk!^%
z1ix~k*y{c9%FLzs_LhY^82xMIXYr42Fq`N}JhJOhtymS=ldHhH^o98dA>d<pLd(;X
zR&Sq=GrAT1U%aF;DuUmJ?aw|lvM}qqTTwCOsjOeq(@|c0{@8K%O^%ZnKF5|DX>=%Q
zT;%+$y#MMu>a6=W^KzZ9^7_S;PbXE?d1q@be*>-%PNOza()}!p%p-#CO7|Z#7%C{*
z-eGz6;XYNbt4=86s#ucTk-8kcrLc-R)pRF<nONLaqi*+u)J{jYyEC4+rvy~%Y^?4z
zY)V^}%THu{z@^Y~zn^@%>qW1EVr{~;<y&r(f%}W(f`VXLT7(y@ZO6FlQjQWnB_^ou
z3E&uh%>Gb7wCcHDgJNY@(#em~-YxYP9$pO2KN%jxU()kz@<M3-u8dq#y;FQN%y_mf
z;ezwcyvNde^$N0Yh9x#Dl)qaH*~c({B;lq`8OK#eLvhubhqsr62u$-WeCV{T?V*?l
zpK<j*o?F|!0qkp18riqnV)F`a&)yy1d~@7+c~mG%9*(g=>N9&tD7S7q#H=%Fif5hv
z#PV=WUf~q~F??ZaZESL%XL8I+VTy`0(jeTyp|&V`tR>jc`%<iEQlQDpt!o`oDW#b~
zLgW2ox-;Ra$<bLtyPuYfushTot*IX!*S;p3yeX%aQmzxI(Eg5prJsSVxm*~xpY5G&
zYLL|OH6w)K%d?DKDw8_qlP8rH9g7eo3+i!#^ie_$eY<iXsyZTq<@0L|M}vnZH+Uzl
zPzE=hUOzwg!kj5}{fV|Tf2W0Lzb7dsZ{)W9HDPlf_m9Qb7_+<FZy9}|r>-PF8}_tu
zp3SQ-P)|JN*y4%wK1q;GuFkiqT<&`db7xjml|H;Ed?_w%uzfwEJXRvUATQ5%S>!lQ
z$LIWnC~fU|A%(QIaG$~Rvke95(W6TW((0D$Vlo$3u4;~iWM{Tzb}F%4H$8VI)7iF&
zhQot-?#$Sb)mYqXQ6IK&m%wB5DtAA9kn`yfuJ8y}m>TXCdVGd^AwNbWV)~98=i}G*
zc?X{bihX(QTvU56T&MM;_?YV&*%CJpz;)!oN8XQ|Prm^)7b>!vN{pr~U(xAyU*DFz
z%Bzrup62!07&od@?@3CHH&$964yju1d0M6TTFYgofHh>E|7!R30~yrfE#+UMFAt>i
zBvf2+RC-F9d3V1({8r>Pa}l9&)A!-f?D&`2w7^Bh_rYh`LlFB_k85cxxO+aF^}z|B
zr70+{UR6r9JWdnd@K8`n^jU1no|Nj_9qDHyQ$&^dtd1fxr$_FS(nnn_nm#31z1wst
zpZKs?9C~+eVdh0gj@$NCS(|%r6YCxrp=>Yrr8_*n{#xp^09C2&jr98M-ovYRU5=ey
zAe01@xqa-(swzHuK=jxVagmcHXZ8Af+QLgyipLntO|y>O++JbbQ~%g|=(Nn}X%^EX
zHx^sqql9k&b$=O)Z|*L=EZX|U%TFR<6Sbv7w@FQTXI(4gDo<yQO%k;GmZ}hO?Pne+
zK6Kd3p40;Wp4GT&!!R14h2L~=8Jo#kY~D9iKD9Vtbfvu9YvoNKD?_%U1FHH#3Fe9K
zyS<J<lB=IXM0JN8@5!Br4@~8BQi!bn2IvN{l<`D0*%_*Ct9?K<Y+!`@+d>0uBYk9?
zRddgiPn3t9ZasUA*Lvs_=f#g-Xj4eaMP^1(JQu>9%o>z3OX3)e7}?)TIB;SJ76~%W
zI+DXl$4NJi$cV@L`gR|srQ^(UkDNLUcXqN2N$+_3LR(XqMsco4MH7Bl!9767(0o~n
z(D+)^;WILZcj6$zZR8%AqwF;OVTCuDX6TgES8`8B&w}3#`OJ5oSmb>uvUvGn)NFLQ
z=wfL~hK6y(E#Hwh?_fp4M(Wk@F@G>o`c74tsgGkweL{Wr4ra+6v^+y-q+?;W4X(9o
zRW~y{c0HwZ>UQTNq4E0~pH5x-B>JK2O|a?iZ@^IQKmMH8ru#qo>KFK_uTV{M6UoRJ
z<>r!>Vatt~VVR5S{POBbIm!-!W^O*o7e2*{`3^y3p9(fsJ?nTK6=BO?AAGwt?|AKH
zrhFr=0~Wo!DH`yxp$)>CYMuXaHUq_>4x@*&p8F8bLKr8ejo%vx9k&Ur<$5se_i*H`
z`?}&=_smwYPsfiOm}|avQN+e()j`3)<da2$ecS=7<Gsh%4X!hVDh}6}cRP2erQ04;
zZvV)qhENi-U_2>3miR?R-)&*8ZSLB(ZSF{_v?2<8G|*+e=ECwh`yG>^2l!{0JBESZ
z00u!fyZqR}>b|vtLvN{bY+Tpe4;}ErmEZJfZ#Z}}!lJe5mN$#S#jK@-#;n{g*~)_g
z!n&<lP4iZ^*JUgAn!eBGR}V8kW6|Z7{NRF+1dl6jIal)WHz1P3^@EtwU16BqowN^M
zhi%Spd3>eYIy#scTfi9<K+77@%#riDsW?cDW94y?TG3&@An&_I{;|0=n&s7>VjsYz
zi+qE-rjTO~I+B_F%H#%~N2IhRUmZI8$cOXcZBo@l$!lw01q}4)SYww+;GXHnWx72Q
zye>J@S!1GihGtH0qGYojE$19x)xit~=JTAAG^ca7EUpqHpFdW?#HXwawjOz`MGwbc
zeLNtdsr!1W@<;?+q&{uM^Dseqel3q9vp87s<2hCg`w@fYi}Z2tHI3pM^LfhVGR4k3
zT)umZUck^M>5#)wU9YU+{NlA-(Fz}{k@fktS~-zND1y$H#~#xBlG@|1Uh<sp$a;|6
z$lSG@`?YKAljP)+U7sH>2*26G`1x*wyU!T1F*wtW=WF}e+e2&~mjj8ilXrzLNM<~~
zdqmFWO0IL|=gRlHx`(~020rB;ToK(+>Npm=zW2y^L(P%-Mx%4{Zks4;X3M#w9tfu8
zyVZ&vlKT!T`<GrAGZoBzE!h#|?xbuJ?GyS!&e{BWpzH%}{K|6;Yo5|g>HDL@jlp%S
z#~UXD6Zm^bRa@TY;@@2ky|Q6(h5CV*eXV}?19WQ{?-lBj#tC$F>Dp=0+xAM~x&?+u
z`W`Br;SqX)`3A_i<?<y^X$^h8C7(#TJgK)f`|=~t(nUwTsFIJKr+Gw^_)`kqLN1=a
z?p>d~W?a{#kiKSMNjC3Ti9ega|G2R2$g0~~Bls{SZRkB$dJNtZlRf%Q{@g>G80qp*
z4XNe5QK!zqJ=TV~uRE^!?3z&c%vBZDJT}{Ji#S472#PrhlQ0qp86uS2G*adaQAQ~k
zb%`9;x;h+i|3-(0Qo%@}3Gz`=3ggGp`_zh><Nu4aw}6Uc>GntQ;K3b&1cJLmaCdjt
z8Qk3o?u0=@fWh6}HMmP~_u#JQ%{kw9*ShlFdiVd{s-E6edsWr$>fY1URkiE4l@L;f
zl#LDm2GKG(G(vCisB-2-2lEq%iqrh^=;A+esPOF3&OVBobo?Gc)Fa9*0()$t^w78B
zGD<YWpm9E<FlMN-*sgQQ;Up^s!U_`2wcDzK9RQ4e3+rW$l#wC4zV8AJ7FZ~<8_}Dp
zMC$W_Vk@Rv1aW}X#Bh$j&*Rb!+U3DtRrPkT5Zph22vMy=mD2CO>8r+l*dlhMK@bR8
zIgp&Dh>bjqU(SW>wKE*QHd6;D!xtbq!lbgHuo0``%p1tEBuuY(`XoQBZaftK1%*|O
zZs@ys=<7R3rtO#gu2#q6_N`*x=lgj&`*a@`S@z7f9>-7r4GG7RiPqe^^Yme!dorHY
zJ$Ijt&J|6JJsOTUh=pj(P+e+j)SSB7xq4~wC3VP_95v2)W0D@)Q6b(~yAn}e4C#tm
zY~=*-`h1Q{T<(`485dwPciwu0=Z}rBlLWKb$tgk`lenVdMbhW*Rsjf{#M-pun1NWo
zqN)Q6OR4CxvWZI~nw3Yg3_uTN1zFhhso@3L0djNY8TT|fS3s#qF^q2%i2v^=q*q_$
za;XUm3M3=pxmh^PWmPb-bFQ>nblK)Jb&t$zs6^I&wHV84X>ccvR0Qi~j#QV_Eui+-
zt&Ls<){Zc>Icj-7%zQ^DZED2lDN5%!gWpfs-={Srs;>_CxG^p;rhU<tl-<~hma_8n
zN2pSgGrw?Ma-IpR%-dV6-SI~mw-ic0j{!aBDGfg*3HH=X09m6GltV0<h2zEc+@GE~
zY%cLNBZ`FGiKs{31;e8%J@F#ij73Lk_oL7*C_@0Y3Bl1>iV|7tz_V9x?B~H^KZtJ~
zIpb2bt1b#|+jaK)=4Y$*L3wrfHo{#)f4I3lG)rbDo8l8Xg@;fj?Bi<&y*OCyFD02H
z#rK@Tx@1C?37B8f-R@LfF@BWVIHrQD{=}l&Bgm?2*8qw4RCI*C6?$V<U*shgyY_D3
zQ*8TQD!pNvE5_P5CRM@^1?;IysA@v+FGN9TL*-Z=s7BTZrZrUxKXND!2$VY;hE`+0
z=KdI6l;8WDI%aI9=lue3e{Q?H{W9FxK!Z~zd-kc3D4<sE`7=i{p|l3)Y4&%arnf0J
zRaS^w(H<gO#crD5p97s-WO2;}kNMI~Mfgk8%bRmy_1OUu#p&<i$#^^&I3xB5QJR&0
z6e%uuG>t{Xw*=3{$rjjS_Clz2UmlRSCtd_l|5tkPx9VKsSrp%z%(~zV792~CX46fl
zH)JDC|9#LUN%CVM%Sn!VKeK;9e%L<jHwX4l^@xS;ISldu|JZ1j7Il%*&x&~~hJjR_
zGPl<3zqWXz@RDyhPlSw?bc;B$x=a7@pGJa$dHYxcvkGobdxhtx)M(=B>Yj0N#rnCY
z{nNV>4Xz1yELqH~UlDw|of@M`ov#p}h;T3KKQuS|NTkag3hbQ8`ly}c>ogr;3=1$a
zhV^+uQ!}IhcPefuhjKI_VRZN*hg$tipK)O9M{qQ?nfvW&^^8{WGZVLb5}Sph5!(M7
zt_7nDd+wA7NSBP5A8#*}WQnB^7*FOyxcPVwvqzWU@ud-OX>KR-Hv`(NIA;sB#8W=}
zfgnHA=7@7AX}~UNr%{(B_QH`jCm87HCKy?0mFi{`>B4^cj<#hOh=3!k6DF0G-pKz(
z*D%F9{C)EeS0+RGm8>D!RBn+?Z*ln%f4VLwCw-!}xKoY$cIkX?Sh9F-?RN#RU8ff?
zr_jbW>0)k3jg7PK>W_<Pw(!peg>P$&3Cd(cX~eNgjnAkjDN2Z8;hge|xLU24RYRFk
z#d)xL#UZ7N1bFq%RM`@zF{%wT>GeK14)nKMYeinJ+pfs*?L?PelN;2T5)*~F%O8<b
zv*pUx2IBZ?;Uu0C(7z7M%?;?-&=%U?62;4xoIS&YYHb5g7-RJ0Pj7L{;@}I`fWHKX
z${Yai{hUXuj+dNoN(ne~Fatk|2j7RNJ2mOc)lJydR)x&C`3g7>jWChl5LlOsAFzPT
zUbqEMY(wQoo$QR#lO<&%trNmE`9_+VJl`L9CLxn!n#04gUDX44{*J4roHOnkGc1Xh
zecsjcLznxisWptn8vIgVw3@8pRYla9Msg+KGd-QhjIRxKsoNt_N#_UGxFYKB25C_;
z8WH&gdi`WylZ?RX%DK(QWY(<*zCZtc8t>Y1WA{I#+HU>;`mKcYxjV?Z`ci6PYqjH4
zsp0QKI;DHib?J!v4ef`W%+Tz-J(ZUx?NzB<c<dUfTp>@Gj^9|i2F=fq$uRLDV{`9c
z#b~%Ym*rO<iK3ym`b_|H0Pf_9c6>TlY^90l==c!e@lO5H5wf~JMiIuerQGj1d%O%R
z{*OJ?xP_i$W;B!M&mRL~eIsYDS%$yYpO`U5UYap##q8-bktZfdf0G-tLzOwH9-gEe
z``JgW1p%s-En6=<PBLG3!YxivwW(69HYHT^t!=oF_aE1nuiin?YW?)cCpdP66mkOb
zSDI>Q1CBGgc_WUh|LhhR|6$v(C|ol>QG+gelt{6;k?b2G-K`n-xrQSPJyl7wqiH!2
z+k2dei~KnoQl-(5CYU7<yXb2`sL;tXQJMRJ3l@)>I5;V4Cvkow5y)@P+i_`gDNFg0
zUWiy(>?0FT@18eye3UXlvKEs>@{H3!$RHlCJCAZ#>&_=ovG?B<bzMv^d`_Ep|26!E
zmN2{5_7@Zi;2qFtbfe(&25<WWLEfIfF+83l>%x+tp)lQkh%ugeif_)mP)fhM%;A0X
z-&wkOH?KVSwzaWyIq<U!(|>pS0l%hE+c<Cbf9oyyp<1pgubbjWpbbqXQq9sxVo!K@
zn)Y%6)Y2tt@v_96C^uf0l-<2Vvvkek$tJ}X$yANyBkd2(%^gE2mjMUZVX>KHjQM-3
zT)vn;tU14Jay4?og+xL!(b}5*((Ar`|HGm?3SH);^td1VbyNvl49Y{Q${)@#4rcgi
zOw;eYt<P{(n#a@m_<0{h6z}a9FQva39LL`Wa{VYX_lc4?K~K&1g{WwD4tCY`9a<=f
zSMc6CJ}c@EVt&CRO{YTU5!Ye$i1FG8(W>bFhW+cwSEQpdBd|AdiC+E!U=T~P@rfYY
za`jw5lAG;|f*%1t{c9X!Q%;wd{padatQk)A-FM>u#aF?<vMBG)i;ixsk;PpzTO&mC
zP##eGpy5(WJP<XtBI&uJ70eQ6OU665`ls$G2QUq#p>5(OeWWbF;y%32`DeKdvPb8?
zESEt;{io%!q`Y30;My6J?aM2tpu~Tc%V7RqE=%X4;qwsO;W%Ed!To@zaPb=@z49D&
zKMYJ-3B3>Zr)*-5=jX2!sS<0Y8DB-wP-}Z}-TmcKBPT~`rC}@3a+lud;j*Ya^e<ZL
zuQ90Nd;+*HL5<RBxa9Oh)Wlu<AVd@{VR7~lTg+5-fd{*wQ_Q6LXjK|fzU8I5YNIOZ
zVbUUB63CXD$a>*3)4UbSe$^_o%(KW<)*-Tp1IJ&!9?|bVG`L7Z%{a72Es42SG_j1V
zP_-Qj(UXW@SnAO}(sDhKChKsfn>PPuoPdv<TOL49N;y&_<LunA;2%f#*y%eUaQiJD
z#k3_b-AAJ6fPvZn^F92sscs*i`2#^~s~=kf`#dHr4~CsH4ql&ixG7_hxac5U(+ykv
zX!48R(DlglS#C;i%c5>G0A@cf`Ii!t$^|mIo)oNhtveIDyvk<dw_-0?xYY*E?><oG
zbw@uA<+yk2!Vc*^m_*rU7!7MLLpL%%Hh{qDnW5rJLnl!VZ*fi{-4%0D6*NW#h<Z5^
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
I{A2Nd0ZTfr8UO$Q

literal 140952
zcmd?QbzEG@(f~SyKp=qt!JXhvfZ!HFa0~9P!F6y*LI?zBaCf)h4uRk>xVyUq5B>&{
zWpnrL-TUo+-+TYOQ~jG$=X7_S>gww1>gt~BvFkYivY3#l5C94a0Dyu3;Cd1u0D!)C
zbKU$xL$3R<_irvZSXdZXc({iT;o;!nA0i+jJbd){5j;F13gTlVWMmZNhX_wlpCF?`
zaO4{zP&YN9@54bVB0qwE1bO>6uj?iN3LG>M3;-I67;p~-3K|9Kx*326Ve%d{)D6GC
zUC{SoU?1FryUE3YWZYiA<w06??>;mP?DYfy0UA;h85$Y#YK2^H(`Nn};OxNI^HENv
zrP?q&UKh654xHPoPU@`RWnO&HI+_E`W{6T|QtahzvWQ)eG%aA-y>d{oyW*K6+Bv!7
z^_-2)NYd`gAl`}X(&z=SQ&VjTdK4C1YIuN>Wj0!3*DyZUXBV~7)6%xQZ&uw?I;-7U
z8d4kR#lRzuj;|WQzzUop6UbEQR#VJDn!IC|FzGiGsSkodA8QecC{-hQ7d~^@o9u?X
zxdZ_2A*H*Ujup8_pNdlzELs$Hk{%tLl?e6Q2YRTBtncq~jlx!eH+zJo6JKv7l3Vg}
zPO^h@YJ!q@J$lEduiWbj^)wyoQ0)&}H{Z57?i~&YHzba@2zQKf)G<15^__!9*BL@t
z6FJV4dLJYYRatZxy*cf&8ge~aT_a2^=ULqlsdp*t+Dr@VC5Ws(=x*aZ)mq(M6>{En
z{oX~f=-lwIN?PHNt(U8{WV&8?EpD=Fuvcz5(yjKYdF4W}kS&AK-pL-ZE!5;nH3oIW
zz}bjkjn_f(>(!OB@Sq2iof(&R7uN~*{$UO$_uHScc(C>p0YD$#U<f0;tpamy?%sul
zr;$inuSSnAZ4YPfg(Cz7bZg>TjBfa2Z#~Z3wO!zo(&=(49EfA!nq|DSRs1%KvJsPM
zf4o1(DeXL0JtEAIBfai_WcD!|Wk=QQ%wlZYomM%c;IL<VRpw;XLO0XXyeFfKS4}aU
zhlDL=kSzZI=B+maS3>lzWW-LkA>~q$M|JG|N)ZFF=|Hn3?-ASq&|K}9PNG#$uGlQ>
z+v{eRz<3rjD_x!zi2|yObv>cWE{69Y9?7N*+~%rF&253Fi9;5+<fyHz+-A<Jb*!<f
zc`EMCeyuArBi8`e9VN{ed^Sr?H=pst&9GeNh@m=Mi-)x+$V2}@EC6gX@yJxWWv5x!
z`V*=|xev$>*2q6d!WkLMh)uGvNW!^kgpVgOq#!c52>HxR7zb?qRkF1xM})5r`2Qv$
z)+7GEmf&D1e^Z|a%f80|!UUGFE|<ps{LvxQq`R!&iu~mrS>U;KfwYtIrj1xsJ}6)g
z?WQ!99xKw<L&6A}F~BI5S+#s#f`EF7Zm-i})Q;N#BSGA-PRx)@cKF3?LN~X|+rOgk
z6rgHWYVY5X7bV@DIWN~1mkdKYEH}f)5JYmM*Fn#~^(vd-rF^qW;#8^Icudjhg?U&p
zgoUrgi-!Py%`XL?Y4RR!-mCsMgadlN#RY(}aBz=XQ`_DBFL{9QM--=|j6MQm|4u{u
zFA)Nsx5(%zT^jA<Av%}zD&C*<vDC-~5xzi3z^G=tzLf|B|6A8RIEq57L?;&A)NbFX
zskOH69Vs+r!#e89N*L%ZUe-G5l2ST4c;1kHyl<mOLxh@i3upOT?dkm_K%KHpwoKk0
z@!}$O&Z(IDd$lZ*Uu8+Nb;XGP1&Ct8zs3&qGmfquwlT8|;&t1#G2=6Kw+#T-^hyqZ
zu!Y_wNzZHf2PQtQg^<yTzWR4S?XR|-;?2!F>`7YQ=JbpVOj=&d;&40@pvwby0UvOd
z;4Z>v<3CMS;-nE+qk1CS9QNuDpp=lF+6Q=hC!8B;q34Y-&JnjoD>5sWINQ{{uaI`<
zSy`^Mv}s-0pYpKrb~+uU7-x2>Er?W$m0LY^nPdw)(*5%Kmc~OiswrN}Hht^SP0v?N
z$WVvw-t{txBp^Mmmd!w1xzDRTFykb{C!Bh(SG3qt>)FGl7%aXm)tRn2KF|ujp#UYc
zO_SN{+yl-#{_+_#{sQ0z<=eU9Sk|?NZ+H~fC9&%S?}X76+`MCoU-EjnfgyDb^GR;U
z=JZr({v{G%bN`kLs)=0VLjVzXTLz~K9Sc&+)MF=nM8)Bca8-Q>DDjXYHzN?nl*QkT
zEAivI%@N)Xojukx-&l8xmff~0o7rcVJZX#SU-i}<wJhl{Uv1ZJ;<jvDjy|;C?T31C
z`vpL%P5jrD3!pH*dkv%aL}1A2bJW#?0JWrp%_$`5)OC$cUOtXqbHvpM^GRwj31a^q
zXk)5v&6TZVqs`VmZSHtk>&1Kt&kWSz>6aUV582*m@Vblu&5g<twj-TSsCpb{bZ6`=
zmC+AjV#cq;yDxXEg47QrGj$97l69OT$W0adxOzwy4;N1P<cHZg8439hTs;~Rm8~bP
zqPL}3#$C7tO4@G-19K*L0B|&8h8M&2N8TBZkz8jjtM2wyqd;7D{)@BAyo+S%%~ID)
zq!E!*nv7$wBuFK9<w9-666Ln{<@x2ZhX<qNJ>zRVAysOjiI(m>r@M6Td-kD|)%uNN
zm*XD{*gfJT|5$g~<^pkPZZ9+oxk}gB!1l$$QS+FnGmOV@wukig=ig6YuYx*t_d^%o
z|19_~z1?QA&`>m3K>+Bg-4Afs_q1I@a%Zg<Z%f`RuQS32AKF<r%(QA!)mf0+O)>C)
zSye6gG|fmzn4>8=`1Ew<LTRH8(|PTSTMrS0_|N_)Ar<;la60_0fo~rqiov<;ZFSvo
z1OQM@Wm=s!;D@wn6(9ltgu=^=PNI8_zZXaah7YdR85xeaXe$FC>RGlCt3}{>^VuKQ
z&yPcO91YfS0Bi8UjpebNo*_pqKe8{1G{5-DcppS#8S3jqhkP^?!W~hUQ%4(xVQG}K
z`j3d>=-Toj=iYX^hNBIpCZ5-*_fz}%Pi0nn8I@E84^7|4%>4(%K_GUXi*RKXANaIQ
z!^e757tem|V@*V5%YP_;M~W>m3BZ4P7Kk$4Idr&F9ccb(bCaFW^>(rW+?euv;Zv_{
zgTNfUY#4Dr6RtCXSWTy<^{z8&^bFf7^7!M3WmJ_R^-Us+d=I&p^*~`zNjisMYDQIt
z0-Iq&e&MS-i%8QeHs7^wTFSAqFc?x<I{zab!c?nX0|Y14bD#@2+*CKE%m+cF>7OY7
z9r6tW2IJ=UDjz#lmM&S)vHwU867^7hy;bB=Gr=pGi|HIe)$1lFvVTS)U-!lmzUR3A
z=Fi|kBLAsw-8-MI1rpE4>TdxE5o~0Z?#q_~(wo)x1nE0HYQlx?!uVZw>})J?m|BH?
z8SYCZ)p1SNfES^hecW~h4u;f-L3GL{oSL==b(iA@;L!RiKIOBx#?d9f&496bh`DC7
z<PwA!gloYr^1yw#JVwKLx&914UP_ul4jdO+WQ%RLPA_xXvN?i>in8xq53+K8(6_kz
z?d^?Tp;-)6TV23<Ky}>{;6bm{A;K@t&z)BC-=5@a5atbaKf>D_eQ}`{ouIJmv>}Nb
zauHaVu1-kUvVAD9I+HrQS{anvc}r(oq0||G>~w^|06l#rxT9IQ>t2<}(0UctbMek(
zb%TqL!9Lo|t}wpL{!ET*pWZ{|%uEbY@y4LSk}&uLB5>G}uVx)<OwqqQ)GV;gv)5Eu
z&@ZZ@+#Qpc$(?8|@3t6gFJV>zmrKkPRaNMD0Ivb~wl4Tkc?VrJ#p*`SH-`?KhPOw+
zuA?L6-#vJyo6LZ#Y?;*C_FHa&FLw4IhLUQE9p=#?hfST({xMdr{E2P1VQ-$}J*mrp
z4*lv~`h%gF!51?WI_)+*Pv|r?q(7fQtV4s=mUR4Xs}<o(FnB$fFyn{Og~2T?h~tAw
z{9^MZv`C{SV6Apjbq((t(2N~lYz&mjP1fV|oUqxfLs4DUsOVuJtQb%=j$!D-x(0*}
zCfiCUYjLG|9oA)1?5=LP)jzutU#3a^&2);>GSzqUcysa5Dt%_ec70`~)0H^B88B0x
zGF+nE4G{^A%W>W3>ZzHYt3zAFL}T@JEQ=ujo-zwRsTKa1A9Z1H!*=lQd7a@^sbvKv
zF~*6m1L^FV;daMqEyQ#AU;HQp`IV^=TmSkE`{DsDJeRAw!n#8|))&(4Sn`TuyS3+c
zrS8S&ln1@I2e*Wh_Gdug_Dd()002zNQ{i>r?O)&3zn$~mzHShRd<yAs_YOT94b_Kt
zx%UDll%xpX_Reu=ivR#XaH!firyb5+Hk8z`ns5>nECZDv_;k>=zkFB1{47X#^x{N}
z4;<-~oMZk(&qWJm^UNVLaoI1-x{78q*2WUMPRn@Yr7-|-V>Ju4ZD)B9qkHiYY}*9z
z_WIhm6J6=ZM#3Tm$@)d@WHr$K98v9E>t8=)Rp0CDxU1UAWSXxko&s7+tEQs&{c|MO
z?D>V(tBbA#PHc|F<Uq$Yy#!9Irs?W(&_?!us&h+DNh=BPLP*5_PvKzgrYUXuR@trB
z0G9H4&GwPjAE_gFU_bXzOj9c;dteGweawd0w#hROUWm-7QVQEx7k?u2M^FUQcw@CK
zT3>oF>zbyG#jO2EXT(SNE}`q&J1`NEC6y6UJ*9Il9eq={#6WNKOD^%irSy%*miTtf
ztOLK=!CaGoLC~D)t`c}GW@A;?H1$WSUA3Q*rWlyPGr_1)3((;F3hKgFXs+O#i8CT_
zFv9TJ?jajSWeO`IL%9QVI{6zLa@X}Ya|QIHn5L40&!ZiHPD~7x@D>B5wH@pJL$=Wt
z=ZV~~BB$J#o@fU?Ajt^uO{BJ|vaOpb`#GCoMSM$q8;>*BBhWhEgNpSB-K^g)-9wFQ
zMrY=cTmd(ugOE#aAM2_YgaMhUUzyfmV1{mLZ<tjrM(LMh+q2-uxT?;MvQgPS4~PVd
zTaU$ef@4_alGmL^`a?<KUqCp#nan*mYcOg?_rEH$Q8L%bZ1#M9V0Up@(Q(9BJ!5fP
zmOI_PW!<yfP)O@i&fs_9UXV$j?7eWb#%6bQdU#ru050LWxOEDD4zIgr-+ECxw#tg`
zK%7(BKu-Hj#9bI(Z&?2Zj@$Nc^H~kC9OZPxddr4OgtbB&<U2hJXO*xOF^Z4F<p{1&
znsRat5jgIt*mGf}buWQT8z<j1dif5kN;THbYx#HI-j2srGj{>P@qM+KPh-rRyi#q6
zkHHkNz<QePjwNSDH<ZO0hRBW4nnk+YtfdAzOU_HTObUAP3k*gUrxQ8#vz~9oh-y~4
zA0Z>`hZSi&n)cJ!Jk`kq=6?5asyPavNjliIcrlx3*RFTKohT<%78^Pq*wyDrYf;fh
zJDGdnK777kZCC$hHcoRYwBAI~<$_g+oPHN!GF&oK+FHy5x}v7utZ07yP&Ht;&-Gj1
zZ@$@`m~M>@CX1KRs!kyYcKkyd4y=m0qJn#1U&Y|2ZG#4URZ2@k;G0Ur{@$nSG<HE;
zol?RBHYSViXNBpDqi5-a?<U)=+%``_M=?vU+^;;}@<42tOqJC9K{?;kpsmxVhK;<R
zV=pi00cXT@{)rUB{l(``W<1UtN>|hp-jLTAF@X_&8f(hwbi28;otA>5i_arme5=?_
zhZbl24aikHAmNhzODXH!6qW)#&@4QdbZzrFQqSASXvd9*t4Exw>S!*HPy^35WG%kA
zO(w}-Tmvi-TiqV*dQXS)NgfDT{dKD$wze`a=Ms<k=*yj0?gex@AjKD*B6t{eJOTia
zQkWdO6A6dmlkQ6V3%3Bk<MonFTt31f_|JDGetM#J&o`pJ&x}aZv!N$uk@_>mTB402
z4*s?Od7rsKQZZxw)H;KW@h$~MELi+Uuk(i&Ni%VA$x;jaL&Z;J)+~}%rGM%0iU;)p
zi2j9fSZ0ckCEo6O(;f^&ZJ|VM{+<L(*!V6~EQchs=!<9Z@l9oy(&_31qAsbcJO^x9
zylz!_Cq}3R4#E%0fuqIWT?h!;yo=_y9Dg9PU@q^+ZIrHjsc!u7TCXvOV2+>;VPAUF
zoojJ@uEbCp#ZNw9vjvaGK^qnnFDaAMv8TP6oT|woAn3ZI@dIfQmoJDTQR>{dNH}F>
zjMpD)4Ap~`^e23^byiR}JU=i+0bP4ZdAftk>+5>D%6W#~aW+#jzs>LqGj|kahs7b2
z<XyXOorh=RaV)*PsU^z@IScWq>ODvEg{*RzVKHZf@)L(rTG^*+6g)bY9l=BC^pow@
z`4Ka@rjdjDbVd)paaCg|#U5*30}xXW&+)XAAatRGmbtupOBwpU^NBF0Y@J0F#XRWa
zylO1Gyaq%E#z^!Q*w-B9k0X7$?2;Qs_?T{%FxhGCAn6&WSP(Dgt8p>gx7i!V>VbIj
zXqNSo?C{ic!xlpI#{W1dC@eL(aD$2wkI4hP<^9;9X8}Ce3}^b@Yc^SEL__{~TbZtN
zr<!e(>#J-kOI=wWjvYp*UqM)3vFx^8k@M4`i~UQZ6}#gK;vrsX>Hbr`C|>`qy^f%g
zb{H-NbAq?`f0xS54Eoj3YLt&Rus3Xyg{OpTL!p6bYWf<$-NudY!4lT8OkVHZwuI*)
zr;=P<K3KQiMYMvi65CZ^r^J>?(F&~SJvluoTAc~zO?-Ak_7|y$hO~(?7#6*2IC88y
zt_f*#?fKGL|L$lN_Y5ieG<=BRe33+~2hiOCYHW@)b!6o=w`DYhKG1n@Dm=#A&_IzI
z*)`C>QRfutGHMF^zHK4wvF2zu3a;V<Up~G%b@!liW8xD(cze5s)X*{>{(gp=5jkX*
znEqxQ$&!aJ>i9}#wU%gqwr@O-esZ!m>uWWSZMN!If42M#dhYqStnRaOXLSvU@56@U
z==n><B2C8AGU~lB6Y82%v*Npf3|etDm#Y~9>j&?C_*=gV?ZywiQzho8=XEyj>}{nX
z2?+=p43I&@zIc{&SNK<X1h=J6;kXQP#4)ZWMXuo}*=TvJm~xJayXYx5TXxukJ(2^S
zWD2RIYEJZbmb+D1cnW9G4$@fqG%c2wGmtb4s=97A99DeYI-Ny5JO~=%6FvCyOY5Q8
zlBbuqSM^2_)=1XOD`Y2KIKIBV<Kt)W;_eyhW)1eSdw$2=6+e*@05E_o%?p#;2#4=V
z+^!FJ-I9abE(p`G`v6dfkHv98=d;gPelPO#^KXVL&!8dR@foi9Q29)c)zDpuKb^@P
zPrhrru41yYT4|3rdK$qZjTkGcNGhtJM+h2(sObMWA{>2j_N>o{kJ-w9tch6<4(w0D
zO6^=clvhkc>)S<K-2UfC5C-?zv%}+8rslzSNsp{Hho;H*TS_fu;ln>ivdsYZ?i%sK
z{U~8)Kh6BMunquVy9#O6$FVb5vN^k+_<+yM_gj_Z)+xH<6?^<o)kfHkxK{EaN)B;X
zc_vjhzH;8up_+h%LM&0jS}qFuzyJVmdbiGzM{Y|W9!7kk0Ix?(&CiJw5@vFsocaCJ
zKQXwwH@6+<*`vL<@~&lowR#vIJMSQTLS>M_rz=tFO-&@<?sAtwnW?=vPtG!1VlQqc
z5qNw}x4`Pq45x=e<2!zxfaRQ9V#QZeLR<e^qBr5UWq(aM%zYQ(Y}aa@26da^PIoov
z4Rv<`t+NYFrZIfKLDcy@#`QtGm1fHxjXpi1{$p&LMYP-M_X0N9-rjNd6ZwPev=5@#
zPm`?eYBC?~x>xoxD<^u;3nbai7=X9B7MM;)2gB)VoIXc^tEviE86R-2`>a$UuFtP`
zGhVtKTvk%(c2_{J+unZUHXv5y*Qt9YZ89uhhg#seUTpXMkRHCsbjIa^K<zAIo3?Fa
zzDcFyd4KveZdA_rin5tkn9hFvmz%ZqjeR=8{c?-_^7F@O!l@h2wU518jlMMhGKnRw
z6|X1SRY?8J3V85)rCXPoR(C(DA#`H)5XK&>D%NST47FE>P<G|nX;5x6&fB}fGIc`V
z?jC+aUi^jtkh;*f5D07$37Hx^*sEUvV6{*p3o{>B-Wt>&rEa{i{Z<ABpHq!w$colY
zJnHKTZy~bD9gY7<yZHD7`PjVB=LH>QG|`m)JAxvHuJ@mZ$iI)CkJ@+a{Du(yhTMiV
z?jHWf$lJS;H{o;wp6`stMHA8bj1eI()%3P7&@VwLPkum7r<l)Qf?uOf!3>j6E@p^3
zDx)p7%h*=ni!8&pZ7C*yS?w>0>YMl11=HT~c)PaV+imn*nzmIN8u%Q~cB~=I1L`#8
z?ld1AO*qZ)Fs$43C$DNS?JqPt#mlgyt*cWU6wMr%>q<P@64J6_`kfSjW8_4Qydj4C
z)Q@_Z0&ihN>8WjrzV$fX8W}$~tk<XUZ><lTuK^KymhSE<&R$(Wg{GZKl`LbeBCK8x
zBo<yvd|hzxi(ly7pqPa+bukbh__yn3CgXOwc;;W-EkMtRP}$71h}`A>e}Pghxw^cS
zM?HO(m(wjr$!M0;QtXM*iJ<liN_D0iE#qqdOBaS!{#tjO-|tsch$<W_<KN!imX+ss
zX{&ni_O~_wer`+QL`>$l(6;ehXq4yI@w1&)6`bUaw`w0pXQvL+wrrl+`?0P)<M8Tq
zKj7ITX*Vq+FL!g#i)q~qA2}9Hx+8XjxVwL+ac(jrrTReifjU7viyI?Y<Eg|`36hw+
zrK0mJcbAqGA2~Q>Kd&;A6+u<veZKp<7$R~=OoQd_qlpjoJ@iUnM!g(mT5e{H2);rs
za_EqQ^Dyv_oObH%`-7zc0Q^H96u%<qK>1D~JQt7k%fo>oBQcV`4-bgsn^aIECnM1>
zEZ(;ff-KN$iU3gW8!bhh-0FR+`W)t8+$-}vhNqg!&?`|^?}N>i28wsuoS*fW2hYeJ
zAY>d@jj&q5WCO$dy}&x+BRLa*fw`H1gDFe-Lfc;Qwe*3U-MRa+&F(7s`j>wQIRF48
zh1#NcA8dq)0!2DVKuj-$No`O%@ZNKfkV0NS;f1toyIQ$vtslF&?80Zc_V7lYCcUt8
zT=Eb8h3k79BrK36@z`5HVeZ*N|6yQJ`I>uGc0Wg(@Zi{9A9|kBXHltTX8f3@mA8Nq
z>oI41cbA5xvf7GOi~fq};QcXl`hn_aRe4m-!)h-8rcti$B!#`1j)S=iM^L?=QN&SB
z4a-6g0Wa=8d1F@rP#N3Bt-{1FYd^s)7GVW8>kt**JRtG~A8Dc-xzwjdKmxHJLeQ5)
zv|Y8=4-f1_sYX`TyWI77B5S*_iSCF20QYU2SnB++^-FW;sD0M;1+%yjc%3oQ(-qCr
zWzKc$Qir*MvEoKp8{f#QDiB8G!sm!Fj#uZ>QKy&Yo;lU1_Mduz7kh!(E_Bp>V#&Id
z357*BB{5QbL=CCl{$b+~0Fmh@lHfp*C6o?qQX3%=xTV0C93;X0mD0d@KCOlgF7z$e
z1o-=qe!#<oK6EHd-CNgYqv$!uDcl)dI>HM9{lYjzp-;I_Tebdm2Zs!l?>U<|hU5{o
zndZ~{D_m_V^SL^=VWOx1ON~pvZzUU4FaC{F0up-CTjqpG^+P(aiAX>k5N-v8=XoYS
zT)JNavhtLQ_8m!4AX)-p7jDTP^h0fa<&Xr#tT9$L?F03$*D-*XD}uIAoJPa7=Tb6^
z5`DE$8<bvc$ORvpP8cFi7IqCV3REsQ_ig2)(6GK@(v;;WRMd#~=~U6&rYZjXQ$KLH
zUFhl6&94DY`Xgi!;E?6i3+8t+;>bm+9cO=74g&zAC7?f35!8<-nwUp5S8+x7LE&FS
zeD_Id+JghRP<*z8_{jc)YUAzNrf|>;+oqM`p95Oo=IhqI7jvMB+8V)p4uEQR-Q{_g
zzR2Rtm0-vHrS<KvgAp)Li~AKi%h@O+hzH=S9Mr{<mzeYiKMJCPLVqr5x51BY7T18x
zEr_Tq|BI+Y8w<=-kDCC{0<$<VXy+x8T-HnoeKgANZNwa?v8HY~ebDO?DQlu*KfR|)
zehlRcBVM|LKyUg`vrMrMfEO@|^7iY_t_W5VaRkXe*adQ!2Xau01sQTk02&Gw_U4Qk
z<b)Tbcke;YaY4a8K}ANxU}R=NK_`0l{KZqI2d}lQFo{V>$ynJSXSm=X=f0p|?p*_3
zx3us?*?uW7(eT$J?1&-%3X1UOeieefRlc2dsvKGVoRjWYNU%22eu?$Kn#Q8q-?EsR
zth;G<4#T+Dyi8vREPxXgt4~(DVbGi&SA$`nF0K&_Y-u3wS*%!0ksC*OBMHV3|9)&A
zj-VQmGF^%{C3y{4IB7iD>l%?bR_n`50M*cLsI_l>s92&H3N58b=`Ma$&f5j-vS%H=
zVhv42l}*q3P%+bs`$2+G)l#|5JhEKYTRTULD65nXgY6Mpxxs6@^iKrh4*Fyz_>@ia
z{stJU=hpxv6#3jw<JF?%iU;C>luMjOXNuO!qC)Jp1UoGI0SZ9cy8CLaFQ-C6_GJ<@
zpo=?<9ga)Vd=0ty0>hrt)5Nfn)ljW6`A(=kP5tgnzYz37tW45BxLije7=?@`DxKJm
z45k=*LFA}__loXb#q)tK<aTvt(HisOaWRo^%#ur4fn89jl@&7P<jUjnm|}beWvI_Q
zMcYr$lWO>a)Tv|6{rWFFvHI@=RcR+^kf%cx?j5FMU{F7f$dTRZjGs_?OaxSA{ge)7
zxcJb4`G_{v%aclla&BS54d~k?ZfsVr)A<4C8A6!K8E)?GZd9<B+52pTg#np|Le~HS
zkr1kDz>>(}q*(fsp}vQ$BsKYf?I%1RH9(|-29Hw8o{U4AhXhxdFFdCf%_@#Wt41Ce
z)kP_Y5)`V8bYCIp`6Rni!5yFxGJ3yO46y(nXnl_QdM&%n;Wa4SgTB69y#6IrjzjZ%
zT2>oG2DMMIM)YyDYI>sUAL#}wGoM(h4h<ta=!e&TFqo%8Ye}Cb@5I$J&2WlFtD{#i
zsqU;&78a@Yvu@cj##B+FF*CImXA<zE;17_)5>l5#?${e1!qar1Nn;h%lnp_-2JCas
zdU<f+ask_~Jh<^{frsbB1*>~>+3q5sk1P_}<D0EQ2d8rjiZT-}NY)($%>C#t;sR|W
z^(<o}r{SgqGuMD{V|;d*#l&4uzEsnYHrQ_ZRLmS<z1Dp60<`AKP1h4+Y5IKNQ&qS>
zS5<bgNIEX*3SD<zaj_9Rp{PP6$JXZFco(LHNHQujjjh;cH+xBRahq0GPu%wlmMf31
z0U=YRqDg+lVx0V;=+PDulmq;^tmkZK37>&IjB*jYY|Ud!z8SA}Os0Bji{dG_G1k&h
zndNcuL+`hT*^=VXiOCq7<M5K)S7o&W;dUqYHIo}=v2u~agF@)Qg2rN0STFG#9|`+l
z``wRi(C@$ZamYj;#n_9|kX8&sTGZH=qCRUn6@)|ep1Olk6oWtYUIKdvSZXdHDl25K
zllBwk1`jN!2zox6b9Wx@$L}%eK_(_6Jn>2>;H>S%3=zB|-vFtg*fO&ho}sc-hIFV8
zUnONJexT0E(U-dL!EQ{6A+7balY8}CG-1baB|BV50!cvbOFs-%!fS9~2zA6Ru~@j}
z?)Iv$FoCKRa;a{KH+_7y%Enbw7wz1#hAuf34~H11`{{8reXdvWBidXqC@C8SXwK}F
z<jjRm12o=F`l^?f1Y{Zp<--P&8p~gDx)h$u#SM`}Qe_GE%CeZM4rOxC6hM}6^$Pit
zGICM3Id2}oKK0j&%49Ok9SxV?EJ$L?Ni-m+rB>^Dr!bn8Z(@>GoJHv2mSrR*rAKMc
zYDyEYQO#uUdYpsR%HeAZN>|Z+ol7elFNiiS97Gv-xGGerDSw+4%;H=kKt*{f*ln9=
zXp}6nH=(CtrH8e0AGpr)aBrN_K!H&xB?^79n5MpN5QgKE{E!UlZXt`jf?&`Ul<bqT
zGgm}YxJ{GCWDb<XdyiquyrEUUzRTD7GV*!ORN0Cpj~!<O57G2*X26Y&6oKZ%<*mqa
z*q;pJ!J7o$FB86}n);4T=1WA@zhuBbGA2^rnag}B&ze({x1!5o#~8+YWD@xQr;N{Y
zYRXo0dF&V?c#ljU!<2d7oA~<9T<1&qUu69A-ucm=^^@-2XKoDw14`iTRPQ$x*^&a0
zm-MsArK{8iG6so+g3(PALpk_J2g{v$Dd93k@`;72PM-cO2~meCO%GjmF;r?CKe42v
zj?E^Q$;YuP7@;+jSE1ABPqQhDVl@ZZa|@_hkVifpj<;4&lcr4Zr_bos@bDpCr*6+H
z@oF5gS}2IeE*f%8@!?i!>WE%UQh^Cm<;{&QF_>OYDb7h<5oSblTm~#JtY^&|ync~W
z@IK7FDtO4Mcv<CZ_@Lu*yR4uF-Kohibye;)z))tRe>-I+pJ;L*MPJ@aH!*NQl8-@x
zy4yFddw|j1i|XZ|p8Lm94=n1Idqj`UyhV2D;$CfjW&fzYDuw5hr7Sy7h_>zh-RsSw
zWC#9C9%}Z<{R53+3)s1j)XyXZsKI)bBup78a54`q;0HbtE3Q}QYaljqMue<?&-<iA
z5eZ81hm%bMKMz>$=(B)-oe?OM%xVn!RFsS)Z#uuF7?w{ZCYzA>0J`zZH!E&Dr2jec
zD7&aZz~n>9hyC)orR0uf<A?5iEt`TDu78KffB7Py>bu*>CDP$JL>;g@x?_O_n+kHS
z(HjnjO!C1}J|iMt59^2(Y|cuh3PIllRcWQoyV6wBdL+ZVfNX0X$#G9|l7+-`Rhczp
z6fMH(NWvvyaN<_2ajKIQO(+AGvQdqFebTq%(qHF|vuOvmULtz4J|AKKBcx>JTeCMW
zqWViQ{+-)g<~886lf%xA<IrM&6#E~4=5xGlM*l9&MO0s$Qugrb+PYQTIP0pmfBO-v
z<qpOBdwkwBj7AQ1G{^dHfR&v5B<>+A!<h@|WpltHKHi@Hpy&gzrE;VtiDlF{1zmy2
zsBQ27c$Gx4CKb2D!9}<frWWV*UZjLw^)*1EfoLkt#k&N3V&~DjfHFcVn_~Z*(VBbV
zWwUs-nHQeevK`ZX{bpBH^&(YVqa~(5s_`Kr+=Pn&Vzj!HoK_t3v<b8ZWh&vwTnr(5
z*D{OU06mA^oYim+x0OpozpI1}K5I4@>x^YTwLs!G;SJUneTpru9ft;m_C-$mAZI3C
z-LVh{`yMssK#a%=^7K?X8vDany@L$xY*YmETP?tvl!v<R3VDcqjVyGrDPHy_;vLog
zUe)tCE>G<HA?HUs>WhBkjHVTPYU0VU=(9IwJ*`9?b>lb|PZA8}C#F%PXIeWd<6Mwz
zoKA*qJLBpP+&{Kl10=m=p0B;RpM@T5=F5bdE|crTA>?Il-LJsUXSFZJ$t_!&k8CyF
zff*fOPEJ`&F1H!Egc}xQHJMTnf}$YiOkAU0+M;VLs#yA1gViup<@-?#zTFeCH)q{G
zDjc4fk4Tp%a;HnEsaF&?Ou%`UJx6Lbiy#NGL&<%?j+ych<{aD4uF-B76}s-1Sckaa
zQduuhAhQD5f{eswN(gycT&a?KY`-3D(OAq@JYz!Vv;>M6a7_ajLd1#eP<=m>p>{U8
z$fJ*IZ~9w4;^|;A+~-^pLk~pujO>C#)DzUJ*AvI3x}jAKL42PYF7$V=0fPxzwt4uk
z$VdlIpE4{}4L($AO_aaw{*UcpIP7kj=KX&1+vRVhS^Uk)#|lO{haLRM^t7_lN|a!k
zvDV4OTUo4eAJ}|IU`=zYInaqA-Vtn)Adr2`A7(Pr;AMf7VhN&`Ix3&gz!=!yjef%1
z4^ftk0wvN;1_heRXd~~y_Zk$|+3ZH})~*v-(b%8UU2|rQ$A|oyRd~$_=AWaMxt#Pv
zdZ&(@1x|4QVY*y&(0(YPn#6o~i9Tv<yphV~nJ>s>y=J7*zw6C|y#vIw`0b!5bJBwe
z%f7LOHJa1Mp)xT&Xc9-S4zpCu&}HN)l@<EAw56xit&mndDa%8OBI4_sz74RpkXi^_
z12C#{QB}#)hg!e7VHA%1(6{1oNfv{?7CED9z{qqqX>@rDut97)*iM?vA91|=jo@~>
z(!+0gaP!K@odm4x*ML{Er0VgT`b-k&ZVhTLUy99e!tj)DBbHa_0=G-haJd5`$y-JR
zi>0v3fp~%~to-j(hokcyNn*qv!uaWy7}`u8>HAfQH%=N&De+Z<4x(STYxZVUR6|CO
zv$`u#P9h?pcvg7B<Eij~s!V`7SX@N{KV~U7KHx)LI!*#7j%cI2m=oxsqLI}B%Y|!y
zSJR%Sacj29Y@1zBYVVr{0o`jrMjLD+y6z&Td~lwhFiO#?$mhL{wBZ<pHTZKc^2H~v
z6Bdk<nFF+`Vk%>)wMLXJrxK^c?X>e4*8ue&n$e}+LOW<@&}k0eOIvGt4Jd#p#>o#A
zR!I}-x4CcGazbo8fH5M8)1)p>MqaKu?dwFABU*T+ZPU`}!~CAcYnD-AIqDK!n%Ynd
zgTK_abU_>b!>gWnV!f%1800$epaMbfsR}pAk*<-#Mea`3vXth~b6n+DSFt}wDHT}p
zEE+w5YM2;rEb<MX)lu%CG`W35V&!-bk7kG^_bSi{g~Ez-(_M_(_X!insRcuhR<MOE
z&sPf}Y}`TgiL3SBECkVV&f|_vn{kRaR+~gUWVvJn6a9ti-&~;7$mz>0jb0_)%KoS2
zigAWNzg)QRv<cZE=vFd4&p0Js+SLT-kJWD`$S<!qc|Js-e3tZIZ<MNX5T62KZlv`S
z8)ok8T0`~iXxW;W_Pc4amJ_7AyxPmCOR;ho<#n@KWPDT6g{b`%&{9eZic?i&^0G$c
zO{rPJaXJGGg#O+O_^@%M&`F7|s<|WK2RZCKGL0L7Nb*+Bsh-1l1X*)O0vd{7`+q|C
zH(p+=Vs*lsY8K8|>85(3<6&jZwFtvfvop#x`UWD%Tj{3I!RRS({xjx(d?TgW*Vp+P
z04liGq?Xtwm%}A>#$EiTtY(t`1?Vh1BJ}0)h&i@9{gGD6Z1UB|!k`a=zDF0|<38Au
zXI{8!^oxsbyyJpzVxW5@C1?matlS`=*K%SwB}dGjA!02Nyb%4gg-O6y-y5ytF%<|;
zjuc1Ta@67N7wu<Q2(Zvl{|SMDgnFF4BbkTd|BS{D(r@JG2md31pR}=clfo-CN?rby
zhhJEGNo7y??7wnz4LCqM-#)`7t8pm7of6nAT98iE>||5OUl?!clwL;bZk7Em#cOsF
zH-J1`ukg}Wqfj-)H2>c8YdK!K4`p*#yn@45^CS&*==??%gJGCXF8Iua&NM2Rk$S*L
zQuW?wuJ<)@;L2maeZ-DyK+mzBi(U8G7QtRuB#Y3c<5fmo9GAxS9%+jOlZFakfhCBd
zrlQ2+_)S$1MG9eiexz>ty8Pl$UALgLa}-Cdez559B=s;*%49F|W=5{#kT;MC7gE6f
zZ#O|2)h)}uak|O6sF?*ke)W7(Emhm$ClRQt7VPjH;V&B_C7&o44|~oDBf{-GTno1_
z#ZYgpSSWBb5>qkLnhM2$N=wtH^LyJ_{8{f21DToBuv09n&YY7@XB{(KZVsm==SZBG
z#{^`UQd|SL#sjtoU+-r|Tmu3rH}doS%6XLd+I9wHPWH~DF`pdgH&Q)40`I>%0Un#r
zfURF~MA8&4W_B^E4qBxz<R>!eZyJjem$nqzbeFrBNmU1a)UUNu`pp69u$bOzJwe`=
zHK+yI%4~4DG2-LcXQZlCNm(!|J+FG26B--CaX-=_WnI+gP@{bsQ8tJ)_hpi3WeYxI
zWKam>G)8`iCVziX=(l%{^9G~w5gG~u2`}k<52SPFxnAX+3ioK7b^Yk8G1;h<`SrJ@
zwyjrDGgDWBc6jO5#RIZ)KBDOKa37|y_1kk#cBM|Fr0Fg<?RVjY!ST%l7Ru)rGgX7J
z5-XuGer|_|H?5oqL(A#NMI!Zb!`L-+J-6X3*~Y0^z=~&~$NCT=YYuuS(B%|upoLY`
zK}A|@^!(lHpb*>T8OvwIptN}36q+9TVSDmmQ<HkDE9RM-PN!gjgZy>i`D9og%n7y?
zZ$y~sBV2US30+QJozl=REk}eh1LwKMo6GQ2P;Ad8V7aDmd%m1pQs7(vfU`&|5?Y!B
zx2G1dn$<W&;UmQIDZ^;rNm_mF?8L_E5b`5IBoPXn*Jvx2#gTF5mJ|@>@s!!?u&7~@
z)=8JQR)&Yc=YLs9P<-AvUMy2g9lmHoVIf;H<t$nIWx(noyLPE5rWZ&zRGcW|fI-Eb
zzl!g466<0VzB=~^ZVwYgX|c=Ndc3-oXt}{0tV5!vunv{Kyf!p(R+v3^(Tjt&6P{Y3
zR3*7$rrucLQ-$`)=28VKr_!~Il$7^fy-32&q}@~kV<Q2I%8*HHe)+Cpr2hPZyEsuz
z_=E^!wB}TFt`woWKr^#*UrCs9e?SEFbD06$I2$8wjZ)(!tr~~>D?G7jlSw=L$%|$w
zQANB5H&c>gJv@Q-Fwcj16Yw>Fh<?2@Lu1iVx57_-)z7%``9#v`?%uqe?(FGDqi@st
zY=m^dIh309i|!vGs#sLfZj((zp$uH%kyWKcm&KX95oz|YY8|O3Nu{QBtSFo9eT!W9
zSMjZ2K9y*Aif74B_2X)kh84}g8ZE(+q@a|d{>{WrV(&0PBuZbn3X8G&V#wU-aZt{9
zTHveKjulQ^LE$ioJ6T7~YLV}N@ghJq!yvZ8MvKyyKn9IFg^~=P;N8^^(db>g!G1Dt
zk5+Sb4jES)*~TUov>zARkv~Xe`1y0xrcgS)dcE(HB#Y*C5(n{vl^&^~Bg{Wd9X<o!
zSU+H=VrfnR9)sejTq$mS6+tzc&0Mxwz|PZ2g`sF6`WHFk&)rr&@plj#N9-uSR8M{o
z;M+QV+Hm6uCthp^Aim@}fQ1r%&K!Ltr>bOTX>l|0yVRHmx;GbXa~I`Q$bG=nGOroG
z^#V>}4_U>5yM}C)XOU)}DNeN77T^*wH`&{kLrl~(#8vuf9!_ptb}2Nh*E;-Ou>bY;
zav&D6ru#wq)(P=A_!DxF6+p3Cg$rX{+b-r3Zs;{2eyjC(7vfp`Fus<zo}>X@beMVT
z)mc<|%F2#nA;mPO&}RBbEy>B~CCOOD)eG4d{g@#uWF8^Q@x_jwXR^c`2k(>HHv4%w
zWstAF%cN{Tbjf1-X&QQ%&Q`^mnFet|xVg{_H}#ZNu60v>+rtXH-%&U<QKE7wp??f7
z_48?7Z%mj~PyJ5w7xEC4NU%?sg5)0p(FYzW!pZHK%6Y{_FSS5)3wDKnMdw2el*>EX
z|0%R6&`8Ut=}|>6L;j)yDt-b?+>0h2s3byU(%)(s2%^}V$1QzhM*Shwg?7DX3TT<Y
zU7mlY_HFsI5|twv^Q&B)tmRs8Dt$kbij;59<a?=UzhkvSzCp;OPKv>7s4mRJ?yGN&
z*1kX$(kw^flOc>E5l9@3C&+{))tLub%BTKgNcwmU*(glx?L^;2mUv7Qg~$Jl{k^vJ
z{Vxmf@0wAeeaIgmOTZGIGY(SzQ`l>fVPhkn5xyn$XJ5Ea?91)<PpJ=5$~7`dEB<%?
z;fISMHc|r_T@uF)hBVa=m@7!KF-P@}?p17LOX4il20GEK*s#7-+|uxBPdn<~+aIWi
zr&rF+F?ngZ0U2ds-o3}V=lUNO`YT`<q7Py!x>i6-H9HPZ#mfyPdanV&ODq;N0f+kc
zDz=JLS?bbfNY9R<48di4l*^b(VS^YZ>ig|#Z!}D+gjTBzh|?x0i@|P#t|3+qL534s
z75<Cu7&0fNq3O#EZwzx;>c|Po?17z)1p(iTP{gPA@0V$6$^`^FSh4$;rR{9`!lTaG
zQZa_rX6nRp)vUy_=I=2m`>+KO3Z3^j$wkgU=1b;@%cz1if{7q>*Ru|pCJ+V*$Gs<G
zUwDh3IL@E!EmCo28;h96VA6bya7pcOdkHaI!KYW<T4vSTDN}p<z|im|jj=S4z}uOK
zg1nM`!D~QJYD8Ko)QYl%T7J6hoNrnXboi?b^TV`B3gcQ)w1&Vw9!Gd!x`&x$!%IeA
zYwH=v;;WLYt;8ItGR7o@VKPe^tE=3SPo*D?k-sfW>bTJ?dJsliM)K(zKv*Tg@$PvT
zbS!?ipTjYuI_XZUCVwV8w_OTr=&=Od*h{s&gqwNp#^^%&PM~s?7L;cjBfRaq^KPp9
z6Y0fi!Ew)$$yQnwN><*!qwI=dx`6>kkOuZ~S7k`F6jP2Au`peM;D|u)1cC3=$Bx<q
zC3@p@lQJ45@k(Jk#T{V%JQ9v5Od_L<-)Mga%gY|CoIT!~N$iJ2676YQP<xyl9S`iJ
zeJ1glrx3H8)#<2<M^&f@7WnlSH9OH`bJUF~i42BSqUjZLhDyLvJHCp!7;i3>P6GA?
z8)sN6%F@({>MDrdXHfZ=mya4mxRyNM<Xm9Ccro)Kzi+lVNTh`8liV)3x!CgnyJBmP
zGy1eV%*Zn1roh+<dUPqHwVx|R{a(|FM&Dxkv^jl!TpZX}eQk6iZXp_dqA$6FQxr?=
z^he4?YH=&^=estoMW1k#`ByX1K0ai7D}zp99s{Npi8SW4yl;m_mm?p=TK>2nYf__D
zZy?-UchJseUSr**D&_oxSuK~cOQ0hCYf%w4S2d36tXDVQWT(LD7EARfWra}tVO_`3
zWxCJfU#E-QiY0@h%G~akq#G=ll6rEzX*O|}+M~E%7Hn8+U%x%1R&LRYQG@>mYg4Ay
zWcaO3jF@UCKE_B5u-J}zqUD`zVBO-)00^i71rbj%yTo^Ug6PU8wu-H<wEfe#F2`H)
z>qElp6-`R@ODMZOk?e9_11^+Da;Y%kYS`CNr=E$W4bN<-30CJwTw-!(ckQyRnMH5A
zyp|I*+<9Ub(6mP$;-XuVq-s8Ly2?1Y$gx&&MAk^4v)b?cpi*Zrb)D6^3Dk`sUtlZ<
z%Ku7W7n0y>wVZaSw)%*Z4pp?<GaO-uKh&>D=D^6Bz@D}!0UX{noG}K6X;S~`Sp0`b
ztg7JQ@?7l#)P+4}$fgw?G+l_#^@qazb!gb9(=~Zb8kwZoWY&!q`~!>@vOb<o<m>BW
znB<vmh?JatJSCpn#g*zQh%Q9yYu6y<G%ugj2tOztW7c`@S*{=dNrsn5+b(9xJifoI
z<?+71q27|h!S|#$YsE<}@1HWR_Pczg`Bbw2TJYw;7Ap#29<BUrkr!G<vP2-W+|NK9
zSE_4U?2}3IET=$AvW-i(D6aVEcO^Ph1CeT<o`+UDl+#qh`#5pH$d->tiJDq3M4VSX
zfCZl6NM6cU=%bRfidDLbh{_h!m7a=JVF^o3W5D-(z{$y{UUg(bG?~if;K5_B>$GGJ
zw1%6(SW$dB*<mCR=ck=PidlRUiXr4PvzuINs;W%KCsQ3Mo5Y+X$EG3b5h4&YAdTWs
zEJz}3S7_#rJxG`i<H32Z$jc-d+k)53B+KJH#MXiNz;Tk0?@1`8O<zw-`(<pWd3g=(
zl<6mZh4Lle_ZVFfCaD%;3c4@(lH=5JPt~EzmNMehdK7hMP!7=XCLfPlfkRI^F=icg
z87#Ya4E@mMB0^^nvB0_&HcjEon|T>&n+~7pVy0Mvxcy_(X6pT@LIZvg(Xnn#W*x-I
zm1QxBj<A^SaQ)$ZM&&%#?1wB0L|h@eN(|+{Tk!g;rFQc1Y6Xo{C6Zfj_+CpZ^32!Y
z%@$<Jal45s{V*yw&gI-L0k~}3{U)mP)3p89GStxuWah>V1Q`B!bXe@F&#X$d=Zzbi
z`aQi;A3PGepPzN8(DLP<gCsYQy&`pr<||6-M-pKKp+KwvJVqRL-RD-##`8Y?Ur~}t
z(FM8H5&j|EqfnLS_S8Mn{3F@BuOUVc$FNso{X>AnfD30W`zFI-<*{EI@c-{_lJ(F3
z_eA)^9|ZQ|AY?Hmb$U|&?{2M$eGvNwdcF4f02^ursV$0+K>NbUbMF@v?{t0X8PONd
zdkAoU>-IJr68El6BPFz)JfCl<$Nje-LNWZ0_py+*`QO3*jT-@b9=#~VQq%#*(-j+m
z?j`T&4kTs}fe|TpkBC!TFyys4R#(&CBnsi;Md3S`+ij*${E~6M9bMhUXg>x2+AhD4
zfFpK8#LOM?g-G<4Dhm4^9QTcw&;XEsO{M|D%(rl>>C)l$&LUJLx@I!N9gIOHn^78g
ztt5!0lD={%!Jf3l&L&5-aR}?Dt8(d>q+0d}PES>1wyHI6z<23-G8N)vuZALPNnc~g
zYGJcd@yJ2lRwjsKM>Kj|oKAFg_>BCNcx5*MoIS>Hs^Sw>;SlCo6OiA<ot}4g7?Uf+
zCcmDMVgVmnT2AlcE2<`>s4=<w+kV;4hP<2z07a#zfozP5p33WwwELT#yw^28EB|0F
z&WMCUzKv@!d%#*gMaotFj5QZ#(_-S#!W1}>(qrb>mT?Ai3cGX-Sao5HFV`J=sdJ$A
zc*+cjp)dEaP5E<C`n-@jcYcTkzCLYMN(c=xg(NODWwsTq&crDmjoL@DS_#fKRTlY5
zz~Rpaj>#)~0^o)B4AC5H<&a>t#p%{W{CnA_rJv1po0#FpB;j%LLlAO5<S8#rmlvy*
z!jz<l5t|EHGq~j+1xt3>o79x&d&jmQvH8M;1#r~S|8z(hCs|t=^Fo^@@_SOVj1VWx
zAw9>>K`lwbogL;uzgIHKCTmPN;o<}opi_7v(W3|qQRS-dHq%a-tWG_C_}PUDE6y3C
z(ch8bM}GlFx~I9Av)a1rAPruc4YA0p$=VR@pzXuhGg7%XMehrC@tS<C_O5@Ef&MJN
zvMMu1zr1FmZvZz|l^e315f(q9hXW*re;`q6913a?9#CYs2Eg~4K{j@#4@^WUiv#D<
zqf*z(xb9DY;GYLZ@}`sP$BW@?>}8YV=grf2EoAdnkq!jrEk<m{%mWo@=+}*(^okhQ
zM{?3t*5#9mTGI)MYIr%?)0c)=!gGf;frPa>m6QCuR6Ul-?4w%a{oV<7-G5DfLNpaX
zD1_B1bcXk1W3O1R+`R0($*g;Pn1nDxf$Gz-;K{RG(g;Tp*p5m!g!zlk@*0u^R@U?w
zVteY?xLCn3bJ9!jBHs3fq!x!IE_>dGoWL&Y1|gV~JYDy9KciRl(>0zFq(cd&3&#e7
zY&6^c+lA3&M4n?9y^2;XnAGWyV;;ksm!_aqOpfGyso=~}^B<OEe^0zCRlSe0OZhDW
zM4cB^!?l?}{9^ygVkInE@FI4AhFu{=XDK}L7`!hCo@G^S@ns$xCPuDaQnc{IwTsx+
zLkd)*llpS{i4fHr`F>fSkl&;v`paOS@Xl|P5j^pw;mR?yX6Y#J%|O{gY@+Grr6w``
z;E@#T`+^g|&6i{%V)A7bi~gzPMsI`z(7A2x(r^_*DLNafQnV8Edhi`PQ;Dwl9ZxfR
z#!?Ks>mL8EV-uGPj$urUo#8-n`*Oh(zS`T-4QxW*h~H!reyYaMT-dMhz(tSC^rX<?
zh@32@fu--ORH$+MkV4O=6s)>gk@U`S6g97pdn!u@={*bCd#KKwVhd&^+3TI3UqnLN
z3_l7<X(j9IOv^ixh@(vz@R8t9EDFFu>GOQO6db2vupIn0r(a?+WnR#?mOCivR-p{?
zl}X2+SB#0Fdg%qCm|`NV=;w7&6c23?+V@i1oI}D_<XnbhM%lvc47Oi6r2SIX9-H+R
zGgSSI0F^V@DVkct3nPc|1=DPpL%MG<Qe)8AUdB$Gs#*swQc}IB%(blaxumX7>p-dz
zZNB_?mRE{?T*3rL@N>*hs-=!9P9nlc(&Ca;S}puFcH>x>@`(AKB+4rfg$Hyn$^A{%
z$=4e*Y}>`2*7WRg)8X}B*uHTN9zb$~y)kLADw<LgEQ^`MhHsq0StsH>f7`gyZ!?1|
zi4$)&w{D~6{@V?9x9uG-<9aatbHlwOaD1!fw|=;>vhFwAay6?ZCP1W{IMvOr8|bnE
zV#qxlA)&Z5UXMR7^N|iwtO;@iQj~xj#O*}txG%D|6tdVs(gqR^A`OE1s4HNM_0Iu?
zo0Sd&tanNSwUqY&^qD~Hi_@<tKyeK7#n*obUq0y-b*oVb?_)JCF?zP^JqT_^dg@Og
zfW`gsnG=HcKGv5|Vj@Xs#D56)Qs=emXOk;ld&>V`!u#-ap!{;uFwy@dBxh@V%eX`g
zg=HkZj0)U7@zc7@?bKf3E-XQs;N3QzTf87^5YV4}bF9ntng09PzV_)^WPC<`^HxZg
zs3O?NN+Ork0c2goYV$DU5l~9SVejVkY=LrAhk?HNGMx=~jLQXZTCef)9>miQ-%04^
zGX^eqSUTV?ZVsE)$GPEM$$YIra&^rdV}opF!9(ICY!hx#fm?X080XpdRKJO$e9)t8
zr5pp6*o9ZjM>qzAn-PVXiW|<zz@1B_DGn6RPZGF~DU`@J1Vyt6z3dfSlB4{7O!xw#
zxalsLkVcT@N2#>*>Z^${e6^ZU4tuWqB;?qu0d02+7cx12fP_(Fx4Crl+XmXdz4Dp+
zguIuMr(x!^(<H`0()*O@8qg~AQXceZYUhojt;JMFsFn;OGwqs}=<qS!TC=}@t#!(5
zXVNf=sk`>AZ5KO{^r8yXr+b*v{|MiRirsiV`}pgzUwRpJ|JReEmT>o6#qL$IrEc+$
z3JdD|#5M^Q{C?^5Z#ctQ@G33I6$r!yDix-r2Ywd?aKeXp;X#M)15op$Mn55G)>jVN
zz%0tS;G#6(J`^^*!S<T>qh|q}vaeo!%5oG%8%}!;+MIs9lP>$Jf><I0Ybx}qIB-c_
zpqSgvvhQZgTXVgrBs{tRa^7E^IX1wRyNbimMdw@~B8yveh}Lv?2J$!Or}>HsjxGi<
z`{;h!`WL<ocJ|1P+Y;j>GKb>u)WKd74I;A?Keb}g2q;7TwL4}O?VD{eNzLtYDtsqa
zcU<x1%WsZKPl^WjL&EZ1O^XRjAq%s_ZxR0wdv5_1*U~JE0)YgEKyVEq_zWK0WpEi_
zfWajMcZWcN26rd8!{9o2AV6?;55Xk_2oMOGH#z6r`+xWU&i&TE*1PxJwcdMc_S)T3
zUAuaB@9OI6?&@kJr}>oFnRn3;<xmXA@TL-|$84u8;;(jmNA`@!+KYA|OQNLnlx-BO
zdjBrn=#`jc$Aa%9a_-)*TmPI7a*<>4@45VDCFGz@e4Py`tZ!87|DA}c#XsbR@nYi-
zz79vaHgO?K==l8*;<n{aR?~YOflw)MlXnQmnWSl@=a&xIi(4h2%$NEv1EDiu)r<}}
z|F_Wo>pjuv)%}8zhJ7W=e@swQ?_VHI_A0FmJ?RVw=3RJKqW?!DK}4E6=gg+WqW`0B
z@$YpIgqwGdv^nd!4-f?Y$eceRfH6!1$`Y^|J!TK&1PN(yVc3U-WlAM?sAHOgyYVLV
zJJo#b>koUMhTMN*+-{w9ytyXX|Aq2;`S;Y8_@4Jv(5nDb;FJYK`;dO8tal}IiQNG$
zUc2rq8z~Lb&TvXX{cc{?SQ(<@+t7}RtU-9+@CwJOK43r~=;gt>i)@0+csBvJ>SwvK
z3q|z>J(+asiIM*NjK0wXt2h@=2lZF=LoM##^K~0sf?hbK{*n1Ape(o@T#n7s8}l@2
zo^tL5QD(fJy6mw+qInfBh~9QGi~dNlmAR7MY+$cRG8*)R{cZ@fGQLGdCstsVn)9}+
zP-A<o;Lg+$xnx!I3ndr48fvqSZ9`li%+_qKq4zn|scjBoMp^QJC{g>wIl<CsHPlr@
zMlQ30c2PEL*rdQ*;Q>)bUnOOoO_T;Yu<)@uyeT}!=2cf89v$JcVDY@yT}&Yh*P=|@
zG=MZ*y{DOcpSZ&9y0m_wbmlo^wmspAq9+WVwX|!IK5tx$D_wrF6iO0)ka1)0IqQhI
zpE3CG38^lnz3eU$!)86JwZNvpp5=r3Tp3)QU1wiPT8lYnj_<d6_T<{{_1fh*+w}eS
zrr)#cBi8gh2^0!A^dSjS3N(drQ}X}M0)jEY*S3lj>7Zz$kO)(m7y0iem92_-G$@dO
zzP|&|ATi|sCB~mL3VGBiKsf(LM5San)roSD_Df4GMOi&Bc)NqC1mDM4v3N*KfZXcr
z84o-_31Lb#E>~U)#bZk&Ri|H!JV5pJ2KeZ@l_QfqJq9(O9Bc#WV;FWy3BEVXm=0xI
z@Ctlp4aoHrChB#s0(u-}trkKU3G50>?*vn6Y_nwD$!9E~e-o(PDBF-E85I8~$;fA9
za5fP#ijp!S)_?Q(pEM)1uOHq$v9T`*HFvg?SC`qu8Wdvg8Z26>$%<9J7;Zd}dZC*z
zZpvVj@z4P;^$j_T=6r~6fi7l?S1>_{GmN?>`AoOa`1sVhIw2}GT5yB9S4>AJHbpV!
z`Ibn_p;<x%m(@C`dcTbH;M!PtC4qa1M3SjuPHDvS+;h(RbFyISt2;hJ!z%ix&}q4W
zHu>>|gz%wS*mvq$C<jkeuQo(Y?0PKX`F2~rJ)7Tg?JnO3oU)<L{Jnu%1KRHe5hRiU
zQ*?bcc^!4DGifmjT~r9DeVH$EaYbS+??Pp<HPTP#WvBKuS3+66lZHZ7xo4Gr@i5d9
z3#cHjnA;xsJL?j`&BBrThHQtgg}pbHip+O}9k>f>!!55`Qp>4HPFiQHrtZ&)p9muM
z?CEV&Ibcy54A6p2fwGLYzN2gyUn^6dv-8u0aCv);bJbMjG~5r$Pp>IiZE&R2nrBR*
zU+ik(yg1-ZXtZ2FU0?1DFLtyn@3V))6z|k#*m=oj{svV|mHNq^GU>t1LEtI&`J%he
z>0kMKr#eI?T+iGQZeK2+i^}e*<Z6`EWl5B%nhOP}WDmKcWr-#oU@)2v8jD3@<*0Q~
z$LqbGAWS`H#Qx#KPC{o!b0p2M!di(Z`^>ivxj<n+Oh8sfI05H)-U&(7p33?-sL?-O
zwWIFhIH=#6MW^%rs)=RbTIps&Q)Fj8Z(rmqm%s*bDH{WAkiPsp$12_aUj;r-Tf%U1
za67;ddIOpPxLs(#iS`dm)IigVD!DCh20Sc+VpN?<2^2Fvh=`p3^*a1dN8V}(t2l^(
zP9lDx{76v6Z+=Gl)CcfaiCG`pa1a#XIIrZ~d$mW(XV~Cy3wrKz980R5Wf+AP?(ovj
zY9%)x2dTr7xRl9P#gfIPuY4}<o+zboSkwEyo)@vf)mukaG}%AJWJdO<$vSA#aq6Kh
z!v-(leFYS|(crkr-RijBK&D_3KU%~|k+oXR*E_7hJ7c93*6b&A!3&yrv?Yz-W^vQ4
z^K<fy%(qDQ>kh81CM%yPss~6<>+)_c2szB*5+{64xW9SkYCCbBR;~e3RLk9>EwmX-
zB=FY!`)~HXy^U8&JnWATxH|KW;pb#rc>?X)sIK)@24F4$hj|NGUAzFkf$InynTPrB
zppx+188sUqFA>Fm1c)D+Kq5$Ki<6;z{{oAbh#ZcsI@UWmgFeW0@Xu8Kf$WAW+H}uv
z!2oTU{)f-0QOv<UYNUKm`<v6Sn)flb+KV-T=JKO_V}qItLM$*kSVb5U$KEfL2Pfix
zbA8{tee&^dui~ZHzfZXJ1Fz*B@C*IL-GA~}@8)9pV9uvM*x!sYsjbaPJ*nY4a?=B^
zGZ2}*4YA8BP_Qg9nWhQ!ZvtN>Jv+^Xc;cwq8hCdBAc~pupM$^*+u*48s=eU9rGNy=
zSgTJUzTXFQO3nOlydT+LugU#0;vX6U`t}_T_|8~*F-0L_${e!p@QR#bl=VFrvZR!4
z--W?2hqRvnw+|0+Oq<WjJW{uAeh(uA36v7aDoRJtIYHeF<cDqfQ=!94AIjWgz1wZ+
z6h-Xr6turleQ5T4aP>{owWhP9KXd7vZ%oK(3gS7ewW)F_3HEA_)}k-(&2DK;r)3dx
ze)e5EXsKi`hXXli-uGhEs)`=_53=LM>kFGx%kTfI?P?Tb4PO&tTz9-9Dq+$0A^H9&
z%45APEZY1w*?T5#XV#UVyu>J2(hK9-uC+{>V`GEtfLz|2>JewZ&UvuGGv29S9&rEb
z*DmExi<*1rz*SoZ;1(Cl7sFZ03+~xZ_Y|}W^Wflr6Rqw~<s9@S@X?1Ke|0IKeiYs%
z?5GINsx5u$61KO=rD2nk|F#3U6{l#0#gZjEsnUtj+xlJHd+TDJX);1lo~{99o@ol}
zD6H)Cms^Y!){!5B3PruRl{51Gw}fb(KJ;-2rwbttPq$z7ACmFMpC#zH^796SA}djJ
z`!8YgPptp!-&y}JQP(Bt2S#=;Gjl4Eu)Nt94wQ(+<(B#^_HQ{wYDSX28SK@?>n%Ao
zNdX3*-?%d|Y`dstGud;~o?KEFc7DK+8ngF)mVx-1g6|RZE{&`uW$Y;eVL0nWt@u}A
z;Vb+9L7tMvT2wRo;r}mDFZ43AGmq1_{J@s_dBh=&aUL7zltjYZ4e3DTz9wm$aq)2Z
zesW0Lc8-3{8Av3<p}yJj`x68GiVQ{Ztn<{%T)5Y0wbZm*LmPc6BHb`PhEZgtw3jE|
z$ad;4KKWPe?$2)L{qN@XyRSN9??v(fvKD<}kzM7RA>Z)R^IyMrw2R@Rpgur(h=Glc
ziiUyl+gkzhxDosZcmy;rPS7QxCX<9j&uKX&)beV(*14Pm;=wPcxL-MSf5(tgPpJE2
zYdi8(6LC~E8MRk7wn`^(qp*m4=EzD-^mVN*X-z#D$rxT#TY!Hi^E_Y>&8E&9g@7K&
z`Lv0a?jvw-RUxo&GDnvFLh1lL|H_VSPXGYVq$F%C<F+JH&Wqk_1<&Ep9*;uYQ*>9d
z?FEv0%moIe@SxAbz`JPgFB&4?17tJP=Av^c4ZCP~&4KAZTZ=R3ynFdJTc`$`grH9K
z&royg^j)S<*<^P=cgFle@z0`&hkTfTv30AVnQ&b(slN`BB04CpbTuj@+Pw%QJ4X#9
zsW|=#x4a199qkdieo!NZAz4WAfJVc5tmrTos78c=D)HZW!`%{j>v1!8P7*gH=NDRY
z11#o<Hjd);GTjOl3>n|WSra2f*us&11hD7CCx5aE7njN&1Yg~H=UUd=V?2G?^5I$U
z=-vgpqg<`4w`f@8QMp(qID0qqK4O;F;pDldyNPgx@-DZ_j6Q;L<nDGiVoud!MTowO
z#c2$jvCA)aaSiVg7GS1$q;UtdQl*^<R+2s-)%A2Nm3Lp9?^WJ?J1bMrDbFw}1@<DO
zQJ)kFo-<rBg|>iuO_m$_JmCjCb`0vqR?+W%p=1k!E(gimV(X|1oK!idw6>+q14~|M
zvha`UiE`%SKGHK6CDhZg;QnB(*`0L}>KGPG=<6O#I_B;qq0nM={>_}+VOFjP%BlN7
zT_r<-$HbKxrX+DqU0!EhXD&;bSbZl~-E~Xj>`du{87tG~=IwMQ`#tMcqxEBSr^wsH
z);`bgn_I%9SXvtT#MFgJ?j;T?t**D0vrpx}Q3g6S(75{CD@4~UlrCHvNYm1fxtH_*
z&RG(1aSE}2zv3U9KMf#HmV?O7r4Yt!7hB_$(2j@l<3`q=gu1_S&*#+0SwpLN@#X1<
z=W{K+jI(1PzA9%0glhz(gD@PSMax|sE_-UYQu`v)bk@{+yzZT^Cyg(rabQLfWt*Mm
zC7XKm!tOH+lblYp`on;XTfj@ue8$XY?kd<vS@#>o>mW;GB7?`ro6IkVs0>K9+z8)g
zMeJzz7D1$~49za|l1s;zS6CwEnM1;+g$4|UPT5|D1R1_-b3IR6(1=PD`k9l{I}mqx
z_cPh%Y7CT*jv-k<;iR0GCy$HUtG?G4owD<W?=y_%orj}Jo47A^nhKv8(wXDxUFoW}
zug~foJWM>tPg5Cd%;)A+F~ednkB&cad@06DX<Eis2t!iwWRhDSAw99G(y-XPB_<Ew
zmpnD~Q;vqT!WS_JZ-@7NFNNPq(=v(sG7kvs*ya~MHZhq?E2<5AzR8@SV7qt47mG44
z*r%aKNnL#os=?Vm3*B5>Cu<YGa>iOP%=pQ%b<DB$Wa$@56SZH|vC6!qU;7(h=a#3g
z_g249YzV8bb-uL7eKRPysDj>T1Mf;3Vl!>RUt~sGkrR;ir}L|LUc?l-ZTtt6I`F5D
zW9GPx<UL{FUnnzIisRL2(F;3F0dV85$m+j&^kFXgYm)Emkhsk@HNqu!34ZLjZaIJR
z8?WPS*?0+F{ZUDK8{jZKBZ3j_QKg6A;F&~NK<Mpl{-NqN<(8#oce0iAuDzQ#(488n
zxP!KCOEnaqnGxyD-k(2hUKj9=28}YO3H5_v=;rde9xh?lTgCb9oV)hfJi;tLV1}sO
zS5E@}fCn{&*P{j*jauU;NVgILS#kp3foW~WIpRFZna3Miu>~%7)?tu|^qo+>)3M${
zwNu=B!7kI!hQU&l)9?jUcS!G3A}np7V`@U1;8JT%819(I%qrgL+dNJ}E1LZ9rMRhJ
zta?kFgZSHm$X51VD2fFvfkQJd7mb-3qDDN0i{yV)m+=ym3d|ts)rBb^i|X#8mLJg1
z6L_J<S+?bwN9r#$H8-M*qrNInlXanX*ktEqicQ7YP>|O=+m)_*X~9NIdvtKf(qOk(
z+FSw4*wzIM#ULs+ftX`^5c^E#T^!cO9)+tfq9daRj~X|Q5^Kwr^BHT;;ZWu=1XU5!
zoXsw7n2LKnFZUj`Ibh81Ei9uzsF`-c_3Bclj!pnC|7vUoUDGY(LqJtV+;lqamU7xr
zRZsrPo5<R|Cfs#}AKB5=6C#fiEqVv*Uu`Ycy4WqW@Yx;lQT`P($lzm#WC%xxWGVdv
z&f*s)46AY(J?2S>bMgnu04D8m^rMQg>YQ)PLcJ}0cweP0?=_=b;cp5&%_eC6kp0p_
z8I=y1_uVmwXe;AD($WCI4uR`RGY<)aJa908{=H882SPO0>Ok7Zj<Eul8f#R+5|Dw(
zX3Z67m-5JtgG|@L*UOw_p|hy#G5|YtJ*^FW6*sEc|B$;&V{f#e;EDBNMzA_(Wgmlz
z?~nxZjHR$ha_(9`*7%~sSQV<H!E8Xlu|Ub5o86~M#&>aUZhcgwwpyJj&gwXe^QV=n
z`a&Pp(O!%>Xk^~a<`G2t6BJ^w$mMOXndRj}TTK?&m}H5b<Gm@UDU1CIK<|b0!N+%C
z@i1bVe4m<(!VpTyGNiPvti=;%{1OpTyu$2(@Ibhg*N!<#pqUC2=SuJ5V%kY55k=Vr
zj|WMceDf}u!Vyf==0ZW+ebo|tLbW|X#`H3ZG2=i0u2z7v_LMk2Sd9n<2zfuzI-xuz
zLp?RCTA1#H?kQ)Y#%b;vI)nUrPC8W(IA-Yr9Pki`DS;YdqKi-7ElScNnftOLEb0)d
z(U3AFleg1yYeea{mdjZ-prh%0^2lV;LA1BoO-1yh$)vzfoVbc$GZq?Msy@Yp!ct~c
zmt<zmpP2iU8O$7PQqZv~X4mVDiXVrLL1XQfmc-m4?iW(Hk%-Jq%vGjWp4!v%p*i6Z
zHCn-z82raq8<kP6ez)Fqfq9lJie#>p+%kFWHB%0HvQb0KoEIKafEL*~WySG*<sYu)
z5x5UeDj(x>nhG`l^e_Dhf^;`0qm}We^Xp@^LQNVdxUV!@l}dvX7audbqH?BV+wkJy
z`mQhsY|vJ~;#c}G!woXj@S**^avo%ED&hxY;*%wq8aY#6(oN>-%LA>#jQh9)jEA%e
zdGl5vJ2v*cHhTuITmvc3LWjuK+U`1;Z-l4g`-LaRzjcbwr^hZ_13SgHufVsi=ikMP
z-abB%vv7f~HpO_-RSPv&Iz{)3$1VlmT3+Y7?&R5KXI5N0NpvN#2h<loCf6$vpz{l8
zlEp<C_wvBL@*s#Bh`t|ex<Fsaez~iQ)SL<$NQ|N_Rr5^hj6W9`o8zxj@J~d$<(!A8
zi*z7Wk#zovSZ~S$;ra-{v%Ld37vcETOkWbgu|oHI(fHM=RxKZ~-&fULfe+?oi^M9B
z{17V$lIeN%+>uWB4Jq02HIl&F$UIc4AVpf|wH^QYg?LeMq<SjxhkE+x0oJ1jXvhs}
z|E8W25YoJWo}lANV$e#MAXU@J_2-;iYDo2zXzDw0Hwhg#_~phcCzn4JRJ7j;D&(~X
zHilunw(Gv$aLmS+nWt1CUnG0noeXqSHZB^vRyH*iAWpC2qUV$55kF~PDrlX19l7?%
zKSJU@ruq~T4r+*Y_K%(~mpx+Sr;tU=Dn7wwC<tVPC!`;A%ME}^7bOITVjT+#UmTTE
z7<4~mj)^D;m)0VNB@TAF^ActoQkKGp2V6BMwKTfe{Na1Uggd3>5o|u+XIswMUBB8A
z%Pv*oXpV4%Dch@Mz4nJM=tdOUdytf<iB7jBS3AdFtSU(xnK3hxU^2&%@}cDyxEeAD
zD9Ia_a0~T$3dKyW9OB`-6rzV)FcSmW%`jy95mUaBL+r@?OhdW;=3KS;ctLXqKTee^
zWcE~vmF4Y+&7ECrqj<WDopEhlHQCv1oRXH0WlzeIh}9`6^RFbxrHz4Hbh=DfcwsDo
zLFi08X<yHvzO5gi1eOMxMC-If#9bsKUqklVbDt1NG6QI(fk1<I@{*Es9i{pB1e$N(
z*(_2vG~zOcCQ6CX)?DP$qV~IcJ_8Cw5f_|k#g6KU^IF}`{=X+Wo=2UNbt}57b<H*5
zwHQl0T0UQiZnyPSTs3K{nH^|bzqDS}`E#;`vUB}sfuHmyWpp1&8&eBD6}I8M+)2Ub
z#^^#8zVbhQB?ek;?fu)%(W^dU#2U@v2A0|;KcOBSck`vYkBZNveS}e{dOkQk$bG2I
z8OF_|dyzxGgYQhiebW|)@iFsuJbn4%nq4K*NRV#0fz2J<uR7sX8EaRt4F3kaoA$*&
zY*xCzXD-jEE=eepHiU;smTc%d0w-PU^@J2|m|VVL8|dilQ%Q~5y)l2bDrYTsj1@T)
zgJ~Q(?TqiNbNTh``1$6CZq?le&~Ez<T0wJTW6NhfK*T}7ipZ^ODA>B}%VBb9Td7b|
zvn;|J7azkVyYE|FLQH)8=oc72(>J%I{Iq0AYK<=~EU$dKBrVR~j<-5?<F^QCaRp>e
zNo}!Ma>Akwx1vGrOPf3IK9W|cFM#->i;_lT93SL2#>g*SgzE9Zo1;`I>-2^72lPb^
z3pZZV4Zi_$TAnmQT0`y8C!dN=FB=w>H3^Q5^1!~{TTTjS;XGow|1$2Kv0L@#_J+`_
z(A{tTqWH|_hu{2gL-CpW`RO;Y?P4?{e`Yy_6|v`d9cA|4L8+g<W>F3Mi_<uE6K3du
z>$@IGW=+FRGgM(UyrBs^M?znjdiBq2$`oA{xO=tH@w8bEW0q|+2_JqBT;gLZONmda
zc!|+@<vzkLvvqCgFE$_L;ns2`h5P_*8=^RwS2396$yMtcq*zy#1%VANfByROPH=Q=
zkDAAty)e2(S6`JA>y-6ABA#u2PvGu$3H*XsWOfo7HE9)~@$+jmfc=@SIM<171Ypnc
zHZa#>u7yQZsC@|)#xc1GBweo%>7I{up=I9>UBs$jcONRKiGG4%vDXu71}>F{bpJxx
zoJ5g~|8aDerz?Q!LF(zv!i`UA+aXM>__M5JBg=}><;;-1pn#sg4aXyIIALictUqDl
zqVZdUR^^4tp77GrC)oz##85u=`?pv(K&MXKvbY6(kEzv=h}p}6;oOJKlg~V`R$7<D
zW1<3%vSRjx7Z@wt87EtEC3*(DsVn!OEd@A+TWCC%>!OCA^^$fH%&OG38BgE5!!}Dg
zGJv1ST17=^4G&c=Syy1oi+$UnP%I#fse*6|4ZOZ9OB!>2uz#1+!k@j?^v=)ap~N-r
zq<BojB>m&@)SS%~s!<fU3SQt#`ZG1xEwF3$&LF9`7mIeYs=?*!AO-uO)oG#iE#mro
zLSxKkwwy#zqn2(%LrjfJ%+_a_C5oYdp0FO?!5gMMI0ioVVb(6yD6gYd-`0Vg_{Kbj
zp-al>^#L}XiN>kDs3=(h?@PG{Jx8U21lj4k?b2h<_7{#lgx}kAVQSzb+gX#FY(4Ba
z*?_q5&|!%$#Qrg@etOAPgtzCTIjdGq0cp0_gnb}i?2NhqWwTpiN9_tBM1y&zWLj|J
z$$Zx%%)m^uo1WH5%1d1TLr*<gv$37^(+7t!fj;pQRIzm{LWBXdXlADKViebm1M@nf
zQz85Z$D-gbpV#_2BK$^jN~&7(xW2HstD5~n@ie31^`l-CU;UCr=-H&noCgEIVRDjX
z#A;>1n#={cv&g^TGGgedFK6-o&DXD8aza%IZ_=-9=z^2;w{Jd9{+X^8j!GGP=M#2j
z@!I=}mhOzIrnX1ND@bs`#`F?{U!^*h$Kl2NGhkTT3UB_Or1Qi!5J)r7ON>fi?GlHe
zJ5STVzVD|Gx!S6<q?^j+ejduiR_bitQqu!hrYI{tbNkVF``*lE<ku0YGU8j4mGd^Z
zl*1dVrzR%{ulunE{fys|>YBs~Puk7&Sm)aVHxHvk)00=VD+NOz^pE*K3*I!_{6aA*
zg6?*<f1T7#i|N=q1&q%6#<`!DFH~gWQsD1p$XW}w4iXrc-Gr>S)_j(+TurZYYPWqN
z10C(uYdgkj@U$%-VAt5@*gvwzv$wwSA-r-)h>4p_r$jnWAYJ3=oUe58SmC>7k)ZvB
z!Vs#OU#b7TeCpFSRfM%(cu_o1D8&{R`*xwnxVxdq0g>S3+Cf|D<y^TWt}?{6i=ogo
zU+g<CON;2+|BiX8bkUctuaxs>{f9m;<{~^pTHp;G`l&2H18cJ-H#MSpC|wdW-Qcaz
z?X0)j^RLvr>=A25%kf2C{W@34jtbckw!==BY&~zps6NH*0}w0@^H1pQRfIM-TE5}w
zHIAwH&MJ@Q6=Qps3~HQGiA{Xj6+6NF`TFJSAC>PC4F}IHBA+prJ_OXOY^N*>g+vF%
zi$>mphY*J&jLiaCRBW-Vyn&7GJ^Ks6+<`n*0tafvPV+Ob%e7%;r688HIj&0lttDCe
zCnW`RS(#-<GQ~ygyF6Ol0h&Y}JdlC`xdzTvP16pW)|xMsI774DLW!jY>lj+RHaC6i
ztpm@W%kGz50T!=s>6AB-Ev1psQX|%zXpGdB9<*8w7sJ#LFs?KzH)fvXPPDeN&QX$;
z6Bs?qyev7zVHw;-!OA40gywa!kiB7g=D#AEYI<hV`=<!>#`#k=YKhYT(EM|Om;u;P
zj1iwu`=>|wv#5Mu+yqvRJQ*KqY@KeY7wR9xlZ<v2!*oT=Q*0h(UuyA}9gS*x*tFHd
zR?~6)dAl`T%YO9x#cPaIcj3vlk&;Peg&Lb(c?5radN&=O%%GsIne-S{R7tGbm>&H-
zMbGF1TJMsY9CT^7u9!n&C(oyZl)6Ks-9qhnd2e1Fitq>%TJ;1`8B)!&tCid_JSg4p
zQ7qi9EK0I3bSDe-z8t)+e3!J(mz6ie6CKDgzvDA~PuE%+9(}G{4QuV#vRd)I7aywi
z)$7%1j<&s9E$ce!iTaA*QGlV-4b2=cQA>flM(>4H0Ffyd5sty{ShX2W1GWKN8?>TL
zrmg%n%09`F0WnoyV2O*qM)=6Jvb7W2urn=Hp*fqu`5!dWXI+3tiFg$`#Cg04EgE+B
zIbaY4qoN<Hy{37<jA_<<RrS!;n1;v7?u&0>d+(^me!{*B$6%6y<GX*@e6ua(ooF0-
z_$`Ssc!5}HFc!I~y40b~|4XBovcsUFbvY>kvbDJVLJ7-#xl%4>x|glsegiMwn=vYz
zl8AOXkx>5>Q)w&Kz=jo2iJYt9V$!`X=dbDBHR~)C3yD8Za*RM8$z}|@r*`skcV&V*
zx7dlKe^z}MMV_RKeZBnovN0yY=EpV1cT}7w?!;?%-fwVwxrr8o)*rY&MuC+he#*x8
z6I2@d)}Lv`NFD)Nv|?Z@($9bD`wp#kM7@}oImk(*Zdg@N>T|+=xz%Tf>l%>Y{k-4#
zgD$^wPj2T1kgT1>awjq}Dr?39j!vU|@x|RQ9pM3(ozI*sDHO;ewmY@8B|ni(dM}%`
zC8;&uuQTplVF7(x#;#nrI9!p<!F_UFFo5xqcP7>E?CYU0)$B@m)@aYx18TGN3FGh7
z<~f*qxc!R`)HJ^bv5JWkHc`p4TV?zV&=%(C;oNQ{9|Il@s5~3!#a`7m5SewbcPLe9
zj!&&lwTW`iNyxVLXue`PV>(`B>VieN$ELP=hz)ZDR50*o;rAN>T{|qCR?xqc2|M+^
z$QzT541Geg75(7nj|)H1(&&m7*_?BI?$Wd>Kx%U1fe_!cXl1DTv*n*vD%(On<yJlz
zoTTQ0*Ec1mt%Emv>Cg10B5@`v43<yN#AGN)aePF&-3im_%QBaiHn-0ngdDJHGTq9*
zssYD;94VKRR>Wn~hhclP(n%=<XtpOUS?G4ePhOnrQ!_&CRFTFoi8-wv!fA>-5xwdn
zVsx(TC}q9+;=G27WxWbvR{=dvoaHUALPRkZikq7-?9LV3cU_&XN_!T`&Ph!Vo1WZN
zQ|1!^)e78zYQHC7kkQ`(zwDk`%+G&>{FU%$K!qIzKly$p*DF{zRN7bTJmy|Odeb#W
zH!BI3BRX{G!heqAeAXo}xJSE=9pS!#*9Tqm`Cb8i|Drnb9{$6YTIT+!dUKZVo2@p>
zI*u>ZUZ}C0=tIp?^&&;&)Wbgos<nRu{1dYz|2sAGbMP0RUnp&pPVv=|1HPJA;=bpc
z7`W~2ZPnL#zOCO47_e_d{RsHw1Z+8s;;Wy9#*Vu$V&mA-v*UmJRNzf3P3Oh59GU0*
zNN1?WSd}Aw@(|~ZR7v5azf=haUMb3BQprma`@nPx-4~x;m#Lu!9AQvu0DIuO(RcCF
z7ks=ko<Yu^m#A{XQO@%>9GF%{Xg3ahM$Yd-?|7U)k3n52D9QYK_&Cld`-`3x^&7kK
zE*^vk9sIa>ofm!GGy9lh?pe9vFpe!j=#$O}DjU&wUO(XP8akg7%MyQubZqw2TVKa8
zu$H%nn2vQ-dxbYSK#&otjm8~2^v0&^sb8$ilF%soaLJ+ZenG5~?LoPQUfrAWv`f_9
zX2vNJllS65yK^zsE=!8}qMgVY0WCZfRI~>V&;d^#p`l}-BmFQV|DvGdBNwbN2)VfN
zh-i_kR?hJWdC%#1c)>2N0fG4iwRMwI4~dbhSc&WEUGy(sxsga|IGr#gb$^#O<&&wO
zKK;u_^Fwj8UnmW<S_<WI#K65=r^F{Cyh%FVy2YA%ULPi)Dxi%;J$eSM@AiDjmapYL
z1K(ShyN~i!z)pkBF%+5^rrH->z1z5T6`jU`HQW9xa16yB?@VX0#?+*#7CzTJm7tyZ
zmdbhK{yO@tIKaNu%miu=Ino*ifn$$cGLg*RwA$8W^x`HsQ;&oNwRaz|eDu&9K?v({
zN755YpJI>rY)rQ-zVT`;E#k8s$U8d3PqJX#!9yeio)-s(CSZOMrm381Ge-z!X_y5*
zdi0plLCadh-Ie#HQYE00C7=(W36y<)n0Gba5Z!nX{0%KB$t~~6)=Cu<L6MFcTB8q*
z$B<D<DyE6?nE{XLNS})Vzd-CS6x~%<GLTvxDV_&anvH#<`qH680B_9oiwVx#^&wU`
z*P>G-<F#F}B>PS;V6N<CJPu@d6f~z*j?QX?I~+Y=aidliF)J_O0#ObAsf<=jUK*k`
z^$VrQI&V?)bVbQ73C{1cZF&PvF|xG}K2j%b29_{#syma~iKNMqOPKJbl)xnDkRFzG
zpCG-Q--1u!S@CJ9c0usr4~{n;1TDL(p1?7q5Vh!mtM?il&x@@1G;zN#cw0D_Tnszt
zptd?W_l)wUa_NAHBydM2-8PB(aJ82c$=6wOiso!B+9}z@O4jthGB-@CG_VGID$ubm
zB@aB%nnl2@p$esKuAWzDfdcE?7>O^}3|@|IrE?37)n@1ie~-arYfea}pLiE0o~UJ`
zZ#y^~_tXKw!Jf>lyY^J=-e{1$$V$p)ERvq)ywE85!EvZT!ppkuXthO{-JuG^=e$LG
zRyMB3oMiRO)Mh~9;?QZMV}8n@dU`d+<<*8O-S}Ou`cvDcydn^ZaVflLuJ&`4u%Ilo
zcu6nQcdJ#Cz(Ix2F$$5S%T;b+p*3V+Z3BfR;n{u|t#8vINmC<U<Cj`A+tT$4PboDc
z+9!}`f9xD|cRIw7Y4C-WivVBt@R;eDPnvN9S41k7dz?keU0oT~7W!45F4&2;!BWY5
z*?i?knFAQ5+40jzhK$VP)<VWPo<}BE1@Wn3)7EuKq2PzEF(*#p+k<y8<t+Iy3%iM=
z^z>QSPAFH3>J3+^?ZXK#LXyOnTC?C}qsq+S`%%AJTB$pvI|7V8=r0tP-A)rq^Kj1u
z0(q%}I;=}A0M(7~64IhnQ2F6K-BHliM?<}$&stxFwE}Id@OwP27KetCr6+S8Ut}PP
zY~3v~&Z9o0J2(tD=)X`h%E~#ePtvu6gB<W!%LXSYzcbIxI12dNKZk&F1KRnY&vB(}
zHhhx<*7G2c=VB*-=If4^!bvA4k^%XOwpkD4U8INjdbGHF5>k3($a{(AgVv<#`8il1
zH9x^nsEf=G=+>2-?~b2+bundj`VjXMm8$551U!uR7!<p$jjbw(me;&g+WAE<YH$o$
z;+UcthNadQS3Vy99{%pvCLhJ&hvr;8Z2`==#ep^k^b}x83y)kRCu1BJa|KOfJEuIJ
z(kyHqlyv4(6Jhzjc+&&)XdyZ7INbf-4=`mio7-{a=eeGB5&`FYCb=nVXd==q=vL|f
zNxr*C+yEw#V2YBvl}yY?O_lDpX%JX1)oGDdlbsS&wB=SJZ$GG*4$R=<b~*iKAF5Wa
zVxeAibOKX3p`74up@215Qw;HjkT`6vYB4f&?h6&VQqS)c&qtcD74$)`Fl4A)hOPOt
zF<Edgf+Bef$$5k|MeT4!f1!NCQQ=9qFN7I!u3dt&LBd{=8f<IG0TAQh{qAJQ$}2<k
zyX8hwYn!Pi#TYSG8pD=QDu*%WAeKhjIpTX7Rq}ApcebNK6fh;5FZ|9=X>9F_O4%YR
z0t$vvPp8hz7O{(Fzf_H_swk=$n4i<veNiV!I+<k==s~udsPts`Lvt)_7OgwhbW|+s
z;u!>Rf`PWMr$xy4@JLp}9$l>k1T%_zCB?q=Hq(6RePb$cH4bRSjM3vu5tlOUwBhvN
zZFeCP#Sk|;ukvk=smttZzmp!7;SV{9X(VZ`H&m$%E^j|umq0XG>E|=Srv~k-X_jny
zGC`Tn9m$JImCQpE_Vg!Y$0fCn`vKfZ7T9Cxix2$`cNV!4)TfG=VF=JCc!IZD#rrvx
zIOV$T1gM+{t7B7tJ@g@ru(3a|gwR@Hi_<v6$Dz4GvtFaFR6#lSt36BCm#r^n;38-;
z^(cJqhh~gaSfnB^lgXeL<MvD{%xaeaa&L+|pwz@(C{zSYE}S9U4K|a_NM!}F$mA#5
zMD+War)=*INw+FeezWG2+<vMSESOZL2Wz-UGO$*`6)@=e+OQeHtlq5Bx0nn<DA9xX
z0z*;ptt+DAmt61j88F}mJwv}SpzFe*loX$a#wgTOyC3mXQ}g$;)y04q#=Brdq9r#_
zw;|7jxpR!JBfG1!_-TqCNY8#I32qU`EZFFKXdbRj-l-Spyv13Qrc1Q^DP*=w^&sNV
z(rhQo#7uqK7Q}NV=ezq0<&x#<ql=66?hHFdZ}PJbDMflo39mVeKnRgZW*O(ais$?Z
zb?V$Ow#8K8Kxf*UT=<6L0!w0sS1>+UUl-z4(CPXM<tF)dlbb)OI9ry_z)O+p4IKkU
z5soe<R6ai?-d{Ar#jT#J%$_(;56AJW*F%3WP!D3)7>PCoQx_Quw)Y}OU+Q=1EThWs
zNcpU*R~oGP^^9O}ipBnObafe3RyN5p;{g0q-!!W(Kurzu?yX{H;<Pyqh?yrGq~>Uk
zV7)f}g)+jEvaQd>#z&U_Ue=Rek;Q$yle}@_$D+6mAfPA{Vc=Bwv}&09p|b<cGE1>N
z;9+s7FHuTKUBX$6{-{`9hGUr157~uOI&2njwc>O~0u2@pL%4?wxd{c3T1+%Z*o37f
z*AA}vOh?_q{C$!i50Uv230S7BNqB;rK)qfbz43G|!#pCg^p26?G-!yVc&QSMaT!SC
zQrBs|vr7p9p0Yt<&p`gAD>>XOyh*|SQ{nln9KH>gQi|`@6b%(@CO<P_#t%9O^M!jQ
zRGgT97}{?ya+FSyw@6v$JB&qruI9H((xtTNoaUA_YTe9<ZR_k|;H=0{lN^_%HPGIb
z1A1ShhUqB4qOaLE_RPweYyB&v60KaV9Z!X5Awf!BkxJ3Nwd_?O0$VO2%ejeEmaJ|_
zJ!mz8ML)qYWEuKiS6`*g4oL3+xC~pXfB2Dxx0z6<G49=FF3`PCQ|WYIv{uc3+R83w
zfqx&+XgC_Flv{6;R{l~eZqS}x-%D^P8Gx$c@l@wf0rW$0XJ#rA>5OdS(&hx|aOk!A
zkOgtNc@qg+^rX&HZB(5U{V=bYjx!S=d?k>ea&~^-*#!H+brgo!kRe##T?Rll`H)E}
zOew;d<UN%7v^%l&DdK?hgckM*>r+Ee!+?sT`?`b7Oq(y2tspBR^inW|RTuK(k&8eh
zebRN2tBqAEB`d7=Xm(xq{-h{rgoS6=fmNR}zeb=6ttLK8UCn0uXV6aIz8cFfl=t9w
z7Nw>2gAb?B4tX}F5<7Aeq{-7tUlI&ymenOSWqzPd1sK{=NM<;50~G7E)JRZCDqmUO
zXE(oJx>_1mwouRuKot3sS{*73mjYS5f{#2}`4t;lVWTv+QXc8x@|T|jI=aMuD&{<4
zo=TIbQO{!RV#3siRR$CF+oKfn98^mfVG8$c;y|e6t+nO|$U9~^upR}O=twz`&Sv?r
zF%J3Xf)pzEJC!0BcGMe|K#GbQABw!TOSJmz@-ojSG{P9H8(H`KUv#<&=C#n|jNwhP
z1Bi}FKYWONEXYHiu4GT2kdW8fj-9Of!`QO}#~*C##8?b4ri>acJhFv!h0H8se~Xz_
z<zz3Aj-lwmRYq`dVso$|=L10M*1<r2@ZAySXtmpB3=Dv@Hja9db7N<=2&o#%@S$o#
zFwWIVWaz9P1#oD)mYIrYHL#lKsb||chZe<!$LWlr<x2uUim@0=0>(AViafFjgFN{%
zJEUTp);J`t!7c8^DV6APm~gWBan#)$XB-Yb6ec%j|H>_j&ECgFnFlEi`pk^q?hfok
zDrQ=M&JAeh6A(<TJAu5S*3^}89SIy=qHk6L>UZq$q<pyXNTZ$KFud2mf+Xb}94$z@
z1b!0bpEplf)jlygES@f9$AGh;awk6hc(|gYfNMJlPog%2HZ|jC9-<KHK|#vo;>lQ&
ziW6d)W8J<KkAQjJcDuEbc1bV2djrME8!}LwhZ%ukA^04u{_8Bbi?1D=)Zv;SbSK$k
zeu?RlM#d@GFKhDpVFbs@oI|Oa+|t(cRufu*bLX_~`({P9_7at>^hLtu$)>pYSoFMY
z5^8J!1_QUxcYaSDLd~g2ic;)jfMZQunuQTNpV+Ofr_^AcEi@Y3*bN9@T=z?@jbA9G
zHl@LJp;}3T#c}1y!?ltrmYtW_SKS_mo5zcjW6dxXp8)nTnA>vzU}AdAL{)4f(^<O|
z*<HPYLlyE!!4xSPjg>GgNnS*6Kjs_eP(=#@eywlbOffi3L}i;AwbJdiEx@Uh*MhXu
z8miAH7)y0YarUSXo@nu{p9Ny->*@@3*{#=#hKZJO-C{9B=OtdYwlDBvBHX?B2#E5*
zGLMKX_1`<Q6lF-tHhc+YYw4dVN{5GHGK)BC5Q8HiAUC!450n%}Pae^Oye`?;e^BbI
z=`<9md;IgmLG;W+adk&dz-9HAyO)(V%<9n!!Y3rbL~tX_&;C~#ubVRhzoo~Dun3&a
z+69)CAvnt&fXlEV&5hUI7ksT2pK;Vv&_>f;<lF>3uaU1h`DU0WZ|X}oAjw9B@j-=9
z@f@c*<gsPr=GBlcB9pfSUEiQ5SYinszS%>GDAjB|t4ZZ9YlzV0ZP&njoR+Fc_!?3#
ziMlCp<xCr(+XKb0g{mjnD6B=~$uK6hvgXYeIz8Bl#Bw*`Um@;^db}}HhD}?7T8sEJ
zy;!E+TW^`p*SO%ydq)zTZ6(R=_;fDh@W|`=zm>`k9tjS~*g%U@Kx=>?Q2l7|T7pKJ
zmojttNMw32NoF7z7%E*7&^m~G<%AtXBtznXOvcA<-r;uieaFY>#Fa9N&{8Hp6IFh$
z0|TRkz)@v3V7fcas1WN>%d4SGD5-(!LrU^;n_7J>Tld!{s`=JmHqKK>Y~G&eEj#MK
zY%(lDf3rssyZ@#N2tWp64B_irej}`?-)OIqf*mVR1m7s4$T`JPL_PD>_~5%ZUdA^P
z6sYf!)Sy|Uk-3VUl5Wk;^CdqaFUqreS@4IP_g#IC=KnwxOjMETB`>rq20u1#ay^Lo
zapU>7QOn=Z#y=4LMf6`$_`gH<A2R+w%;I0X<UbJm|D!kmU#O_tW#8w>88Dom@9IW_
zy)JVxf+<cU)YdxhNBB2zyO%~$qNZuXkSee#=W<s4_1MD)j#}_;%I|Vlch=xTc%gq4
zW<!hnaC69vJO%r742f3KG`}4%&q`4hm5Iy^C9r{HPsv7tFPf9HaR~=lhfyBZ@cI$D
za%)`Ff)8K7rx~VGfLHk2(?p+0%?i*Dg&loT`sK>1%9LBl1>guJPC+_1D>mDYa#L>J
zz3R8JwhHx~A8L6TfJF-CX80f6cqqJ`lv5VJrG;wvXc(@7<_TrBnJgC*T7K->rB4;o
zt6$^FdvTGADAT0ib7~pYYL>O@tP=FSlH>feLA1$kY2!e=iu1L3gmXX%l~6jQVx-6c
zySz>A-92<1E9mLzFdv%{O81f8S&xH9&Df%%#7Py5<*|sXNx=*0SinIaN?~KZh{*>)
z!?eZl%jPFPmWqU;1Z4b&o+*mYSmnJXRihZSe5d(*X)5o9>|`?w+d;C&kFs_2);;yg
zs*p^}7)o1#V1bR5RUoCmNX_;jZlj_=Imtv&_FQ`G5BOAE<0?*aA%jFAg<4tMraiiY
zt0Z6Nj5XGzMwyz#XW|!pB}B7rkcf$C+{bSxiqNs;J^6|(W+gy+i+v1QOKFX2M|(z@
z(n_s!_AIO|`r6Snm{K5n>^jXh?I>#%xK#9l0+1P0SCrAh-@LAZ;y-Q2upvUHw>tYc
zEo$|!A`)fQ+YfUD0m{LeCfS$l3BpP>=SI~-TeT5zI!sy)ELF>kX#E=NpeUjHkxWC$
zYr8P=Ik8oD#AkPN4;xLnK%3{)0vl`*tn~X*VP)`x?s4tmQyzH~yQU4?t}#e3t5zOw
z|4SD;VGf%ycMRe$@F273S|y-8`LOsj<d_G7rJVQP!s9YNy}?$IAW^?e@Rd14SX!Jt
z+^u-bU!HC}%4`dC1D3>i<XTb2dX-n~`yD&wB@}Z6rPUFG#qYge5@sa}Rw^+nQQlfB
zOO_kGU}h~;Ne$C|7-Zx`n?GvOzWqk8yPs7gYht`?D)(ZZAQ{M-iw}M^gtwtT7K(eQ
z)7NaO(->-q#f-?P+NmilLLP`$7V2Fq-MS&Kt0zzAYVc}^jfKF*5gMv~=HdF4g|<}$
zZ^OX3AKM?Ti1Mf#kaAY89)ZP7*TsvU0edY;_71@8Glc*$ugXY1v*PjjD&sZm-qBD<
zW1`5wS1o)|8)UKOg;A3WkYD2sdYI{)AGFwz=!J(yviXvZ&n{B~-6*$sYVwi4-zDlB
zlWn}fB^#NZbWo0~^keT|C=Ww`!fduaPj+}K&&A)*HBH=`>a9s#MgRAKJPNZVAtA^{
zO2qPjLdCVq?u!f^WbAdxmC-J~D&c=;&i_RPTZI#T0$uIgO8!EzqWu2oF4WzM2P8?0
z$G7)h!LD?as-MRpuCWVJm>f-mT^CBpfMBc3D{><xB57ZM)Wvsr=9#G1qck$tni&W<
zM=m+#A5`EBR46kfv4V1N1C!g3>-~x|Y&+AcI0jIg?!<O*@aA{yGXO~9(<0L<fFLG$
zq2Eca)4UVUZ^4s7g+&3+|ED#UlsV-)^|A;jum)G5t~~}?A2Yn@buPm;@6xh5p+#H1
z4D)Lm^^sCRgf0&g#)G%YaH5Nyz(;JqPz2Np01Zk0MH>-L($ns$jxagSD{#>=4qFBc
z{Pa>LlvsZd4N)h+?1z_UjloRxyziARiH6=`(*{oZJsy6^EQJsBzvQN-?o5fRl&?5v
zFT>lUEHa5a9?<qy?#*5GcdFxy&QG45NGpH*{~RdA&0C)Z)>Z+8O&>&y!T$?xk&jGV
ztdhobiXg3iR>z)*d%6#w=YPgrzA@eqUj615_Md=gT9z!%l2<krDP(grt$+Mi+yLow
zN8>FkKYX26j=Vbsjyy$;Gd+c~tH*@1#<h2;#&*lkVs>3;ulikE4sJL9D-nCYm5MYh
zIDVpz5cGJKxa2x5tVuu8!rt5P!hp?>ID91gqsvN+U8OWOb7KZLZl#VqQ;8clg)Bp#
z$7DMegZYf?m4Vr90ee~r$@CNCptreUE*G!h<15F*8=291Mt{VNg9@38CemG$Iuw_o
zq})sZ1=g3b5}&mD%*KR{LG-;>8|_lEJL_7fe%?%Gj@V{2q=_Nj9+R1!jU<>Knvpe_
zCM%<FxR|co7_Zr+qys$pR6r2jsXGX1O_0ck>Or+PjfVtxF6|&*=E!qL0jdN1C;gvw
zB?R;v@dy^m!e6j1neUVsWh&^i4mH`^Nc0-S(;@0C)H4jO4b&;j<L&u)0t1sk)ULuD
zyexu<#yO;`U<yA-zaqoTn9@+}qiw!p8*}DSgjGbjd+!IGxE!xpfj+37+E4~@^G~_R
zvu81%#tTkjyHn2ZxgU4jR*ZDL_u=~1#2%-qWveXzC8+vnrLgoJ55wbPbHS}<4J%Dz
z4P1fcH%6YqjgO0`N05dO<E9qlOiu;Q>z>&wS2Ub)&<;me`-dehrO`1%*qzxcaq6Z3
z{@}y(qh?dS9pxcg=f~mUNqirn$w=8$>hsyAhbwGA*T~WyTYZdc3SdlBsR277<7!g^
z>PQWydYHagN_YDS;O+Z`GECQhhuVqf3*259`ev5KZzv0MeuCf}IWkc{Lf2h&jPG<a
z$9NiYc*Z?ClsiIeUF%IzSJ2Aa$ECeEn3+B8lE&=JP5D|3*BuB2p_09OYj#N*zh*V4
z+<v;^;f~8w$UHmXP&^bZb1ADjJl48gU1i<RSVRz11S$F^wrK0F$an-y8Sqj%yh+$I
zW3LxBDPoe(M6J5ze!)I*Q)RE*DPoVqXKV58`p7HaYlq9Wnqj2o)6xSCkiCsHn_67i
z5yX@+U!QSgSYTvm(Tkfq-0O{QR~xKN`_z<N>y>?On)i+wF!v1v!7=LH+6mmvSgqyV
zPCdQ_i9cWKAy6I`S*ge@R}m=5v=bsaXyUWedxqn<8IF~_^#jtz#C)ObjG3mSq|euc
zn+Iz>66%xpc9HdVce$|@A|KMCvSR~xy9P^S<l6#^A%mbK1*LBct=9&6MlxkZvQ0A-
zg#83crq90xN5wX1>!wVltc(%*T*k<!4$8Whdg(sSK&T(2<A!Fs>YC|c@HA^N5GF5<
zs?g+y2IrRd&cfIGPw)SMkI4CqG=*jB-l?=UW{p<j_}k>Zy_rlbI@MY}j<B#~^q3r<
z>LRI3G<r;{Zjy%jf<NIj^4MXGq$ES9s7-pMRpS|E<}hT-g6a(jvimGy8Ex4<NEbp{
zpkEyo154PkXl!p=|IQ?mLKNJ*oy(?29NwOn=z{nDX38+Ye7|8%_Y>pT;ZM^9v2j&U
zA*%wzT|?t2K{BX@9epl27-F`P5^kx@lbp8iRn8{R_tQP!Q?d9?oHdsE{Nb(SBFq+z
zAEaI&vT^h^k_(`2$e3DuEx|6JB|iU_A(TNL23Dy0xV<2|HbgMBIGmX6Mmx{&YJ%TX
zXG}?KxwJAp4@MmRHtKvdZLl!8VKvynzwefhXvk2~SxBLB^9<MP!!n_fuJ3)1Xu6R@
z145}BpkdD@iB|U9WMS~?;XRq+Y{JeCB?G8&&>=t(7RRsjh(d~OtdvXR$(~ZjSFfIt
z0%IQX@RpDTYk|sM^g^!@b`J{+Bi*>0C<fctx`v60@A@fC`r}ec_02U^Mfk{aHIh3M
zNKTDb_zUfdNj`M}^6eief|Eu*S`)X>VDUVAZQ-@w%6A`YD`z;FmXhAsN~pZVxf7(I
z(oCh4JF$ooh~e4Euy?3@EslBkz@A14`jK9<OFu!ih>k%2xd+$hoIX>L6TM0x4W>j{
zN`XJ##S$Q1pTspR4Ft*1W6X{BV<q1jA0~I(IC0Z?_Lk;}a54kla^MtENdj6ZrvKMi
z8Xym<j3((i<|~7sS>$=ers6pef0i%O)5rb@rRUXwP1H#QOlYs)Szk##8G%f46qkOp
z`r7*Ry^V>YeI>6&yyPrqLY9+Is$^arDmviUSK*oX9&)5tYe=Km8Nqto_f5ySFS(mF
zjy=+x7qg?_<`CB~3f|es<skNHBp;d>W3BR-1FIxh?^9uimbY0$_i9~|fQCJ717MvR
zn0h*P3%z)ASAM?@W_q$DNZ!@-fL&fm5#EsGEGDzVbvV5EvXX1$QO++E-0YRrc=M;4
zt#{X8uKv#z6`<><326)lv(97F)Z#;^>$mmUjvk-pQ;a*!8%wfq>V5KID$Rnz4#PWu
zN)5ZmUh6wLnW<RsAxQtQVWcs>0**)hQw<>D+~lRaL;Blyevcm_1-;h=sp8aDYl3%>
zxvcKs%}aB>i6Bw?=iEq@NdIVxsKV?j<vq7P<g2X}9-s+>m!t|_X+kdP^|YA{d0I(`
z;&MaOW`Lx2h5&$az0{K7Y^*U$9dmt>_{;qy$G)GHi)N7mESri>$2dXkJ5D{%fxewX
zs?{{kUUsUtecW;vd3`nn^}%aL@KPF}EE#-2><$XSXII0?TH{T;;*fh~Ir&rW<#atR
zLjx2%6}=#JQJns5goD3z8vgmv{DXMZr-n}jCjDkR1V8Q4^@*NGoJ^`+Xr&Eqmpcq{
z&a}=Y6rp$O?<qPWdT_UiltfvTzq+CsGF!ER_3QNyR?F7>&>1cnvOt>cqaNMq%-DKU
z*3HdYx3r3e`|6vcT*I~wrOhi(h$mv{MRy(mg`0@2-@Zd7*E+s>w5~~K-?~KM=wV-$
z(wy%VT0&0V&sL{2$g>h-l_^!FA<zXDn1vF2&iUv^A4^@&qJ^UQsbN|5@yZf74dHAk
z<Fpl;Zaz^oT-NjM8p3i!ORqD8_2%|XOCbma%J_BGm-JKW;$^~VamlfaKWoYVMcaEo
zHMOnn!gT2>Rf+{9AqfQOMO36p5^Ct7NeK`jRB3JzMT#IOCG=hbgeHd25i}Gf6d^R}
z9V~zdilE5;<KFxH-#O>r?~Z%!Io}wJjI7Cm`OLZ2obQ~^`@HY$?R@04nYnF9F^1TX
zTK5v<1!9In2ETrYSzoi~mfzJHF6!X!J~l#g$I1r`$HMOwLHJuGOW$f2g<T!)kG^h_
zZMjXp4U4)gm^#O$YR=3i-gH;w?uE@Jl;j;<Gg)Tw#C!0^vgu=_h45ab;&#(4pS6o;
z@AucuaIPK3vDpF?xQO>L!x7`pS^MNcgR-MxBvxMu?DKjjPs>0R7hXGv^NmZD0k2ch
zy$H4E>emw?b5EEgC7SkYmM--FaEjrFq`FStnW&8ZS(-tq#PUL8*71Rwnv2YG^YiyF
zrCysfM!42(-+}{3V~!~1ov==szZt1140n-~A%8%0NU^tClC7_t-JFTKkE%WG{Om+p
zRyOXEtDaep1b3HsqFZjsn@7Tt;FoV<v>ERlrE4qt;kK{6qpG-lVfG4p812M&t8B3L
ztV?rv<+1<lwebj585kuBG>1x|?F9dtjHcKq2>PTHLkoE3Cy|1Vid2rIOHmEiaqYi3
zo{ozu)~7Vb#OEOMftB-TqngS;XDTQd#mpG}PPe}j&GK#?<4is4f!DVbCzw<$O<lUS
zsKpF1;Hn$8kc|ZjLf|M(o8rgc@<jqHa=5PCYZdhs*)exzKH@Mr{+us#c?9@+tLpG2
zDnK0#?v7RusS#={6~X#2>XugI6P>0ouwZXeaeQrQ%9YPe!3mAd<Bx(Zp1>JIaOud$
zbYeGtkafnYgj%<&BTsgIPF~sfIf#)*$b=X7d9w-3fZ+MWW&VbVXsgE~rxl>zHgTI{
zFR>KGpA90?MG(oMRH2hV+H`XfTO@hkrs~NRSMRnop_0_p86>5%sH~zkh@VWnvuxzP
zNj~e864L)j@hWS-Ubx%nE@x3XH4=aM>3hC}wB+6PW=!v{S8b7Rthqw8P7D=ydPa5V
zbSg1wr84)<>U%Fv^*ltp6=z%APP6C5EeC6)y}|6GT`#9FGKXu_VU<uA>`nN7zypmC
zx2=hZbrOE~=X07Ap6}<jf^hht>ASb});{P~gkb_HT_82@l0f1(1laSSJzG1>pmE#B
z1-!nSLTv~E1zGUTiza9E!fHon^aoZ-Txc<QUB2CCQ!<?ASWb<RPu+{<^F5QMg+j1l
zHTx_5^&<yyGnuCKjvqP{pu~Ic96T#qN&FI;2(GBf2R8#YIdfNEp5$lp9CrmRrc~N6
z?O1Z=w!bvXskCTdsvSy8JFRQ>unV4dN0D~OfXXqxik>}**S-Ou^#vq>drwzsBjFq0
zLva7tTCXcnIFa_!YU$2J;FP6*ulbJp7}LpPlZ3tdLOn5~_FqL$tj+HI)(C7T{`?_5
ztyp35A&$n`O-Fugs8E#a-PRw(P6Th&pj8ytk4He$6C82gGv!W_t0D&xSN}AnQ#N%e
z)$eO&waysgY$~DLs#yTm7s##eT`Xj_$}Rij5?;+ZI+E<_)UP!;PoSZEQ&cI{!PbM{
z)R48=m)fwWGht?)OGaC^2uL@NXw8*;RZoqG)~7u>{`ypdk6r^ZhOT_pbD~3Qy2|fE
z_?=3PD3xy3@PT#mnmP5f6)#$h9hmc_W~WObz%%@dEO~5thSa8&UfbJDK8x!!QZ`k9
zW?QHFRVlR82tL5zHFZ^;eHBs*{9ow|HVMj<HfKLDdaEK+PRIMOE%Iy{g;+0R0G0oE
zsqv*Xls%aEm}${8u2)o>D3o5)qSuAcN2zLiKIcEq%;0Ra^`Ux~mJKGm&KbTl3BIS|
zkvN~G3pPA(rydv>z#B?esjsSCwrl3crW<ehG}(D|u{urGTb`|3YS46F<0$`nzW2tH
zgC~Gk$FRN(h1&M-TTssx4cxDn#=A1It;j&<%7mBlG?z$QZWq*6Qr_$C5deLGP~WnA
z-#k7+`G!nasghb-K}L`?AO)QV*Yf<3i>HY43p1>68nW4ZDYiLz;!LnZ;<MmXPsU&i
zBYv0XTyOgI<z&fLQVrB{%UF@E3S^v~_YQmZEE58z+)!!cfa#lLz(0huQ!C3a2W31B
z^_$>XeQc<PuTs9JHLvV>A8+5Ici7BC&k-IcSVq_Pr1)V4K}vUA<lr-TVqdojGGv+_
z#%g3}ds7@|gMe4IxM(PuU&|^_$Hy^`_ZoVac6#<1N^fIK^hAEAOAj2}ew)49|7~Ab
zPw|P%-@j5vU|-`Eb^4Ylls?K%aP(HH>4XLyai>-3Y2Xu_yKN)huVRUvHX~v@mDCzI
z!%Eu9JN@nym$~_t72p6f#x1TBlrix3k!vU|b)d@f$sW<pg1=RE%vX@)yL9xe<e9>|
zql-Iunk_#LJE!3u->N5PrQZvAf2PO&;+d*a7yerb&b7%27F4-^{a1;{;WW1Gpd@2&
z`>!?f?{wtUU9KaI{4c@4@bgi3`DpWa!J9vKfZkNa%PUrs!X3@yUwfa{Duw%3eN1$;
z^ZdRjx?tyd)nn}TNX6F@(~o*36Nxu!grA_4&XNAjVrI|oP1Wzf>R3Jt1pnjB{fL1O
z_xfX(wyOnuXQwu4dWh{e?nkeJf74i3ub=vzPHry$&EX%nDL``?vb9W6E1Lfi9RKuB
zRErRVx)zeb+a~xU{>NLtVEO)n6;6XS^9QVjU$B1AU^V>#tAhsX*KH~QceR|_kL+U;
z|9;>66DHG-*GZ2Qm0s<f!^UlPZ;qcDOl`x5==j-p^0Y`wy57i4%W$m?Mt|6zU%uim
z-lB_UdVRuZUQNS+7eVOh;<_f^xuE5VF@y`wauOK7+oPIQLs!H(Q-Qc=vU>vtO$D0l
zNZmz9CcQ3$TpajG8@Ne6t8eU$$8g@f;8GL};&q|Y0eKsZOdMdl*YTEZ2NS)JLSu*a
z&uu!rAr*KF76eJSq5GIG9JZgMfAb8gB9@ldw-*p?DGJAyK6r@amOZ(^9lk2bf3-;g
zT;^|eZZcZ61ZW`I9=vW8?(5!I394(u<uGy-MVDNv!XS*d_SX#RT6E^26VCt&Y2`p+
zXSn}V%&OI;n;TGJ$b{m;QR>|bQ$agYIhy7kaszk$3*YD*t!U=Q9rixB%Db1ya$9mk
znDdMAkfPALf?N-U5e?O0_u{*L{Tv8OJAbg^i95T!*(HXiWfi05m`cTQVb4S*y??EM
zSyY6ZG>Wy+qWGS;{g2iBpV7#FAH%9nn`3$}{#*46NZD4^wYZ&{!<p&(>;0cv{ZDXW
z%JLMEA8l1#{vR6scYh*M?1}l#NP7xdyYO#!`JSfV=ydjR1cnzxfD}^Wbw(3g8Saad
zwB&3`4cov;^I1uKrN999%co2*W;!C{*L}&rjyIK#$}wk7Hp%&HFejA+$+VaZnOf>1
zZG!Jm&duF6;o;96SyT<`?$z^^+}J0jrh0{_Yhu6+F5K*nuTDS>erC}mcTfSXfP1Dk
z{@3Y31YLNM^@pdiXrT}rC!WCpz>5!a!^PWWEE-?W*AMj@V0!^@js{Kco21&DO26wr
z<QfvUCcRN@>Ij?G(54mMOV~R@li9(j^exMmcoz_*-}SV7F9LIN;A$h86&~#aGdwtZ
zkbB$q!p5qEt<y%qj3x(hnIUHJ@wGEK@<LoweFnL>O8=dAy77-}ad{Bd0`q)rUZk2@
zWBzRyY!rk%;#tJ3ve(_8r7o_nCV3%B2K(#YvWYcG{rlXo)!g{i?`N>(_DBad8+ebV
zc4+N8+>a}0TrfqqY0Hi}Zp(HtYDx}=5AN{YexJ~TwVYoS{_Mh)zRUYCISio%<k_)-
z8UNJbVm}u7wJ&~^=GeJ|zY~9T<WdUJ4WXuW+lf6yC65aLE$8PyljJV33VkN0dcJYA
zUaXput%&r}woWsG{ZJ*OX+T=i3J00^tnH)egZS^j6p{ku-GevtXRGQpA6<a-2?M`(
z?*wj6n-3whrE*a2x~5pAW}7*)^z*4nuZ;%kAtbS{_~Ekx_vTohi62GCz1!4SKe(}k
z_)gnKTx{5D3-E6-R9D6xn5xUlho4W$H6UinyayOrbFk#LkI>SH&lRkkp=bohdGBZU
z@hKBtctxoxe3Ocms8?zb&40s@VXO2kG5b>&ad!$}Y!tq{ZtRq_BSgNBBo?cP=RSih
z94V591`Hu4bzge17ow&~X;a0iuXtKif97csqq@9)Q)o(cd#yNIn}hd93TK<QRSTN%
zp>CP#FKeXVcrx{2d|bF8NUz4;w93ld^WVBC*6aF*@!<lxx_|dBEIpu@y7DMYqM7_&
z%S6^v<TGwn{?<|ca6fyKY*R}0p6fk9w+!LYcu9wpJWRp|Je6FDWqDvzPTv*|R6y9(
zj{WF)A9=6DjyyFOwUlt-`BmvJ6ui4|I2rGgzN~fn`8_uN*Z>GISSx*q1=>oUC2d7V
zVtqoTc#(%<0SWSP>%@d;&DrMU+k(gW97`IvjbZM*8kc0#Q5D#-8I=)p5^N=UEu!P(
zd@KmN+K~G@9S8opBGkkFWF2X>=e36Fmp+rAfp;8A<iX3!ze%sffo&S|wZ-kF2p}-a
zxSr@~+%AzRGYhqr+xNlVBl0ajyhm1XC82EIAScPk3VOe>zDU=*axl%hENxaXj<8t{
zkWwCxy9KwM1JgHdW+$kWKopYKSCawhghquvOaD|iN;PuDw2Kv&8X+kZoJ0kbozpZJ
z$jkNsUkr-&mD9jYrl%(qZc-dGw5+Dp?G=K*2~_oU@s4tGrlSL*C=NC<ExFf;^o8|?
z@6svtPgYmg6|yGRl1w%iRo!_@J{_rCncs?g0_lucf*<nzR&0C8RT8Z;DqU-X9YobN
z_SJ&hPdV!fS@Z&Jujkl}wDasujx)wfoKFdna7PE+Cf<&xyhj9a&`Ao@ZzN;`07Od@
zH@JR3L1E3gN{VF3fOP&1awQ=@YYl7BH%!pS8kVA9Z8}t*!w4Yzl~~)HIx{6{X2>*L
z@14t&lj~Q{#vU!O9)Tke%W|pR#2KTp0yj)>-*a#c<`vH&fe^eQlxJHd2CrLT51va6
z7JsK_f3k_Ba;dpzKY@%iNeevln^<wM@wQFeAgNfZ@rA%v`l|<zkJNCk>u9DG8;kev
z{no0dbNrRz7D1Y;)v%`^^^^@qXKWz5(?{6N3uX5i;s{HG7>UOG>jOm%Dx|SAw``@B
z-buINE2dHxl@#6Vol1**3RsVA{$vH+-20^F4v-x-=YGbN3iSmTu{}cLD}!JyirsFB
zax01Wf~|>oMSkbEJz}?r#sadZRS#kH-cwjOvEYLR%c_4S&*K48+Hlm0H}le?-YfQc
z#bU~<{>;O?NRz2tpBdR#emeSj;~>tu2Ol3TEb*x6dfw+-Vq;}a{bp?GNS(Iyq!Mzr
zxyweJjrUw|pGnOvk8JX)-JMul-^(2nRUqAOX~+kR9GQLlv$vp)WGm^di9rTh==E<q
zr|_Nf>{+(nm$l)>-WJ*HBE3l)4}e+uZ`q^ae5c^I?pa8usJwI1$AwmuGCM>A3D-_l
zwEI5{U-z=aCQ|j=1IV4P2z>2ns@G#RzA~eH8uUUZ-r1hKjDIB1q*qsdcPCunalGgS
zR$p)xWMG?=oNs|lz2D1sI^EtIn9(9z6!t>9Hhj0u0M$4#ZBa*G6pIGB3490)d+9y)
zz;y5E#9uGv-Pc;W@I<DN^R)%JYI!#k#-X36&B5{=y64_`YU!C67__FT>8j<xO~7G_
zS1#V>Z5;l1DMO$S4JC}*>RqrAoV%kW>-Hfw#WIJBV4ECwf#cpvVkM!(8_cGN)dfRF
zDhZk>vXF9(nyq>&qWN3V#E9&&mZb@Ug+AjaUTv?Sd<$l|N9E>Q1z&km-*CYZ2GG*=
ztsIu9>;jxB4jq<GeM>c?;6q~M8XlYEaHF1S?LLc&4lgVg;Ga>ZR*yNW-E7?a(QgK6
z7i3Qfqp>W18iSh|wzx`52v_M6y$n1Xmu7Ox=ghwRaYnbZsZiB#o;T$ZrMF>E%?<j8
zf=laA`t~0h%jpXXMNMYzZx{u^wUB^WDN>%8Tl)Py?LZa}+~vqc5Eee004tom|B9FX
z8}d}I=a*?yi*`CX$MtF>b)$)Ha<<+QOpy)NF7h!f$^cG)y*aI=$r5G77^V8b-LAyB
ztTuCo5d_xy5Y-OjkDIh?^Gx@y0ocW^38ICn;Hm(!7+x)H-BMIAX}1ZoU?lrxTE1#u
zh+5tER3)EjVFBUK&!*OrCL)n|AeC+3(75C?(jCu8%a?cdoQ9jFAHy@_wtx)H^XB4O
zD2x4x72UBkD4w0&1+9}1vg`seLJjnnQLC3jqY!Iqm)G4)1ahn&U*x44hz+;rzr&CV
zK`{O{r)7Yf^+0P`TVOEOjBLyvx-^yB_0)}Ok>g?Exy%^DZRozaZ>ybH0}8FRzo1|T
z-L8G>V3wm@g&`(s-{g0|boL(%9z6JCz!GsMS*d`vbs#-rf)rZVoaL$jd?`NhBkH#(
zenh_;nPka)Qd%bB+9Oay@Xy{H`Cr334!lZG2Bf?*QQaoM1GVKn%{xXjauqOspbd*w
z2wOee+5c&_s7}@3x_!FzlzCU8wZ)H`-U6{$vrDA00cwtIykB-<6do8?_VGp(l0SLY
zydtHfk2^j?-yRbLN`bnVS!)j|PK0w)h|>crpHN$`=N;}f+ew`?dg>Wh4t$%*b%H;K
zI49HK)~+&@kV|ST#)12FIARuiE!e|Az958HRC2t2!xMe2{zTHuhXBW0?hbbe*nYil
zvI~VD<8TNe`=?6E-Besd1yotuLJ@z3`%Ji6FM6%u%?S>fr;X7MjK)I1Digyhy|*zW
zTWvL5wb7NYMX%eEV;I_>$!D0vPg(0eKqY><;tpg;WLb}F>UtrFE7xQh2h}QYLo!(2
zPlz?{#_t&d?1?20ZUgx?R{-Tx2=n5qpu2t_9}^~}t-NYjS$?PcP$Ui%(wjyVurtY|
zn|lSkp^wcle0?)AT<qWvU)DK`yFarcAO&~CJbYZ6%*V=ZGTm~<c=Y{nBHSxDj61{b
z+m-0Xp}tS^a=dx_%VZVh5>f-%gBr&uGhw=56zqgPqZaETt&6ZB<-qe<;V&#r=HSdP
zhI8(T49_figpD^YJ6_MZZLee&Z{Kq!afDCqDuj{+cQo(tFyGd8V*H&hL7Z%w(=i47
z{8ImpOi5$a0@u2rY?K(_0v)sJ!D3Bm-Z<ToEakobP4@44LTS7;?g|gX`ZcX5>Skw4
zd+OGkF9a=cLDP&HXF$YZIFiFIbfMGQe=7Ll8>xW2-|1d|S3h~!ar&+PR`5Fiw3*%L
z%T6Z0?$R##%FxE?6jBDWE~az+-cri+)QGJzxoYt3ucc#*AgHX1`V{}=grWsJ{v1c#
zlXjqmOl)qp)3|apKLF${QiT{iVgO{wWQEw>^+c}%eE1##NXs4`K8vyd+bpzZ@BC2t
zwG}ZLRbrLaP-X{C7HHBE@X^-7u(V>z6bpbbQMaTLjMS9R3=Ir`chV=|dTZio7yPt!
zS4&m-QWiBUSYpnxpJ-Gz0gKqwt$!}AgDsSzWpSz4l;mFTO64KbI~Noo_w*ofE$))p
zRkegwzG%CUVk|z|Vt*5uFDsiRbgMHU@?HSW=i}xsxlh=*;<3}gyU#zAax6oD$E>u7
z$3$YU#+Pwg?2=eiOPXXZH=Lk(302Z0{$ticu2$r8O2-?0IJT**Ot~w;UD_5~_0H(4
zaVzk6Xid!>V4Xr4R9B{mHaWvaJ=2WD>%KG^lUzlA=mMjBa4O98_f@*Tj8z12yM7{Z
zJ(HTTn9h-~xM1}dfCnPYM>{d@Jav4!y7{2|R82L49bUE{25dCpB43;RIhi{nfG6Zo
z>s^A3^`50`EG9O6bD+9kb)IjW-yZa>iJwSL|DA5B{nKnZT6((4MI%?BdV0B6A!c@#
zyn$l#-Vn*cDDJS%5}x+>c8e%ngE?%axBGvJ<3%}q@NNChsuZ-@XF=?#>ABeg;UG2>
z^1k?&uW{4cQ|(RKZck06?Y{oDDXzT@{${yVJ)Kkrs>?Op=01Bct%c1aGUMfPjr_t2
zR}WuhWeDM#GemCzM<C*ZM@d2m<)JB0d)sG0&wr;oe$NQL>Siy}W|<M7Wv+M4!yA#r
zk=7xwe6G@#s%&-(8W+j0GtGkA{6MgTeP#*~Io~MWZ-{67DW05rThG4d>{ms$$NTWR
z6qn~I1;orxuH~C$(ulel*rFEZpT_Lfg3JPJ9nNi!-u#Lx>rILwT7^Gfw{X!uN2&Al
z$pFc@KSpeulu_OEo9`){e^fOZFetGT#rjOP%jYq3*|YgR<0*p>qS?OL*-hL}T(5tY
zQ1I9liAMUPCndB~NOG3WMm^If3|w4_HC6nb&Rd;G%>jc}Yrh~4V(T)#bX=U8GGRKq
za<=!)*28UO4R77_VIEbw$cEMTXx=y|P<;yg1N?W5Vb#(?$})Z)Svh7lo*Kxasd|0a
zgbq2A0n%$=Y&y>aBNGjog@?*+cT%3uD6t$cZ_N57Kp~`r(V7$Kik8NmG1B$Zr_5aM
zhu_(;L2R=Of!G!Qd}gkPrQ$WRv616;P^Qs2o?UoyeP)5(RBmH77y!SbTq8WCqSM`_
zcF{-qC}x6XnwcMCJ+0~>1_ljTXQf!QY2Qj8W=NyYz_ZWk`K@cEwpR8rMgpE++Tuol
zA@F$a<K*f~edj~}bOQg{?4r{^!zXxPd#^$e$BXw?!h&t2$AViWzD}IAH3DE}=Tl8%
zoupPxw`rv7U%g1QP<<^{%E0j;QuMb^z*%IiVN(_Q%9$>q*rYWcFSNxb;OC`>zi8QC
z?(hFv=pGOKqkHYp{U0_EoivBU|G(iq+P!l3&A-Fp{x8h0$kC5~K=V7@n--eT$so+)
zm(a=Tb;;b}ryEYc)2Wa(*d3_{Pd1WQj_>{T02iXA){;LR{rCrdV1Y&kpWnMfBccCl
zt-FHaOoA9z5r3hh3ObFSc*5k`lAHY<@zFNN)wQY8kb6UCk1Ee?KuNWcf71UuUHp)N
z<Ta~sTEJNseWJ_eY@3-(QTez+o|dJSmELy6LPE#pP_PGQ=>Vx!^lm?P`o>q0q)c4U
z5$?2#Y6G52O*u+MXSsTtk7ltZ^j}M52ZVEj%DwSw#As8i#T%j!-P{yywxHhnHYb1w
zc)>Qb^h_T$;1KTYcr8}C%w}=Af0BjranX`rkq}d6pXL$U?^bg8eyix`6#3O}Gb&jH
z6eD+oDhkjZ%a0_RFu&qh4seQa&mBMvRKoCOPLkJtRx;g3G<&h2Lc}2sVT1|5xtkq)
zJZDF&O$56K>eWQ9t*Gf%=O;Hx&qx`1MGrr(Po`<1jN$-wEw~tJF@(<^4>khntWe=;
zs47be`DjV|^nu~Q1GK?YUFR5?pn3n@#K87trJ=otlj=hk?LMjg(`C$pb}b64sYRN9
z!kB%9+ha$q<i+}b>MO)j(#hA>k3T#6%>TajzXK!Ic-pNW!^SUqdNJ_E{lRl56hlQv
z{u5ty8&>Mv*eBAYg#Rx<@YI|_##1L$U;QT$(3-=jhG<q-3GgxTQj_@#EgKQ}Iv;z!
z?@-UQ<vLG{h+l0@A-fG(`e&g(p+`<OE6$FJV}vg(_HKLNvePIWDS62@wkM;Qsl`!z
zxla438FmWwf$DC~P6iT1qtPkz0-?p`u(g1J&8qE=jQv(bcs)$5TKcn|F~xUH>qm;g
zWlH61Bfsj2CZ|5mwXED)S}vW2nxY13Mu=^HAU{1vo(mXjp#g0;56|SrV<(!d80`;)
z&IXEO=n=|$!SKi@(P4y@82OMRox?t!Q3fZ10U0atz(gT)bdWbpDNHwbp}^7vv)ZK9
zpH|V@L<QRA^w+B4*4>0MXR_`wAW#giPUH*O+Q8mV5oYTz$*ycsMiq3DJtK=F&!4yi
z4y-p*cXnFqmuTD?BbL?GZ$zz5taHpXs9Lzau1xeX+F3pV{-t_m>Hky$YaA;YJUjJ4
za_#K&ZMMT3!TFJQP3OuB3veNrcmGWx&p?|pT;Kyw5n9z!<!~h;|3CA=_n0eo#>b6p
zvZODd_xbVWRi>kowv(C~pzW?<V~Tp+7vA0fzOdMSgH6g7hJ14N;(rQ{w7-?pR9MKS
z7~jqfrVyuJz47*sE;{$Ci(-Fu(SKXWIbZ-H^q>e`WVy~aB1fP910QS`?~K-uS5+!`
zen>>MmRQzS{CgKVi8PO5z0#`HHcde(v(WPlC-g%@Okz(6ioteYDHaXCMPOBxJbOS1
zJiM%B@Y*%#Z6<<Z8Ahg)sz*di2_Yn9><haBir!1=tCuU-^mBAZ3`V&c)&|HLp}fHY
zQ^6H#ReEjB1?gs4{I;6jO$~{pPI+_Oq)O}3mD7?bIq8}>Wu}#K0o<ClORmoEbhB!g
zVTX3v2N||L6|wmiJ(foC{tHp7%HzqAXVGRbWL9udU8TwPm#5J%a6)dBxD!^!q`DYG
z;uP&z<2E`^`NMJ^{vi=Idwp>!4km;nNw}@$SqH=n2MH$If!!n+M}<yGvc0z$j2;3w
zDPu<%jYU*?P5KnJD5BlPb{XNMO7i@`3|M8+w_E}|1@_J^TO+y%X?~HG1_!6WBMp7J
z?w)s?YJtfQ;7ZJlvBg!0#z#(U_0coyd|w_-i96WoD_xG+V6U%DV{A6$4{M8*2q>)&
zpl%Pgc6rXE)xCC5uFyMG7aJg->kCo<x@(%^kd~2N_~(dEF{|jzzE8%TR|tA;rz{#Q
zamCbJk&S%5uD(9v-tHl+MQ}EFVv-FBe~=k@5z}9vy6&Ev&tqVqh{sxNWBGSxRjPOs
z4EiY8L$<Qa@Ua>BcUb2lsv@C>ox)6Di<@-hq3YT6dmDgn1o&4hw6=}x2d$%Mr%zkn
zYLI1B(qvV>*ZDn4E_L<zQ-*eR22=N;3ASg_oVEF!HD)SC+o*=FhTgI|pZ(LZO35?1
zKfK&OH6C`CP>o=Xgsg4^p|5p)IEDM&@MG5WG^Fdf23&W_I-mxe!J7lAy!0v`c*bM3
zmody*|Ad=XH9)A%GOhJgH>tY)LF%5_5M2H{ys?rRH7&!nd*yR#_78*Z-0bt2VdeQu
zI53+olH_PUHm5D*1*U9;j7lmrta>xvh>!H1pzXe`_z-JRaQUp_<B9A>{_J!U2`HT5
z$A!nueG_H!yte+|Y-i$a?1)LYF_5W+F*9fQH`x~0#ybYiBC!lUys2W1PrJ@hqj`E?
zZ%~}vW%5*0Hn@=oS!n3<loPEBun`aH17`ZS#3A6$RrWdTb2Mu5&}KitkHT|5)?`_0
zj|1B?Mc}U}mxeXx*6(AMR1~deKuwt*OjftBD?EE)aV&eOkKwgpmIH-wKl{lMYmOyC
z*8UpxL)D$O^cm}Uq%r-`tv?k7Tv<=WJ42RWhr!3txR!*h{rgAxL#AN!Q7nl)jv-C!
zvu3H05;)^rdNM@^65yyPV2RPz%^5Yh)GJ@_V=!f8%IQ`yxBCGjpeeX8E_C83B#hVH
zs%9%#HRP&4PBQh1NOpFXo16XSpoL7?3sLpT(RlfUv7?no1$hB8fozRQJ#=-_sA7WQ
zL8f`ZwAGqWKGH5%+u$C)nT{PPh$<$n#1OZq#^DevC3oQp;pwM*@Ik}1Z*J&SH_k4u
z=GQV0?yk0>a0{_(cE6NAcZf8)EE>FedWS5rzl;~f_G7}pB;9UM*h@JnoV=yEo3SSa
zD;q1(wLIwcQ%k;BKE{Mw4VTg*sx1&`r2I&^=cj|mvrGF4#D1dmYXg9MF?IMp0%y@u
z6DszmMZPObi4f-sA5a$Jw$)-zhQG_Ux6Z;|n$k}3rXcoP36b+0>`y5YuIn2-7E-bU
zU5^H4w-R)-=d6=6jIc4K>my1zTnuSbwd?tzgRj@nh)R^dSpYldgN7Q63Vb{D36o0W
zZu(TFny!!*dYlOQtdD=BG#ek#-4^g<OK>&sWdG%vn=#|dpB^o3B=5&NsTnytDR3L&
z>v&q(nFMw~WnZ0&aK!8~)QpVLwNdOk<70v%leOh?Qh(S*=$1Krs5Zb_#!)?ol+EYR
zcHrFA=^5ffw9aHP0cSA#bEWxMyyBTs!xKExF;HeHUd@B~$K9`fMIdB+IljoF?>~&A
z7#4e!HhHMIwdFUb`@mg1u1f4=X83bO@;nv1<H#u!2-?bsG5tYCBW{|mxDDng%{~sr
z#!1(f2?CT`vY6Ms8mQH_;%!A?i*cMq>KW&9?izk8u<;j^nU<c?uU+J34INx#Xn`dZ
zHO)DJz>rxRIF{LR(~DPn)viTOd?po~jlRJD)*>4Op|&|2)5p-#l6=JE_+X|QYLFKi
z@lY{EuIWNDf3iGjG001JA2moj5jrX7J)-!xPj(#yLSKtND0aUNj`D^~+*3&jT><y&
zuQ5^NaMV61+wG{!kt)ugAD+=!pYP9_EmF&3aqXwWi8Y|uxF&yer|kAxq-PuCzPuwQ
zPfx1g<C_v6i76%ePD`S@>xT&Uvq<xph~0_!?f30IQLA4D1e?745kwv+Xl&#neGiSI
zp&dl{i@I>oy}R9Ozd<|SzHAy4u@}RFEDnU&C-~CT#BC7*T~zN%Sn-q*IxaqXaL&vr
zh|ce(U*gluyS=}8ZN+oWhkW;cD!^AQyNm~-XR_d9qfeObRf(4~pS$M5?r(S%ZO~s+
zRv-RMms-gM@%2ZZy7nn|Mhca~(`c4k!LPoLfje4XPfyFaJL)vPJ`AB^`R1j}LN6<k
zB~YHauexUri;+kgX})mr!2+uXVgOK{Yi4M`moW2)zd~>_bXlcvLt;G_OL9N!PvU@<
zM~%hrvS-@01q2!c8t~=kuosFrR5`smR4Sx6uWcI#<*s&ZuD?s;k0I|A*Q!4`>Xnk|
z?tbNg{hY1qDXN~_Kh6`E(HF>m$uR3iN)^2!NTT3FXUs<es}tw7Qy<c2F5wbp;*Bmi
z+OIsEk8a4aW}}-?Bv$U|I^G_vqNK46wxLR)kQcqiMt=9c!!r!`bdHwvoMy-B!K9D5
zqNiF^{9(;IkI(ox#l840&~Q;N<1zQ?6PJnAGkCVA%qQOLi2l=j;YPgEU2KXii$9lv
z9JH*<9+URl(VEKFTDOp9C@aWt>o;VK*0fRev*aNmG-S*9(I8g_<EwOgncn>{!vWPr
z)FUWfdH7Tnq{dLLZB77{mJ`MX=ll53XT4_0gV*7vi%MqZAb(A%hO65I$&x_p&risA
z0odv+Wx)o1WwKqJLIvYl=!f`ET?$1B)3df<P{4Ov6w>dCKUA{8F?_1ZGBDVO4G$xT
z$_DZTLO2jH_O23u-2^S)Z&W~x$qai|X1YRD4fGyw5P9h9H_PKQ9&!NHZU6KIizvoy
ztuLNZX747L>YRQsugCzU6Q*uC=X$k=5ZK-2TbZJ5Tl<!y2Kf570B?j&J(5&I;bt08
z7*6oUQN#^rmtO+%S+eL&KzB5I#p0de7zlM@*}OEWik3;R8EkUl(Zj1zo#mg;pm{2^
z3bI3G$Dg0_Rl0W5>Cn5H>JU`jM@u<nu;_2evZlA<^_Wi(ET0wCerCE`Qq@vd_fmcI
z*J?mxz@3k^Z~fsIHp8+_VUTcT&d%6oz0Z}{NWP@xaQ@B+Y31<}=blRcu@~9g4=ikm
zDkUJk>izWik#3K>rb|$-E2Wv({rn-mZQzNYO5I&Q&|qotxp)VsGGx8eaAE1Evwa#f
zyZV1W2w%!45X9iM>8B-SIEl)Y(pIX5Rk7bgi`0O`aroBE(D|TDkZS3un{j{BXKw>U
z_&cW3k;)lcfr%%;%I&ZONEllx*lg<OY_|E16>l#8@>5ZSE84IEdpmfnY**G|79$b1
z)Yn*6k0=qU>CxgFu~7LWQZ1GtS%xojvq9k$sQ0}`v~Q?5h%H$PW$2968#X4X$YYr6
zQPUog3hwy;^U<Ypfa6ICg24Uecw|YK-WjafMCsZ&v(5VK;>bjQ3txtj`B=fmX}G<+
z!VUBuzCA?0Gr;#ltY{j=rtEysrOWefl@K~cUCTuel>}LXMI@kXKI{6R$;gYEKBXm_
z4xsB)-t)tIJ5oMWE&7(??D<SBn_RSv_-{Us<R@%J9s!iK>R#Pd?uVt;r9nN^4aI(r
z`-eoFV@2VX5w0BI`cU<6d)H^AQFXqWt<SKHlNP@Gs1Ett^{z2I$W~ur$u;&Q%OIJy
zYD;g(0eZ?+Jx`ZXfj8rdLG$%`*ys;U>x<$Z<Y^lDQ%RGN57z#qK(E=*+!mO@x{ihH
zN=$U6)~<_TQI^g1+|N51rYNfiQC&6t6lEK)hG`<GA_sG_h9qAa6>r5iS%=$YJ#g`I
z4-9W;l7hdJminPH?;IiDYoc#JRj`a}%}KQ%)O~vfoj#8hN}C~mwCSA;0+o(g<%|62
z1S`+H<}R%0w*YY1x25obG`r?Fg3Y7^x|W_l!xZ8xN|A+&DK}2XmSyQ=N81N!ET$Ha
zD(7++J0siuWpW8>v@}A!7L8p39F|lls^hDD4<}_B@kXqdJ>Kl*sSF-i(G|uRfcqY4
z`nA6R2Jcw_f_T8*(mOS<DaJNAj;;Bwp9V_o#-jo(%`gOn^IMcmM|w2(#$y2Bc*kd;
z-cVTp9pkU8GGiaYzxOg9D~|@OX|$%o?to|%f2dTCgDUb-+@KAe_~7EF?7i#ip;*O1
zp%+75LAfgLC-usjY5vmlBX2Xm+@-ln+@>-D`oR+f?U$mbK}Thi92r_kNTT<Gfm%`d
zdQJv>j%D8~T-A%_Dv3B9#dO6cD1&iO4L)VEys!{GQ0eY%tRV-1HumsLpL(YPEL%bv
z?yRKlNoy!JQGenQ7I_r!sP(>fle`1%K3mojZh4dLIt)MReg)lU9nu3{wg#D)nIVBM
zkr>;mPOdiBx6j<#gX9{j4}w3gClvBLn8^m+5Gp$CjQ}fec#0(PMiyhs>nR2!1ffE3
zkZNeLlQPtO8tMXfd}6M+YvQfQXI`_^a`DIUUy(&_Uaz0dy%qcP&cqz(6g{ogqe)|p
zTf+b(ZsC2NyY`)roIM?kfoxHIe6ejoXO;M8#dE4db+BB|X0X=77CGiMIp+1AIpftA
z5C)(P23%xWdQxGohkjA7Xvh@>HcUCP6+(RwH5zCnRcPQosVhx7o#hblw%ZzCd05mS
z)QTTF!H_bI<4N^{T=2O86)RF)z8`KW!iq&e6l>X7M6B;_IM}kz=1k;RoU1JI759Ft
z4Rjts-xTPD@QXZEg!Z{Z1tzHGqFOU8o<y$q?fy#)ri2tbDO+b+qNSS4um-s0$}ONJ
z$_ei81i#^F&B4f%qRYA(mpg~;FDoM`k~=~R^ZeCUGguku?4~E-XXQ0djg^wf(?&j1
zbsjLnp;nHORTdUxXx?z8(x21CQwn4ltF>u%t=g%fO8WA$6$;!EecJS4Tv*1SWufL3
zMTxt-zZl*(w8$u$@T-Mwx_9Ko5?eNsF+C>5+@t7~!A*nLAldJ_va{8GAf4Ux5qLiV
zp2Di^k$qliE~-4~Mi<*%l$L{2aj7zV9pOpB+Xz~#IH)X1qb-!Xdu0GsK8<gI9}z_9
z$;U}&vu)_%w9OJf;l@1)hnv=6HTVWW*>WyT82p`=oyyXyeKJ*;$d@KhdKy%sbJ}C_
zcI1IhZ@4Q|mtHI_1Inozk7`Tdy_^9h*0G!4voP@^1J=-hl%wuG3tUY<8@+gGs`hr2
zAxppOG(5@Bn*fXod_wuI&U@|&S)CJyr^q<r<l5loCnCWeV%^V@fILgEIz(Lar%?Y?
z+dvpJDa<3E>^ORmaP{*31CZ1;kMzt;&5U3ta<9jBb*q%Q)rf3t>g61cAyae3t=o5S
z39GGrViP$?JFOY<=?X4(ufFH3W?0pGga*p~Dpas+d?oO10>6Sv3zy&)wBZ8n6=2pn
zFq3~=-5hm--I6lwoy+}>_0Co_)h4W*8-1$@Wh3a57!oD!a*Zfzs)bCqEQiPm(9xXg
z!*lNR+;|yg06S94h*^hSBH(4(o7%U53IzMyjW5%9sUA*fWBS|MPJMT0(=Kd79UwVh
zB6jAuTY-ZywwHKN)>SV2z>-_4qt^aBk1Gh3{LIRw!lK;o98{OS;rmEa&u;5?kQN?s
z4K<$>Db<FVcRhkn@Mxu32Ux^4p|FM7EaUE{9Y3ACGH;os@9pEc+vItids9BQT%ONR
z#f&K;R9Y?Vyp&JDUVIc{;1X;irGDf5y+5Nl|6qSMz2xM}-d>m%q_!u0tPC?^C~-}F
z?m+&-;HsXA<2T=r!}G+h-9d3pszzU~%g8jJm}WO$Ayb}>bG_`0sFc|C3WPQ(N$G4b
zW3<?<jCF6k(KjE+reT4npQ@zR@Y{tl^K%-tHFS5$NUx)^f^btNjHtwMpT#|GSl|0}
zC#N>Gv4P71QzY}yK=Kj4e%~Gl=}l>FsBO+JEZYuss-$3T!Y0cix2jYN>)NWR8T>ol
zr78B#GeUAx0O4#~lj|oqRe+*lO~Py_01w3Ys62k?8xx$^B(i1pX`nXh-6b`+{o_qN
zBOHSGq$w4D)}tmGlw8Q-cS;(vb<R2mp7cnKC_?mA&pUvZX~nbbhAfYwy_(2i&e{wC
zx~HX1@@+xYd+~_JDE8h$s&Ec2tI200lKH4^IQbHwF&fuMqT^Bf6lYR|z=gXU82!@c
z(+ueGi^iAmq&xicOaS~<=f0Y<ZxTJmPQUiVFEY?D_BZnDAMeWmZp;a35_A#k^2H4H
zX7S3|vr~$EbN0RBM$R{s?Nb7%CLbQcU&3Jgbff23{R1x{l*`eUBZCigs+;-LbSHPZ
zMpLo+8|E?72(ccVDFjl}%8(j9Cg|Ty>Uz52;AC`fVm^!yd#mkA-V{FX^BpBHXw-5>
zUjRPtF7ip~iX1I+TF8uwckZeL!&8dF7lm)C6!Cn5LIS9>Hbw%t;u52XzYS2f;M^Qy
zsUohzM)f}1?{pK6&ToD~;&<nGDsY*X+)@hhr$RgI|5$#y84_~4Y*uU5faw)EFZh`-
zW@ifA9Kr5<KN1IJKYn4?UJ-t)&(|E(J(ZlT?IGVnKvZSh(1G$JZ!f)CFayiTn3~TR
zJ+Jg5*y0nvlX=X0Vu+9GG0KT>0l^?}q7_fdr;ceeaO&B#AXsISj`$8ZboNYEE($NI
zg%<Xlt%~m5LYd<A1wZ?0Wet^I&Mj=2c=utL6{5l~c`N7f7X=OAK;v7X*%c$h%cKgK
z!NVSg%59b}&<%x4Y-LHaWSxHMI~acrPomsi79c(aFbYbj%13VHt}o&(wJ-+PJL<;j
z`&|{sX8RjcN<4~&*T2drIhtc_qA3@>Ublhzw9;nSQ<(AgEnW21!FLEk4HVLAk*{!E
z#G%em5Nl1%-~;=?3hjQDxWyQd#=6AU?w2No7Lk|5CGb-PUPtQpdwBT6ik^0G9I7pn
z)LSiB*kgexb~bykm#DZY2OrY<`o)nWrvHUAy7a0NZzI`#8q?yI5~{^yo$1tcgJIPA
z5AXILUgG$K9H}4R_><&cQ7c)r5Se4XU&evvU;JZVK~wZboIZ*TQ25~tRqXQ6c&~p-
zd7$2Cl*5DNznsiBp+c8!AZJcdBbfj4qy94X2gqM${m-xz+G|e>OZl}3{3Dd>w#F~@
zqw%sv{*5Pp=*zQrrD*!{f(+l~KOL99%-RnAO60ZkZ*Ko#2WWoI(f{&uBE0zF(X5Z~
zKLdrI*!7l7%2j+F@Vxqu7p!4r6(kTCIMS;$r}aPd12KfXHS2e|RW<akw|r8LKtmB8
zC|qFo&lj@kwgC^Xv+0+8@oJ6wpZGzU65hVKGH4m{LFa#u;4f@!85#EJqxb%&x`f3)
zsQi~7y{=a-!R5@q@^P-~U%H)k^X9)=#ra{|&n*4hjUKezTxun4Wg333LJaOMJ>Jgz
z*>!eK?njJztIIdekXx^|&uqVcGAlPXdcN7^*KOUEf~vbI<w>kEBA*iJ2Zb546;CL7
zaC;1kjufhuTo2T{xBhPy7kMncy~EaYof||apm!8P<KJmDJJMj$(&Et2O#V*i_bRxP
zhL9F5N(1)vc<J$01P$x28=Y;u_)XDFshzj}qmce=*CWQrwv(i>mDgI*_jrgZQ6Xga
zZx&~FvVM-=xC4v`GF@ORm^1(H3wgFXikAml30A4Ca{r;O`uqOoL4wVUhebZK47^FP
zYNO2;t=FIlEvd?b1Y#pMLYenL*`RDkU#*-{%KF_=ql;dKVmRe_Blz$lQ3~TElD*K$
z)ju@wHYWt6k{P0$KPT-_R|H2E=Q;DIyUAB%;(jdITt&t^F+6N?<*RTseZ}^}>e~Zb
zU9%sy9&RjEYB@FSSl=COqW2oU{dc<g{xm&fd99Z>A$xgcJ1g_|x^Y9;^Fc!fNV2i_
zbpgX=`D<|V`3VX)e$_CTwEe@dF}I8BIJ7Swkw>(IyZJ(Z<Pe*h!CaZj-Y>3M?IpPB
zY%eIOJ{!TNH)-iJ?Vb1e`5o7z0%+PO@Y7se-dz{3BJ?=HoFS9`7JRkusCo7NkLD}e
zBgr#jMl%<~neOWk8lV%)WpXKKyW4Q$o+@fc^@Nv&SI|Q8uZcc$w~98=KTW#PDzS<W
zXzzZ+4R8HWFRyiz029x!0m>_OR}T<rS?S?9q1)bsvL5|4i>`Eem)-s$*N|16vDZWu
z5R#Bvt75K`@MWNP3h^UMnGsV=5!Cx|y_t1p${iHfKzbRzk%EiLscI?vg2rTRoQVJ-
zSn}O)#8Y3T8I9jdOh^)=*3B{~`Uo~C*dS&sHa^nNut#t*23QUxmNp{cIaui$@0hU}
zinS42bMf~bTJ(Q}G!VNap4AHsZaq~h`c5m=o#9eK@mRt-R@ybnpiu#%c<Z@a6V2E3
z`dxuMuLx{J8Apm1SU*L2WLp${^|Ojfn*5Jc!~VgmAR+m!LJ{Dag?MMm-@+uH(!$--
zLd4pfou;}~iut{5OzR`K#C5Av<#|&xAb7QA80kIQh~s^`^j`Onjqx<52{-~09c)Q8
zi5V^~ga|svCp;XeT52Kgn&G~&sa_Tq{~Tm!oPBDVNS@=Md`yuag5jYoo_@g(f_hNh
zAGd#&<_`5|wb6oMLL`-RQ1vt3{#*x$fGm?Wcm7n|kJq<NWY65qiHfF!GB_bytfbuS
zIc;wvoz1-3X-b%3Q;(I^BjS~ae|r7nM4RMtXL$JQ=x3`UCxKry(g4JH^9+ScC+5&i
zr$kIw>+QGCB&Q(DPR@-2F&R+cTyd3-NL@9y$H@5FeR)E6f9tye{IZwlYsOmTiMxRc
zjmi_FZz5ucRy^N852#${v*5=&YA_jQAoZ;3{op5j?i=opeAuk;pbQ=rZkNYLt^=h5
zgKk7y5&J3`$wu)(6}xMmdPqtz;ak?$;Ti{{@ckED24YJYmIqGkJ~mC|$WjE}N`x^r
z<{4<9iAL620ei<!K2wcqZtTR{zRCv7^>tz#`#xl(^E~9K$Ho_r`;xf6%Hq{DaDiq5
z{PI-Ctw4yO3WBe9DOyAPS5gJJH7i=?AIA$%ZYkjI?iHkl$Ba=eAj@XvRia2I_Fx0U
zqB5p7>>yJsjy;VBA}5iv)T$=CD~t=!7h97kS8PC)o%7MhVetm4af;WbPkl(yO4&~H
zd2)a@ON}vOPb-^yWbq8;^t_K-bu1n*{G}D2=VlMaHt`sGUOy9W=ZsdU=WWq6Gr*!{
zupi-w&?!SO;!_;X*uZFw*?<V>Pc=p%ZCMI|IQ+NnnZPGQ#+CkgwM}mMq`LWC&H0Xl
z+zgtSNkJ+PBMtqQ&+ZR>V1k=72rW4lzqDS?*)eG%r4Nr~6IIdPLKx$<oSpj8Y=bT%
zR1S;#jT`Ha(-;}O2T0?7jdd400t(tQKjoHx0;+F-fAl@#*-N-w%cOd8nYNy~_JpPz
zvl=}ZfMe5|^UCGpO0C7eO2)<?xO-JP(Z@Q5`b4jdO{vdxu{zvvaOmgmtEqmC_G!|I
zPf!sxRZy@RZfS{evqEdb+QGpm?kbask4=M$l-+eI=ZxIdQ4{x-KE~#_%b=ZP4sTUD
zUQSr>uDQdlnjugCcD}K_#-ZJ$aNPE6wUq7i)vL-Mgr>KIGO+78$GEwJ@QF9uti;i+
zYTB7F*I&#iK$YyE)vW*3h<j0JAv9=_k+Au9dbhbq0Ao7TDhS?-5yIf5L&XG-Oq)ys
z6Q_~<nkBksH0JT$K_dW=)jwLJq<q#CZtLRjhGVGt{AofMS=#whT^4OBmp7LdsS5}D
zN%$QW^{E-;#w85YWtp1o%MkcPQo~1N0;Si_58%=UqFM{rK*;%@Qg=^{JsvCRnVbny
z{)+J>lfRFj1^Gcs@eJwwo{jA@BW|r$6+Z^RoCI@Sc37`OvTdB-XtroBh2GYtRebAf
zPLvGHxf0g)Q~NeR-;eN$p}w77J5+~YT0=Sa?C8<oq<eMs(&X9I)5ky?*!l5?8=L4m
zkynSaTBK{_pffg}<WnOs(jrW~loxd-3ky}dHesZ1KGszW;C5`C#e<70^7T`7ax2|L
zb3+u9%Dw5EAvGQmWy;x&&3fU;Zw8TDq=|Bs#OwzV=HV-HDRA_hhw4l1iTKLvaC4A!
zs)rwWZCxG}JZ(wV_Q<T{%dl`2vD7<IA0dsVnl|l|GY8#&IIM|T)=braZam=i0Npkm
z>pS5cok*!~^toX5oA6=D_UDGptvtfq#jC!tDnFH48}@W_sezVWKI8k%;FIorn7j-5
zke3;dpzBk0EWkRdt^M^-iF2o|Gnw8+(T|+Y%Ozz1<9w`e>|?#o-h?&?v6VfU+x44h
zrp0@NlVZ*C*K_*mTxupjWKvNF)a>)svvCDCmd-|^Fw9;SFSrh7c;!72zpb9a48Em&
zj}VHglH5>=8zPi4H>ZE2ApKRfd3t?)fzD1?z__IH$}OL9QA3uG11d$a5&(t|-LIu<
zoyj35nWkSXgs>dJv0)Op0b*=S*v^PWNnw0ESUa*<FtabKPjB9gJw&~YB&Q56v8{4c
zgc&^t3h4~Ajj~}bp(>I0bVF3aiYCocv(R5*LcQwYMXtz(*<~n4>#|dMX5-HEU?as&
zAn>sjnaCy6O_u2Rs5hseZezHW_+ks~WLZ5AQWf_C_4kYMN}oX5n&l*sc(}fFa<d8q
zc==u)s06xI{G?;AVF*z#@n2kvlUzkdz0CIqd4mVu&Pi034)5rVn55GgU@aozg=X%k
zwOS7PJT;es47!qM?>m`swPs);ugO#o=~Rjnr?T~s``Z&<hJe+#HsVoJy&qrMx##1+
zgUWlUY)zFQi){a~UG2@pr@0wKSVrba@%S2*>m1uE+LR#rh6x<J#@=g9s2n@C<a+;8
zOiGGRsAMgW{<0X|EgjozQpWlRz#VdfEMT27LvLxJGxqSV4HJ$;OfrB&-73vkCB9#c
z|2tb&=aua6&Tge%+HKHh03c!Y)1)zrf<eHMiP4B?XRj`HWBRE-$MpsdZ=24+#>h1;
z<=}y6bG}K6O&|l}gh<VIq@_9xrSyYV6yz?+v?vnIDXDF95JLOel>{jjCB=ROZPn3O
z`WDb?({1&V7N05KPsFDgSYzlagrk<*>T2drb4#~3FjM0ci^DFgXN8^)DrFSNOZVe9
zF)zI*Za-ydzU^8`MM8YbDI$Hp)9q{?uogkI^a(U2LdMi<v+B!}u}+R4PX{+R)~VP7
z0Vh1=MD$++ks|dM36i@qzsR6pK_E%1V|C%@sm|tDet?4cAk*lhjT4esr48?Cye^n8
zJ%y7m8?=*8wt9VWPQ-o<1e_L~-N9>W&v7>svSO0u8Qg@iTKzBl<{YF5JWr)7gl;H2
zWMrQLcjDQD2z@wW1EB|Dq1FcPUh;aJRw`r#T%U7M$;LFO1;S{jv9Ww*W+No5cFzuU
z_4MY-G@E%fWaCxn!0R-Bf{KD{|Az?g6DDTnkQbUXFq)m#wmt?1RjR#Ca4CZLc;!-}
z0R$a4l|EyeHIBe*D_eC%KUKmAZSKBz8}j*hrM>P$s?0LAA&mhydB(Ogn4pVceU5kH
zYDV)>k#+UvNhhwTDGro8Ro+US9<^iEAj#r>=1^F9zJv7@$+@Q+r(OqoPcsY;R*dZ|
z@t&*_1AAuCL#nu)dN{9C=dZA87mZ?=!F0l(jwSz0uz`-a?M9-dSJbOp#DTb=ZP4Tr
zpUull-+&JX-zwG8((I@P#JH%N`Kl*sj2>w|qm9;jsrN^2r&9K+Yw)(%-bB9C?S+Me
z^@Utso6Y0tN`>_5spA~Q`ruO&la#>Cn$qTkWy?o8(BL#wdCX~GTvi$W0Ss**=1d;W
zl`_FlKu*TuJ{Yc=fzKK67v4`}*$=Dq(QyGEG60~}HoE_hy|)f)Yg_k569^DOfZ$#<
zkOX%qw1uDv9^9q46)6<j(gr6;i-e%1!JXn#XmOX~-WDiQH)_<@mv*gv?%v<s=lRar
zcb`A*b8j-9%#k_XIp&ySzB26njjX$M$m>ep@6%_d=hP)Szz#W^+4@h#;~Un%A-#%n
zT~4$7uW;<Ss%53x*pE8l4EZr@^FP-u>qY9V<I<iYu>#L^-dj5q<y+P}oBcpzJ`ZS3
zDb~IcabAHN(j1Nf9ZM9WN(okv5+=L(10_;eOpSIep>xKiUHo%RPV9%v_l|$P8%VCx
z%u?${hXNtuPRJ(HTk@SVeqc6rY?zPIi(qnh#l!Q!FoOp-6yj6S4<2a??*>pd){9Rj
zaTMP!C`3Jus(PJ5B|tK&kMOw&dFG5-`lelFhI_l{TeQo3dYDj7TDB^@Fm$+;6Y=R*
z>lKFpJk>4pL9>lMa+YivG2R$C$QPZStg_;3NLh68c9$V0TE<QK!0J;aaE<l-i$%W*
z@=3DCU&GIe`?;@Q^6uN-<?B553toN3a7l&#cvyyvpt=oSK7KRw{d^npVBy`hm<Ou8
z9_Od-JZ|L+f@7@*z!R(7_A?uE&gJFlC?AD}Re#d6NZ6iBkRe<TU4Hpq!mln5&t$ZQ
zLb6kkne=$J6|n-Qq|G5#!cFuD)*h`jp5bVd_S{0^q#7JlA#4$sc4gaVh8w-jzcmSq
zq?g)pSbeMKbMCRvRS}rs!DkgQg`9UigQW5gHPx(w59i2~icDAxo>l$HZDCb0(wgaO
z{#HPjl{tTC`n_T!Tv~dcgACn+>6Ot0^!FQHvld=a8=h6r;?<i$jt)<_8y8@zFhMJ=
zU5=biEg3Wc4-AVevK-iCg|^qDD#iG;zNoyo_a@P(K)oK3Z(R4dwRk;bvFPJtzWJHE
zVux+vOpT=5t;L(mnV83S;wVl@1oh}-Z=PJs(V$8(#n4u3%OTbJ1mS9)7<YK*qkMXv
zcC}^%<HyI`j9>J6>`4xx!79ny^vzbO%T571#kyRsc?EeF<Z4N)&*_4K)QIyXk{M8?
z7P!2O%{LQ^!@+j0`w(l>-frO|m#i?S_HXI<vK&X0XjFdCKr)X^jRU$pah+EWI)EmW
zSz=dV>ox}wH5B}%2rnA}9NP#mUbVPlDmJw0dTk3KPOtzf23eggi^3-gSAPyf9f-dk
zUsx}oOp3NXDbU7ke7k<^=cx3k0a~dl!*ZLm$ggn#d#QP3RQy!YRVejMr+fvr*(nk~
zCN$3l8<6o#;+i0jW<`thY_VMb9dAlQ_rc#gNIZ-aFM%LTwA*gL>|>Ib<5ODChK5@T
zupB2!Caif|PM7~R2Kme1#7DE%`_WyZ-Cd0(iG>><CO^0<WqW1c`ZRXtHz)Dl&MGqQ
zo5om1I7W{kY4cbt22^(m<L~1hhju<frzT~EVpKzbK46~+@pndyt-JZzMiuLi^-PbN
zI6B^E5cK-I*;joceD|bn^}BXm)D+&con$^yIrT~?nXB*asq;g^`+1J)2V2e4_ElLC
zs>s?3_-BeGqP^v1MQVLgdgZlDZ}~;fqx9$7Rw>S{mUk=~>Gx}oGMZ}-iD(zS#zq6%
z;#0h@f@_(k%dUdX2@&8cb%kZ^=KVkPpGIp0IBRYnCUFJ^hyDT3*9;XEpIcYRR+QE7
znnb73Bkfjg((c(>Ug0jZs`%>l>E->kYfI|WcS^ZZ1r~NQx<T1P#Kb!qV!1tjLX1<B
z+q(nq6$cW}q?Sj933)Rc&Q_IaD^7^Akfh@in@6j8R(&lx!f?RS#ky?vV1DXUX;cuA
z0@&#F4Qh0_wSB#6q3=z8zW!CUWLL+hoCr(b<@lJ-?{(Zq>6|DV*<eg0BbAb2osiVm
z?OZyhP+=yx_>`pO;KegtMRtCcG~V&-Y>uVXOC|Jvt?Q<~p`q_|+FIYIMl?8LR08Xh
zuSrcQ95`D~qB^6$3I2t)xLivNimphYc5o8y=6l8+6x>c4_8`!|gva~|(e!t|KqbzC
zTt~lA%QWkLtzDGdXZht_^cSSlzn7lk#r9A0SN&a{B+2%Tr{LH6m#H+eO7J)KeaNCc
zJpbebgKnE2&P1D@OTQxqv3jSHcjZI5!+m0a?P7-iSBpkhtaAOce_xU#Jb)Bf^M;u6
zTK_JkU`>>Q1yBmc`>SC8<OCJ01C)lR1OJbg%fcy=vZ-u)M@TJTJf!8DheqPfEtYMm
zYwI_5&wm=Z#30xy+HLovMPO*0;z7rGF3{i?5w)>(JCwBu|36Vt|5)=JC<)>(mn{wG
zd8|_TzZhiJ`^JcV`u}2Z{)zpy;1P={g*GM6e!;oE=KGR-w0eus+QGI(I!$pjGx*VV
z9sK>{xuriTujyTTGn7pki+((!qEOBxE89KICRNFY3mayn!kbiV3ZR)cBD}g*;1Y5#
zrzq`?t+5FWr}}HNm}-#c$%aqZ-kXba_f+Nm?So#o1C^Utlt~<lp9qRndI4;*W~@WG
zt{{iTs|(0%@AssYTREA9MlV7y`sq&@nMp=H{P6^-sF>T@tM~^XlB+@UX9N@PjqT}L
z)v(avn|<k>iPDHS>8lq{DFtVUN>uiIZ@V46k*ir-n}(ZfjjJyLJ!2>fkV5&qV)X{4
zu8O;qz!OpT!5t1K<p?i(vwNF4tcHLC1D!PH+}I$lTN4=hb2(mN``?!?c-mII>ibdI
zz84I^cGWW*@>l1rlY%kTf^3QjXG&BPRkXziIg-NKS1qU5%#0Ih=n1)MS$bI^YVIdo
zzZ?c1$Q+G+!JT_m^hMY6M0ZAw+bRBqWn@M+I!DKFD!b0bHI!s4#nN7_7^G+g+2l;N
z^1lDMf_&xmFfwq@vhmsL0G@L%3*V<t7GzDy7IcNzb@oJl#<Yi)HCE_^FQrYtMo9nM
zetA%9ZJ`VFSh?KQulV#2Kz0#jK>Tr*Ywz2N{%zHFjEM&ZUIJS(HPQjb)3vqSP8=pr
zz1j_z0%mwRSBjm<&qi(PEh)Z08{*+%PeE`_!Z_dTx3`_VldqGu1KTTtx>5sgJ$Fbj
zyC;-*e~Z=*v1WCZRqkw5zE=Z@%G+_K$JXYO;3DHC(QE<ZIMQaGZqw3SZ*saZ7Av<-
zWwD|mdpE@1q2BS!^WemzO41S&xfNI2l_K;8x6C8q&DzPHzJV^Zr_torooQ%gB^~k2
zo(UhR6<o56;?LYZmbH)R1l3s^C_B+5Q-CS<+d)%Rp9U;!#JfveCw}>Lm_}bZD?5}$
z@sNEyBwSluiRu#Yf`f6cp{>Aoh8eB35^bI4Md+Yi^DN!f)cd=TiEn1#QQLFGBM!&N
zMw^uYhj+spezoQj-Y~w<&0C8GHXp<z(H5(>Fu3F|d079@?Oe<2$7gSzAp2o~vnL$i
zda3263WJ&hSA4i%_XLN(zwv@}bPf?_LBaf;Ut%nf{ml4X#{+Y(<1Enx{!xu+c0bdQ
zzH-nux|C1}&#3smkz;hx=3;OvI<-EAg4nuyf}utbTg1h$gs}(l*1aGilPHVQfyGmu
z_o~`tq+?q18-gv2?D*Z)ktQ7_eruhxz@GNSL9RDj22Se5IEG8!16((Fhr$PH#UAT0
zmG;KjXc2@D&V3m!Fb%WSoENST$<Ow4Rg$reXh~&;c-Z4IYUv~Jt?YG$%OjN0?%V%S
zh0>V`RG4lc?G>rnpo?NQLweSfc_yxzK~l$+pauuqN{G&EmY08U?+W)P*5Ax59;C<?
zq;|@^X-Vmc$J8xDRk)U$v6+O#;Y=q+%Q4O?`1Feo&RI_Dh;8L0TbU<@j??r!W2?JE
zUBX;7?{s?=dM$Dr^Hy75NG=9Vb6c^vXbMl(Dov>*g<Y|%Ga}$p2^2^K788Cywj7f(
zM}@71>E^f`-^PK5lnxBdeXzoYP5@Hs^lJ3sJWes#fnG^$K9NZyU5-?lEfDE6`w(%w
zg0Yw_OIc7FDe=vV0Yh^)98)61$+!>ixUCAS4te|vM81a0kUmG&S{nNq%iR~Ny1jZv
zW^-lA^5mSscj7Nk+V8199^(DoE4t(M>T)3|Z#=tR{rThL-%5&4>67^DZM)Z2mNhlA
z!|HYe1TO|HPZuAQ9k$p|&7r`JnNiOeii_*=ty=9`^K9ZS=@xEO>b<)iX0^O724ATZ
ztJdA1&1GlN$n`d#axQ3HpDp~<zH2#rRqc6@LnNt7cX#xjKy5RbajIQp=~cp}GOm&N
z6%=JoBc0tisZ^tMq7x<<Dp$2t{e522<OkxynQUI|;I7J%@4M~2Nb}7=%IN#<11P4O
zY=sXnWexbh6jCdpAi_Sh&8pA_e#6EMSsUS4?!wwd*vFH+wd^TinfIo8(!IPJo|!bX
zM{yEk-@FvNzNPv$WoD*qQyPA;Q5IA4f~8a3YbsBR!+@P?U}&B;^>~OyDUpA(kz6_|
zjM2nmKsqWg3&avr*^po;s=XtTZ*W-POX%7rpKXA$%$8xOZx7rW#E^P{i#y*7H;E`x
zDG^-ur7PSKKH)IR<1JkC;m0lCw`Ozc4(wZu^;2PWj4&xWw`7%diCrZd49%>tx8M##
zTdOP*43TwCIL4e*lWde4S(u(4s|VnFob%!OB*i(``@*j!hZ0kgl!d3Ob5Bu=B38Dv
z4=Bs!ehgoS{khKIC@*~PC3lYCG1qnRKLA!iksrfqXCWbP{s0`Y+mZ6O&%1k+(QABD
z_{H=FNB0EZTT;NjiYSW}B54Y|gvf;(c8yS9qYun;O7O3AN5E&Tg%$Qd5q#j}_3jIM
zg1?bKi{HP#>L{&nw9(^ZlK{#s(kLG;=h?X4mfqg~T-)#*l;h6Jkyc_k&ZOvvosmKh
zM}Z#AW@oBRF&ER&pZ522`Tx!Qo;&+%rbGQ;`%C{{M*6=+gfXm@Y5*R7NB-7V$FBtl
z%@tW&BnnFOKjbEml<qtBuZGbru9Srg?td|)CI3>n*EcB}3;eYW51G<d5li>uHThN9
zMNb8b{Z!}AsV!b0Ukj~xto8i~=6>wSSWXP}afUeMP5ghGOpmx&G~5Dbzr+9kSJMBP
z9R}yvPZG~*Qk1^+WOJ>G&%v5phIsZ<Ni#%hzR^r~9-m!%uGlh5bM@^A>CRYdq&{Bj
znyFXy)>*y)2>%|#4Fnv?Ayx<wl7>LAiQ3#OUog?hxF?hqO4<J4AD~7%F{|;2%c&>Y
zn{$qBH}*5|)!Sgu;*Zq)*Q@73^mt-AvVNdwH6IdwM7WkvcpSAKXXOj%8#5x^BIOlO
z;J7M@@HIULp~dwlyP#Eg<2kwS6<@Bxjl9~GdoV&>Iv1`C5%_OqI~M){V9s8@)GnOs
z;1FBcu*-MrLHt$tN%e}@kj`mF;nlbd>B^<5;$V@d6Yq}!JeS00+l$%Bo2lBzW7al?
z4qnS%URGr=FcTLxz?4ruSB%!q!9p1Br`wu(zcP{Ub+<Y0x&HDbbf(@9YqVix=vg{i
z%khe|%&6L>8A@`_yG5@+a?B&)%-JZ|caNGZBi<>>Dyw~~_n&N$8wgr`G3*njx5gqE
zeFs@P67#h7OoM}7_M^)K_epi?mr8ra4yw}Y4*7%pke&)jgCgY3Ifw4^;}<Ege-bN{
z?IN^i9dIm>RB;OOE-tn|>lV{)?{2-iXi``9GCF`YTJgf6vty25q@Q%vV!UK40^DZl
z!uT|IvK)B`Rt)Mp4y?#i#2P|4YPi2W5q)6%pf_-GmZlP^g>7g=YOM7C0jSg0_6tAQ
zh<+9UoeUCE^-^Y6JN}t47ZBdb_#}>6s)`_R1vEP$UUOB9)z4`3@yzMr*3wQ#s#zv}
zr;s-(cP=7kt7iFul3hlw&yp94W*1P~tL=RTMJ@6~0e1=vlbr>2zK&(W1M6H++e3&x
z+@|R&k;!bYnn$Ag6V9`RwZ4BJ7t~`tqr!5Uzs(r^^wv~jNMGnk`tr-ZlF(1oX^w5R
zezdRlEHB@rL5|a25XYeWlEcoksaN(F(bu|gzrJrbtT^GGBlWVopneJChoy_Af15i?
zi?-30wPUQczA8MFd!h6cjPG;Grf2}^)7-K|ki?nb_ND+n<;Qml;p~y0AMQQc*wnKh
z2yVTkQLnbkBkqEZDJ~UNdh)Pi9I>m#i`p()I&AtOADf-t&>XS2$E&}M30u@Y(*ocF
zEb%=NyMq$#GQR&6U3l%em?TC;FQiiQouZ;>P9eK{K+qLmKF|d<sn;B%*H|P~a~*8L
zU$-grEv;bhn8j;J^PV&l2<g>XX>ejGruAdhitpmbdHX8LXgzY0VAYDNquLr=T~))?
z*Ux_S@Bd3k3#z;jRg*Z{P(83j45E>Ek|6F!(2x<T8xOPxcVuKa0IyMT`{5GA?fa%9
zogGXse8tdKgmSYnVO}Q|CNyHu4No@>m8{ivrsfp*10S27J%tD}QMlK5K-1$liZl|1
z)D#x0omW>IB9^6ZHr%anF!)e6$(bxgS!1gll++Z8X^)Mw)}d?>PN<NvM;X6*6Cc+^
zJsSeMSF;%#Mq2J--^-ADh{$0mD)v>Erwp~~@!M;)mua^p*75t%MzgkGthr-iBh7E^
z(HSsq7>u>=g|-)gO#-x834W>cFx=SF*Fg5;hr_@`BN*{+^&)OByP{Dy7e@A{0IF9W
z#6j!WlWI%`tvaS1bUO%Pw`#2H%Tw>JJb&C5%1tyfHaCnbh*{XCLLT)de-J0Nq6@9H
z`H)OVOlznyNCK1!M%X~uGXj1HzmGe{hGIpE%1;H4jLexn@a`P;>WvKWnWa51c_7`q
z;}xh}5THaFYER+NxT7gFdtm;aH^(U(MhJNbt8*pvhqKlNNR`UUqdb@I)jOKJF?ZOm
zzwy)Xg0ENef^k|Hs-dGUVJ)IElp<o?VXhJfXBws#{jx)l_`L=(7$P82b;!X5XS&AI
z=7rle(l(I|vfj2S4(XUW5F!`|DndM)A+Pu*7@9!uqIYX+p=Dkrf$R&0b1KbImKK8<
z9yacM<@QNcP6ZME{zr;=2wZQ8>>Jk9Z_6?cn4?pEjZHw6xTI&+eXm;xa<$)lvty3<
zfOUM5bYUi!8qd>uUqU3$tvNO0?7*QI+aG$ik-<B#Ew-hTEml-k9dAp7He}?HRLZ45
zuLCY3E1zW`s8mV$p7O7Gq)&uI>BH6irGk~i!dVqYWSD=H+I17#BTBb>s^^^Zaiqk@
zm21(I4&(e-qvk@rnUep~EN}a<{{Jig=;1OoA7()R^>*O@sR0>mK&d#o-412AlsIQ?
zf@;xOnA*|}o)EPR@_u|y<tD2Z#_W?gSEsm?-TA=!u;2?x9QLCtR12nSVJo+vR~Bwi
zunJ(`+qWiJC-b~MZR_|uqZ_TVC3Uwc+nUI$qAL=&v&qC_NJ@`r`f!hWGO=rY6|h-T
ztckL`rjoN{<6MWk1VLidXi!9xsJ#Gjl{6@(!l6Uvz^43XBkat#h4zxd)>pWkZVN1C
z0BJ>mE@hLF2~N%7xYk%VB}4lWSM=_TEgBBz_8aQxtUz#ZcyLT0Bfkgb&LWX>Nxt@W
zcJ>@pv(gc0xUB+i@8#a&)9glAIaaKMnw7EFcxI{?JDZ5K6)&5BEqWcsrA=6-Y-gG0
z=tYmy$`v>D6k=s&`H>ojaWCCgL(zj}gYE;4Pt2?KLyO7-W=-s!fi}CkLi~^vcC!*L
z@s|$;g8b0m98$Eck(OA<vhLSHcavB2Bzwx{1@3SZWu}_?>&<>}$mCt?LhIa0LmYd~
zM5*hdRIV$pxRSAN{(^kjdEGHW2HQXUeTh0B67Uaa{*i#L`5~_js%YdtyFP=BEB-6P
zHKFh7!ZHsVmS4y;eYFsJ<PlTrsG;wn{XyQcE@B8(f=xZy^TSR&&+Ev}Md7Q9REpcx
zpvES&y$<g~+)*`4?e%weP0B@mjyDusY@K4gMiQwV-}YbTT--nO*}P^?x?=p!U8s`N
z(5@YITRy$~mjBSH!p_y_9i~Cl-?*oukp=uOqD@}zdAAWL5Tn3$`I^e*z4S_jJ;c&U
z@n(Icmy$g3y`_Ts>ieRNky#&BYHclQ-}4p}RDB-j_IBxer?;npSoRPh)k_>$FySO8
zr#QEh0v^Qq6-{z<AnKW$6o)2>J5Gj6Nd~t+>Gi&(xr@ftzp>bTB-hn?HGAGUqJt~@
zYq+FVWq3yY5LvY%#Fa<oGFEq%-n!e#&;jRbVbq8gtb?~EEPqR6+-xNFcO!dwsRL#i
zJx^%s3&UKd{AmxE#J(lOl+MaK-;+vOf5^BQ$F8~lW(=2`H@WAoZqbf^9V(<0?oRvg
zLgmWc7Lu2v|7I2YoZBW}Gf~JkO?S-Ft4E>2c+SYU^Pqh`f%FO*5Rt=!4H|p8JaAs6
z?ujSw&&;MtChu2U5uGhn*|m18a4t@x)fb73!e(tMQ(OAki_Kcc0|i@)CzZT(igA;g
z%>^-?a}gf3dM&;;OeZx^`|*39AURn%Y)mSdUDE1q;@wcj&uC6n28W=-wXmdjy(B)#
zTkgWIoSpdYn{r=~D0AmIWMwb)y?(IuwtDN9yGg}@5fc^g0N>x|)sSmPclwqLSjWt`
zeRI2q9yfs6PgL;Upftb5*K5*W*1zgYmloF6Y1ZsTCVXP^%bRSxyIfj!W4-LgK5BpC
z$!=1dcv1U%^kQ78e}XO8K98~y)uUU9@jfI5%C20NZX1$J5ZkzBZ^uF}<7zIdLBr#*
zt*yYrbI*@xN}@<4MUz~U=TBR7D1%@q=N=OAxl$%4B)O>h9Jy<cc~-=IjL)*sW@t*U
zVvSee%~I|L)wI_rWdePJJ2RKckByB=-$%ZEc{Eo-r6c=N{Ur0@MpUV!yZvkfU&Kho
zqara2t9`<yY{GclQTz>_Br3Te^hzd;Y74Akrf5pWSfxWaa5HeXmnlk#Z#=%$bgD<_
z%e{n|p@Z8IwG|?heyw+r%Ir!>K8O3KUbWT*RuVZjtn2W8qlbhGZ!LL_MUom&u4>8W
z=1Wu6g9(ROQg{1NvxSUP4LN?C&4lCw&r>>jq(Y=69PXpWbQ9L#6(Nr8nG~x8saE**
zCfizRig*4D_Daeu9;SEpmBqltXTN9V#<$*-Rr|8Q*HHoIN`2DLCK;N8rYt{}FR;wJ
zQ2p%_U7nX*$uQEPxG>La&9VoLqZ$j+I8Z)JubZj37guYu;citO7fcJupUh!wCBR#s
zOL<S#W5sNF&EKI{U)JAH5zH-HlP(OMlGUI4p{}~;9cE7;6<7^Jkh2y6Z58B1CS!wm
z=!3(fDqc2J===)+s#7X40dQs|{kFoKSv09_ZbgM&WPVX}ut8}n?4}*|7V3dwZR16!
zxAjLanV(93iElHc&6U#+*&XE_jnGyf4%y4_xLa=5R3obPJ4!Cz?GDv%akgl%wPGn&
z`xP}e4cS)vMY1Yc2cF~q9hFcE=Kn<!z_9}IVfr0qD^_JfP)L+hpT{XC|Blkn@g=iU
zNVsktf935Lx|JKI{qDL@bfhKy%b`<x<XpJNkGKBk06*g>vp-5<l;I7{cz35FiOfLB
z9MAWRiD7{y+RaTSITI?17tU@n%3>dBQBbscxhc%3`cbcrCFQ<ki%!eY**^gDD;w%^
zhiQJOv%XHvo}KM!IuQ;jj-x1ZG`1#TxkQ^SJ9YBT6pz-%s}Jq<){nT|nY~mLL>^9N
zzrfkbmjHFe7O+^=@e-;<e|D4x`^)-l=ClnvtkX_i&AC4Ql4I!&(Xe*JdF-y8EcBML
z3YvX)Rw693I0&&V;)vw&>fV18B-NaAnbgPT`UWzoZYCb2UOX4W=`vU8+sOEV>yyDR
zu9yrPm9d7jnha1}xw9>$Yx7JpaV@^C+Wl8i!EQ(`3nZGxs)H}ifS*g^edLn$CBy?d
zMzv?jp4YX1?M>tbnT$YpqA}!M%~MeZvY+B7R5&JEqiKhFRLq3dZN(?|`5^lnl=^$a
za_0}g*sbI|&0Z-uR<i%{BiPWkQ`2IYpHXN<Bg(I2tq0rHRX^xEhKaFx(HU4)clzGL
zq8=pAw8@dmL&b})K7~iE{k+Yg`EBb|_?sV$&LsaRX-6-V7M501?#1!R+`6Kl`JhPe
z4@aI$Be`F!874A}I|;NLm?La$@wpF{6ujFLvR!4Nv+3xcnh^W2#`pS+*;jYz<hUBE
zdX;*U$$sWHJZ3-29|H;Y&(@@rw(FfLHn^D7!lk|F9JX@6&0F+#>Pew()Az54PPgWp
zd477OW50WYLkIC7wRWFRW%OH<VWy%U+JfyBPc|bWZ8TsoD)~TxUMpJx6Z%1^t}`zv
zIGWz%is&zE`|?&kiD~7a9k=IP2BXcy1;ng8QhS5GQ27U7lZk?fFG^u-o0q@E;TNx8
z@&OJ~Bm>>$^EYOW?^R<0Q}~*r_fKhX&CSPg1&MTNpNr~QVN|QOwiaSb21!Q#ha_pV
z;dg!smD(|5!{SG2BHN`xjf|T=daoPf7Su}Ysz#0dvi_{v?8xmR*^Pxc6%Ny=H=21r
zAD)v=yq{#ACs5gu@Tkt+l4e|i$rMNQ$K>i^4inm^{m?L}N+dfV61ib3Cdkz)L+{<l
zh6{wOB0$LM%-m9ssq9j7U3yG`xPZG-xltfeB;T3J!$=Gx_jEAGs1kKV-TK>1*smBV
z*<2NgwIj2~ZKY7gY9NL+@`YJMZ)eczv`NB^riuStBn43^a^pE>cYkx=U|zJ0BT#I^
zzwDjs^CuZ}{hl!))rU5$FhlX;i|MaJFGu&PS2}iJ7iT3C-wx?cVe(gQaBs#w+HgEA
zPO5cq80vHURTI#<7JNF$O%%ut9?++fWBI#3vKyjF(hN`jNy=|BTTj;n5HR7NUMk0e
zru(h&{)xB@zORXgMk{?Q{jF}KS3SM?wRJAy9L0RWZ#>st*6};CZn+OsvUi!If<lMc
zu3$cDCKI0w>NQtOi_BWytz3iHf-|)*T-=_F9(0BU-TrC5;G;=m{X|*sQAA^PTGZ$i
zU#I5L<DXY3vRkNrz5Uc*itKMP%bcsreSWg~;cuCByVdmY@v{t_817agUahPM^foa1
zLH`GZLhxb+;-7@rYm=H(QbkP-|9rw*Peo64N2dLsr`q&WEH~3EfBz=)Kd23-BD$$E
zsQmuY>%UXG9Fu=(*Y$!<&gNP#_#W%UY^7vn5C0g`dVj;_EUkJ{$K%&+515fstuGo#
zT~fx$tmqXVqa*>Z4PF!B5hc>%D|F-T-D;UnA57^ECSxoSUR8=6CgE;R`sCHncHjDV
z8k^zEkFJEFvdQ&U!?TcV<3iIQjM1&$NR(2X-{lMAEx*lvi~Q+=&xKK%d))N)jAc_b
zs9WD<8_rf>e0Xxm`Qhqlnc7y>r_Ah{x{0;Xm$IiG&ON@{7R64P$MAw1%PnTfJT-DV
zgAKMM2sy_D&?yZEpS#Wa%*f0Eo$I|4v;+y&Eo2c(qB#GXCiaANiERfyQu|WNkf%$Y
zEge;=^wDcyx>_EkZ$2eyFEyRM$>vBfJ>y;CTX+F=y6YAZxOi!qUD7nypitoQHM@4w
z{!lz3a@|6bywiVKyreLvG}yk3+vp<(?rGEhb8DVEruJeV-&}X%Ea+h$o5fvKEpHpE
z(?!xvpV2nB#t+rkZ+pIfS;e+)sJS%_?d0srWSla=$?kX9`QNNnNQe76Xm8irNb|mD
zkn2d=u=RC(RmmodEz|QQE178qxo5N8lJ;5pDe{8fJO2;Bf!hoQn^)wNX6C*8u}B&9
z;skAEpRI_Dv0oeZo*WR1(w7j>&8>~rP4rRBtE+)<S>9l;wnHP0P(j;!oN71Se%l^m
zU!8*t@&I4|tcZ>RmR=lk!}S&2|7N4(4=ic9-}`+=|Gha{KfZnassBqXCyE`RD+@<{
zyrYJZ`C|R(kbIb^sCqUxyK@<0*GiLXn|$q5f$?lIXH{|FdSjwU-<RP#J!e&>9veM%
za3E__u=Z`<nX2hdFGW6L<8$|K(P|ttH00<#rDjxL%u{hU4{c=aVE738Il1UhW@$dg
zooIDPE0lHdF}_Z`*ihGHn=KBTdF}6V!R29UP6T7lJ#)3apv)hj>B%bw`lR5G9$uIt
zdgkt}0nQg*e$@hdFNMeRh>{A`OLBRNR`lj3g}81U5AJ<p_2%_6zFj>-By>PX>289F
zx>|0MO*LP=V~fLU>>q%tpI{$}(@zl$*hkxI8Zl<-iLY!Hq_!GrtIZdY0r>YR5tGl}
z?uOzgnpe`4tkEs1tEa*)AcTz~7`u8rCOEAFlA!y=>+S(sLDMFVASjb6-;720Lkebw
zrB<WZb#&h;U+eU;O@CX{1qUisjc;Q=)qwu(buNC`!GjHBiDsQS$q=5<T#@|5r32Q+
zCePmdxg&a$*SV?O;SzTci3)a>jGwa1!DN*3{Ssfc=xz8hr{B24kV=y!V-|{FZJoL-
z-t{EoEt5&{40Msl+|uSbTP#1V1Vnr}(FB1&ihO`&YJSmq)BT?F$%l@j0F|Qdx(k0c
zDqGor!JU22ot*`oIZRQDtl-B#=PywM@A1+fCI-{;vye-C=gpJ^1_mzZ$3>Sq#wLS&
zB?^_;X6ZuY_!cOMHaqTv6xw**4F5~yVZMatOZP@0+fX%8ZOvcF8nO6C8K7fy7c~=@
zk`LutrX4rca&67|#)08DN<P2MscYtMRnedM%f|gw|3T9ai}XGCIsd;klGe{!!`yF*
z-@f<{jm(?spMNGb%~XarW(|gg9*2%5ob|n1X>ug#Jf~Fc<hg%NLs?ej{c2uksrmt`
zsL(RPIE0W}(B%!!QK&GIKDG^HesR3U_f722wxf(i9<{F?ZOZ*}?rr1k19Al&@R7#y
z3j(2lzph7Vdb)crJ}9m-6QybZo-8HgmYy6-%D9YTx{R;~W4x2+5hljdrr5?!<KAK%
zXPlfw0>8$e4Iu%Ny`B?2F6nJ)qJ~0iuM9iffGxp30HJ}{v<^B@DD19);!40%&?z&M
zexZp#F;hey?%?C%L;FhkmpA`ww(xJY^2-7#NBX0@E_U0VmaRN%F5x2WooF&wQx9>c
ztd=4<WD?nmoV$1&c?J?KtR9LLbx~Fj@qDtB>G>QVn^3nJ2#Sr~J(C@2JxMqEGUx11
z!yrkMWu2O@rHTdm&QK6XaQK1e!@;P>yM$-<7aby=U4q3rSP>txD!hb?gc$_%5s|hW
zT_&^9yFBL+`#;LI+wbQ4wLZ70MC!6$QpLTV_@yK_G>~v94k162O`4`~C-++Q4RbM7
z>xbm^$B&f9A4BhDy_60*&He%<<dbzj)09?RVgEa6u}g;FsaVWlQ7XRJ@UVa5moGG(
z_diu>7XO(_`yTiEvA)Ot61#T~eEt{#NWlP9Kq?Roh#E-w04N_I3qV+2+rs@VEHta-
zU2N&#f{>h+x!Z2YADaL$g#>s`_z%GTX|c?aorLEHj<xlvC&vQC<T!k+5<SQ1q~`pY
zTq+9z-<MzTqOqZNx(|ln>zkrrDY4d2MHx@--YhjE&T0oG*{4LUe$uV7ou$+xc~&q8
zpKWDMEftc2y#N@MF|ht}%HE9$(8I47&txZb)eH@;45)gZrl)ecg$+W|d8ZCY(R5`s
za1@z2#-iv<KbSbiEo%m488o>965R2#LT@gsnI2_=<MSZ8`v}bLgIM?SS{8ukl~BRz
z(H5|WKgil^N5-&Y&>-azl``2oU%(9;D+Djqj%U(|%|2~Fcw3mR$!+ER?xxQS*{Z`O
zQ>v_a4G#|detv@gCJnQZh_Dzmp5?~5M8T?5-$B(H8u=vdZ<!F$_=KAvF{#oyD%t>U
zUIycNC-^u?Ue-mX=9&0>W*rAUhg^T2O$88heFw<Oqo(DnOa$N~$U^DvQ=&2^r~E9H
z7Z&r9U3Z@{#GSiITNBDSY(qLCf+_+B5Z2~S%Ivv{`{t8xS#x7w4uD!GU`U5yY?Ejy
zZCP9Vb5SD^APZXvgGc=-;n+b-j|v8NW;eJe;=qFZ{0_{`<a?dDa>X@4F6twUx@iv9
zhs=1m7Y?tGALF=cy-GW_<LvRAQPR#bkPF6mesI)#70sJnuL<W97A+M=eIWVKz=BQ6
zvOvwJG)kNpg6+ScoTm*iarVG!MDV~oQNU0kK^V%3S13(VR?svR^A-GpUxmF2EL^|3
zeED4uZ>1cpDa%YxV|0+<3J5YB)3~cfqpy4ts`?~@n-l5N{gE`~Qa<-#fU2%LG$8v4
zUQ9)MIdkm#;n4Parl^SYZJb(PYA9QxBCRYKHMAPQCS0<D7Xp9)M+5UiQb3k$In{xi
zGUlA84d(&EQ}ro`Nn7sG0X6RrjF6gxQt{Hu{Hy#EJeuHTG$b%p(9X?0of@bGO8+<p
z_PbAd4X@_tk4jPy9vr0^;U#5jgxuF{dx}JUwSLb0dFZXsy^t^v<R*amr#1@8$YQCp
z5Giqy8mOi(VX(}6*TvW^hpGc}pp%IY1qUfF(9SXs)R>a+X#EOEs(3R{9~V@GUv@Vd
zXt(GAV7(IEsp2P8d5h_)Ic>SnT<qbUZ2WH&D^fUq*3!C<f;<6zW=i;U9*_^$cxEaG
z8XaRUoGL|w3xgRtzgo4>URvS5B7c=xEAHLirm(B7WM--t+quLj8Y`Wnk<Y;R5Kd+~
zn)#$UXa&F{inRTb!HsGd2qG(a^B!BbBz<xMih;E`Kn8yR&@>Nj%edN4nf8TbvbWT}
zSrK~Y3+25(2>TGnBi3pLS#u20(?uV3mLe*sH+chxhNc*~i`7yvljX)%kuEmxA^t^+
z=4Fh^6ZV>{KT5rV^+pctKy)hDPehZYDo!)5tI3Q;Jrc`rKU8dDXk2t+>zqb(UxYlx
zYiUgA%6$*0oMp95RZ0-QcDA<!e;O@@J?vw$OQ_7+*#($y2taSMXk?8I0d-OhcbHF~
zzY#)c%|05OC0<kz>(;u=pISQ0x`!+#dH7ZEG&6I3St)i&V+|BJLZCS&uj=So^|cA*
zYug5e7kQ6W@wmPr@+xLB4=HLU4sZ`aTSIO-*gR8alOVa8k6cq)g#uFRF{FYN)>#X?
z3s+g16Pvw|UT)f2juk+lrW;wRkS35dKuHBE1RT@i2^aFIqt5Fg!7YbP<*FQ@x@wOg
zMK#=+B7NHmjN#d|=!rK|0%$2-3k90F5QyPy86&J_<!y#LR}LpTJx%jL3bR>Cob%x2
zF)~{SK)Ca4;xo<%Sw@%d)2+AACWENzz#h%KsC4)I`o*WS7Y7S37>;=>=QVUDrc((6
z9$wsmt_|u}1)&bgRA>~9oftf6g%n<Z%Jj+j#&VwW4@r6m6dp=JvxZ%4oi0xx#HJPt
zP|F~eikSwU2nj`}H?-jX01#Tpko1J0TWZjG8^5o12mqv#Ghru4si`#bneV;9;2imb
z`l8cdEdY!fGBwGMf6#~sNqJ?F4fC>OMxXtWbdZat#+xBB%L)Yy>zyN2#-Q^q|Bz1$
zC7+la4!xc16&t%DMiKEXTm{o`W}@PNBNKkCw884~*t`RTiwS5k0ahJ-?jo#h2(yR>
zWN87O^SxDHS|0@ZQVr9QPoU$dcK%1{ZFWy$-N{Zyx?lI4y(0*PDBk5mA$WWO>;>Hr
z!d65{45AgwZ*7?xQunn+N5_w~uJG*KxZ-g9&p1nV{V!z6NvfP9@nbh(U#Y1|-$<Ma
zCIHr;P%Ucuy^<P$g?<H}a0<=u;0<epQ-`EK`qltAs9jT-wBMre-N1I?r-=k3g%qYF
zSBCtgQM_+9xwisjEUbNp+tB){&gte|HX0vu0lxv^LNq|KDh~e$>TeyZN0k;x#m&j~
z{8+>@VPX|k&73F(Ys4$7FU2X}TgfmDY|1nWd0r&JX(E!ajggU0w*pWxK)lPi%bkQL
z#I&<tR}Q>X2cNe0S{l+_jEwaYx(Gzcv!>G&7Y49IMF!~T+CcoEHo_}6U@v8?sq}c_
z>g9xY0iXcv04m9v=>7nZOfyU456crTL$Rci6Quz=neAFC@}f?bEhrXP!DIxTLnc;e
zzy5CXrIY~U_GjswIzK*H0OEL+lQ4!dQKevulu=D$oqCFSI%k|v4ju@c0MI>?mIlz%
zQmx3_&62Irc1?hR0Wc5?=CDoqY+}kVshv3i$XaFXYs;$Dgk~hL>cLVzf>Of0_C>(p
zOL*vLYTW*G#aUe_CxejC4>c$n634-6rj}#kZtpf^jABf}_1HAAhbbx3R%bjN5`TVm
zg{hgyiUFrfClM3tF0&qTo`o2Rk<y6@wGyi|^dr<lLK{M$wZ1!Av9$>xvBK=o8#XL|
z-BcGeU>9iCXbms``p>*(%g{MuHWbb_5_@Z7FV+nG#~k3S9b$E&m)%PL007#=f-y;V
zq!y$GW7kYj6N<@(-`F#?iYI&;W}7hmHr{p5qhyPXjJs=5`Ba&{b{Ih>s}vnFk9nM|
z7HsiUEHp9uyqcD{I7`i<XZXGF07C?mu`U>(;tP2yQr3I};WemUbq2Q6oJ2Bdonb(K
z1|l;Cq=$b3y$!c>C^e>=r7LnqTg1kVb%KL&*^)RLBgBqU22e}UY_Qug(t(=7{OCQc
z?yyp3txu&59X?P0Tz6Tg=J(YA@Ye!g{!viZj5Z9Axr2a)#C7MkgJ>Jb@?x`EAA~b^
z01W||NrY3?4TIg9anufYB%rV<*V+ZI%}8m&0lrZld}k~r|NXS8+zdGr%yPfx){l`?
z@KaFJRRv^JbIqJx&Ct=dkNx|&X{I}|EzK#}hy;TgF{5|IzzKq-`GqP}*e6rg%eTL9
z9(cO}sHjhrPFK^{_`W9Ch#;uHDlM7(eE`AqH4$ple*iLh{i+J1k4mDC?!IXH6<VjI
zDB*71ug{<HzyEC>hRXfZFwSnFM+y9)<CO6Ccls6IqKwM#^98#SglMr;DqL>p8WXqX
zI0rSY>+dqUWCy<UYbS#*Mf-4pXquvR$l5Bn_F%!!U-P<ClT?oTVAK-wyybTMZc=fv
zv!S__4eG!;#Rg@qsxg5XNae^WJZ)yFuf(0VG9O2DICPvvg$@H+v=NF=IuE{hm>&U_
z)EwWrc1O{zQWf!H4I)bO*Gy@4s716EXaPQ+g$;5m4%;7-Dq`q`!qsW!FeZ)RQ~<iR
z91HGO16<x2{#uOyC?FQtOvmQH@drTU8^~QK;KS(<h%Y!o)Rxnw86A&j1VM|e?X_nV
zlu<6#uMk3EVvM-QAZnC4O-9F^IARU&y!jK`i@5vb*aLcRKF(?GU~cFFq~Z1oy!dL$
zH;?i-s3q}E;aX_RtQGbG&~V6V1Ja$;<CafF-+csL#Q=LI%PVwKjW{RkYv&{h1JIjF
z9RQ}-zPDVBr7Ch9Of=?vA1=l<tCfLR@uDonO)aq^Ldz*5^<Y*vQv$5f{gUC4uNIM>
z!5OyEJ-|aX8~yEC18?z#2KnOA+Oe-_o@>UES~EOe^GbTaW^NBB9&5FHG1*#g=tPqe
zAff6iJzn&5q<Io6D3v9SRQ|;vkrN<19yI+vYt7hy_mz{9Q$P*l<+)(ZE>)Y;?=s3Z
zX=9CdxOl3p=@<0w&ywk<YfW5LC>(Q@Lmr_7M_u2S^rKHp!7a-W^M(4JQGpCa!-D6k
zY0KgRK1fDsn(!}<%t1dS#Ioyy%oBr44h8&*u-cJP(DPK|CBERp+{SdcGA*^u;e&-n
zA@zJj-voQxoRe{bK&+9~e7CoPLcZ6edV%Z2&rY=@VQOQKFojf<E&#kb@3URANR@N|
zi33v&!qT5OQcYl9l1GfrFR|LeWj=LF3K=eb7!tJ`rym<iSOTLxDmWP$-MpgCs5OTx
zb2QX-(<XQ_JvH7Ag?mNN7)z}M;@!iXo_sX~fR%)vP&#Ss0QZyV^ppR_H|2~nWna(X
zpy{{4lX_;LuNhB3B`hC-0QWxtG7FJpvGX%N|Bt_(=ohZ91YiG6_`VB_vUzIZZ;4x@
zNA%m}>^ODsv=oP6xlV-=0If$gmIJhp0axmKcO;+1!w#<4BxT{bIh0!uZfkiV987pq
zY}zO3c(k<nlhnM;Q&<NPBZAE<Gk~%asJRk-#VNAdtDfs`!v+8vZNk{ak5L1I(9o2x
zS4F1cx#b$TbO^pI@qir%t#^iHB;@fChuD}2z_pUa498AHA;(X<@>u=&PG)nd(JrQ=
zfjV<I#M?Cyv_?pf#A`#3v}nO<+8o)aR?J9o)T^G*OLX)mp^E`Ga-1#}KB-s}5bu7b
zJdSBPZE(@5-sIHx!<*N_4f@r~9~UpYne+X8q;%!D@XX2Vzas(aE=E3Jx)VVV)h|Rm
zEib!~dirmNI}9pMAyJS1z4!b3qKB4)s)z0idp`pl&iPeWl@wm~d-m6%>dsdRrcKrV
z+;cNk(Zp)meeY}6{BL{(ap5cTB^0gS{z-;5+TS-VfObV&SFc$HIN9kJ397%qirUR_
z$3rUE;>*Vv6!Gm>eBAA8_&it4?UA0Fv_&AjX`YyuL#RYCnX)rNI%iqbfdF)A<JaMe
zVbL}jj#JIUNwG_d=KJyN%0JCw*7LkS-u@V9FI;C|;si<qU>albecE_njTT@OGv+)s
z62)Z5)>wX=s%-Pz7ue8}7}xF30`O<`1H^08ID5bnW{0~z*dM%hZ~y$bQ9)fzXAvYW
z<(4Vu#t)!^xy2FgUI_u#ON5u6XVKoZKJj3r=g8&7ur!NK+!8uZodB}NP+73T?!*I@
zjd#R^mcec2S;YBfDnKR}^!VgnS_`SaKWO@9_{S?;kV5Y7v3BL9J-V~Fd>Z^M-Hlv9
z_e|je8?p>hHQ#d7_a>O8r_EkZB`PI@&yA6{w|KWqn|V!FgCNH6&SP+Z96s*ATd1T4
zWl~7ly0(yCAYZni7PUg}PBkx5e{$+ui_GkcbI;dXwZl>Or9Bd&)Jy5hKPij(QVGF~
z*yD%^c2tNgj4?hl1<8vqog<g5*hF>XS^WB%K2K}q;=%D#VsG&sH$e7jf=6xB+rxfu
z`W-x3@Xg>}5UikVL~C965{{eM>wtBNUSpz$!8=b`i6xfyRfv8Lr_Mu0A^=f`W4UC$
zRhyB3Q7{P)Rj!MTb%L=Mj^VhJ78r-ESoiIIUhsJ7b?41i*puzOOaWu0G55Om6W}`P
z239bxtb$jV>Z`D6SJG&lo}xY-v&T;H!NmeOHC}o-yl-2gmZI<o7t{mpXyD<Q4QlD(
zr?t`sXBCf*f4K5`q*s-Ka}*z#){op&e8Q=981_9<Dmx(nM>Sk#L*w{Jo?nQyjLg!(
z^V%^D0u$DcNnuUQxRflsBadfH!*Ran(9u4-dqQ-ZTSv$HS~$^|hJ1AQD>WCV)^CKi
z+SR1<X3@}0BT>Q$H3K|?dw<mp&1L%1Ga#-Y_i6=${Rx(OTkBIkRpME>j$!O_Lir#L
zZLY-C5$<CFc$g#7l3rJVnr9d{$U+Z*9vV`sN@Y1nX4X%^*y322v{WjeycVEJ;}EjQ
z_HBp|rB1!2<`-w}w#WC`fHRxSjZFt;{gnNWn%e<M_&Q41>(+tg^0;f}=0ieT_?QuH
zl}+hFBJ5J-T`E;0j(-67&!oi`DW{ppNwUO7F!2FzxJW<}xAe_noqb|j9pYwMS$^H8
zj8;42Ridcu!xYh77eLS6q#C^dGB%$({QQs*dBOfm7QroE%RE34Kt;B(dShkW=}83d
z-#r&3%)<ZiyNXnnIu>2?A`2>*q+i5BBgsqXIN-m|r>v!>%yL8iObl8Vb4U{!>l9R1
zo2dteG{NA!1;SGt^j!XSm%;FEEg4xcz6@hy+EY-YO46xj$VjJHgNL?qRe?4LV5~4v
zetpy@uP15g@ioXp767ZQns%n1NT=4y)pO$LXOM=|R#4c}fp!t&FmnYD9zcN2+tNJ#
z^AGTV6diLM-IaPl08q<HXx7bTB3%pW*)f(3QG?e}W7ex~f2D<$Nu9T&PpSvN>((|c
zm-4_usq^bj2ZD1V+6o`I;xK?V!M&JYf-7p6DjsJmVO}Q0;jHKDmhE|ks4Hmkg7?E=
z2?VdlN1YC6hf68zroc7_wvucU&d!nL(~Md}^EGMU1kQ`uhW4>^a5w`e&dz}23$4*z
z@zm_0*=zT@WX{Y15`5^WNi4z^nKj=CNeAoRJ2M|^2dr+!pW^dCYJ*rsIWG*acT;tA
z?w98oaY~OfFeGryd1hl)FB8_=C&KfpLvqJ-98iT*n%J@35k}$a17eMORpR-8RYkzd
z`@D8nWk%Odeth<DE?T`NCUQ#1H8xJ1c1w1EXS_|)$o~F3H650p#_LO<{W&<)2(T0V
zHlCY70rOF=Tf%oST#Mh{^YV|{h60Z7Hqlq|gU)>B(AJR$ki#!s9Rz@VZ)DXTu^e^h
z;!Un|;%b0GMq*@u6@g4uB}B~1G=LfbMQPP;DJEum0$=O0b2m(gE^E2a1me9ei@fBN
z1ch7k@01f1ipbiq6mz1&Y>dLw2K=F1YbzPB%9@XEJe7dYh_$%_CgoRcFpMt-E>fZ7
zjr%XPL@KQ9i{WX_ykQUC8M3e6#}Bl%VJB)EqOsxvcnos|QkeJ2s;`}tPtVpxqTptM
z5@5L{ir#5Bg&P3wDN}VNr37m$J`+K7=82K*A^s{y9Jm1DR-NTi^-^A)UcvWsc4PDt
zZu&YRJNSpXRdU@N>$eh`Tcc#xIuFKs#@?Ayp^OdrN@i>QVV4d1bd29BjvtCUPA>!9
z{nc)o2K%yW3ib)`H@j2bnkyQ^IZ|qeFBGO)EZ4-yzv$6VE(T?14se&`PtCSw7g#ZX
z^z7n4j^tSy#wr4=_1xk5Zg+M_TTsQD57iL<*Ka?Lgm2vQ*|X-QR?9)dj3)LuH5%1-
z%zG~wbFJ{u*scf;drbaV{qxnZ+gU5H#RBY60IP);z6cRMV?J%6H1H#dve;2yhm~*r
zgG5nP+UOCuY+P$|xcGFYPz@0O0?e{AEJqMpM7Hvq@>6-Z13Ku1njy%!_!i&Ry3gFh
zk`c0beNbx-aO!-1_c&M2a9AK>e^EwW4}=0OW3+7xiAf^0?n7^NVQh)IB6Uz<Be*9#
z>H51N2ED*y8E#`EcRok^V0jllw!+L<&>;Hg+iy!~pLp;Bz)3@CH}~iKGK#4QjFvd1
z=j2=sW_@<W#u&FGD51OlGt)Nch6u|WAia}V<M?{F6gxxu4mMQ(<sAE_4ql4GD}I4d
z#Xp8g8__-LWZ*q)F`x^2YRQ49?3Zk26r<1A%ZU{~H8j5Vz>S`2qGp_FT2GpmM%6e4
z?Io}y{-S~g`grC~4M*|wQP<oT%bvWRG@A3R;r(a1%`2~wS?33H!g)B)<shzDWU?&@
z3C>>=n=aMmA7>mTVu6BaD$6H9)P<EUz{!-HFn82iEb)2#=PO+2rLSMx$~$$m54!yG
z)aZ|&|6z`=N0hi6@|nf_MEk7w@&vqpB&Zm5b$0hyHF@S=iAsw%Onlz`#g$+0rG5KT
z#;>omc>a8$d2dFg<lFaz2fu{nGo`sKPsOeU_3b=Ratte!?lIxqu1X8G)ayc)Z4noO
zrX=rj-7O62F;UsBDhjqV=|Wa*5to9d{3!HWVgHr{ZgtLi9(uczyC9PPVIi-tUujj+
z-wy0g;x7XhEB~i%O?e8gTlipiCZ~E;0JS`E!AMV<y&d<r1LnH7ZINX0zxQ$fzUE5V
z(L5udb4n%J%OdgAm)p|cq!rRCV-y|ggsPQdPj^4R=nl!(N`!8hDnKiR6Cd$}u+@oh
z)R|uBSVX<z>MLW}o(F1!R*t_r2D`?wfD_QduoPX9|3XA<@xMy>E4OOMe<{<yZcP0C
z0$Fxrj`?zh2D`3s)cT4kNDq*;tOYnAB3BCK2@<TdvQFXvd+l5yYB#B@Cg!{&RxMK5
z2UGz!SJQWnP+J^L#@f4}o={QqG$nosC9Y@LVuo2Fx&-Piq!IvV(OtDylp2iuZyk~Y
zyZS4{_}LAo6Ivg9{GA)CnBl2;?0^>bznxi8DwSuAwOsyV--K+f9sTQdx&%sQSt5G(
zf0o5__x%gSOK?dX5kE)i0o*t)`gq|aivBIXv#t<KOr8iT9<-x^(_cKp{i0YQ5!yp8
zv?5n%u1WEAim_CE_Ocq}od1GPVz|4ZkAx<OP{T$6V{}<Q7ZALMLi)sfQbZb6;_7|E
z9{}PUiftPDMC)f`C;-A`a8?e`+$dyEVplmy@C10<=)m9?#He`58F$RPKFx?|@njl$
zF#0XM^hCfSc(gRIWPslpEBCW?53+e6o$1r+k>ne>JZjhae|4)K-li1Utywz?PsM=)
zK$=ON%sTA3`X6G|=4v{Sthr3k4_fs~&6z93<(uL!2Zwe!mE&>uudjNs?l?ljey06a
zNJk$hzx8H$N=sT6OI}ey#s-gGj2hA&8YD^zeYI_13iA+4v@@}O#;=u3WkoA#W~JX>
z_yk<)Mp0c0fF*)+#76^1H??j1n}?rd#vH!)ecp_I(|-Ke@96&0gP7`)Z)Rscm0WqH
z`CmVscf<W^2&D_sclg8crwg^B@fQ(5H_*sV3vnsdJVV1KS$6$+E&hM;_9pO9z5n9)
znK8p)F!r(4U}%gbdy;C5ZEP7rNHvyZt1K;&G8nQq_N_96tc6sRvM<?*(rPWzVyh78
ze^8&6`@P@a{oUWa|C#eT=RC`MdEV#!?C<A!B3L!4{gqM}IyC8FZuAZ64u$C4FH9_v
zLTM$EUUzuk3GPwKb<9dAf{Le}*3#F6dL9o+v?D7iIz(N3f0d<UfB>t!W(l99C@bPL
zV@fYNVu+TZxpHq=Qx&nWDFQK-{($6wVJ40Webr8T(TcLUt?SrB)WUe@LH4qA-0F+$
z2LxJOT6UW~KXTI?IX<@Ea+L&u7{f<5-&kuL+&KdBZd0NT7^8p>HtzVxwa{dx2mx-D
z$o+9D`B1%{Gil2vK?NFPn_kXvv8biNS&f2wASiELVvq?$$>_q5?(XjEW&~%%GnA;M
zs|WCj-9g0~++ytRKwUw9s0aiLJ2qIcsZ-wspx7UEU`@Y*;c*O#;h;2)cYcU-X{vkM
zwabkT6qGR8On=#ry6^GipU&<NRfoD>QdY)0MlyA>Fqg199s&4V)rECv<5)K<d=-<8
zpA^cvlspJwkzFiH4{H-Z5EXir?6Kwdw(24W<RV9&`u8AU>Q^tN+7;fiZabJePAIwJ
zEpXv$?ufAN09}tix~@;CQmnCK?z*aC+s*w1S0YVZ&^7F+*I?Q^l*eW)tb79FWUj+O
zz_X<hhsZ%mJFj^k^0}0p41uwKZBSxRMKBOr2s5YK6`jwh23@~6h_WHA<RB1D<m2zC
zR10YH2C8nX?lySv-uULR?#7S7fTPJ1!?OY8Na^<3p}Dq?=T8L%R8nEzq$IYD*gix<
zteE-Yl1*F3O|me+w$P&qn=ys)+)^S&M{eractY>-+KaPd>#}T!>Qhv4y&x*LDB;0@
zkb9#}sqm)2&tjd@rOWwIZ=1FlE!A;i1f7w6jbtVk6RQ7Qt-;LG_0fslG|Ay2lVW#D
zgziH&;S1(VW>=_Aibij9hr7iWMQfQ+N1Lk7+?c%!Zl0~P-&;c&*%-+~6{)3;a-FWu
z&PT?^w-h#xa8j`Hu3V#<9i^~>a4)Gm8Q#`yyxk@eW{B-|$;vMxnmNp|LJ_rqWyQ!i
zM@Kyy##5-DO{H$Xw%&;(FJ?|!!{>Sm@Eth2-js1G;pr1rjEup{(W9w5^QcOK%xHB-
zz>CTXi6`(k^GWJaxm&S{t{yaG$_Z0`snGNhLjLvTkuaPW?769+u5x{8rqN|<U1V@c
zNnLqEDVjmBSE82Af4g_g{`936B+GE!c|}y4gl;K3&VIxv;C8x4aBLntgz^E&IqGj2
z-@WKPG&dtuP_3ZrDYxg)!F1v?xYc`h(dwOyZGeR~WEdW$cqQqxh$@wkZKJMeTbFvq
zUl1VMXdLgU!WR)Pyx^WIoxyU>Q0=K%x0$^vv@gku`Ke0Shsw}>D|V7xcYcWwR1403
zP?^XpEy{P-rXdH`qf3z{q>2|ac!fP-!-)id;=oRHr^q$D61DCdR-uzB1dv8)w~V-R
z<cQ9(*Cv%8OqjoSA%^ZH;P8|R+}5{LJ~g&lyjs}#l7nj6;%JsG(e2}Op1Ak^=Pz!Q
zxv>rLESGaK1gtbCxSQ3t5yEp5QP6}iaJQ&1a7U4Yk|#T$LbRtrO&*hp4B)gZ3z3Qm
zl2OYBC#x)V=B|WU!h^jFFA0S)VH;Z2a9D58i#F8&{Y})VPzlQRrekuZALJo*{A6UY
z2|9#aOLAQhb9(ajqy#YpK&5_qQJTcZY~V_El`u)FYTOr9SQSie;PH63qQ2hS=pNx<
zR~Jf)gj9NG@Z}%7(B-VEJEhOn>=Pr7&_LBC7wYlrY!2mngKE4S6Mkn)LojOv%1kh%
zN}~QlkU=y{C(-T-21R0FBXlua(-9XmztV1?@bOrv&NiYzNIER)6HO!DK3K)m$}73H
zN0rMP|FDERO`Aqp$uT~uH={K|3c<iQT1W>3#*<0J9PX3k*R?7g@}F52mci!tc`GW7
z{Jz>x-O7^V{`-?HWGWkUHaJKZLKrY*NR$#?ZK<WEjV@Bi_eK(4s2KKg@<3u;oe);<
ziZtIijU=bcT#CGrD}@~vx_p8oH?lhI+^4>_fz96mchS4s6L<0}bTauYCYPOAeR)S=
zN7u0(uMCZQvNPafW7&d!X{Ssz^RnLSU&~C_61S3Fyk*_EH}*S_66z>PaukI|LBba7
zFjG=ZF2(&eQpX>thmIT;B?qN5Q9M<s9ADT<4H?%%y{vQyTPp*zm|}K{Yggc|L$B@b
z81D5kF{^mBo4cfqaiIcpPx4v;@6iC$TeIp<8Z~g>LBy@UX${iDTQyeWFt>u;XCCSK
zl$oKqRl7^USLXdz2w7sm+{{oZs==$HHzIC7kbbsE6&M%&%(Upa-s#D#7cRxAwiyf`
zD4+!6=O&7u`+oDy=*?ncK6)sk`aH(#%0mb;GL0KNY4-<lf$anabI69=b)noyGzn{1
zAWd{k6WS&L58U-UMQmalN|Gvos6T*|Op%OK@AdBe!n^rIrF4~pnV|<B@lC!Zu)RLk
zi*Xj-?x9E6e-Z(u%IQwIA-4!f&LRL|8=W3ezDs6W$OCn`9a~+l^P^0Mqf%QF-?>xC
zUN+_mOLg)MOCcMT;i$~(;94M~`wdh=yaeLyU;2m&jO^JBW|x#7y}HbLU`r2*5WE$B
z8yh59XzM5v-t33Ho;hOn{y_AtZ_8`N%}`Nb`%=E64GU8@4P9#+Z&t8+{GV1(;N9-6
zz8u%8z?r~xkfq~XY1O-2W|lG<-u!o7lM}3+&(8d8h8&t+>yRE@TY&o;&vV$-ror|@
zLttO;Oy}1-D>XyY_jukvzqwlS9oV|CF=D-Y-0<7lP?dNGCA$$OZ7$o(i}D<&iV-2z
z+fN2q!`xjt46I@EZZH{h4xLo0lD}02Jn0PS>*@OkTpI9cPWAo$Bu503oki*BaF9=#
zAI>%;cgKuZr(o#t3#iYq2cK$)2+ur>nj^$;6KLh$39T(7OWAnj^MsLugR(_OmY`n8
zg&#ALOBy!0aL5O9@$o;VN?gFI)qUH4%wB&CYsam4k$HSEBVqKISwz(?>0htnnoPR1
z1kMD5k_A=&A>aS?hu6Tp88lgHXE<xd$hIwwFEV+30!$yy{`q>uqE`qADeirDu5;6!
z7yrADW+XWum&ff}7{MnX@wasT5tO+KbxJb0%k}evHy8JR{9k?mrc`vT&YX-A0m)#a
zOE7d_M+Jq#<C;sx038NWp`$*-94daa(iw=M=z80psq#G}im9_Hp~V?N-A#{u*y;%p
zK)6MpoC`(}bCnnvBI5myW||-wNpo;xp~j_hvLtTju;_X1AdRqOpM_i(H`bpCp9$Sl
z%R}ciW>}o&Ijdq5L*`@IPQ7h8Twg1vq|0CntAOm4+im?kWw_B%2_3C3$sPV*c!^d0
zuf|-%CQ~2xUqSjKj@0hj=RTu%r<f_xQu5ycQV<k|Kw$_6t#Vqm`FPC=RKF(tkKE#r
zJuR-JXlv|zFZ$vDF_euDN6yl|Y)or4R82o;c&-0`;&xmL6)mN?3y`FE3$GTgQ2+@E
zkAbUb;c~D?Q>MFe{s(Tx359*Un^XQ9owYx^c73xQTVq9z*`Gpw2Z|gY)>hZO1dRm%
zj&}&S@^Jq9ht~Z?y*|-dI>sn#YvU$nz5(W1I~^SlbBU+@R+M2&zqjYv@-?G{xm`~J
zPX`Nv;c9A}*VV$@=()AH?$%>Pw|j7&{Hur7%KRm8La|ExuJUzHPea2}59Ztw{YZ<P
zsffaftv!BGM*5}>*tntG4ttV=vC>-`y<+4uOj!q>m&zP<g9S2<;4snmnNhr}zs=JK
zWpzTwXW!W=J~-+g+H<FORH(RYx+E(Jf23HBo<k@sg6(39yGxb`&G){L@Du{bAa(2B
z!4C>4y+8y<-qqF;ZX^q^4kSy^1LN}fETPod9|OM=?>J~I%FohSr4D*GFEx6;p<<w|
zg#9{W?<8(E2RR^bRen5@lP&0^Qv3Ne8qk)8&ooHr`Cry^7L(n1yWlZeR{rDw!w)M}
z>cQTYgxbpO$gZx)oI$)>$~I!jxExtbZPGrGbX2T94dZl-EpjJ;3)(KK%gJtf=4zBB
zuCBNsi5jg+bhQ$`IP|jy{rOc+*E+T_Fo2ZkDDI0jG>vHU$lRk`q~1wTWq#@Il?nY)
zX8vF#cSW;`!GwMoMD)Z*KNAL5DS&LTL@Dz>T4Cn-Osg^F&|`D9Mea^ntKc7iy<G*;
zb!s`ABp=5a^JI-;gsUnPZF`Cfx*+$IxF5YgFK>s01GNn2jIMl@N1%0fSyWwwzB(S<
zD=GC3X_(lujk>+<v1&$bKBO4%D{7Nq>~Xgzoz{z0OS|J74pjv{MyW}`PzL~N5MS7;
zqxl(}<AHt9!AlT$7HGKpRJsgE*nXU*Yb)n*$fg7R086Y5vJwat*J&*#B0v559!0y|
zshq5=qc?C$n0J2S!rBmv_*l_`uiB{ls6)nMwtkn(5=)LKq*^`zX1h?;5o9(rn*1Oo
zMAbOXY9vdQTQI3MZaWnqba>cWw?XcE!gTnpOBWdpG7tj43@kTyQ!6x=MeQJJZZ84W
zP$G3_e{92;D@y6u?F!s}sLfODE+!md5UXlR9V6VCUK=f0{RXyFnFAY-3Sz7{{52b{
zQ(aujuZ@&B56e3Oia`qIGN*D8DrXH$P9J#6JWSum#$Su8qc$hVn;Jm$HH`Wq(^_}%
z)54=4aogr|^zlszc=Myt%mlQXj=%qz`#oV;PX6JY@q2^-bzY9GW?Xp`STEdiGZPa+
z$|(&)cP0wp8#vrbi;AE$Qhq)LNv$F34gknFA-L`d#vlp6x?3?kR2L0$-vID9#YK+6
zI-?A>V)m%UU5~77-s>pJK?u)M(WEhJL()0&$3!lIuQV@#R~{nYn)S>9)8z0n!cRW1
z-dXeh(A8gRGO28&TLiG$ZnYDVoW2|18F#&KZ^TJBLtCCs5~iNjwwszGlyFkx_uzy@
zlx@^lba@caDS;f_+$doux&$fJdH5gz3xX8_IjYR&*XP9VVtRA-h%$D~avL?F*#h#o
z5!nuu$}({Rl_b4sq#DSr&WP~M;mx@;(2f^~EE3&Yg|;}>a~i_Y*o)8%CK=u4Rkh+)
zCGsK}{+p*a+H9FrHlaJH2J&-<P&Y@0bvWT;5Gqh$DgaxJD5SFy-&)LY(Q>9O8L|hs
z`vf0-d_1lUe@}qZv!r*0xl~Yyjn!fp>C4wFh<uP(YP$t<E_yRh_GRi_F_TliogRUR
zro+m)G+w5lGA5?@9o~ul`O)}sxbG+Gcfh|Gvd3ZN;Lk=SrF#*vk1nkT8Rj%k6)lyR
zJ2zVF@;K+lUJa`{Oj1D$Si-)C+7OuZ<s6FRb+;T9QgPQd7F0k&Mee$n5b${_IUKWb
z_CcsvW)8j<i6fhZP^c|dkjkmZU|m(!QFpE!_Yc!@;;+N=PvE~$Zz~q-9_|4$lr48>
zW|5rxFi-gG>|pVZFmbv8)FT@+ZS|3PG@L;O%4kS#2Z{Vr9)~I;{H5UJI5rWP06pV8
zl&2Dvg2U5N0ahn+hCoqmuuYZCwz1&~?$AS&6Btc`foAD3ov9?*_$q7NesS4=7fS7(
z0}G12!#?7yy6N#Fw*nzNMGG7KrKQY>ct=Z-;@DW+9TJz0xEd0NhXmn62MUkFXDNK_
z&qfe&Er%Zp+V})K61?_UhF3URtN7s-mq?~L%`NaFYEFvG0>orCT(6Z{n$fV0(9|LT
zlsUt2cg*=^i-V-7G_eL|dP9OR-3I5zW%;71jxEb{dv;33v8X*t#FA~+ZrTzwjRdv_
zF;r0nj6~Lcp+kF2PB^hj6(zep=rM#`ChA3*18M>i3BF{#$jHwzbrC0ITnc2*>^`?X
zmvm+ky2J9*9j8apt&^k_>WNPH$9R)%1&5j{g#CqQ3T(8Y%F@{fcd7H^lh7#)p5&rI
zR+BBNJLGASOD`d@5f)Kfwx9F}$2`Pn^p0&M3G)#Hy5p)N4322^rOX6L4!Wl^iuOH5
z9A4BDxxP&U<KYm&)S1ou&Ak$S=ECgHnJ%%A-NWR%M=E-Ce&lU_N@=|q1IE^w!E!HA
zGIg)uQT`?xN|=VxYkS@))fI1E@}+XPCwcog1sayAsB2Y_BcxCdc94Uh`7?f&QShUi
ziX{qCnK2jqM6YU29)Ad7hdPy9y01QYLwK+Grc8T*P(nj~h>pC_Yi2Q`GF7><^7=Cb
z9M*H#l*P5xgKdz_iY<=kx=WTCmUQp}n<+QS!I$I-f2&#fmUB8HmLdpRaQ5SkPcXee
z+fPcfKlWl(6BN>Qe<_7nF-$*u{>Da?ADL>9?a0<lwT?qIhlU`vyD%b&=5kWaceuZq
zy><O8dcQliJ)YyTQwW3EhBn~ul8@!aLGoagUvDrk81R-_7zqQOl)eZX0-nzvK?xs(
z#28|3hCfsh+1(p@g!ih@xqz1p6tG8P`|<b+Lw#uIUXB4<=ncn+L$5bXN_GPfe1P(2
zAC(Y-orU{n0_MVpp6;gGi&q43J^jznMl4C^fda2<CXM3q)sjkhT2*dRBQE&Dh!voa
z(>6MD!|Ikc<Bh9D8HQ$dut^mIFbjL2<>=xlnj#zC;vG!(QK4y`=k<7RhA*yJ^HMHn
zY^X4la?q(g?GDR_Q%6|1ulIOEF;iH4umyCIt1IqGa5f^?no<l2XHbfoF3UeIj<;Um
zQ>-Jry}Ycmorw@(Q;Q%+q2ll}1$H8)d534^?df&>iKy(Ian_LLuo-axCg8B8X7cx%
z2s&BnrqA6edG!qNUU01<qSFkBoY#j*-Fo#n@oXKPOY+{vi9B7-#z9*w-JFG7!eP3_
zmH<rEy}<m{LrgvaVR@G%tBU?`V1jdezFU(EtEdZ{Obgq)H^=n=ca;mX099Lklc<`_
zad*PUNYp(RZt?5;QV4B@F;j9lkJOKsl$#2>r0Me6O<N0i_{*iOTpEG+TFXeHN<AQV
znGU3DhpQoBVHdq0W88O{yP|<S`4&~Uj&`9xVqd%f0+X6-s5sJ^?IX>SwYg}c(pix$
zP~%ZSgl>Hp=Igwvhe}JZ0EZsh<6(JTt!NB~d5Hrb@!4&fHVtFpOG7O_M4+*?w@Pe-
z5JlW^h7j@qVJ!C>b%xg8FQvGtfRXB;pM58(RFUYQ-~8^)<aADU9LqjS6!spP9F1^u
zD23Io?q8o)nV$hx_RCN?dD05sz1xPn&j+OFP*nDfKFzn<epJf!1WBZ6TY|7o2>Q0z
z{_R%R^H|DB@$(nNKvOcRIRRjKjQw)-8#r@kAI#*~Q+HxdFS5Q&$6f!DU@d<-kXQ+&
zjHAR8iP`GKv0jQTqDO_9QeaBPZ2}+tbnS3eqVHJWN<Edv^eBX>v|co|%rbJ8_S4>b
zb<<UGew~8*65n`u?IW^D{Jy~`0!0>qGKTPbPqPDW6v|L8j{byZF)H>FF_Y}CONuBX
zXtP(7&z^K<5?&g5Y#~gB5Rlu6NlGa&rp;H^#+aACyr_IH1P+WeB`jPLRxphC5=7hq
zlR(0Zfs5784}qg$1Ol_(#Z?plAlSJE)<#H%R8~t;w)_|%$?Oxspu#Ejjt{#!BzN!~
z-g)inl`GlnqhR83#!$@sp=*DU*_cy*6F5*l{$oykeuX;pb54B_L>{$eVR_BytOM+Z
z9R6vEF|h=x`C+6rx;qEai1t7o?eh5YPHp*Q`nS8C=U=+i9J_hwj_r--#ZNvw=9bOr
z5#TU+a;(qej+@%^iu4c9Oiz7~zIQ6&z&*q3FLVAU0_ZevYCYQG4hIAIRjA~7@#7DV
zJx;w-yLU4E<=xI>FJ0~&ySe|4Ef^qqi-LnfZ~o6w{yPyd)r&Jb$r79=R5l3yOHOQz
zx*j3g)zqp~{`VLOtv|>I1ulTb5$9#~RQLWjF9`Ds#C4ZQS8&nkf9nF&wGayb5AaMj
zV9j~^b<?QnxHgVt`}Ezm%#K%qDrZ(YC+2^9Mb<MDxG5LD%_Zi_7+L&r!?L3eNJ(+B
zekA}@M#j*a<AG`SS6vpC{(MC=xx&KB%@+Ow2A$zpLZp8h&023ea?ssnbtz-{&GG59
zng@TrCM6>JICI{9>-&TD8aBL5ZI#fzh1+1>UIO!WdjgeE$H|0X<8OQn?D_1~6T1!S
zM;Jyh=q<D$?Q9QrU^=SEkzsyG;~VV0`8SmK7hdW5sLlyg3_9V=5qfXB%_x%Rb<ZtX
z7*!glO*NvY5h5GB`x_2RwaB<7?h`ubbwD>=Z?Kt-Q|PVn?r|uF1Ck?|-N&P6ht1Np
zU=L(jo8&v+{q?qe=}q1K9z5LCRg%vxx<kEIN}OCP#qW)zk$UdV^qq*cOB7G4m3Sx!
z++k_Vj&O#-_?X`~Ebz8LZ=nlpitVcg^&A{M?b;qtbr>YJ#(shFs+MsQa2%k&rq0E(
zl@05sYop%PgNJLS3fMV%W~bI0A56Y6yU{PGxe?4?#51P{O~uQ?%l3rr<>t?Usu%^I
z4x5ABB$&Ryuj1LDgqK(=l*F_z4Pg(!Mm6;9fp408js>CI)tniAE=q`PT&nU4n0cDz
z$$h^jWV_dfGc+jMti`BlF67ACjMO85ggy;WWIf3XOV3HO)npqJIT(;66$k5$q)N%F
zUko`8eS`Axd@GTi%tvuOjx)@A3-s_rrn)-7k4bdG3HeY`<1TuGti+kx1{fy6Mp0@>
z*MU+PVSB(Lum6G_%yuAG>P)<Y!ltJ@RMv3(4g!F%`Ay7a^&hZQ!drMEe`vZnuYHsc
zamR|rWgZ@@q|XP1j2SLTg7n+h6(`Yj0P@;TES96_CBU%<3gzP(moOwUL$22rZ(?u<
zpvb@ziZwJPzM_<XX+4&=FQRBiq_$X>=xuZTXihrEpq*d_D@_BUU~)42y%pb=E7$$~
z({4X-dA5|{@kSWNg!Q2BE?*zlzyB?OM*!7ifn?9`(`<@kj*`1nAcQ&w)R{EU!L_<-
z9VZ6v>=4LF>M(8Gd=PQr7^}#xe4zNi&7i_JddIHf%1J>0Ac-;&hNb2wq7{W9^a7WZ
zZ@N?=975Mz=xMZpWB#>@&%TfPJ8#XaKj~1H(QUk9Huq1%Xjfn@#@bYy#r4DpRGi=6
z3d-HZh`ThoZ=`&Dm|QZ0a!xJ0E@LA>kwK!YAsp^7jjUKhdCNLy4qYxQIu52AiPuOV
z*BzVdJByU*Mc7z);VVk}Ue{R^M`*CeYn1i?6rxBNRBy|R&$0JI_N&@Fyy$wA)WM#@
z>BU;jya_nNA*QS0gS<qgPO{9bS8VS=YwCSU727jd_qSee%ZzPL-rd2&vuUe-6WQW}
z8?2EHl1hEMPw|1%E$4DurIa)w4korprX9lU5nE#g9E0{qY;&RKpUoi(#YZ!Rpk>XK
z)jU3S9F}tsZoBU&hcqVy<HBf|BU0r{A;PkF&R{{)1m~#paa?f_I_oiWUm|@N7Vimo
z5uaVq`6%8_XQKN|nK+|D2wg@|JuMQ_<r$2Is9q$YmKBRpHo4HZ`Gweb;P86K=<K4;
zk;M0j%k^xjH(I&FVUeYpGtS&svnnb|nW9gqK$Q(~3Nq(pN{V<DbefS<eKOGeySZN0
z<@Dx?{6Su&=5Xb=dn)^|g~#5!XAcfYn^b+25p>ExtT8B<8a#3s4wRij5_AR1e560+
zl0v+NW!_rraVFP)2TmvvU2=r@1wwBP5g@K|ndYV_XlM>zh3=gV#}F}SA?7S5WlSb)
z=>Zbsjt=D*WM#!Pwep{kt~GI;+4PDI=gU<XS==gR0`0kPXkPegM@5#gg&C!q_f$`u
zL~PINR!HmilhT|nVuaKRwq`&-viu>BQqF@+R*a}aTWWi}c4o^ztr)OC<+!26ti(Br
zdzqQ4INk#Z=W(w}GOw_80=u-e&UvL8sL~l6zAS4Nt7e1dsSN`6T*F>E0%zkcL29yw
z@$4zVAf)7(uCh(GF`_R&;?MGTvn?&=yd#(1-k(P?P=XYov1&@^Lx^rDrDdb#!>HPe
z+qrLaP0|NHp{=~sQ^Q~5_l<fc3@x5pGeG`w9<%6bc=Y7B8-Qwt%Ib;9rPL#3U5=?%
z!HH8nd!Nia^{I<fX@-ESdz;<@<*IJf?Qp!0L>MZVld5}5K<}^>3&r(aRqqxadBUzq
z%8W#Kya~oq@%7+4+Xm4LCHDqbUJC#k$3cCs7Z-jmud33NA3$|sXZO|Zpz~-DKAU(!
zUkS#)Bbj5uxwXXm^yCP5$;hbJWJP%d)B+-r6J)(iu<nd_p%ZN_Bm&dh8gwEV|9XT~
z90m<3R#kYW%+y!*EqQ(RdwLTz%T28CrSQ!QH+2%l2w!)SsSxg1$^q-J)0+X&?e{J<
zeO5`{OqG1iZRxC7her|gj<O|}Go|e!U3*+wD%qrv5B1_}(X96l6cNvIv2b+IrZXfS
zEbv>&Y$1A;Ho3ME#8tG*BOBQxW$_&8uY1L<T%Y2J(F0PS2@n!I#CoTA;~)vcW}S5#
zKF9<^KycfVrngej7EX|}#O?-RpDjL61B9Q6Lo=C&57rJ%xou>tiHhu}_xL@8z){(^
zPGe;B0w5HYB57~M@d~<2I1ri+>9VxOCc(qaB?ybI&2y8=Q9TKV-26$fzB*xtI1Xkm
zNzw^cp7N8WzKU5;T>%G{J7fP0_y&L`2~VzYH*?&ALq~brm@oF+0aeMw<wK?z*#6!q
zNmlmA#VMPhQiRdxWH-@y)Aglr!|x+y;v^S6tDK~Z3Wq@hk(gm|xex&yr&4-b(stCT
zty!g5Duzj1=ZTlkl`pA<8Uq6QsrWoL2$1iPB&-p^zy!O#NFx;0may^Bv!uwQ?$)PF
z-eg%f2yd-Gn8{2SM-i<B!j4ubvV?FGP0KW-lv>~>Jlo7$<tN!jdYm^Qt#{RlXyQ-0
z!maq~988LxM7?0nx}skezYs%VK!M43U>Jc4FT*mPS!?^dU*7K&$*tsb*}$T5hmwu-
zWHyx4k9r%VqS(mKaVe~HrWW3hyV$6i=b(xMHU)2D8MjEfw%Xw^p`AtObTIVTD{^{s
z%tqPNGVm1Y1z<nhNvl!ev!i;37gX7~#Bs`@un{g~ZAhY3g7lu!t41|-EWhVvpg<cC
z4tL@`V#^j8Tz?q1XY{F0VBkiBrFl_w6I15y2U4=*j~sQ@M0(gf!Il(uHWjt$rdZf>
z=3>QtCT`ZDH-`}ivBI|)IasQF$iPjt7`!+vQO;<;Bg8~4%NZ$?Dfe*ec&EFGtP(>;
zeTyo!gm%ras=%uEi62CS5)R|2H#LIfDff4NVooo^*IyOcRWNbp!Y3JAGruESt4sKP
z=OB57>+m{o{d;1}Vt^SyDA0pvi`$|T6t}C90FEY;J<0;{0!;kZ9i!3G*Q!)=&b@$(
zx17uN<?t&se=L_R+Yb{h%us=_Je3t|Z%i<tHp0(QX1C<px@0BRU#{3At4f^6iAgIZ
z<Lo}gh)O-&CdE`@x3XcoFw_tfHXjG&dUT=Xu#5fz_KMC5W_|U>n$hKY!)JHRT2H-Z
zZ5H9s$Bm(uz}De4laV!xZL!SVQ@<n%HUVp1t}i@!^&N<-`&mUxkZR}G+o{XnCL9k?
zbxvo3FyDdGM_x3zVilcM^;rg&H~Ok+F(E|hT_PphS{jEo^9BT%&d&b!3VQ>|CN>I9
z?CrXC*-Z1wNv)|f{qqI?WhZC*1j6w^CoSTe9k_NIyyQ4w7@!pTe}&|q$l4-220XSS
zI<QNcX*K7izb$4gj2<6~_~TU^?bzvXg30#3%;G=T*OJG>AEj7l1}^v-B?;2@31z3t
z{5P+ZeQb*V4;?1^?p4{N?GgJfL5Hic@!d;Isxy+MDOu_meJ^Ivm`y@W#gXO3cc2M0
zO@2DRT6giW;>QT`Nx5eKEyHp8E=m+g1v5E+5nO|A13`HuzCKSAxk{&(g<i4uueKDr
z=_s9=JV><_ewHspphwu{Fr+S*#v*sqVDw1>X$04GAF<6qT-*trq@-f34L7<a2`w;a
z4Ue)hk0gFM%qV~|V{LM51x~M+%7tuHnF7b3pj|K$0Rr(t*UOm5Xr}N_tR>9N_KHLV
z538|aWu(XZ?DP`v1K`RK{AGS<(!H<XI-ShL5^%O>SKy$M(_>XHL=442rPBr+2O;Z<
z$T%L-fthMomWA=Til2$xDa%$agCRt*?rHF|XYt;Cbcdo1CkoJ_N^GU^kS9#<$wg&Z
z-D0%O$-UqFUNr9r7xc&hafPhb#@PHaMAD|Kj8ZIpw8e&LP`A+$+)hgWJJ7H;>@s-s
zd}Sjb8SH#$KU!Hl!c{99a9OOkkWHGrJNKY<cKaeD*zGXk1W&4Y<k9-u4PU|RyL%S2
z5;+A{Bf*K$UY-^#(FObB7*8ErMwRR6-gGpo6Ge1?k##uxmK{|j5zmV)#Mi=U*7}<Z
zuK*m=Gf*LYq&6XRQV3?a?>Gq(!H(vs>@A`51#>9Fcs^5&-g`pA_7;R8HLIoc9zP3G
zq`up6&X?!&bt3fIBM6did~<PquD2;80;mKYZfD*5aY=56x>YJMXe0y%>49F26Hn{;
zdUA8L%R9y;Rt>DQ&f{RXkw%@hk+w($12vn-!|M919@m}|s2h*Kq#QFjX(Vc+K_NRF
zeorwf*6P#`wq_D-mJ#6>10pHq@WhbfL;#r|&xsHbV6xBa{osX-3y6_??Ch=V+Qfbl
zg|<xNkQU!HvH1RX!DyN|=ht>#oK@f5sBsDFT>H{tG5SU|f?ux8&F?}K6M(0d*A;re
zidburJWy&DmfuzPF_EW^lS*>M#cUy!_(1k+VyK6=TQf|g5EA(4M2W&I_-o?f&Y00x
zp(1wLKHRDyGxEo2b+VV8<fYUxBeuf%Z*M)cEPS&wBm*t=<cCHcQ!lI)A9v#_3xn$+
zj2gX)Re9?mHA&qDqLe)h*iP8yL(PhFx!!s^l_9ZYm}E3FOa!7lNS0_l0g$rF!m4*k
zwX$M|M=N~CorF_pH-f|H2cd>oVDDMEfy=}CZ*AH*VgLc8_|+bfcxQ4SK1VQ>iV5Z@
z<Sxq*J3TS3s7-cmrVCQH0|HEch$n156LRTQBcFOwwS~*X3Z{E)B)=(RMlcjmV6vE0
zEWs!~je5(`ScUI+^?4KhNw3N((nITh_X=oG0v7xuPGh;Lc#V8>&q+ogO=Yc`D03M*
zSXqqHO*=SqLIb7eiwYb*3hvKAO&GDJM~Qx`sgD6`hwnfnXu5TC0&F)QS*wX1J6Cmo
zL%SrobFJkoaC}Y@?AZs7g2Nn_{3umh5tys1gf`kuG1@&2840BzWv(Ue8_WO~*l6Ov
z{kjo|mTonL_561)WRQ-HTbQeK@PGGW3Iq$lz&VaPTUWJjzXtbVR)0~+=$8=7TrS^O
zrm?;j;>VJR|Ko#hXPxVHXzyYghA%GaJ8%zN=J9_8zqT%ff6;LFc;G#7sn`RrQ=Pf`
zhK?vG0Vt3LRvOxEf^i1$nYxya1Z|E3beStOiOj9=hZ+d>PrF*nSh&9$0xB$zpi46n
zw7_8PRz)hWHe(p>(o?G$3t@+7M8i;ZlzIXWM!}_bDXjh~hOr4WupRxd401XP7D%U_
zr)&<0ejb`ERJSAP?e<Iy8|Hiz(J6w8*1NgG!DzRO1wrQ3usiDbH8lIANeoKYP)XLV
zn3&qf)`9r?#&ua!jfEhtnd1DW0vhUZlR2Z5iYFdztjf?`3jeT&+1Q-vzMQxIje4&j
z-3qJ<Z<!(l%cz1*HgXJ85E_HU&_;b)PGL{RVd|BVC$dH<nOssgWreL6JXw>}Wj+{d
z;kdHzOg&TG7JkG-XSVE+;xla8xL%~bPV1C;qiC;yd~YDlGcS&fmtX8im4EUP8#|l|
zdolzo9hSs$mrX(~I8NLCnd!3XCUPZ{E@FgqS7>bOs=`pUQd6yeB_7E}IpCVC9R^LV
zK-|mrg{0GoLUO$+R(V7wfL)s{y75@)^*vb-Oc)c&0$wb>dOTQHF`EIUv~RQXsE>bN
zD{27am+qCct%~8NYJE_$E`2iODP=*>;pUf+vqh2dZEZn9P)*iICEC$GWgkySr7)AG
zw(ZLnmewqKa8Df9-u<eBXvGq|8e1cWN8?pYcvMc%Uga2J3?--@U&zn0G88qj4Cblj
z@%u=%n|WW9(FOTixoGqP2-Mn?fKZ52>~Yv>qnm>k1^4V@Wh39c#0^gJ*K%7hH(GC+
zJ<T6%z?V|T)h%>?3UIA2rLi*K?Fh2PZ?1$oC$bx~@?Rc4{T{T$A)%RRXGtgZWZ3lT
zf@tAKq3HyMx~uyuIqp*Zy7-QJUESu9m)RK^#9g(Vst_yd6zefgn?ejW`H+gNrz+ol
z*bCu)fj0ZoPWi`9D0~NZY&_Y`#Bz<-^b%{B1aJZ)!bmv<Z=F%|w4c4&g9JAdZ+gCP
zVN=Iq=oD9eFde&PGV3A0q<R?Yc>hZMmY`NgI-8=RQZWFhej>!Wb8$^Re1X(ws~e(1
z>Pt@v2CF5h6(NO+#guT|78m%-FR=Mq1ap^vRTG^-5n%f?@-G@{V8tC>EQ<M)qTy(_
zNhb1f=#}V}&jO?veg<*w=}CVzh(sF)crcRpi1=-WFNd3}aP_5R{tP^lOl-=@wntA%
zrF{psjV`TzxTCNOystA1wtzQ$umFbg!c6eWR;`16)w5?t=bI*?y8qXmik+!ujl-To
z)g~{bk0z)`WaxHgyY#BKrd60clRnD(w@1P@){Mr^dY7mFX^fvB4^_O<DovjL3miXV
zY*2YFeT;WoL~Q<!C!jvo*xKxe9Oko-=lif-5tD<qf(@o-oUBN66UsPb=#chO+LhC_
zQ9}aP0~8W8Qx(jZdV(LK`4EO-S3Z%(wXJWpwi%}(Y~5)Hb*WPg;S$3=eEZbWVL4Uw
z(BynVh@;TRXz-<440!Yv12|}wLxq$Nh<4~28TyN>@yJcpZxtm2+ILeWLiXzskR^T(
zv6r}$Bd$w3@reUTLb_~C2Z98mBG4Wj`=;LW$aK^j9)Xp(NOLQ0fjVx|2xHDZAPhBX
zU_vMW83J_>NCsOZKTWcf8Jz?k=<ywhHQ5QkW^UGZvunxyiw9l;@dmRs2$Bz;=<6i@
zFQcq^Hh9&e?UC{3!6t+&0)Dn5M?(L@!-gI5R%n&^dCI%<C8`C5!o@crA9iFVZS!G6
zD7J0x*LxIa1z6CoxHGffHH_R}YTfe{xny&|KWy$96Y|vqdHG;ZfgGG0!2<vBG`|N)
zyeZs=f7@O7cq*|gJ)I+R0;W;MNz7XyRL5VHg*`{jGF`rE!g;rN(Olg?Rla{zVml15
zg!0laO3n!!R0Wh0bM<9*=#Zhd-TeeNHeWAEZJ1H4kH#YMdMH<)n{-k*-kTYr_fhW*
zM3KBdJO{YHD5TQwZEqbi8ji+N89~M2x7>KLNP^%9q2qU8?78fxd*^Lkq;ec6FL*!;
zGyr#hzjx)=u+tQB`1ZaG2;(8c-z-t0RYh`6ZA#}F)6|yA)0=~Wkk{0VX#K`EhA-l%
zl>T0wikiFPu{X*$O9Hl@($6SYg*xTBlGrg6MR+-PtHM`eya2Y9<D0mUN|ZH#r4JHf
zv#sCQH=CU26C>+zy;!{5;=2fFcHe7fcN8*}S9RTbs#t-n*Q-O?bwNDB(fQNGO^J&4
zpn215%~y+hRXaFl$<iGQ3t;&ru$zryq79nLAL?giu++Wbi2M$yKO8)@Qu?mD?-s_v
zTDQJwJZP`BH)|^Mt`K$U$G8x~TSu^MdYBkA9+p$yKw+ydwO3>8o2waUUWoW8)-rr>
zCWU}W4MSj_eU4pJh+O0~uM}=^XPjnsOYOp3$CKN8V^e~)NqHmW6FW~+TOSxzT$*pE
zW$jH25YGUbuG7QN<;0RQxf>QrHdG^Re6Tk6fz7uSOv7(MUYj+%ti0U+aYts|;WASU
z{geawwpSD;AHy-E{f^ZIy>hes&8>r_K(IGC4U-cNxCUwJ>PnATKHA%hlC~7m@L_o+
zixxII69xze?K7}~@M+qrD^Y=%Lj6xG6>G~m=hY<%q;X0anfX~opI>(l?=zj_IkTCD
zW4q`!`AkRc+_aALv3?N0vlcd+Ns_aK+%8eQqVg8@h5r047zTO^;DP7X>1INog3pqU
zegeZlZ+3p*Xp!lb=&#y4bJV|rVW2lWlBzzCm(Y9;bEQw@92iEFtp~mZ)|a0Ws|o%N
z>=SvlrYLnEU+kGWE!O=e$S74j!X$iikq$U@UbFLK!A%#xvzf<ss2{md^=0gDhsfqy
z>M)v8nI*~rVXJ2kf{XZs4~E+V9x%!J)vq<{M5N>Pd<^Q4@euSuJVpnEFhdxYmnH5x
zU{G|a$D<0B#s?p)if3zA@|5sw=SbZhvwD47wVBt)-4eiO41`DXelGEgXE8e~>%i$S
zcrz=n1bmb8FjA14`x?9vK4rtiVV3|HK?pp!vX%SKBVO(qt6IruNqGmDk!1HO^VG5Q
z>r_a#Q)CpdBq(rBR{IzsO8?Ai3>P@4uo73Bk&_P<<}>g7_o)m77ZQ5+)RrE2>iAg6
zBi#!rV`|$<aj4}v@%mY)M_wXwc8={kpcZ?KeR&EzxOYvdqnR2<Fi9^)+Pq<~FW8+s
zU+jb1)shasM|GH}Y>!t?W}p43#pAxJDe=KkUmDOp+z=ilW+32k8^X0u)Ro}~9&aiL
zyW1pFm0p$Quypng?_DtWEgeR%yAOD(KG3Lx-O|PL6N_BrkwRx{$o$BL;ydL`_QCl4
zeZc14thKBb@AHPuLAlh79!%19iFM`u>Qb_%9422&e<%ku&}3ju!DKS6H-pNzrX^-?
z(<|20MrEpDO{FZjaW-Z+{jlN(^ceA{_Gd78=WN!r2vn}1-Ffb7ny9{+Dqf3u=u6NL
zwwC2lGv6xjsE*kT2-hO(ql7UJauGv=YhrnNYNd?d+v2T^LlYT1G6%u*2Ck{0r?4x|
z$FvzKsm){q;8@09dEXyBd%=5&1vz3Po6O(?&<O7mm^=}oDsg!8Kra$gO4Z4M)xK0(
zI$MG2TGQBZ%bO~&d|4K0AqdxwhlFA6>K!gn?oQyF@Mdu7%hEJ>UbRZYi)HVpH??+l
z-w|7Pcs)}|_Az~jUD);FlxH{8Mf$E7?BY#YEi8*C8=QMf?C31(e>G`$JIGiFw4G^S
z7b!x&z>f{r85s319va%Ws7)Ht99e<suK)Bbx%t}IL{-OiHDysn%dO$-zo48`vgvh5
z&-@~UQ=CxE8SafAKS7DKUI4tB%J`32YNX=GPTH$-Gv5y_E*&#oS$o8Lg0^jIZ1H)b
zSppIMs-ye3Re)M+jxvv^Oi*YD-Grm&_?q3M1$j%mR$0!}Jh(9vjd9{Du*fw^!dtFC
zFcfe%bmC9fn&&lLRHykr;cGrHt{L_JEUSw&`wspiC}tYb^NK7`Zw=5mjVWA#*ZK6a
zw6;zctw;o?QTKY9mZ>*B=lvHC8TOsxO10S^!PT@pj10%45x1oW|HVT*P12DOCT63y
zO=ZUXKSh>RUJ)J$nlJn(U-s4SUzTe_kl<%t<5Kp>(dV;U;H4sk*Ez0}Z#x&^yHW|#
z-SVtNLoyUPD2X4aqYl2T%YY)(kv)NGM%=8P!NL{Z1eYL`xHq$ozl8<76$*XHOexFV
zy=gvXn)k(yaIyW)$ii5=+{s)H8(}Hw9%D^W*mxN%!iO}a>V-K<WtD;{AmW7pJ~4&V
zy@?Qqh)M}QL@67CW54bW_AEcgp4w&)7Ym$iWlnMYiSPs_6}dP0p+%7KOl-L$GMvm5
zcckD#0WrIh<_?*{*D=7InYb~LQRa~1Bg6fgb&m9{1~)dJ3Km)~_qYmFAD5%E{4p=U
zV|<zArj&EuCNmB@yo8sg>pkUmoT75`d7OEcjtF)@su>e4uat9!-+~v}NbRe=3EaAr
zVEmX1S33c(hnHPD)V^N&OI|y|h70zU2;q-E{x7r9E8i>i$8ER#RWXbNo;x&RyMuEm
z{8gePigG(#kGxBr8D_l`A!`#Ko?I?;We5$xbr`|0y_eu2saC#DNUI0Rm+knK=s2OW
zBU}g-IHTW6A}hw!V{vF|>}=x#=cvG75684D4>p%QO)J*=C{UKAd!h1m3;)T!xo-7)
zUVG#?IlagGwTrNxyeA*1JPBC7f<Z@>P~=3ZXlQm;2&R}4%7=HU;5VI%Xy{W5SDj?z
zWS;pnd8=OYjXh&rA;%-(_Waint`m|(0=FPul}hB1Kj99=TNUwToe-BeN}8ztWHBR5
z1zhEf>VK5Pi#v7|Dj(eJ=d7bp%i%T+uq#??K!x^2e+N3^EdA}^u^1LUuVH%*ibA19
z;w+zGffMP@hsp7a0`*e@iK#L=_744bA8p-`wDfzhWe-DT=c9}e^=BA|493l1A*rz7
zi?A!K(675C{IH_6SUx}O3`wweiMI~(27<X-Cyw?FDFi-kDJzKQr0}q5@%UlcCs!hd
z>AnEnd^n*F^BWo}6rg_G{hw6&Gm~pG858#h)IGa@Wf`z!1RV{OuCs>sov%zhkL^qw
z`FO7K{nIO(CZ30W`y3eR{C>yz<L1oJHuk~0mAdK(a5HyX=HUaeWya<_%HoHF4qVDQ
z%U9}zl1SzWO!`@`W2SdBvF68|%OY+{v4Dh_YC}KHU8t=OmvgfeJ0^Kf&5OLp_@*Ln
z85({!Hw!H0e^h${TI8##4rKA*2@wDuaNLjiOFGODn&(Dltvx6bM!bi+N`F}#sK0KT
zb@t_6u=w04+<&D<9XU~v@!0U6B>YIvT6u20r{T_<Wg-4uvT9Um%xK4LN7s?A<Hb!=
ziWj-rNLX^MxK?2s&ay4HXbC)LYE2=>=7hxn7`b;eb@D-UEe4@yTW}axd|4TA3BD#|
zEYCMXLKm`#(e+)N!vPe2>HNVDjUTUhzgX2-gaTIy@u#3j1K>3eMo%A6X92SS%7U1a
zsTwfF_#96vL^bg0ziE7lF#A6Hr$qjhx}OEyBIIlQE2jRn78Dgf6^!0A(FitUhpCM7
zyTOAWkW3H&3NQfxfLg_LAu|_;zI_K;N{vLXc}>)O{toyBW6W#bebich1@6^5^c|es
z*!Yhj6<dD3e+QPqt$YJPeCvVHiVdCcr<=GE!P(q1i7GgQL;N$FC(hWAgRnLGx-REo
z8j#z5fi5;6m43Na*Qk6W-WnWuslzhfLr}hdfW4;hy!2)FGtsEUw^cE{mZw`nyPe3h
zr41avfr0zN2L5t_TML5}R(rrHn8imi;=45F|K4hNzFX_BYX+qJ*Y$Ut-DQD)L;Z#1
zFXw~nR_i_*^WCtUj<%V9Bm4u~Vz^y4t5#^{<?g?uiTeKS^9LYE0!;8P=3BJB0|8nM
zW?&@MzZm+jIBQyB&P;=_qVwGtP%Y%RBXBw!*fmafYt5+uazBZwfYI7viaH$|w3Ytg
z62SBlR-z6s4Q=p>1G{`R-wwaqw|eR)6KmgVIYv49+wwZ#tQpAneNczEKyiUUD7qN+
z%U%bN=DHL2<wE~AkCMk`cYeTkfkunVL%xiu;}-)!FA)58%cm1VUF*R>bam}m?cpC$
zyK!Gu_`e<6K(v1EVt{)Zeo^f9TM7ID{4**T45k|R&AG<<ci<23?hRf0g%G4Z&*l4k
zgV#3E`EI#i-=hHr4g!A%Rv!KOMhS=36CeF6Qa70R>6aUlnD2_!7`vo(wE<a&lv|TM
z0yP$^5#OxwQ}CsrbBciG?)V{ikoXTNY0bCQtP}hC#K*KO<3q`V`EK04nwr(#Ih~sG
zKVnU<u0;tg(Vc(JwFU_?U-M0vBXS)}TaElsb+*i=FHiPM9eM&nTL&Fno&Pwq!|f;Z
zyR&QHTF<?`!21Sx*>B`mT2@vbSv~pTgWCswR4{43aX9@EL{R+$+dB1s-hXoc%LC+o
zjoM!rHoX48aSc7GXizo;l5N|$Fck0`236mobD#fVuv?4!__>8Azrp?%G~d2!dAb0!
zcM53v;fq_Cez1fD=jz3Lmyc_KSXG7|EPpI*zpv4-k@`8aHQ%4tdGJ#g4L96WxxVmZ
z59o{A;PjiRt<Ra)>>Kf>L2Rq}?~Y`yg{?uZDbMdHT8i@IYTP7MqNi6t46F6Z-*E7Q
zr_a~?1P@$(?fIf&*~Iq|2>%!G;&jo2d9&@$CHJQUtdpPLy<%4VlhPWQ>G!9XclpjA
z^SOUWX8LdN<>{i|Soz8Q?>T4sKgj+U>ss?&n(cDgKh+e}PEj*(3;17puUMu9ZUOK0
zD}vc?DQ^eQP5lmhmFq$BWjC&CHX6+QGhRWsVS^1t_XcG@7LBU=iST#m?!b97u(N$a
z(Peb!dJ=F8omw-yBxjov8oI036Ar5VvL&u&=G|86yPTCj1s7Oy&b@jeGjL&pA>6{N
zb2HlT9IJNiO-f@RovA%XKw*1>8Q*K{o9dH*zo4t1xc@G<g`r)uI-axhmuA|}DX)Fx
z=^;=t*11@h)*sMafotiW`W+t3J%2<w{%?ie%?d-A|B@*Z$3SVrf655-=b1NEeez4t
zGwUq;B)47?O^tDszB36}_tVHxY~cD>{xe+b>L1a6p;?a*_-+VaqI|NMu(IyN6)Wm+
zPBkrS{fPGOVHa*pEe&z`ELZ=4)q2hKB=+`1zy|4m4_o;JzY%Q%wuH}-Yx)OK(C6R5
zcAfrP+;TK9#s5X<cG2I+f&}IMbZYtjJ8Au5@Gq$Uv$G3<spnj)34Z&|7#)~W;I56V
z@%O!D<rmI2>^8mPcTcd-H?-*Q`?q(x1BZ5zlow9h+5a8(AKky<ZCCl1iR}#3dN=)G
z8N9Bq-=}Z?a2~Dx#S;kG_N?cW$QyJR%Wt9wBLwLnQ6Wh0206ugB&tQVR0p95L1N7Q
zklk3U>LX5#M<yC$rhhbX_I7LeO=!(s)SBroJ_qKzEHkZ~mOmgt0$F;vt4(~_7x|jH
zalbPJ0>7=P27%{mUBL_p!nV}>4V!I<raZ*XCty2~=-**=%(P0!0_M0tZopNDT^d1V
zTHpb?^B}J7U)KiV+nId&#(xkVUjL@b8|7pR09|(~as2`Wk!-*UWb#=={sFtUTfPvo
zG847q&WzguxqvJ)#r%Nk+24qQup3OXCt%~k{$P4<x7NggfVBj7tSqc2cx?9{ME{{X
z^&jYh39gy0o&yQBaQSv?m6>U2Os~PNojk`4o+Y<-@*H&S=()AV)X$UWyo2JhW>95y
zy@~|P$Sj$%aq=7(Yd6X!CqDT*u<M;W8rq%XlDDI!hVjras@LW|^IH>tts#`zEeE}x
zy_FssjKi{gDsCh$gXD_~&wJU%bD~|b$hUNXl6-xp9;q1CaSKU~!*`vArs7?=J}>C?
z93hR&fyF1pMh&@}&xC20$njZe4n2vv?iP)fWSYHp((1ieVM@1FH?_|m*FN#6?a1&a
zfndEWb+hKw_77*A$Wh*_I&G0(wl6F^vQtsaSZcXt$jK{<ruZ&>l0iRxhSRRI&XdjT
zwK*l^m5Z!(iH?2{GJ2)C+j*(Lf)b;A4s%lO<KgF<5*wf0xV9T?<GG^34xTfo%zioV
zhVxkXaw4}}vNs*-yena%2dm_CyCt))(B93)+i4>8ZlAQ`VIzL(&ZAtikI2n?=u4}c
zXE5_dpJwvgg?-(5D7y<jC|%{y<wb2)TkIA%Q=8g7{YvAI5yT-KpafnyWCtMkc5C*-
ziqnrqFMQCQWv+gH@NvOh6KhOBjV4*}{5aW5{=$O(t}_k(FsMD}(7?Sh(<$fTEu*rM
z-CJ(4UPvPctK4y0h<|QD8{H|nJi*s?I(BIAS$|eKL6B)`=jz-=!{&f`%|p>2jOBSm
zuT}9Wv230mj<r-YNV5pN%v*e)@%o+-)3wVI?yp{*sgIJ>WitEl!DArLOsm};Js-L>
zG=w*=&E?&`w9rPAd-Za>#`yH(Frlp2hykGw;}t_}w)0&{u1pwBZX)c=ILkSg#M@c1
zH3wae>Re1e=RL&zZLvx^ahRqj_j1)DIV;S>%_=##Hb*1r)_$x1->*Yi_a<{Pm#4TH
z;qzwG9mwOlZL<r3k|rdp#&<UDTQgh^zaPR^@ntByLE82!_3DqDrP%I|aI4XhT-7%1
z95Vdemm)AEy9eQ?d)nchP3rvScgx)$mTo*49Ln)^tBXD8U98ph9T?bgCUCyP*Xek~
z7xzB5)xh(VJzJA^JK-2nfkQmO7q}-9?2dl}OTDo$3-e&*hC99Hl-AV;1xLCzTYX#j
z23Qy+9Qm5*F>~ME0Jq6g>_g)TS7}N0?JpPo$#fyG({CV*6gdrhe{szG;Kavj<AsA#
z%QtwwJ&8E~)*89xmLROI=916jtbo}se9V%{djxBa%ypWAKiKl8dv?AbRO)wdCLVA`
zPtd$Gyl*U&E=yJ<MC?6xFd(AQY$!dU7pYtWi}#l~t3wvAlPuucyNO3nLqPt~Df7pD
z)(dp;E%HYok2(a>QxC-%X3L00`vx<6eh2jHAZ3d)i~fdF@8wsA3XU8e)5W6fULdwn
znTO@>Fc{n92R`Wcjgx5aF_Sy$9-q3kEAI9KHCDaivb>}#(MK0EM-}hzQp2mG`XH{C
zkH6_!7HNknY&*UG@))UIGlYrsp11jh(yh18kZEr|PFx`$CL;GB?|>)dDygqf^KrWI
z#j;f6dPo06?B1=F3yw4%hdm`ump?pxJ2{wQGjV!kMc&YWK|AHotfAzyM@`M<Dm9w9
zzUg=(r-XcOT1j%A{(%b>A-c&lM<QN3@Zp8}N}GYF2`4(5@*F>ZQWox%O6%1e8#`tR
zIb!8kGx2gtK}}YdJvH^Chee+`U6*_24Y`gWu>v+)c_;lFqhNasIkd~u#9zG(irts<
z^7#4Ta~Fkjm;^&{PmB!O4wL#Lc$%`rd@uU@0YbB@lSERiYO81<pF*-5-GuHnRAi`V
z_wnjr)`NE#J$e`+sJ?x_01i;~JC&wC>Nr64PI`bGly=xU726nd=5w?LfvrU;VPG-H
zS5b22|Kskh!{TVVebE61cOTr{-QC^YC0KB`;0^%>cXtU63GNbHg9Uej6Cha5eDAmS
zzGt6v&w1|OcRlN=uCD3s>aOYPUcKx$5sglot-WxZ_icsZzC~QbBJtsU$FYMUkv%}=
zI<Ku9X-A|yajrhhBEe3P0L2ZSdkxnnQ`F^UfDCfYm0n9n7MXIQZ3F^I%BEsP^IBRb
zVa%9<V8!a;#KCm~fqct}KG$GX9++Yi#egwD_6OC)y`Vn;yzIvH<Q(c2Y;+_wI{{Ga
z7(OXaxxf{f*<IsPFfrsnkYTyMXh4LixyQ2y62vd)6`2X;B`YPX+1w$1mF2BCAAV7D
z<4<}8Bzu$T?4j4(z%ToTpLI+8R;=qQ#)S}Bg+ayH$TdGsOHzi?`3JUC1<HYrB#O_B
z2P1klP0OEdUOluRq(1zoe|fc6P<Kl?!VL!-%LNAoB`|=h7rz+D9-CKcFuskXpFUoo
zI9YWIX-l?bzscq6saM?8ih9yt{$}~2*@Cm%i^t=v-@6q00m>xng-)SIUyp{AdRE^1
z{huBrs88PmHa^#o@t7y_4UyE%dxF-^5T~(L=kU-W;j0h|(}(VcHXSijP8E{bGH_OM
z7YIZ=4UmueP3qyiuxBO+K!Jo9r0wwt9z3dgxkn=&?0M_q&V*5<(BY!h+*W7xlY&_;
z%X6GD2AQ(lC$@|<)4Gf*Y_)AI220%#*VvB~iM0f!J*6Eps3K?DfEZ17tCaj^DBPv%
z$W8(ETW_Ek`-lo_u303>#it6K-9k;FVHaFC-IskTW^eo;7DX#wcmZ;@VS)Y6R@G2f
z4;$ri(DPE_ws^dCSf)X4i#K8;aFWLewykqqcp{g9iH<m>0+UOrQy(_xN&%axCHm{e
z^%xco(1R=sVdSXxQ&w<%x!R1tv3)>d8@0m|nW%X@KNG&I#Att>EPJ<jw^H)xpEXl1
zCfHc2MsE{E9Zv8Z-m>yY9ba`SSoBiJJkuF5X_)jgE<z8b>}C_m=B-5=mP)@WR{nh9
zZFoB{k(#cB@R-HG|LaXy0K?l><Ye9N$V;^LvO;l65HhX&`g*it*O?qPGvsr0osT-0
z>d8_nI_WD<froA0)J^Vbnhd5aL)D6^_KAXxv+XCI9+Lt~)<4I1!N_ON<nchcFsbz@
z>@@H9t#!@V&WSm6{Ye2g!vqtZqvpq=IJ(s-t6srH`zT8*s!Qz{{M<fpuUN5YBsEyW
zbtF*({gX{yLSm>{Mi}No(zIyhiD>Fs@Q9fH8~jsYS=dev0Cx35uXFk85C?B{rvSz6
zo-L;4_I0N!6*jFQMmRd^7X5^MPP8Y`W}W!L@0;tM45nAz2CzLA)M2Md37hSwkf{W3
zFzWDwucs@RzY0Qcp#P_YcunupIQzGKJ6k!fH7cklk2_m3^z&G3nJ)%RC%U6+I*x|8
zCaa>1wJhYapL`uq9a_lKO7o#ue;vXTqfY<%(PO!OR<}b0f`VoT%NFe^>eAXu&`z>P
zib1e&A;bgiLWw5&Fhv1XC{8;3Fj0<>|6+2OamZ5VXX*JpkB^Z8Zc(`8gEvKQ@{vmH
z;K(|YcP3i}OBI0Y6`sQK7;--Ud1{)to3}I#S8eZvANBf2-@aT=x=ZTwkSwl%RzQRC
z#dY10_>sA%{*Fo?$G%=H^`cO-pLB;lV972Gzzh5;-E@f}Onm`$i&$u~-w*6-=J<We
zzerHILO5}=Xg?)PVWqF6hewFUB-Y;sHB#~`{y^NPhzc7<rbo?FLr8MWx~ZDNzj^js
zPwuiS*hcgd<e{!e=aSq{T+I6zw>-DLY(Hv+yudgmHin;c<4for6QHdVAp~$Whl%1}
z0vZB#;a%OO=ivmBAVMn<F>5PkiV*owAnF69yiH3j-rY#lgLWoM!VR7<ZsRwd6@<m?
zMQ|usS|5Jr(kxhhBC|G>-*Pv;b@vmS<bik|aAX3WLNk<!EUkLmu~Ei2x5Izpd~>xT
z^^gwN;2WRr-De<+k#kdhBQZ<Z_sO)ZU2BU4$p=bG1WD{v;k6el$&o%={OB@@lw?*q
z7iCiJk}FZWbWpQbVZic}J#p~`)?*2fSGdsNu1>YSlNUWSzluHAZ6%=jX0$9iXkR1~
zu^kqQ(Ke~Tr&6kt#7X{Ihnl0dv`?jq`i{NJ6ekYMb~CasRT?Tuj(C%)dT+kh`*0s6
zOtlxI7e3GCST-x{aOUUwDK!eDMY*T+)7zJ)%A<G#%@Z&&R@1X+*Cu7NB8cE^2wg{3
z_Mla`3mE{VAwr&U5;A{IVv!!S6L?KVbuKDzi!n`NDu)r_fXs`H+D~!?befTC5TFQ4
z^Sfi!10=rb*bFzJNCZjFAKZ^^0C1a%I3PNZVMr^%6wJi7JhFS%IPPzLQx@TOG+hPF
z-?F9qv{zlB14k%FX;s!M12`pNId%xG-rb5u`<dBP1P*73LAa2>!N;~VtCr2C0G2yL
z_XKCKk%<>;oLLhEY7+ZgB^gTU@#pWLhqjuAu#e5;Av?(%yyj0{oyGt?UMloXtn+r4
z;^N{{g^xa6O)nRr{4oz;R95|&7Qle$`xt<GmyR=wNFvwP;2*)2@H<FiF(EeGc{l)8
zhIkOux~Ih1{z~SjdVIy|eRaKAZT!&F&dnR-eK-amed5E`ck@fl<w=M%($OEc=|p#|
zSlpNdecmL^lgVnXK1s4&1Znl2o^tGjHO=!sS0TR?L8Cw6)%^VERlm|<7~boJmkJeM
zT-#KLwX~OgoZK5#;{y7m>J}IXjyhB_r1)`s;lb#-^r(-<gpy~&CJC%d5llhn#-GpP
z&{J?FEqdW|<tc%fe(;w6k;AoH6MEGj{dMCvhp9e~PswL2GwG#xhWRSNQgV(YYMO;p
z+TzD0V>`#e4Ct@ODrrLPjCFd8aAUg>FicroxeTjU*{d%UmrE(?b1Kc5#gWryxpxOB
z3yepM$ajY-Pv8g*ox!g6@F+1rkGWodlTKSa3G#TGG9`@}h?n{f`DZIpTpe>DR)*D_
ziKBESD;AU*$NWnYcjvS3V`e|b3%IeHqOI04((>sn2$Wq_;kc?fP#Y5v1c4uM01{8G
zzW&lbgSAs9xo)^+pCm*Qg(R%lbC*luOuw>je8o_OrNFkC<?onUK}&btr8tI~L&KOW
zgPsg-Kq2Rh%QjK&z7jqOQex+!Yx1!yr)lE<AS(eDE5I*_EHsv~%|^+a)H!Opd|Rtx
ztvaR@5{~D_Q^GxG@XtFM)@C<UI6!X<kHAHS^H>9Zwl?}qOJiN2{3gO6<%m32c&EG6
zOl%{tLBhchNysfBIyOzbsMD1zpC?=9C{`UmwAf9rcV|D^=)0i8nXljL-M{d7^tDAD
z1FyqTXgf(zp$H%QwW=of=<7Zt+lkZc#jCzBJtC@M-tMgIk_5W^ch?uI&JpJ14<xaV
z$X4G_8RHWkbAP*S+8i1a7wldNTvzeo3hq28>}ga4|5#sXp2K?+*|~C{FF;_;kndlO
zmiH`=qX%_`aJa(xnubP5=Ys;~rVS3G4DYVgbx!y0UfHW<2%VSW7eV_PcL~39rvc=*
z2oLRtHPoo4{E}kd8zl#bzXbM}*welSlsv-6>XvW|DhG6@&7{QEJyP(?YKP5=wnpUw
zCvY~SFyo`RlL0{$Z0NESv3j&WMc94c6VZ{xrHn}L;n0<m|M(l)ik+X-{xm-N^xjwu
zu$~nt^!Jn*4kBR`^1goZ8NJ7N@{^+bM5Q=yD(3S;aFQkHpv%ay2H#6BXL2iyMH;>d
zFWSxy@hcRg>ku1T!}Z|386!aA^z&Z;41V;@!2UD8uvjABiA69mWa`m4rZ?+O7}1@K
z<h$tpcF}!2nbce<uU9h6=(~0!8yWn<{l+#zKZ6pmJDljq{@K`?*+<m1)iSN0PphaW
zYDSszJ3*nVsBM_(@8oH;>ik`*G9d+=Uzem~^&PMJW}`#0LP_aH$`ouqMXWcVa!XYz
zR!*v){bKhwq;ZHJgPJOlT&MD?^nP82k!+M7&e*Ag3?4}|5^cUqc!OTdn&zs9a)YpK
zg>Gyz?TNC$k<CpCT%Ik2MySvbXj2P+ihPvalLb<l6J-(+@TygwHWA{WiV=)L;{sP$
z#IUF^##Wg{*#qgG9Eq$jY5eM4e&u@*)e6qfO4>XoLU9#KKdMXJmHfuj*dFrr=)IgJ
z8KUz7Zbov5-__n=SuQvGdY&A*(o$9Dxgw(#NneRq5kf-4OwlC$VI@+it=KatNgBx0
zB96x}bnjYq@o~@)2EKys%~<Zn^^KTq9|BFWTpn9(mmU^5AjQY%;NW1G^S@A+7A}k8
z(){^9Li7Kr;0}t*;OKJ~bg;3P*V+F$ksdK7h)lVU=9=p<y+M^<HHO^Kv#F<3RX$Fa
z{9$<Ag*$naY46vNQ?;C8P*6t#6Kx;Hbca<G&5in`FfX-LtE#|U_`N^8e=c2?-w_gQ
z*}%6eIS9rq)~rz%zmToE#sHg#s4Ms>hm-i=Yro&d$B~?_2(Ku=DJv(Qatcy|E8h6e
z8Cb>SLu1N(nVdz*AJ<hwTows!5RMnG3YFfQo;fuBZzR)WS@M6Qq$Lcw7aHPY)H4{o
z1=5N251q7AyLig(BiFL-TeR9HvFn<T?JL=J^4CPd*&o8WbUD1y3@UvE8hC59O(&=F
zKDFqxN%$}Jye8f*G@4G1Yc+Q1j}}w6+os7pjx+_RwlZ;`W$(NW8?J6vCH-*P=z<Rj
z!kh9tJfHarNj)9ff(}mVD-L9u>3itS&+@5|cFZdl4JxWQA9b09OrQd16Y!%@m+Y&M
zZ*YWXrCpL`1TRTUQPSa#7g=~YfF*V{5PNlyoi4g><6zNE;I40b^Dkh~zc&1Z0ooxT
zQi<FtNUv#_V+)xw2zKMMehZ0Al8=&CxjU!ISBX20Ru#w;-Q+F@0lH@(Lipt4QNPP?
z{X*R^tO=IVhhko{8yKi3O*e?{BjBt_wBeq?l?!6zA-MXaOZQOB5iUxw$RY613a@^)
z6-7kahr-^=LvN*ecb#<c&em0p+BstW*`zqpSM|y8BR*dXafR5F^=;sjC|-E?V~nqt
zTXh-NgW0d$ptfAwfWVn;fiW_H!!5CR3VwEB<PEP5=-BxEw^y152aZgsRo}tbh<&l1
z%YXGe$Dvt|OX8!N;Mvyxialh=Q-bpg_SaGjtDGxIYT<6n_KaJ6huHR`Xf5`OJ@ecL
z@RRgO_>~?}?Q-Td6)sR2gFl&cM7%ov3Gj<78fn+rbz)lu2L1Ry6|*qVurR>?u9&sZ
z_?Kc9qv@Jmd|;kjefQ=+6tmF(Qp|3p$|XJCFN7N7dN5@_Ja&l5m=HaYO`Hr1>}IxM
zGN!?LR&Sw;YYF&cDD`ECoO27}R{#;o>niMsF#iG=pv`<rjsrz{-r%`e5H>48anj9c
zA$7QDW}kb|xN709CR-^LR0(%Qw>xKLO@p=V!@}j?jGm#8XHX3n{sPLs%MAMb$#PdQ
zi6u`In%$3lYISJbc-&j!Z~l|8ew62X*LAX1hYonbJozeVR5s%|ZC3B?G%mQOr&}?_
zwb`9-1CDJkplYQ)lS4Wf>2<%81^426)NSLTX`P%<D?X|nfu};e8BC%6`04cNUWpab
z#(e`l7LEw7`Ch}n%p?a^9t7hS;OCnJn>~EOiy6rH+_$AgSHz9{@$T3mJvF$n*Rzs_
za)>M^%nQ3mf+!$>pZDH+u|J?|4q(|jJ$8Jv9%823_DE-Eea<7`L~5N>nEf6mLJ#$0
zUl-@*L|aO1Y2?osr=qbvTd$z6Q95k}+4T+A=%$w)m`pVITT!60XW+wm4uPgc)A-2M
zr>E<BRRzDPgo$Ij(ovDkJM%0y4@J+fY4{9%9g5;ZcxWXpcl9*_)V-uXtBME+e(|33
zRRKvwx4WK3$YqK{wy5eGB(SG1iWiBFGRY6kSi0w^`&gdK<abH+?%ngNi;RQ%<N|(Z
z24UYRfr4jp#{R@9$YBZ?iEv4_XI=0K-YnL$ckw^aO|^Y!`U_C|s2;1*H#=_PT>({m
zb39^5Gbj>q+ecm&dbf|Rv~oO~-&%3PgZ&LBR#pC1<jR2-%Jz6-E1jaI=SWClh6+cy
z^2q;sAq#VCtmm5yp26-qkx%#17#$=MlA#T)a=dnU4j>rR$2oH&LF?PvTw3=Rkk_#3
zTE@P;uQ7E>`WMg%N}6`M-EjEynw7{%N?QaZ8$($>je`TG0VL#$P0nUgIz-ktA3u8h
zte^G%|4}t)@FH$k66gI@KCR`h@XwuC-`HD8{|@Qc5|YYpWu$6jX3?ZvtdqU;pt;+W
zsdql1@<RJ)_P!5)i}LJmG!_}~fH0Nt-5uQLw|<B*!qF@tDNJ=arjO;lZ<@(;`<F-h
zI?|K}UD|tXAsOCZK#=+LyP?RtE4#oSjmyBv=){8H+3Z${zRvgFZU2?vYb2z(<vX#8
zudn;hCBKtZf^T9FK2o0-inW(#FaHI!8l)bmU6u@tU&I+a-zsa<FKzb<O@CdA5n>b1
zZ1Tw-u8mB6AU*M_hVo>){wZ9|xjmR<ty-wc2q6YZI;)-}o;v6JiU28L$}G{qphJ2v
z`_NRZaG^F*ddHPf(C>c=e7^8nsI8XI-D@+R{QPOF4xdVF(@cF$;~N8G--LG)c<^@q
z0+O1A!9$OG_H*~RpX86|$6TFIva2ndrG8#oC2To~C%ES~@=L*hV|2C8qWrpUEp{oy
zsa&5>LD;_1>weH;E<EW!gR)=E_l1-dS9fcz5^SQJ`Fa|dN~TI3nZ?_b3>hnSDv4sI
zHngX+OxOfOel{hxD;NyJV+yF!$Ur`Y4ktz@A+E$_)SOZ!St>!9G5+-aW0>?9d!cC6
zxB<3QPf=hv6v+#0Trkvpz~-?D1E$U51WeIg6BCZ>!gp~es2WU1!pVAgkzt4sdP4bH
zv(vAEML;pHOxvdp6H<=U9Qc}lcH&^sX)2@{hSpd8fCuKqN}$qeihuICXB`;ymk+26
zE-{Uyh)WY8#tvCc&QFyF?c#!-pgQ?X=J4u4$ifhC(yY$kwg7mWmf<kwZ_PG^Rl&G0
z^!^F&jN{?AjRBAx=h;1o7C^TJr~Hj8**al{niwv^@amWzoKz|1u<47Kw3O@Ng>VJ~
zj*umO*Jo1-MQn}6z@YPxBsnekJ4395bIYf$TDts_cuIR`MRcyTk6F%f0G-=vhWIEn
z`6BBfXL$nNO*~R#M#|-dWAPo=^#~b#Nj;+c$vpcTUS)8ePxPrXApe|V_R6_ff`Jos
zz<i|WD?)(F9$5pv%Sf;@EbDQ36&kj+!uIb5K{<U<#m*Ex-dS7ln5xdI1hRwgW-LmF
zpZQAZUN5cV7-fGv-L*SxS}i>6#$KXF`m4h7<dofN-{N(xP&RR@30@EaYOz!qXBZ^T
zo-I#HUhO&VIyj!A%RUvx=-T5<XvO6ge8NYU4d4NSZ0#Of#?|apzydi4U8(kA>EY7T
zm+*UjbrKH1gi0qAcL9@j@+DY&4CT+GMMF5VYhDUg(9r5@2|78`RknIpm*a>Jw(C#P
zH+N($UxODG?$POG0ICT-;+O67QP1Q}y+Yv==016-z|U+a{syG-=WoCz2))H15N<!z
zL*QioUFs-3C{Sw;FcSuJ|1^X_&t%?pbxO;K0!#!mfxdgtF>wKQ-hdBiA?Bi~mL2Co
z5H3F|D~xyZ#b;eVCdB;J18r-`DtO9GD9t9`$8eLY8EF9eY_sy&C}aAB2FA#nbogx4
zNgg<eIKk>`_*faYX*1{MOVsFMe1Q+C*~0xInoEmZfeCoe+FQ-|0#)TnoqsgyIeV9}
z_3z#iP|cQJkgnM@rB7yKGt+;Jw792$oC;Ao5wYXa@cP8Wv`+}P>z^U)j;bwKMY7Vw
zrz~d_B=~DE<|lO_*{v<^-6*khu6dc_;uU*vqKsPxiKP;Q=Z>(G1kE7=6*a~t&^2~n
zQ9!-e#ZBaawcADJFvY&E<s%ih0CSE|!PMKtuHd{+1@zP^d<0sJ^c)uxKL-lR1@PuW
zHrP>`4l}aAm5op$B5&r5Yewc}8ihV(!jY7lQ)R$nm?oPe)8*s5mP86E-Oa?k5?u`p
z)0oYt#Wr%7IXD6;%tnf9Oy6N0S;{-^vsos~D6Funut4}OChjS)CCYZb_z-ja5Q<lo
zOgJ{x?GOIb`{uj*l_WhY3ONq!adjzKl3+QBbYh@P(*Q>&2d^9pk|M3fpt$Pw${ian
z)5nG$o?rTZ>WOie6wGP-WR5Z8Y+<K&AJ(4jWWyyEKF#hQDgVHr9aa=dso+nTOKBbR
zQ{X6{u7n9xw;qE3{)b~?gfv^zlOnZ$pJ|;@eu;1K^U~*dJh~I}XV8}=Y#JbCGt+1F
zYZip#504eeJzL&gGpPKA$ymDQ2)|+$>*4rQ_Jy_m1P9<8FENkoum@*J^tyr*bg@Ic
z3kUP4lyG1v)5x{TVQr)sQ8=*Ve^zOM!5kUi;?)3o7<c44ZiV})vi2^rm?tM<)X`td
z?GrE;4jiS3eZKJj1w=OrE~#Tx9#YHnGU8OlG$A1G;stvls0=fIo4g$bh$fl_CF}3Y
z5}Z7P(H-oY5WvmoLxEfO#F*e;L$mRk$q5p3<Tt7oLnCLucFilM!QgM*+DkC)dwPmn
zpaNq?he?2J=#D6v3hgwC)!EMTjP$d$X8%t9@aqzoqJd}vt(#xmPP3TxQR0`-TrKg~
z(nQHphoYvLGJ50W?4nGMeRSqMNNkMimwRv`{OX6}SJ&GYS^+}`od}63yI)h55`s%`
zo~e2FbFi0oTpBPD+fnL-BjHibG885g<A-y$nEZT-u&<0+jfz=Y@)Vf#1eI1<=eDSH
z@IVLCgm}+rb@laIt*DrW(Cyi~jrz`i@e9HIe^hYS6#w0ZK>i+u6joHlh(vIpMmhW_
zRZo53EuAE%%jE!Obz6fUztUd}N`dq58Pbo&Udzn&)E$14XTojQT{HUNls3d{+uu93
zmo^Rl13adb{X+Y(o6cPNHqA4ktk_m!srVpRfSSNnE;o21e&CBOW-sWtnqVzL-k7Qm
zlc=#n6oqJpi9e#7cR%bt*6<TB9p#^+rnhTS?L~W|v*3?zIsS3mHGViJFPOd?hzv7}
zk+WZoI0D1&MBVNr^2NCDmh5!8^(+q3JQ+I4WFw;0km3=n_^QiSfDf<-4SH9C4&GUq
z4dmogX0a@PKoGliv`{W0@65r;-EeoisY0B2#aO3~sG~qTym-5;x$JQ~^<wsK9Lqk6
zE*|nF2NLgUZGWgDYN-NEx4AFfXjw7qjXsoX(0AdLriY!i1xW8wf3^Hov_9#NRm4Rs
zmWaLwqv3`fn<6~A>7>Ys)km;roW8TK$i-l=WuW>!#9h4yzo~ke{4U!hepQ^_#_)`A
zW>A&+#)i5b2jpl#g)utcX`kRcY!r%FCd~)z<{1XflIJa;-riIa<i4Q<_OJ~<S3zH^
zTG3@qe_fA-;Y>I(@V``ZB}|~4!Y+W?Hp9%g0BD4b*^zV`wJ<Vrpn`$q2E)>p9vYIk
z;xULN5(oMEnnc7{)+w6$(-p%lT+Hz-;}1W|x{aE*FV!^MPF8efu8386r*zWiDV*Vm
zE$Mibrx6;*ufO)YHYd||9;HKNYpze<_uP7xVA|S}7=1|SXkThZ3Q4eoTbF!ByRc|h
z=HtRZos#EMI;@yXkW<S!N?wOe&Q&U$MFJ)x0ukT{5L>S`9~p5b)M+z3WFMo>Zps;@
zu*aTu%8)3U7jV{2bczyeoN{d#LKAqKJi}(1%%|*?zGko0P_!4f)M<|Mg;`-BjB2>3
zY$Fep=<Y&W(%KVfRph~UaQbO}Kg&m*$@N@FEgVaD%o7kz6gAEFeVrB{jd4fqTF~Xg
zP3C59D_L3bN(repS4hPu3D`opW=4={u}xy7i(5FXpmqM}mhws%hZ=I5{9#Xaag;vi
zi}tWJiV`0GB7u}5PbrUqv`2uE?tmw~0js6;j8&exFrvu&((feM&;!xHi%7=J44SrN
zBTPIM<pr$<5@(oA)F<h-Pd{G*&vT6Bp8}B5c9b7sZq&#7e{1LSm{cQkC|I>oVPj;g
zWoB-M67cro>Dye<M;XK!o1-6w&+AS;C%97xB&1ur-q}T$SCLbN+kd#?_(ZQuk=6Tl
z`?HI=wFBmTqq9$oj7=$(g;-7IOp1=9O_~C@0S}W3(4aqmCLK%(XX0qh>@=mP=Y17V
zED8XNf9STdfdRFOamf#gB8p`ESdA>Uf60;JE&Cle9MfXmmbX*)l8l3T6KK)~AcWeu
zP}_S;MBh*S#c}&C@aHc;ibY9tsf}%QsMhGhrLA}6<$-+FaQow@`iG8ngRVC?8Asg_
z2+JE*3@YyIjZ1WK4Z`MXM=X*!-cXOD>^-av%%_q1W0~Y}r%K{?>~&aSEZ>y8_A5GK
zd3}{`lBaTu*cl>$TX&b9P6%-?o)3s8z(*OIA1CmtAM@Yz`KKt!tp1f5dbBXZ+%C^h
zfP!7Z1$zeV4Sd<i#-3p8&l4*94f4!Y!4Hq~LR5`>qLiFBx1KCxD|}(GMuVBBzCnMv
zFLSAP);)wUa+_2qS?&Tg)*r%apRaBR)jW8MjA#k8DwZny(2dx-6wf4Z<Gbw2ZRR&`
zmHSGcj?iU*t&H%CG;)K8^euMy65T2oax|0T?t6e1%)w}B)&#?e3u17;Zb<mh(<fZg
zH6q@u3ctGUkCNt{-PjZG(5EsWy@W&jt|q?S`|jvDUv0O=CE}1q>@iCZj+HcI>Tm2H
zY_XV%KP;ppHhot53HNJ?pldXeJO!JU^Zc`F3O)};M3GU*P}_2R^O5~To?15P?JPmQ
zO$lJ9gB)-o!>XO4)6Fi>kH#=l>TX=@nc7>pFD^pgLPZU6SA2Z~rjRzx{4uwVF7@Z;
zzn4TA4Ku?TkT$8dhc^N7A&dZ5U1RxWatBDva~xZUat2>;_l_cPzrY<eA6c^GS(Zy7
z?v|;2Q<p7rv$uTnsII48j%weBd@Xlt;~LthK=F>Z?8VR|n0$yL7(!BojvnltIw!La
zU*u!dc%~n*F4GK5A;T$7L;N&;?kwWqhGz{4Y23lj#Vl4bLcHd(R-=*E9T<%fm)}sb
z%+do7xXj;oM`aOLZBScDXR2~fOm-9-yJOp#EYOuJpD7J{I3JT27?69sO(qEM4P`+&
z&>oyt375bSqhTxgaUjpb?+Pbqe3*QX_LC&~j;X*tAsi&QR8D};${tClPmH+|j%Boy
zR%@j#-Zormom@+p5wrfKA&wG}#;Nf-{dcJGbqNO%7VL!&D64R{FdvZ{DWpew%4i-i
zUF$P2IHO)>$z9EqDrylJO;1_>)5pY*U%9dnvF>s9&$AFQQd%^}p488}j;TMf4}z(B
zM=rKiQ+K&vOze|6#XXtjkTI1t(}Y4|oE6-f&2Y@4$lJ%I$6d?NhsQ)j7vYP5q7`aQ
zw}i6R4OwD3b?7qVRGZO5I7=gQdp$os#Q?)?;6`@BoP6`WqA3)cjiszGNtj1!<kV$H
zse2Az%`2q0`T0eLS}m6rI5Eo~or0Rrx%|P4b8RKt(X{D7=NnQgiB7-kMz;|Dj2U*e
z+h>hh=bI;wD^=7J>em9evYglN%y)uOUf-Z8?Qwdu{sc>eKOMY~QM`*nJrF>i0K|cP
z#hdlt|HUu3mx;@b7e;9R6x&wtimUZ;tMy4I?!m;kE=>WH$x&&ZTm|xp!znbVUdXG#
z4YJ`z8Hl$cE3Xn5Y+n(t>o+}!4AZcSH!;>1NUXPTQssX6>B)OP8~FVNkXDG|?<&Ak
zQLGCUt=mFJgjrDgCQ~hIa#Fn&s7br2)X2B!Gu~LhX7$8+@%zNd8!OsI#$wyKwZ*YS
zv9Fqy3A+)NE4vhV_H_5Gi@OilqLk0)^6xr~ig)83^`}i&l+hy#VEwB5p3nNFPl-)T
zqEV9yy*!x)DmD@lo2UN8K>i%zJeN0*Fda)C3zFv3h-5N7Beug^V|H^b0kPXp&F$hF
zYeVF>qQ|E#v4)9L9~E+D4Ipk<q^5>>8To2V2U4d3rAX82sj9*)Q+cG#I5=N2g}!95
zl7yQN2^Y1@7*2h5VR9ytfMI&_@mzu;V75ej0$sB{qJ4C;3WLV}M_kK{?khbsY(+Q6
zI>Mo1NPUAA;_9N>FHV2Tlnw?R7V{V4?o)&Em_qooynFWB_aAgO0}ld_fg={~dv3+X
zMH26l|DMIZ#Q0B*`CrRO$zt^??f<BhA-BTgLQ-R^N6-CN+yAkWD`u`vr!*w;#3_|M
zf-u%^`*G90Vz?T}sx*GJ7}?_I%|_IfV5FXv2sl7GrI=QFDBv6;Buao1p`micKQ>_L
zM@Qxga`Vl*tzsdpU-_{yLu4^L#d)Kyx+=)suhD5~>X-YL<R4(KVKuq==N6NGSE=zu
zZuUjMpP&NiJIngaX)eKphJ*giu7F%toEt6W7=zC`%MWgGK9LIIm^s!4qzSQyBk%a>
z6bdSt0*<4tK#5XK0$;D8?>ZZ!5_S0*mqB#AFM)jx|8f_${r_;i8D_1K*dA%L-m&@B
z*BN??>|5lQyyFYa$R}=tyc0saMmVeFHzB0BTR342a>#d*KXH3IrM1)@C)QHH8HW>g
zJp?cxqovg>H>i~y2m~vCzr@}+U=SM%F^h!c(SME0*fGAn-biS+uNH^1wz3jwG+|}2
zxgRZb=1OE(&5U1R6w7uG`uP0u*zuv>vhtWQ=3NSr_s*lQ)bYp6+IzT5CqhAkt{SP`
z2caapH!&_<VX~svpn9m+EVe#tHQRyiYBt<Y+dc;^A2&p8KAk#aACirYW&~$Ok;J?`
zI`{zt6fVaUJZL5Eb^>FVXVu_m?cQS%F3~+M@qWY8P&--ODN!f-hT$tXC*yTXegYP=
ztEg&<w|?g*-eGT9{~W>Lo0VVg8QQ5lQhH)$q)^%Iga>G$W-cFfG!hFIrpcsZZ1azg
zaGSi8;gE`v3NEV6!9(R?@q2?co(qMW-F|7<Yw^!i355g<5M1@eO+RWPj(?l_rVik6
zVSXt9<JV<BsTICzQwXWKOupg0)7E!SJmtQh!$kOHd&cwZ`_>u3+y(>?w}WOUgR6v2
zDO|4;hbQ<4IvAT+Grg=<j#eu@d}4z!`vS;mKfN2h2ZNX=Y<W}%4%d77hJ}Zsvphgb
z#Fayx^*dJ$Q=cAt-<kM+rgSod2=qlJdWXluQnGZX1|hQN@IGS>MJ!NY#h8AVaEiC*
zEk;OInAZb8bKDKDjkJv%ZCYKu{kSpcy+9&d&P4>C#605PD3QlQ5dxrAMMGo5Wr#(j
zOSf|90pi#nztkKWpWjm%%0Mx18?EtM#SAySLV_P4-s~6<A9m<}{MjK^lmGH&x44$j
z7`VY8cPoZCv#alhf}8%sXaezl7sL1qIAGKGo+3!`7tj%6Vhi07&>rbtGLL*j2A@*I
z+--#PgxVq%FY9P!-eyO5$A#N^uyx0b4j<~=%ewjjw?j!A3vt9;n+QAV7NLx7)LbW9
z6c1;wYi=iq@-JX?754`noq=qXyS$xjHHJbEo5$5akuinsRm28Qp*`i)+%;aWILScb
zxRr$G@eny489V2z(P_Oj2I>fYVPfttzal^*yhX$HSUoKi2j*&0^w_LCI#o<y_;~jL
z(~>l0O{-ZJ0@qIe!1AsP2NI2Cta2npeM2w2GmEG!4MGSuju7V36Dh;Dc$X0Jo4c9U
z-y=}fT;NR&)jpgzyQy@^7$l-z5ZT<}1sVi~Mk==<3@56>922(y@r#NTZMM5m?w~ic
zp#DIy`KzxM=uMQOscjB6t5Gj1i8xFd?*L0<loZXl-tAT*_S(`|g4QXBavVlWBsW_F
zX{@V+7m3OYLmT=F(jcwrtvWU37YdEJKDlw>VYLvJ5(^!ib{_s=D?U%j5PniVXg%{9
z<wCi=n<sFCW(hf_9R{pT)4?=<``j-6UjTqLO&r&lKXr=c7G}hLk-xuOb{(^}nu8kc
zz(a9WkWmf|dji!i#!*^2*ha6P^`QtG8bJVKX=zwCWFcXd_+sO-L5;e+B}=mTm92jb
zW^a`|U73{*scKJrOj^zb3!u9Tf`tDA++m-X*C?ftaTKhi26uWH&Q}L~W#HXz$j6U0
z@eUEA?sxA~!c}AUC9@G{?9>Vm=lWkGg|YWO*K2)67r<I7`ewB-fNMUa?pVE|sQ=rd
z1QoS^J9>~TsC~n)%STTRf7b;kQ4ad^XY0*%rO(>+iMPID01Qsi>11etC|Y$5Y%&3=
z`ht52XEzMy1ib#*?rzM4KDs3~qCuF{z7q-l6<X!OIUEV~g0O0eXTVeXnuKU$sA^42
zYu5OFBu1zvH0BY7Wrh8;Ie4xeE)G2sjq(6N-SKBPCO}<8iQ;2iO1!XQOo{Zt6PbJn
zOEDX;V$SmA<37PVQ~y(qj#0Jd20n2haad^ooFh<MaJIh3hu$@&gwle~lN=`Wx;}x+
zPe9wNeU=y-Y-|UdiG?XxCDIA&dTQQSX4=6_TG0Ff8=(;~&5;i+6G&O%85mc1$aHP)
z*82;GP@z=CEhHWqX90d^v5lKp_Sue1TA?hb5UU1D^EWJGuELQ&9EhwoXO07vnA2RS
zsL<-qebuTp<}&PWxgpZPA7x;lJw~tWy6U|-o^ZxHa$+&|zW}S~MavK^SEs;vA-7C(
z8O<*_3ihC{f>}fe_T2O`?zlS|B5>sm@lYT|TH)_Sjpb|Yn73HhfJkxX4fd6EjS$L^
zcx|%KnN43+{>0cb=<z!oqJ<vq6l4vPSQypSn(R5GPB>NveEL|HAX43~!N$a`K_E>l
z>}tP(VXG5a2wUzz2fV7fDdSG7WC1QVx4b-04ge1T5XKZ`u+?@l8U(EFlcIy-a*A%T
z2LpXmj%ndF;9t!F=%#+rpwK+PfR<d+Ncl+wEW0=Wm8jnRaE>{vXyFfQ1%*8HwQnG4
ze2laz<_M*|#B=&--E~&B<{u<nJ7E~P=wW^X#TQTA+>)-ZCxDX;&6<@<-P=9Hy92_S
z3%wmD^=m%g15~O}lEKvP-*SrT|K!YIj3Q<64S(@^T9N2X;gO2U!pQ0qO-YVA8_jKw
zl1zfYHPzRgo58Shw7JtKpV!kGCc8|asQB&<k%zJXpmgTohv!{kG<0gZl#LT@3QHNv
z^#LRR^iW&ks%{BxxJoi4k|zCy*f<91AX?ckG`Mrsrb-<_MzBwGP+d4s(u?|KOIpiM
z%wL#Fm@G6=TI4bZWjCW+e^Ex71p2Q)4^E!Z>zC(z$NaqJtAYwoyV+jMsSUA51*0zX
zbgsg(?q4V8JK;p*+Fjd@K%`hk9owAf*xMZQUa8h$h4&u<nM!A`dM}k3+|HjvM?D|5
z3<PZ1K;$rGu*o_|jSY8u))XpCKF2|i8CaAxb2x%!p)<^+D5zKUCZfpf8|cH_dS`S$
zp!~K7x&s$VcajnX3+&GC>%RZwWfh4@vKB`Y$7w+1%S8aS@8-I49e@nU;9$QMAt^A}
z?=b8eXM8TZUXaGj61dl$-<$qLDvfelN}7n*OtV^ny?n!J$0X;aQG}3%ZaoXMB>ux9
zue%}70lPZ4D^)<qFo`JFHU<JeQ*7@(h(q_g!VDExGxdMov(Odr`@|=^a*t&qUazee
zyJH5sxXT?sB$tN4&5J59jgG{)FqiRDs~AgyDWpbUJsHI@izrFzFW{WYjrRjo7@9}r
zFC3Se{vE3hzaxAa@mtoRG|0dyXrXvBef_Swifbkg#3~nvh7ml*AoZ&>P|m6?ja)!Y
zNlDd7gP%^@R|&TXL)zcBb1+67g|hT}g2blcPSeNCc_CrpUqIh1jN1!;aRgdNfv~Xv
zD)wPPC*o*OJC?}5!-ryvqQTIP9LsI&)3S3>Ln8t+o@|skoN>^L*0`-Kzz7zF<A#0&
zgdKi&4a}l599p(@*nr671wUhs$|RZ{RBCk<jkTLG${Od2AHn?+`?15UF*qv`GMwh!
zk|0O0g@!A|4m<|*K}5B=`ZqS0ttDm4`=uk5-4T=lv3%iEK+zXMD;cl|Cc>%?Vpyq*
zlN+Kqh93=Up-!%sF!Oi%k8!G10P^A%%I=K<%EOYt1iDYBNbOKu;=AV{Zr1dUus;Y3
zCGf=B-~IxMmm4ER!)qf4UD=U#V#fJUG-l)_WIx|1goS9$0Wj3@`*%_$9Hi37?Hmc+
z1ucoyiyah&xbt*A%2j}ut9UE{yw8(Aq~xTIuK@y>9^#8d<oJ^2(=;J~27Y3lop@~1
zCFg8y8s?}?$jc@cpIbsg%a66!Y+aTSmK-lOnRz}3Ye?dlQat5jDMk6Z-L)8CkRkhn
zCgVb<3xSpwsdx<3rnbfPOq#MzQ(Bo;lx77MMml87{sP2jzKy^a*so}z3x<-1woJiY
z@|oNrONUb>?6?n^t)URJKgH1(Vqc5Wj#=k?9r!-uW<uYS%{1UAfknd*Z^w;CL+@6d
z<9O;j!s{!-rKZ6YY(vf>iJa8*aGM_e<O4y*CGa7c<AY`=DtGNeB*%5q)K-uA3lJkL
z#|2@&2vqwTSfIy9*^2UCcr(V98*UdgKPmgJz!!9jZE5|GkVw*r@I;^E2}_b!htd%T
zY=sNtEp?Q8w`(MUJ_5Ny0Iu*bcxaN^aty7^M`Va0Z8QBysMu<V@gsI5dy!@h1Bg)G
z9;pLRgY>7v<38pp;fBC%0<6gCBSGR4tsE;H&#rnF_gLiq%6<fWBwC6CbXY~FQOSF9
zS&0x;;0lmSbz`5(5JvUVETmMHmS(4+^^q;=U{yG)6~#JDKQjV+!2c09*wB>9TJjg`
zb~v=u^(lT-$g&z!B${F~MmvBRz|W5M6@wXY>HWi*(nr0<Pj6(H5$@M9T^LM+#$vQ&
zj4M0rj&Sa`=$JCDP#w+o6X8ruwL<b`J%?T~xU%TeGEzbq9pNt^0mgC3RX`(PXTrEj
z9KREYxo3EVfr{;=zFt#v;aV=DP!H8ahE0UAw&6g|GxyZ%+r?R+*x3*L3&SH-<HGIK
zM~$)1;0YIle8iv~M*-JGU}%TBSbnQSE#>+n3N>LC^%pQ*2s9jLFsDMzm*qg$5Ice*
z6dL&}%j||ewB`nF7kgJyM-M;_W?r!`Xi=dKSKSoK#48AZkS)N0*NI9UkwsmTfGgb?
z*D7Ef4DeD+fNLe$^yF4qmU5`6Z5yUWU7Jw@!XuQ{VYo9c))DBK+LM^?{FL}mH(Lil
zOE9ThVagOlg(`)d)mQ4JYbeDO#;@c^2OGahR0XzZBr%o%EZ5?@MZ@*LpW3`NHQoEs
z`t;TYzOf|gx07ZNU4ti9Scsi6If-r5@)Yjpnwn!G!&Zm19o+f)J{UoC@%<2W4&Meo
z(a5a49}t+W`8t${_$@3KyH{vBI6*S#v*I=#o%OHu^RXEnXaq3c<ZZ{khK}tqA(wGX
zPOchuKyri@i31G9S3K6_k0!z-faZSorDjw`dNp$QCxZ6_x=UOcLnoaP9o+_28gl0u
zcVBXT84~_4)mqx0q3u=7sY%u6nL+^>)>XZ+^4hw9;G|dJ*VFr$bkQ%+075|Mi&R#W
z9pbE@3Nw9q&e$#(DR|hDb{G>Q*wt-}_<v%O$8Ec!wk6!?+`oWi3<)5HMHI*)N<#+c
zU;McJ3BnbS29P-<1H*rD<3F*++>0vzEC18ZKKbu(;D2xbuOs{yd;Kuk67G8q@AeDQ
zlZDj@@jD=)lUAd6J;x+xAopAP9^HvLTn>pvB-x+5MQLw%Mdzy!RXHjqr3+nrKQy~n
z7QXl6dhHeJVEw2TzUOC!5pgJ*^!7*1n!r<ikAA->M2{TbFoDP3b#j88;&%w*M-_8o
z9kdFwgs@T-drsOi7p4x%)wUhJ7^KH`KUA3Jjxn*u)ygRRkxkUop6P*O%P6Av5T2QM
zg6k_%v*bC7;Pt?Rn}_L2jBYi)#b=bpl8D;nn~Qr!au%~X-%qoB1IS~1`b3yORnGag
zaTxZ`zunlFno-K+;b>_rj4|GE`f^%}O6uoz&^ABsmg`?*Cdyd10EpBSM$q47eo!RG
zMrAr!l<bOp8cQ%ESNS@DK+}lV))dOnflP$2+ff%PY1omAXgi@U8-Eq#B80zO1OV|D
zK-rH{pecn`g{%uB)Q<YGd~Zddur6I%VOS72OAet8rS@f%jLgsarP~h(>!O~*M(Bjy
zP_WlL+rb{wCiq>(pP6)PkUesT%PS|FLuoZzCjW;BKz%;L$yZ9Po6P&YGt&o%r2J95
z1|B+dc%+pHbdpSjxNz~A<Vb@;hP_Uwme19Y#Q>_4K75}NF3z}{{-gaIp&quISUvgY
z@c1NNw@Y2C5Mo}4nIwjw8DO)LvtV+%|I9npAbwN!OwkL=l5JYNZ~t2>kn*)`Ud|em
zrv;#Z;SH@{700mO?e`wOkeCudhd5Po_-L2W2xLu0@?+ewX#G}YD9d1&^Q~375rhsi
zt>^sOXW>5qV)7&-y*d0NdUai`DBH?9aeYB*hHmy^fy|rMYvb?m-6{_|IyTpz(>F&P
zlPeZ*OrI02orWrZ(;=DflN$T%T&Qx>uNa0%!^wb0nM?K>5OR;b>aM|XKhE5l4i(#|
z>)h){aiV~~HjSTLg?5{06S9<qs##<LN0|haspH<-5Y4h@Oetob*COiUQYQk#pfwo*
zNIz`hE@VQ3R+B{5cgQSln~51~8#|B-pMWu;t6i*rawc$PqUs%uiVx?KA7Uu0Bn!po
zi$<vG?vUW3`irvNgwO1)`9fk_+V>D}sEYt$O@PW&V?om{oc2BP>jF#5)eQOMBCj&d
z?hh^XzF|I|0&L`xq-5n;UBn4<d|$}>p%H<S^~o!}P2UlV8A}uo(sZy6;(<1YH7tra
z9o@Jz<G$3W<z!_js+~za*YwLWHzwlRde#onvob>nWF?3{p+gVUu%U!P#EGGHf*!pu
zHaeVtcKx@-%$}Q?kkjtrza|No5cvZ}U?bcHVF75lQQ=D;&`JY<U-@pr2-XPiH)w#M
z?fv(i|Ccq7{SX|wG;fctm&=<&i2egI@&5t_?ui2ktHxAkiGBR;!EpdaUcp{8^l8hT
z(G-LsxEVJhHwKL-Tp8I3S5CAl@Tv>~g27B9fFRvXI!&U)A5IEctf(AK!VBI5Nd;|+
z7tw6Td0M|ChP$m_nyL}hG+hc*khV-((zp&*?`Ef*(}1$Du0D<zxkcPXYFh3L>=pUv
z9F|9n#FHBh%$T*$e*Uh(*quOUMm*6d4Z-vm5<asa##<yr2<x77t^hDKY;L7(Z7^wx
zN01ajpEuB$2;LEs@|HmNOAbbAqKNdXSC=C3h1~|n6!5~<&dHMy%cF4_SZM4-_ZLrv
zkX2D*?AR3_$l6SQt=^Dbih2cHKRqU~jVZ3h`>Iu*#7JU9P$(1E4wyAu9i%8w|L+WD
z!+{mHqg$H{k|MB}xkK!ye|k?2Lm-E6p(iSulnOKR&fER}z8|C|W}h>nq>^lRWO=~v
z2M;0KH0t)kzc);+u?=3;*$&VC@wo8+)@h31ck7~&yTH8U_xsbuO4WQp&;NNLwCkxT
zHZ<s!_bN1&xj*|`?CR7fm}~bKBfC)fSbU93qB!Jh7O94B#m!1YhQyZ$tSCBSqnuZM
z#i&CoG;9U>9~F+=tUHTdB}gibGG+S-Ukz;4Gbfr&7C3$L)ekAUqhn}ke*T((8m%&q
zq^*)#D{0jMp)0vOq=}BaDc?$3=#Tb4+gWSqbAg7FW6lk#ptdNTTy7L)DTsJwFan)-
z;hD)m8nUF5BKMgNQWBWnFp=yt`2mxjuz~|viG6N;nWxW5GAuPcSyG%g+CNf5u_vJ5
ztJ2PSZ!a;;1;_onYYpJ07fV&(phGAxwHT;Ryb)SgnY}^*shr;cAE8ox)xwE_&?QSJ
zL4;vpX+Yr;NF2UP(nVh|<mE>iT>Ac=>2oIvMF9`O<_#GDR|}imQY6|a6#rxwYFD(Q
zG9WKn;b&}5MJJcEZ{lrXD5e3q^1HC#{=zXK4b?>amaxG+TALFCH@-q;I^9!>s)H}-
zg5Z-}B!K~tw~Gz4aEJB`qpl|hzttx-1#1bXb)zV7)RW%NnZo%QuGY-YS@3lqe9N)a
zT9wVTVOcXusI1VzsZpnlsOwOo@%AL-XhKZK1jo*)U-7Ki%jjN{&@aane%+qDf0HX|
z!E&Wkk#%x{vm%g=JD5aZfXmC8e|L*xAXjq%Rt!=bUN(LxLR!;2k=&yg{qB#VdFX?T
z)#)Q~4AViF+s#l?qA}yENR4iV`%n~par4%3_42RV<34yhn#fhE6dpVZ4YYpQc=_<m
z@684{9KZ%lyFalJJb1rjhyDc!*cL)*Mjfg}Lk16-ntqICO^DmnHNX)XEPkEpgUL`f
zBUqH9DwlVI<O4$H(#kIWF=*V~jgSimR>OYe6&?BGk%-s$;hCh<C~ql}=K_KIB2SDv
zt)#5i695sR<jc%OM)`kLBEoTFM!;%Yh%=RZ>y^>3oW(}2RAUCyz~f@T$geIEFxuPL
zq16<~CG2D5vcX;G^?$vT<b;X=<V^bt?_at$=P(d3`P~kzC=UOyI5r|AC20L76;&io
z>cW1=p4_=ijYWw?HPI~hVDu-bkZGkKQzHZLB|0H~6eX}9=KK!1R++x0iov@G7ErW%
zna_;d&sBttsSw%(B!q?Q{#NN4T!wE4EIJ&hyJ={FPBsbA;g}DpU;tno-Ryl3i(Z4G
z&MC&)^~VCm#lSU(&Tt|#B#m2t()lih_nC_N0<%Zd661H!hkE+N(e!NsSJpxKSWHCB
zgEgub=3u9n_nX6~yEn4O9d(xQjKZgH0{Aw?BQEZ2(6hZvCgn+?4e(^gSn4q_9)ovD
zki7K;Y=lx!;-S`6Mu+lL`~9y%ec9Kg{)~X@SV;|b`q4jZv}NL&?yiH#At)djG>9TE
ziUKu5-@;BIKmsPZ@{3kUx9!{RL~Df8auw8vTmriqSE4DUmjE)$*X*-nLLFBO_=4Zv
zHz7cbFO59z@zT+fc&+Px_anC2IM_1szGm=;sTNdE*Q3NpE8^N5xgxEuKlAf)MB4Tl
z4e~8R=Aw`q$*<<B;-CQiT0E)_0gN7sp@=({j1o*cqGS9h#tlok;ouyE4iILDX~Vv&
zs&=U#Bd??f({4(HuLfL|qNoczEDlv-if&rm=Y`@#Nd8uUNo3StfGy<VaN8s7Cdq)a
zEZ9)sluj3h#a+ch^e6HLPB|GAHY|gbB&c{!%+Zf58~RnERA$|`5xo(d+nx%W$Q}7*
z{~J`2D9Sopq6AG$$h6rNXPFHJ1ib1?{BBeo2-(=yr0|M<IA&Bfv`TAy?+E2~M=>^I
zuUlC;<!lZbqqdc27W58*&4fs%!F_A{FD|)Ca7xg1f*{0S-ieIm#S*l6UHv~C!INd3
zgJD(MIF;J<Q3clC3_JjPxskdj^q*&xF|erGN&K}3HRAXmNI`iVPg+?cv`wglF3>LU
z9`V#QB{)pG`?n~=coOOANVwNGZ=(NsS1>jr=DPBnvc(=}04*aUH&9@m=vnboz4ruh
zS*ektuAVu<6c%y=&8`osk9nxiZ=WEK{GC(xoc0(Dc7W%S+{{lR#+gm{v|fStKalLU
z&`vC-Suav?l@4ds&F&@$3m0V2b8s}qXwzP@iUWXUJ1R8sO<)^{%A9pXtfT3HZ6bdw
zAy%56j$e5ytL)c@>sRz!no?4Z-~`$m$$cB0BHdKmQw0hq8Zvf-r1>Xy{|pMm{*uAY
z77Q`N`Y-(^olna;drsHONN_kb(Z3#V-$dmqN<$xIHJA<(d&xY1NSOT;zuPe2IC(dc
zSK{F{AbBnMcIzpNZwN&n!W6Z4nu{QS<c+Pj*LA=jwOu9p#pTnf!Z`U%CLt<z8+oW@
zI`W>)z4|S=mO9#4q_Q~<w2M@<IEpo0LmXHg5B9EvOj7MGcA{)RrBTwG7blQZ<~X@X
z1A%DX`G&G4De6mZa5iiG3ME;o7&*^aPkv#EY{hDBO5S^~So@#sMs}q79m0rO92{9h
z>~TbcuQDHEW~sHAwekBMI0v4`QVd2`q`ITwRkOQ(B~A0m3wqfCrvC?Z?*Z0Sw=Ie$
zA%PHD=nz`yy-9BpdhfkSmm*z6P{aTMLhl{vy@_-X=|w=Ah+?A`5mbsOAm9!E{{OSj
zx#yhw?!ITAci;Qg<Xfz@W*IAM&N=!Rj4T8Mc=ugL`qGvc+CM;f*w^&S4X4{^>b&Q3
zWsv2v;Pj1LmmSK_Qg7xGTwj+(ZIaa~PB#;Go&z4GtiD9Q@n9D}D`qUMu^?Kx>+w}8
z<RgC7&J|%&^a&S}6JBqq(hu4lBXRNPM~%dm>S1(~rs}pwOlQb9(|PQ?O~nf>?E;FQ
z@s(=0x_>V5RyTWc*YyxqJ9D*plcaPS=f{IL=CqduONdkTU}nuXCrht)X`iG44Plx~
z<vhBL>MrCdaV-UKI<WF!{;(_i<TSDztemb)uJV)rk)ha68r*&^7R}TJ(x0K8+uC5!
zQnr|x4e43lsM!~m4}87<8}OL1-p6oD){~Hg@gV{CL*e<2`?5>!vP3Vo9u_$761IN#
zKfXIE=L4ryuaZA_BV~tV#L+Xq0fc#Crs4Z77WoaQkb`@!-F!y+@1pU0TuPdLdAkAG
zGQx5aH!1W+YI1ZD&$xpH0E5`JPO~7*MWQClo1un4m7z%1d5k9infpiS{yanJSz)m|
zwN*^Gn4#VJ7Cv+K;wZ;jYD@+OU9827(;d_RUuNi$%r+cP6CDlgx61+^&$C||mOef$
zP@Dz<Q<C^ykb)<-qu-XAs;M4bgg*2>(^9PoZMs*L9tB7O;7!@TyZhHCVfYmY(<x#Q
zKDdNa5Kr7%JhJ|{`Lv*u(w5WA;k5o}urk~mEIa%#dxo*bl-h$Tl*(l1;OnK^pxj`8
znFuK*B$Nm}k%Vd!e_)c!S4`*CL1A{s&QT0stA?DGG=axstY2i(G84;jDqa)?qH`2%
z3F+@h>d*0vlafGxqcxlgrD6|zH@4U(^zim}*8xTPMB62){-u4@^Y0r3b0g-R5$wl)
zxc_k5B>%nj*FsUwY-~lvzyd2;!j+@TOG=yC7T^}JPqND{E7bKxT^85RnL(%Mdr|fh
z6YBKtc`9iImM8Pa|C(gTEGb=$J65z$e|lQfZ~2S%r2g>k;e}${Jt4*Ri?37pl3s6H
zZvN|2b7G;eo!IKXqQMl=xNYUYYUA7H*+Z)Dwtu3)Ly7Sum5`mCGxk5CA-=}rInemI
zvt1bS@5`9jCXYJ`?*ji$@vvm1Rq?!bFH8B~>IMG_FM0mn!z$$Aga0`?8ZO}3(TuEQ
z6BFRESZHT~NN;ayqJ|M}dD(ckzsHpm-8})lkl<&E|8Yx2$_TzE^2t)jLVFnw_f=+j
z=!q(xI&F0n>8QB{77ePBUgrKlC}}f*VY<h84R7C1l|4ekO}N?xygD*tuuduGTOWA0
znwIzW42P6vDllveCymjMeMBkC6{!0ucTTL-O?CReaM@3K9oj|wPw41xKmgW4$ph&B
z%TWFGM!^2ibA^|omG%2wG`u71)psXVWi1dQ!^5>lLlB<YTzIp(o?ymx*1-PiJhf_M
z|0?Y`21Mp4f?Q0YDc4LUjdL@$$_@zsC4|F@*%UMb@(**9$c2&==NSGr-wKI;cv6JN
z^IYHpc=qj2UgEM+3gd!!68C*O|G#rbN{X$={Xsxc%IGD(v4^tH4MojA*Tsif?h-?C
z<@&ng{||r(e+S&8RuFY{js=8rMG=r4oT>l0c27#`Fr6lmYhQ8lfrqQvIKSIy`=6Ke
z50_6||KGb2?@MaH(+k{8v0ujFz}?TUBkeXuR6D($y3_#3n=5ETk1oGnuVbR1{1J9y
zo7|~}4;~%me2uCZl`RC49e{6=c%Rq`i6qLrA;onv%1`c)T;Jvm-_gExaQPBd*~nSI
z>?S&Y>pMZdg5GQ2#?L4G1)(3~Mmqf{l?J0(gXTY!cT(z<H4PsFLgOH}<juBK2RRW~
zoGmwx^W;%cRvt+q-{Hx}hW#g2Aj!va09VVUPZLjYddNzAsmFaA2aPM;$jwrMd&bqS
zeKpQ|_OD9nzpB3gdo%Do<r*1$ky5kj3MLq(>hW2wx<}_KJ?sGk5uw;+$d%g}wKcu-
z5bm>R{bhBBipF48Jo~OcIKhaJ2YpzU$>Y^D`NA8TGuIAiMwzUnwmU=<zsIdq&<*C_
zq_`cT!G)Y)uI53oMVDFk1YruJ7=fxA<J{*D(G&eHOd|ml((fOKSFn(n*msQmSbp}e
z(vAF?b%f7!;q`&%Z$QhHsOil@BYo2M$Ld%z(a9q#A8{@C5Q;TlK6L)IlUbxqE-}xm
zC=JLn0Q;Tj?^=bnnN7n<w0FsBIlg>pxEX~g6MWw34q$HZbuRRA%eP}ik^Ajg%7T+Y
zD-#oM9kOy(UU8H$Ltb;QHAUs>$XAZV-O$D8Hm?!jfrps|8loiF%|BjK&v|7Kv`DBD
zM!fV@P>E!goD5IqHH{Z(?z@OMagpW+)E>NT=2Vc;a6~Ya6P?ln8edykGWe`%>au+-
z@F4yyLn0x#K%y8hj55+{vF3{PM7^?WmLPF#&D5$jfqj%p9@miriz7dY1+1$1opgo?
zJ<+CXaZOC2O;O_+|CM;&XYeYR9q2T2^R)?;PlAHH86jWhTLWF`ITQ`$gE;5+1@@Df
zv7iDq@Rw007raOhH3zs)&iSIIQnn}Ph6CMVcT)WWV=5k+t=vRBl`ai*1<LMnndN;L
z&d@jHp}l#BsmcliHpSX~{DF!x+T#|#0~VkXu_&sd^C6T}s#`}MrEN1OD2g1lB4+4+
zfvl-aB1VZq8HDgI{cR4Wh*5fuaqTQgB>8^EHoYRffCV-Z@yOeZ#jkc<DEI;mb&$>_
zKv22ry(PqRM*MzmogT0<EW^O!v)*KiRo<{Zf+!e&*mK~CE=@O2G2mGpE>fFr%$Fxp
zuc^rRX#4$E0&B&H{H2%iV1cn7vrhP(-Aklog32LjAry!8Y7p_8gaoOCtz&6?uPLy>
zxCnq;A~#{)_>R)`FZGsZuXqQQ9682nf`u@u22FFZ4+zzRwSo87y`9QJcdmIpPuu6F
z8Wt4+hhoV^+^J%24(HzXDS_rZrLiHiYWeP13S(4V<Xevg1-%n-Xl|0(Fw3-;&;Qwh
zfVawHLJwZ|fW@ECPDWN0sxVm5G^0i6+x92nkNGtyeJ+5`C5{)4A=k!V?NS;NpSHfn
zpHEe~t<GF@(}?OexR-3N1ILG0BvMWZG*OkxiP^YP=Fq>Pm0L)D!F}%2_UzW<S9a>}
z72axzD|_MR2-Ro4HT4VXlHx+N-tD?y9*_#n0VO%sk)s6k#hD=92{^k=vl8e$JeUU`
z13>dD4Jik3=u8Co=pAKZaxgs0-s05qH<7Y|{qBoZkG>2zhI&=wQwQR!igV5y*+w7V
zEp=$s((-E`SR|?F9u_NlfFKv~DP?CwT$4#<i8Bg8wJq<7UUa-5Wo5PGCsS|;)}?zp
zk9c3&4;sDCZWvqnV-O2KN5mDZ+(B;u0Bj(L_cp#05ptp$0y_yl7b-rM0B644Zw++3
zT@ctJk_I-DbS&8#d+9c=Yk5w;pG(x_NP?iZb0lA}U%;*Rd_y}=X*mDoe!=dOhfoCY
z!<M{L#DGLxLoKA6sgNRAbQ5)YEn90dHfqOq_{`h)^z=?L>{=`kd6&Z29`^IIsj`Fv
z$9JvDHTq!d!%lwWP=P_8%zc{@Rbr_DOK~q?1-Fl;kr_i;J*7q@^ee$09gjW;Qq1Q;
zWn9b#0W{YSXY!}F;Lq}*_xTYVFZLp4jUo))zbV8}+)#FDTd}jZjxla+b0;P+=*yhj
zvB2&sOLcr}E&L?SBQIcVLlzaE`ds+h%C`{$Jj^pIvwYDB4iZ9wQ^na8DKE=Jeo#Ka
zU{|QfvKCh{#9Kd_Ftu9M9t-$f>pmsyrx6Xk0n}C0M7_nHmK9liTKq-3S)BVRf`ag#
zQm6bpY@rSnZ`QV-&Y?`Hl>}YtQ6|wj+)Wv=O(#&2h;U|{2S?sxhk4ho*f1}IlHRdl
zo3kX^_V!zrENg0JeRmHL#J>X7%dKo;&xBrgH)!-r7lV)`P!Fm`gE{GSfEBPAS|Z0i
zui4On<uWMK=z`h(4Tx056zmh?pgK`2q@$qjC}@sL&pj<>&|%|6@fXZ|0U7no-{vu<
z+V{C=UmZ8YQU78ErBkXq?_?h%_L8wz^=ZqD+XQQmY>HL{5M831&%2e^O)D3^YO$&)
zus5I|1NlgZYM^o+uaENv#N)5}d0?ElEt^YH9%ZN*@nC5vZ#f4uISi_5GdjVFRp=3V
z-XmuYC;HEM679j<wl(-7`!iCPquw}vYMvxXf?$M&__~bjfB`jJf@-*DDN@B96H0XR
z2_0V^aDhZsMW@H!4ut<?OYN9t(fOBe4hz=`t9x*jSS2rWHD$-`B#KP>k$o!zb^ztO
z8%|;&F7jwQ=eruJGb1bX8;p+MiJyHk9Oek2kluLlxEs{YURpmT9A7w};t{JRZ3}#g
zIE(UtopcVhd<;+7-0X39<c9guCb&Nma(#b-+h$1SU3;LV2VJwGDQ=Dzndtq<TA)yU
zJDU+oOJb-R6mi6)wJH%sAyji1Q`>OXAu56W*+s0f&M@6NlYS$Pr-Y<*G^;VmFE~ca
z;Z47ZzkJ5HGfNdEc7tMvq9nII70%};F0VR<WE&U7bnrkjGwq`%715ttT7#eCBUTKz
z?}WnEyP(hUk)T@=D@R8yck49ro`yoNshHqx1DswwJ$|8ljvk0?d0=yzO7!Nt*Ms=O
zSv{yb;!#6N!FnGHK_7rW{#BL4+GXA|hnVM@^40d?WF5?NDV6GEiOV9qVJL@z*EpN0
z*naN6&4_5o<O#?gcCubuud4>&V7Jllx=SX!gEiJhGHdQkdY>R;=x!NQlF&UDc(i2Z
zebqjDgIW$P&O~<gX>!TK$$4`2o++Ch*fz74y)rLBR^%!A;#fGzVt6@Q68XMgQNfby
zTd`!~4|`k&gbd71*Cm!nYCtUg1bPV0pbt&A7FopG!it1?IlC6|(~>B;HpTp?@sf#i
z*pOue2lA3n#i{)**Y$o8Sg2I)%L7Ll#<e=FZ8R;P=TJ8-eCoMAb2g>sa!Xrjma!Qx
zZxrl6TX(Yj9=9SlijQca<#ihb{cLEpQtv_WyAq){nYYkrOYvd7;G%(D9GP@_L!>Kp
zA0MMSQsKA2Z)@e=EiV~O6y7>uO#0{{J{OKn#bwGlyqq_0rg>>}1i)UfL=x0E!3$sl
z{B?@HI6`f$`WCL6OWu{7%lAK@{yT=Y<>rKB@Uy^~nBc?T0ERj{oVY)(<S|ataZ(k5
z`|++Q)r0Of9Iz*~2%Nl2F)kQ4=4ld~6R|+TX=1>Ig5?e4r|Fj=AoCIu8H4ddAiC&0
zXWk&t3*sORmd^un!8;;qh>u+NRhe+1o@g}n9!I_ks1Sw6@~itfPa-2w#}!1y8t-;E
zuzK#TUSgF5zry?7RD0+;F3PE!_^7l`Sd)oSvLvq|MB_k!m-=VDjMQlXwYk}!XgiHa
zu50IO+L}&Djpa*BhoWB4$?%L|MI9U~D(pb&>QJ;ZNzScO_TA87AQGRLjz5wq4h_o?
zFnIj!*UxXuePI{>!O5{RZV<uxgScu-?4h{e0`*g~?eE2ZG#7EGg~?K@0v#+_43_Wy
zXYB(?o3wy|4?8GE;p5<HU~DJB$pw$d-vE%~HF`N^xOsvo>iy4}haC&pTpMn%hdk$g
z5ff4BVj1JHzf=>kisFQdRPb`PVO-P?y**={TR+(9Ojn;WbI3|P&rxSdoH~58!h{EM
zbKxLSs`9P=X7HZc5B_RVf=Er%N~+2`m8;lN_a6A|o4K#yaoVO-H&CS%Pgp@7l8^f@
zUud_fmkB4qz|7O&SlAP5qfsP^THFiP&en}3ClfUpc892V80VYV*p3%R#E$wXH5%5&
zI>DEIp4s6HEbi!j&Rr0zbu*o=d1NA6`Cqw&9_$-U{4+ZG0|*fd%9XN=|2kBEzL7&C
z<q0W{T|ekg)QW!@EvsQeSX8Q;d(CA$ool-vXC|CsjNSG=`)?|1q^Ynsj>pp}^paC>
z5pOeB+@wT>gTPQYl26m>Wdx|UpZH6k?SDssh*Y<mDTszRIDo!pn-yA|UGTt>e~itz
zaw8CoC1Iw2AJ+BXQEowXt-Y@+>PDPi9{-yhk$=l5X<}hBQg=BsgyTDG6LMb6B06c1
zp)vTQV~;4;b_Cgo2TCj*RwX6!btu?ZN#ARvq^sd)QWKTo4YG?2u~97CCzYKF?>day
z0&sEJ=D@L96*&yA`(-9Td+L;y12e~)%AFSdHWzJws6XelQh^17#hZc>QHWWN`1^g=
z0hAJnRB@iq(H`ZFk|%~Klk&Tekbb!^%^@WBJ?N}09xv~~86bK!a5F1xLbo^oz!PFt
zPk{VXT-v7rV-W_RQ+*%Pa|yO|P9=oJY*?cV7OV83d~sNRfp*(BPK;}$_5GsS3!8dY
zuh@2OE1U<6(VjiBTW_W!wK68LP0JVEyuDk4LBG^EzS@(GXAERvb|b9U%B6z~p6Ds<
zI^xJxc5eEQjL6S1)xN|$a7ub(9Ufz?h`^$kn0`m2wIrg&c2E!<8N`8em>Dti&JSyP
z_r;H+nnG$sJ>Cp3vv@$^H=sYJe+&^(PhSZKs8cw*4SamMKfac+F%qbRc#@x)l&)%^
zIVGmIa)V>RXh`UR9ql;=QH9yyw69Enm#KR7HR1U2zAK)aopbCu-^94XJJnz=)o%Ju
zK!(}E=m={zkA9B<MI()3*#rCU)+<sp!NK7){aPOwlV5gGj`q=&uWUzDi#t#^8CiuR
zK%+hjglm$^T-GzNf(R=rcQx>zs_8j!L6t?}OhkgqNTFT@fLE^~^4SaNM)C=gXw+2H
zFwHmv6{B%m#WrJeUL*s8B6YD7Nse_Xeu}K4n-%*+<YYYQ{wl{e@6Z^RB!@Dyzr(Fx
zg4yzYX^YEH{8R1QK=KMt_%_rk=*;t|-Xq5|GmYxWe1ucVutbXzGEWH?roC<r$>yCC
zAO5_f<2=gin|?aiHHDm-+RO%Kmd95%09p5>?8oy!1Ua!2Yedr5kJ;pG*h44!!tWJl
zj)YWyq%Cj27`>Qk(l8~>)SA8759-BlzPB<uQdtc{t65+YI(dwY!s{iILR`GsCTe}u
zGVYjG8Rqfdj0{Ks(>YS_R0Boh17gm{3G!$%$mKXAiuv4Y_v1uLodKei+u>VeC{mY-
zLL<XKk)_rW9g_;Ey!{nTbcNPGk!we-?y!rG9Q+2b!aOykzgHiy=j(G_dhk)2bmRdX
zRd437z0`A4c{fMvE0}k9zz~)91Bs}oC5KN3)lh*lx)@t*v<quEyC_D!t}zd-WNM}f
ztndeo!=DBRX~h}en)l(~BKn}MQQ_?>9|w*D3HE<2{YfpqMG$|vcTxdgNK;B-t)kth
zFv?2tT5K1F*402_VQX7oLbOTo%5#jM6XY((UZmU}_ePqDP342ppKjr+>uSEM_ze(S
zjSZHMeka2}EpRyYmJr+x<2ICK<S034vmapH=@Tf23q`g0tJoDdS&)km>8}huk0H2X
zfsVzdG!nxtASJvOjkL_{g2k13G^qeHOpqVr>_O=(32SnBstt7DfRG%ViO}$~EhYvD
z*5v$&aEvf5J=VHc2H$QDdm_?u=x(k8Z+sKHU-tY{g0hD>lE*<p$t7G{6^0R#<&QQZ
zBy?_ajOcyPS#=UfE#eEM8?}<woELag$xF0powMF5%IWUeSsUHZT8VMiQgpmh2EQdm
zyjB85QjQGspDYTEHZYTZc24F4<Y4zShBiO1{|2N5P02xE)xs|}1V|)6Fp^o}HA8k1
zJxC79>cMn^z8}6^ASKU4%{#*9foRKXX_ykE$(Y8sxH7(%&#;z$H$wLNJA-a;(?*n^
zuZfJBTY;XM`5!j3LIh-hPrIH0$V|VjMbl8!bku<m^aGKDDe{NGeJy`3-~#NOgW|iU
zex0JkSUFAAkhH!XG#4p;Pt*P~mn^o*I5j!;ahBF*)Jtr(6uro7V25H0ez_NtgRT5U
ztVHH}wXdrCkTLT;asgtPbQ0!g<b<~&uSbNU`0Vsd*68>x+DF1Y%=!Q(EF^e20LzTX
ziys|>BIhc`iJbTe@O@+{D)T-t9MF?78v23_t%$nNkHBiQM{k6rH8ITEG)CcC`i*4x
zg0Os9o=}J<cR*anqB5yTFJWogxLUpi&jICb;`p>lH#ri|1hEnfY4tPdvD!}A9@g6d
z0RS_!1)o<KAmAj#o7vH!O!h>IJ(&4YtgY&-fLuJ;HF?D{90i>&^UMnk-Ux0kq^qPO
zZ?X!>sDN6~;S`T#bc}f3R{lG~_}E%ek%Mrvsqw)gj^)G5-LI)W?Fq3lR6`TN)m&IJ
z-FOezR!MD+EnS)Sp~EN)0UroxLu|%+GFD-esp1Y2JVh|YLG#V{==BJ{w_6u?D&`Hu
zEJIjLuRZxBd8?vsjcbs&c@YlJz!Xff9GF)786rz&H}5kOpd$fFhnZDUcrBr+<Tb=x
zK#4(EO$9(d-x?;U)HLn|+N>`5bAtKq#^x1WU--nG1PAatyvH|{QSGeXCz?uehwD|z
zvj|&*9fu%F=4->LRJ)@hWuevYP2tl}e&BC_%YGQ@kXLUQknWn<;$r(qy;Xgbp=m#%
zqJ$R;*`NEhN;Imt)%nP~Z=GUgF_`g&Htj+BoOwH-i(F%FGbuff_%R#GhA!Bth1i^G
zI5dgzs2=L>1|oy?-=18#ocU9D7#1LILRwkypvl#0h9FfQuY5yw;M>y>G_$4wBV*MR
zhbSV#-%@jP*umXOjgq+-KY^xhnk@09NfP#<E4d11ImPL7-N~|AUX&yaj6XXDCWd#7
zO3jlXEv<xLa<!0DQZ?oLn(y<dksu{0+gx{6l777U5~Xg4sVjqJ=D<oQJD9nE2JJZU
zAu^lrEx+2!t!%RQwzC^`c$KmvpA%P2X_CUfUz6Z~^o#CUq&&Jt_wIRH1`s{<IND^H
z&_tTym2dc6_Od0gUuH_LyxvCX1v_7mR$yJlz=>dDY;-MkUfo&Hm9jbRT?ZiAOwiqf
z^8?a<IshrlceoP`IZic3Mu)HHb7|FFr*E~4fX&;^Jbk#F=3yFjV}G`kU4xjIEih}F
z5z-1be8M%tR}^c^4O%%Py2v8uxvs+IHXm?Yo(hL&GCt#f7S{#krB5J?pf-R5Q@x_&
zny3(t6UKp581?}}{g3V%-!%ZZ$h^P2agyMy=?pynFmLLy3)h<sI!@n8nVF^iRd@!0
zRP#@kCl^Znu*JIoGVw9TT6d*YBUbVzZ-zQEBB1t&wHy_he45=Ut0$+@uM_PKPj<m)
z!=-65qx-&-3(z|eZInS0*^a8b)oXG<c9l_fz>FcApy!LVv+!2%C~w}mCA0=yo?<Ol
z`Nk=RFP3DM@Y=&FL??t0^$`+a_;xg0LO6$k*VS1hO=IK>TMpr=C4~b=d24m0EtS+K
z<lB1$G$I^Bnp~W%hhv)4Tmd7N?~!+Am|-PAC*_Zml{*58r_%-apDX3p^9{TGBU7(;
z+CdhHlQP4S{$iHHnW`iuT8M0hB=R8Q9}7k?67szsY^4t%@M;^%T9QJoikqQmZcs#x
z77&x*>%l+_GjZ1tmU3m3R7y;uR(NF<*fcEqkZ5#4eHg|&Z%dI+MFS+dZA5UZ!sq?H
zI4?tFb-dGb@3fNy421`4+7!6<8msi>Be9d;r0u&#)!0bwXkG<oBC{xO6GJYGht~c=
z7Ji0mNl#SH{1{_cr%xti<loOWAwUOFO+O^vuRDC3%Tu~Lu;x1wEOcT^AqW^4;FF75
zel_xhiO*ZVNx9_{OQRC)PM6Z$g&fZAscY94Z*n_o%km_L!zQbJ8$*jGOZ2Dgjxw3(
z6`qthu)=H_sZ#J%n}!CiV;;`FrB)$<SjB&c&|h?lXYT2aOBJ=URe1oea*nRhtPltn
zxJCWw!7wq%#eZWQKp#$BYZ>^Wq{z{L%>nIN(x5Ujy*3+!F5dm|9%qUsn9XkG!Ilst
z$9PmIc04#AL(xex3JupDjAQw^x$}a5?v9;VbS$5PZf5^n``g<TZ4iQwrV~UHHC0q#
zHmlZ{!6&5*4hhE#63`P-BSguhjJzuOTR5j%%*tLQPEaCk%YDG&m!Z4MmB@rs;B62c
z*A`>2k)%*fp<)-cg-9vI_nlN!O;~GbLQ%{u6rxtiNB4jZu%*-E91MZ7F-pj=o4$;I
zJ^0SPDwG#RSdkD<r)I3Al08EffTC4W>=!;6@MLs<E&sf?j-E3nIR4hGJ9uA&MWWY~
zgI1rJU!qi*=)2a$!8-oNF23Qus=?f!_;HCmZEC53+4D=0k3t!%ZUPHKuY>WqQe=P#
z()~17763pJgkLTHOMdx}xMlazYUdA$RLzlR?P|)s95OxvN)y7%_|}t1d_57n56CB<
z!?OOIs=omUb-gQ*%#75PNTyEVFOf{S%j}i4!qFer3N5eytbVTaGFM6U9(z)RV9cjy
z_l|epJihVF(uKX)2rEkY^M`=t6Q_}Qnty*9>NX3r5C~~LGH1}YgoG7U{3V~zt0}Do
zHGyg`&;G-9S2soJK>c&8By@Q>D!SHyC_o_OLijJy%AI8NXEURYv7fL1{g{7t*!CSx
zR)ELBa>XgcMSoDy{0#{CO8?J1CWMDnxld>O{+Y)#G>j4H*7;980Daqkh#0yfxifXn
zS#ef_m)Jkm*K~8^4Nz4h=G$+r_UeC_-{)7zES#8eb!%?<$8J3L(G4*^TdUp|5x#ZQ
zk6KaGx)O}x#8crS7GGPh9GJHM(JucD6l|}IMpR};GUp+}c+IsUW|EiL%<{np>to4G
zEeZ!*FZ&_Ec>jl>|2a-?adn2t&`uIr?v<tK#qD&|LHHCA=(~7EjzgE7y&0bfPi)GZ
z%<yQMrc}IHMb!4Y2an(qPe%)Aa&D4*5bxEKh>90<<2&Yu8u|p-oijd%NPR?`5(jK7
z-sIU6Wpr)xd8GgwsJ;cO+0TxtBsH<|ah-e-UC0_sVyW-n&;B+uo&+r;sBf!vivt1h
zL-=qK@%e~fB;uB+(ZIDYkGdDlDc}n_e*5KvM7LI(MBSN&vXX<-uj`d&BgGKtxokdT
z2d^Lc-XxtEpqbyBDH3saWrGO558<t|i%nR7w+2c7yJ4kL5>Ry~i{Z5nk?0yPGXg?N
zl2*RY-Ui9u8!UC9#)My+oiN4^<Cug>CXZQvDO~Av{p7y%-s31F1q5ra4B3{cd)NSh
z5(#dvyRp(Jo{|j6>`%W&Vh%|>vIiv=JQNEhIxV3fC|2u<Qmvp`{7qgYK}d$t6gUxC
zPfQ+k->B*@v+Cn%J@T>G9r5lnCH~+ku)>2-PLhh)*x<J#vZhecX}(R}dF9e&{(x`9
zgeHgYKVw4t2x(_WIDzgw5^%N)D$Z5*ASpjze?)YU@f48<UZ|3I8d1|8ZFqg>&UOR2
zEgt|+ROo@dkcJuzQtBveF5ke;L!Hpxun!)-_U;8w)1U^3AoUjmi_>LUM37Clns(4v
zTTxX4IWeU*+krBc^)~QD$vz5f$-)9K7Ke*B3FpU8riq0&h{DdaVTCPyYT|5Cj^YcH
z*E0d`QdGGFzqAKG#YG=h-fGnG>`0-&sEKk8FuIhAn%bBx1)r7Lcfsj6AWBnGT!qOg
z^5g{k^aR!Dqu2n1({DiO=9OAus=NMtBKOVl)vjyQzmp=OHGQecgQ4T_wpafsM2Bs;
zcOM^b)D$hC$B5iZ|D>k%M4?&_en^YAico;M_uh=wcDTi+7YVV8jgQ|g6TkHaEuu@R
zPJ=03)+M9eVH4r2$D?NUAlJP{W(3@(*bpE24N#lFVG^Mn&#wUM@7Hm*dsox`blS4?
z9{)*HbHMHR;FnKOIR;F(@Yk9W)a)5TX|59;PHlP;wUE3nX~?be>#r>_Z>>P++!ln>
zO|_bfP?uF_TPoO=YR<2-r6kz0bt>K2@F3Q5>Iy;63U!YE2CUV8W`eCluHPKD#^2qH
zO1T;6N+u%qc|i8{oQRzIjCqajnfW@p$5CS2fY`GP6Hgwb*`OtIeoebbub(t#uO6rE
z>5PHIvNT={PYx^rFE`25`a~6^1GYioRN8TaiB5|i0=lj!-}o#TSydKXsV6S=J|2`#
zMtz|j(BD4xA^>1%ViwKVBucNW)XYXcs^m<;e@ZC*054uWnx3~Ez<}(`MXR1ihJJNw
zxJKu&SnoUnIFQiHY);xN*A@U!twY&G&Cp0r?$d>lp^8krJ1fb*Ml<#TcbWLk8bxnv
zwi>>C>}@~}H>@NX=Y{Bb$*w?NR})7`Kny5^_@wZPxj!}b^qF1p<egwM>umtzhNUrQ
zs5a?fQ~mZ9Q^lRP?&Py3^NjGZ!Ch8eHim0mG~P5#u`p)ISR<sZw<?dP7h5NPaU%7u
zXYD?Zjf0(tLUL&eid}>Ksp7BK94P8UeV+iOtj;*h9kUGV;_TyR4(>Ms>9Wm3zlzcn
zfwMXt=`X*BJ1uKxt?~V6wHEQlAIapAzy>JL(TbV8aHJaJhk}*%xptAaGZ~0QFvvzJ
zCVk6+8lG~axdc(hJ9Dh5OmOsiOunqQ&uOD_bty(v%{&0ANi>%-N?55=)?BXNf-re9
zUmsZaxid#pTo2DiLrJfa<Fc7klWlae?k*S7Y1RcF(5J$@vTJU1U}m5HmvskfJ*$w0
zuwR^qf3om)ctUE@kd7NOebsv_eD-9rs!8$hCK)JR*6OtO6NO$%PQzzT_*5Ka^u0l(
zIhmjjWJGb|a~QSz5<PRVc*cnD)SbLBnsE2(4Cnzc<uw(3V%Y{&0^`#jwI+M;=G`{8
zEaWL&ID3<TL$`yDpM%I_8-jEp308zHI2xA?r*rgR%7>h8c93ypk7jgu-V{1zbdj0-
zBuoS3QwOW80E0r3D<PjrDocT<C$vAVxv;RlyhW$V4@dWw+EdybrZZVM${8AgYn?>F
zfJ5KZ-Qwq1x_)0chN_}C!y6m~tE}go{gv-jHh4p$d_K_u#$LNYQo{2JMj~!Ib?$k~
z*~daF{OKe6dw0e6`;~yCpNg1kWdQu<aiy4HKbfH$@PH+$6`3?ix-9n1yj7BcO%T%V
zTS;0lHu-=6OMN#n^T#J~GwT}Ub}(N-F;MRn<;tx824`An34z8h$1^5rYiD9=x2&e-
z!YGNo6Nrs){Ml0+b<G}!q6z1JagJYb@<JXNAGihtB$$<mwxpKx12?PXEhw{ZQwG1g
zHI`Cn39Rbe=(Te>C6E&IKC3X#k84m%T-{D?$n!w*(D_I)(pn4@<Bx%NN2v^bEuu3p
zg=ceGZgRa}w;DJcqj<aI1GUV!p(5fz?RR`Nw!!+#9dRX&?)LbbH!2<XSw|Up*Ta8&
zT-QLej}w|L;iBnkhP4lNxcVHz<op>Z5}m}~r=qib=-Ti$0FA95=@LxLi@C^GeNAE2
z!vyZRf!7#cpjFYe#{3&j-pbcxNf_G%O)>k=T3u+2Rz5~~0yt(9YcU%2p&CS!E1ob|
z4dCdo|0CWlbjA-)O_?PQNSbySE2L2hqo{fPUP>|i(58o+K=oswe$}aHw@#Z36W{5R
zzc~ecCzYYizEOEtiVDhKndmFi-7x=b(yuWl=Ua3l(~e`u8Ch&=ZP28)0>#mR7PANE
zizZyoHRtgfEXEVJNj98&i+CmJ<9>;_a5cSGVI4YE(L>Xzz@iPxR;p`fy+G7HR7D;h
zV;vU$0U`>g5pzkST8xnE9f1q2;vhaY*OkG1#<`_!Vwl?b5;JFy1}dWHKH!xqCn}&k
z|M`gmtsTR&pw#B%&}x2K{}c*Ast==G3HK5Pu6+fhhjb!dmS<^<)&PHucv8%09K=3A
zKkdE`@b4a$0a7M-nqs>bX(&MVW`~&=3sy>72~5Di*YmDQrj_&aX@+pd%(1L@>-eSV
zWRmA1zBZj+(>#e6ek1V+!2+=K!Q&*=(AjE2oi&wy5A37qmkIb)!6wS<WQ;bIMAoH5
zq3Y*XtQ>osh*S>cw#9>N1N_^PC{iOT@U<q^=qTPdO_+x`fr-Q?K!iX?)1sT07S=LU
znd6nj<CU1d<b_+|{!nEoQ&lp3U1O#bSARY!BMC7adghV}99lIidbqN6rTq4rNhvIM
zIRvp-jPP=XGVnb>ZJhP-%IZHbdPL=-%now~e7R%qvakZ(C;;DLsCG_PN%P_x`zDGl
z$a>5eUi^5Jp*yc;s<;mMKC?zhj_+$FeRGKkGk)s_)3$LswzMCDm5R@Gm-Y@ZJcG4_
zq)9<C?xy4!+N<0wCah9<7vb{y`XD;CJuC;+-C3@k)*z0}Vn#xHdX9?ep)M*t_Xab4
z6}wZK9SBaVE!n9T;r%&^YQeU>C6@K@S8MLv;SY#1oGs^G!<|i3jy&ENm-51XY5xI-
ziB)~w9bht%#<E~Q@A&M%^`N|9hdZ0<BKc@l@@FDOh+k^_4dSnt=q9?P^sZ|g!|#rq
zc3hcn5x)nqL3vTMqi%QaIhPl-i*6BZP&~xH{&z+&!2603^fUNFH;=der*6KA>q<9Y
z1-{Y)#rgeJ{oF93l;D8l<@+J_JzF63&BI~v1ZJP{G%RN@O8KN{m_3d_a^`Qogp}{@
zK*;xV2C2=%;{N2)H23vtfvQTB346Z*w*NQ&1S|AR%+5A}2V*mBFF#k@Zc-5YPl~9%
z`7c9!0Dyr0?Pb@0L+N~+u5VDg=INGIM1B}C^D>r#Lo=04HMVEHx5NXYJ(PL7<>J4k
zjM!6zWrGQ>oEz6j3`dHW8}Cp56OSZ9C0VDbwI=3&Znx9)s(}v=aE1W~e)BIVuqW(T
za<kgQzF}hra3Pb`ug-O5eBOv%R_9^>lOpzcYN^cH;6(xsgA898L{C<bruHw!dhn6*
zjYM)RM%`}DK(A1K_6KjiB%FOpv{YN29w`N!_8hTMdi^#0W)C;?72v@k`Yon5V2mCb
z*ff|l#a<^4)<?Q6KW?9QN}jB(PW_|7La!H@v(r~jk7%Oerv#+_;hH(u18DDm&&q-7
z5da+^nke3mALcl>Uo9En%VatF3=j{`H_2(=w}^HLPVH}AB)d*ocB>@`&!x0cjI3`p
zIa{P^QglVx;ZVy!#qK44oUPK8o-<p!FH%uD6ugj+*r<sTAl&r=m7)kBKdkOGS9#i@
z#KJ)=qjsVF@|3i(3bVZt41iJ#5`l?kF5~DijnoL1+SDFM^_@^=;*cZ@!+~n;0tA5a
zk&5@_uwZ(s=xJ2lS6<S@&bzvXb;|zANhlT4T&_6*EExHLdVF0_2>D~S3j??!f*u;{
zE0fT@vXD`kOdxLhCJUqjG}V}Su;=08P2ET<1+ENyZCz?##)f-Yx+taO={$Rz5U&~e
zt6`hvq!7niY&IOSCcx=oxIjbB*I968y}tRKK-O{%hi?wMn-x|k_c=dHJZ+a9b0@MI
zoNkv5R30{(d}rz0T;bHOdT&+2a-}|cDwXA3KWkkmd=~#ny)<6Zd-IQAlDkp%tRG66
z2A?jBdfuo|mHakD>Z*N9+w)@iXA0*#cgzW1pX?F3zmP96CXV`!sK&Q^E(aPW;5<zl
z>^h3zjO?u?4rQdR-Ei6iysHBYFvuJ_)L>9-rsBKM45KF@L0v)6SGs|F5v6zo+Et>`
z2HC79wnf??5IJ(T4Wn5biZA$zk|g6&ueEAFQIvO3>!-(;c<nM}Np7W619fvbj-j-b
z8C)_B_{(fKXQEr}N;lA&E_~A(j;Nhhb_)8++5`hC!#!SA)pib-(zn_|^>iI5_UDX>
zTL1d|h1Lz5U^+uR<avNgt#ro(u!3$z`0=DpY-133P-)QRRinzy3vJD~2!(uc!(PR2
zlx+i6kk$4Yg)iu81ZMOopgN<w8VYIUQ4^|uCjmnQy$L>T*u^vEI;crfeu^|xmU;nt
zAVLX`&~_-1HPP9O>_Zk?F%RD$3f&?BSx>)e#I($i)LH?;y`t*u*1+_;+}tTvp{{?>
z#adjA6=2G6>l?c5!|w&-c>&5XgHETOnlN`x^5$jf=ey>gXrqq&>9E7Ghb}4b(BO4u
z2+p@E*OO|D^H7_(US#~HNY;+9a`D_4pWTA<kU$hCqkf2w1vP-Y18PEZ{28?eUDM2W
zqb&_fq>b#4&h6p0#S(hC4(8;;gd%|AQVmARa)qsYA4c*9>+vd~rodtV-jDog#RG-)
z$)m}=C4=z98p=m%JQpdUT)`V}n;7hAPh@c`^3<i-`LS?2PAEt}cu`D7mSOB~91DC|
zylB^IQIKS+nQ#3Y07(xSyX3|heTDdb{xJ(wf<Xk{FrJ59_?3A#*7GfR*8T>dFG;W1
z11+{rJ(nF=l-c`f0Vu_-6b2Ti%~>NsQ$aJcpiZWSS#DXU7*CJK!Yj?bf9^>K%{#bx
zcTyuGRq$}_{#f?O+dv$Hdv03rC+r6tZ%I(-kVYg}o&EW50J%;`yr}e?qW^&Ep&uoS
zmJSm+`R=*8z9+|aq}F9R=^yWV5NPV3m|c0F`JZ{H`-M1w{p)5-6q5g$2Mi<2a?<$s
zs2b04p%`#6e(oj<k6eeb^)G;{P8A>hDMS2+PLvPfk|k@O->)9-<$}KADbZStoi6@q
zC-)DX&Rjm(cy|zFe|w6H0`TFyD5|Y?i(NTPT;zT?2C!)>j!O0HLSf^$2TV|%A(o_d
zaS>zV&)L#<W6mFg&BOt<pNNSjs4DO@*|<_KsGtC|U}6hnc^hV<m4r)3HaQin$>Ihu
z3?c1cl2`whs7hnN<fOTWB^&*|9_(O*;9`RFiQtW#=<X-4J+IDjTlx*yIsEyE<+L4#
z50Y;m-j1+^sqYRl^mnm&nX@C#2=fS8Nsxk=l;}j_lF_M11RdODAm>TX$?A)mNSoK}
z3K1sj%53xNLxePi$AqCx)PWI1mh49yQFz*>OOq1jRMW~zyg*!-8eG;(aAyXcv2SbV
z=U|XG>uob4f;{QSPUXxh1)`fJ@@6SOw^RFYEO~`&4V*z2K)4R3?|6jl>EZ&zy7!?O
z{(<+~4-XhKiZ>=9LdC;c+0+!|vAou_pPP(4F){n9YdZ~g!bCl5kNiGG)b+ua_|H~|
z9m|OY9%s3KNK$r{jWl|v?7;dN{22+dCSxDp_iMNX;av}wpZA`xX9MgHTmrX??*9f<
zO)dpGym@cGka7bWo5Du)2Cpu_99~0jE-v)3Iu6ZtyTCm6OKuFBjy&Qp^2rQR3t(c9
zSwT<Y`N}W{&;Ml><&hS+ShrjZ+YwGBjmq#iO3cg`u&Mk!N5>Vf!>XxM@HC23zanc3
zZU|^ZMq`uNmWpHKb+)8F@jq8Bk(r}o2*l)3KZj1Z?rBk6Lvqq<CfQ#KRI<G@MaR<q
z22g#((J5cU^pS9Kw(HU^Ia>n_;iho`>!EH|y-qKquSL**k3u0Fsm))R6+5YNIZ@#E
z;3-8^nebV_VEq}oH`4iNM|fY7kB9)COl6{@Py?E<?U);vk&@pPlG<OJoZabGg|2Dj
zCTIFZu#uaji0~(@N(_7@$b`q?rC;i*yGN8T1=z0a$Cp<wtku0?=d#ZOe;GHRygwFf
z<v{jSB@sbanmSF9j=F8w{_^tI!feJzPCfBd4HJye$1a`#--iRjG}mHL@(I4_d*=|!
zE%P|i4(Np35e;($2UzmU++=iVYJy?%+fhwGJA6WkQXOvTZ8ZJh+hvh($XxiR@DZJf
zFdO+7Nd%=#;n8R~b<bK)_d81}<>CD3w`vbucU}?K1C}PkdgD<CRD!^mYad2CCxF*&
z*><@;DCl)pQL}9oKQn`k;SyGpzkZDGg;y^Cn4{CA2;2+vB>Kczx#v^xNeWekFtp&S
ziRxD~24xx*!)SOl)j*~~giLVx*%Zx;xkry(oMyxut#4RbP!MA$ny3=$27UwLeQ=hR
zKNY!8m!JIx%x`{^RXp;>nQK!PgOy`9wjJ)d{r{~vAD6P3Oxg?e!ZPK3qwoF(NZx%Y
z8S>z9W8lTd+f`q8A1U6o-TBqMZSe7pY}nVX`JZ>Di=O^39{$`KkX!yK_ZyH8|Mu|1
zw=l1Nr19T-j!ArXwte@=?e3BDYEbY0^RRz!`L6($Th0ex0deVdsBtLyAgr$!xA)Ck
zwmum_b1-OU`X>mOOE{4@Qa`6)cX8|%{b>UzI(F;_P!SuFK=+vJUbwOQfHtBbdB)Ng
z7F%qdtm?A2BTzilhGvN;Lf8@F@gMxA-Z+mEwxa4%{{ccZ#stF`MNVz%vj`L2D0Psp
z0Fxmf;Xy0y3^kHcm&kr%oDA|7CRyPn8sxwW<7Q^(c$Vf#pA^9)K<X!?^OS8=t1vM<
zk}AoK2FqxPZR??Uc;G`grxU<4wC63ic?}1L-+diA$RWoU!&xSo!Sd%n(>Yd4($FPr
zNCXg<TbxXALnx7)Q&>KD{h~@?zHnzIaJ&2VN13k$KlShb+Z(EU!6gBnPP<&IS{saO
z9!|w?x5fU$ihs2n8pipe5>0JVIE_Tsm=AT$Tnq~du(BNeuLk+4Pv+onPIq%<{^!N|
z<e9&t!Ts+IWUw9r0e?pu+OMLL-o%js-AV#Zi7FcS^y4t^a!Gf|ZGB*r(iubXo~2Lq
zq`ZL))H0Xx*n74yI*@0bJ5AO2r!8OqN5V52Tf3A@(;P#kl2G2LubpP$-IU)2I?=3_
zti}kc1oe31JGeZ$sem>csOYFir+rC{v!$;3SzIi|tT$+%@{#=*WC$H;voY0|@fBjs
zpdvvO^;|7;=th55H>e~_IX@U>p}gpmK+B}Ln<~L5W=E=NVa6MX?Q96(iQ^a;DDzJL
z1g;OU=4>r3ZWUZ88j^QTX2QjOzwUd6rkv;{8r8m?IhcmZlRi^jA7foLe&C7pZhRsk
zKs4YL4wd8{m?2!g?<$2}#1x5jhG?8mP>)5zDaS5-Cr~zHcUJ13Apu6ZZt^(<+Wm%`
zLoI-6?8Nh`v_c_WspTN7rh+becDUol7V4TZ#>Ry5!{}(X@mG&$c~fU=W!j+6?$V}&
z$@&6Z)qrF!au3Jh+twx%=ZP(27h<smwyNj7R$Dyxg-awOAcW(%C?VNxA-#-51BnSh
zaainQ1F;wyE0z<05)WaU*yk8E!|32QR@?Hu1P>Q?3;kLLsqnh^K<g0>cdVt~b}kmg
zD6-W}DBh;BI3d8fd3>U}9|aHv0Mw!`Mb~9+f9qR4x?Xxzlor`2v>3d)&j>Gy9E5_h
z>8PunsjWo=Qyd4ZSVc5UM4opW?Fzq3xAEm*?92c5jDF<%SfpHb_5|uJi^uQ|1*2we
zz>;iP<wqI-GD-4n@Qq>MVtJdf)iX$xyL<QGl$8R3(|5X+-~>%x3I-G%$9z;7CR=U5
zUODl4DJ#BkYIZ#pmfm!P@1Z0>`Ze7cWAa#U$Tps|%py*(mHJ%^FW8kj*BCO!_*|H+
zm0!ciKTz;N;69AN5n>t7@ZC$IxCS(d##HCO60nTH+Im6jvl-D$6tBEZ6b&cJv@wLi
zY2SSIjJ1C3Q+XUdsKGgPu3Z9g_~7~{FwnI}bwku6?_;LQkL$!N^3cJklN=H2n;ou(
z7s-(XGa!+YFfL-6+=jQNiq0zoNBs#r_OX$W%3DEZWQ!*vq5JGG+BJuP|8)oWq_3OM
zhK{41is8Z2w!glegbn@uC*0G#J0rj1Mj*#h^+{nZr(M9^I(43nt54;N!I>NFKF(+0
z^m6Aw`zMRkghl6Ruko|7sl&{#*L^c;c<OT<zB{UDo{JN%iyEbCO|14Sdvce!U4#Lt
z{X&uz2Uh+zTIdIM^LKH~exs@|G~io5)K{h1+tE8(lR5xUhbNHKI;Dep5~@UrH<9`(
z_~ScKF0kL&N;Qu5+WhrR-T#5;%Jk;uQHpQP3kV=^Z<&=M$7>>h@~)u=0F6=77SPa%
zbdlDNOlqRkP8iSxnC_33uF_foJWnttTi*&p`lm^Q6b&Bj;`MU~VWJ;lUs`j~1>@Hi
ztEKSpw|J-~+?h)ojQ)(SimH7%Ea4eT5zr^~uIT%;@Cp--ud_#e@qnd8fZ!HZKMmsk
z?b|>0KMLKvTXfU9(*ikAD2xw`&DOQfRnRJ3l2*p~%DqL=08>9zO5Av#_a>KRWt1Rc
zbEX%Uwr{EjP%K~y06%@_((|#HU)XTvVD@B@hB1qp&qx_D8%WQoIx@pr!%-x>d`~QX
zCmH{)uy8?m7qUVYLPS{7l_`oSJRzZmaN~(NuN+#WvZ7>upaZ%>%sulc8%c}h?X&-7
z-rg-nky2Oyy&ATf1|r(fLgkW5we+^bE@8h;7r+jhW-^ne{xuv~Kp5WG)-RLG+>vuU
z91H4_Zo%18tSsqSGRQ+cU{K3-J6dA#+l?hfd{TDO1SZ)x!vitW&UQ)1U)J{>)<ixH
z%r}JU(*4hs`Uj-DztAi14kTc6Ln&sS^}l*2tLDh{!JjVBVdr%(7qQF`V(;!_UzSLa
zk=3=i73D_si92Xj|9jfNT4xTAoob*LF7fODTap2Cn-&vFsQAvWHjTu}p3=U*$4%(L
z_W5<!bUWmS%J<wNhf^LUF9TKpfbfCn_WVN(Hp3`l+&{*2fiEkr_KPi9R)ZfS0GEW~
zF#cG9ek2*6d2-<NIV1>XTsd;%hArNpL-?hL?7OzPO%N8F;3wsu;T^?QJU5E}nw0|p
zq*7WuALw(P=JLPYbr$+f;H@sabYe*T`z^^#0i}nd^u6K;aX_Ai<u|%tJ!Q1@eNyLr
z-v`J3!!@)2rO-F2@@n1Gk^0Z+s`isGuwZ1fg$6O=C{Q)TaB@5@d-cuo&!&^bJ76B(
zH`}yq&Oco|n>g~7QmiT;Lc%B6VeXGek&M3q2}<9Wr|&bI&Nx4m+4J32NIc(u(pT_9
z>Zow^^7i6?{3s=8Nu#L!mZ(JH4R6kjTusCpMRMgo*hicnZUP^r$C~MPN{a;C{Bfe(
zP?S)ioM>0Kdi;;Tf&<f^Sjl0@w@{b+Kl`n`6!*?4?_TXWPWL+|iig$ZWA`lvcy=az
zs3=;+>uJ4=L8?}CF+8?LqccK0F-f<08&>X`@>}Ck8b*>Puj~gp+ddH3rGG6}?`Apu
z<dL)N=$(Xrxh&FwuGg*p*pB~qPyVH%$c_WC-!vTona;my`7h6}`kf&t^4-7MCobmK
z{@4+(_JoT2$@#0x@{3^*sjI8t%B&z7|3|w!nX3NEZQ+f!pBa25C_9peCPclOT26G~
zwBl&7CyUp+=I@?u>n-m-l6u$}`0?_8|5B8`k0brD?UK{(Zb~9R-mo)XJltnc=Z&ln
zPW7?#^x}5qx8v#jzW?oOKShFvjY<$#Lg)Bz@n0g=Phv3Z7wbWxpmLM^`Tx^S{Ri22
zA154*Cl37K?1{?`6L@m<Lv8YZ2wmpAvA%V3*FcgbO7G9B(<^MVAIvQJE$+hLB(${J
zsl37_F{5<j+UK#-YHTRLOnGHDj@O7^Q>7mZx|R3TG3|?TKCQci(&Y>w$)@@>mTr;v
z!zn>7tj?f85?CN9YsbP@WHOhm8!Y<c23bGasVTg)@)b->DN<rJU*SVAIxU)M*9_43
zh`r9kaBkOc+iP?U%thl^c?OheaT*fDOw1b1f=FgzoKHtc>s3fn9eniEUQcyVc-qkO
zv3LJ8|L%&G6&ra(a!d@jl*bF{=6gS-)Joo8-H$nmX&I+fEBRpdzD`7s$n1$K&q<|1
zwsh{u*xQ}M9tqkt#d>T_T{`p}OOkN&iMnY1;Eybeid!HmxFB2GEVVme9_40^hu3k@
zDBkRc&&x%lUgH_Rpw?XG=R84Z*V%#u0=MvT&cJ*VB_L-uhC|OjgEJ?iKlXB`#n8-b
zMD-gIotf^?zvJzzSt=)-FIV(<;EyT#*LV0AbX_@+P*SQu9zgKpC9zYS@m!*hlj(};
zugy3?_7<462Ple6p4iHW?F;ixcP1<OIvxFGKpPmQrp6m2Q8Tm88-fJ_3C4deC9It}
z4?LQjTtSU(5prn3@@n|lUGOWShQIS<B|()v`&Caa1B0!aUVn8fQBqMx6u9hMGo0qn
z#g{Qb=ul0NhX<07Byv%IU>+v<@QMePkFR_e79g*?>Kqt;1K)WM2`Qe^m3Se9)`LTX
zl<_P-n$w?0@04^4N<{m^L1q;oL+vd&>@NkXt{!R|E_${!v<?-YClfaX!Vk=<E9mN)
zIeofaK)kZ;jB`<jdo+X$tgxw{#6Hs(Kh`>mU;^BN@|y$!Wh2zz%gOK?$c4QWKiG!a
zZdpzd*$R*dB(uH0Cn5qOtKAZyzEdgJ>aIi;yqffZ5@k3S)Q`Sy(5ARkVBe1uHg4TH
zHjpb9A%dQEM&y-flqKoDAcy!4m0Y%TKNEd3iX>0g{rdQ-1l)AM@`o{z9Y0#wN$M2^
zB;0emb5)$v#lT87`=1`x<0{=bz=ECU<?7}+%)|+@{PBvSC8*3SF3n|6hC!k`xRzIq
z|Dh3_#qa>=hah<zTK##h==k@~_Jc!iyU<T8@=@~q53+wnv?_kQezju%SfhVXgiPyG
zMgGSpTvxd5e+*Uv{;=VfJUzb_*xj6C?YKx*Y5CHlo3bQ4{1)GL$um3Q-khf;%Bah{
zqk_potuLbaVi4O0&Cj*p7hCL`@gcqF)6WwO=S*eJOw#ksd|dR-`u-V?=38&2{Q?XF
z>=v7T`lGl{W-Wu1^s&&JCp&&E$lQAOtb$PCXLu|2+$Ywr@0K!|L{*-b@e%G65#1Sg
z`cy@tq3GlfXJw2Ovz0rQrm-1&IhnPeL9~17F>=WD+3dgfv)qNXc7Z;tXK#ddSypdb
zzQvdK%LWdc1dD=8nG9V)Q$8#<^-pJE_uj_rJhlFNV$6@XAHx3S@B5N2ep!y^U0l2+
z>!({D=Z-Bp{e&&&(!py}4zCt%aQ(;}z5dDqQO2^F9KjznD>!^vrOhYk758jXoTas#
ze>S2m*J@MYVkFdXee&FSPoA>IxdrZ3ebkU4aMht<mtv~pQJ-b2cZsz#1O@!ucjZ6B
zvch@>;1I_Ack@MH@c}Mq`JO&Izxx-oT7@>{|H!fTm_BU0{!e~`gIryYz~h6{Ui@b`
d`?r(*%6Cv-F!8?p4S%k<;(s$9*c<=92>>zu<*Wbz

diff --git a/doc/images/dolibarr_screenshot2_1280x800.jpg b/doc/images/dolibarr_screenshot2_1280x800.jpg
index 2956a55d36aa8b86d46eae11e987f1c88c4c77e3..7f5319942c280da6f083e2eef93106d07c796212 100644
GIT binary patch
literal 185341
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%0D!N
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
T#;*O`+Hz8P{%NX}`Z4nl-acJB

literal 159669
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%0Aq&_@9cyKK$hZ#2zu8Ci4Dv7+c0l)xt
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
O{@DZ9C;ia>e-i*~FhZ{Y

diff --git a/doc/images/dolibarr_screenshot5_1280x800.jpg b/doc/images/dolibarr_screenshot5_1280x800.jpg
index 6eea0a2f02936c757f5403c168a1c67678f2d3d3..f9ddd1d1f77bb72e03ffd0fb8dc84bb6e9b926da 100644
GIT binary patch
literal 157713
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

literal 135317
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
BA`}1s


From fb492515dfa60ba8569d93de4829fc963833302c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 21 Jan 2023 13:08:47 +0100
Subject: [PATCH 714/816] fix missing include

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

diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php
index 6bc34977e4e..e03ea174ef7 100644
--- a/htdocs/mailmanspip/class/mailmanspip.class.php
+++ b/htdocs/mailmanspip/class/mailmanspip.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2004       Benoit Mortier          <benoit.mortier@opensides.be>
  * Copyright (C) 2009       Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2012       Marcos García           <marcosgdf@gmail.com>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2023  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
@@ -128,6 +128,7 @@ class MailmanSpip
 	{
 		global $conf;
 
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 		//Patterns that are going to be replaced with their original value
 		$patterns = array(
 			'%LISTE%',
@@ -139,7 +140,7 @@ class MailmanSpip
 			$list,
 			$object->email,
 			$object->pass,
-			$conf->global->ADHERENT_MAILMAN_ADMIN_PASSWORD
+			getDolGlobalString('ADHERENT_MAILMAN_ADMIN_PASSWORD')
 		);
 
 		$curl_url = str_replace($patterns, $replace, $url);

From e48b16a9c5b9c8a6aea162f74584e237fad68b73 Mon Sep 17 00:00:00 2001
From: Christian Humpel <christian.humpel@gmail.com>
Date: Sat, 21 Jan 2023 23:20:43 +0100
Subject: [PATCH 715/816] integrate Contact Management for Supplier Orders

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

diff --git a/htdocs/fourn/class/api_supplier_orders.class.php b/htdocs/fourn/class/api_supplier_orders.class.php
index d55a398dbd6..1b7098d9cc5 100644
--- a/htdocs/fourn/class/api_supplier_orders.class.php
+++ b/htdocs/fourn/class/api_supplier_orders.class.php
@@ -288,6 +288,155 @@ class SupplierOrders extends DolibarrApi
 		return false;
 	}
 
+	/**
+	 * Get contacts of given supplier order
+	 *
+	 * Return an array with contact informations
+	 *
+	 * @param 	int    	$id   		ID of supplier order
+	 * @param 	string 	$source 	Source of the contact (internal, external, all).
+	 * @param 	string 	$type 		Type of the contact (BILLING, SHIPPING, CUSTOMER, SALESREPFOLL, ...)
+	 * @return	Object				Object with cleaned properties
+	 *
+	 * @url	GET {id}/contacts
+	 *
+	 * @throws 	RestException
+	 */
+	public function getContacts($id, $source, $type = '')
+	{
+		if (!DolibarrApiAccess::$user->rights->fournisseur->commande->lire) {
+			throw new RestException(401);
+		}
+
+		$result = $this->order->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Supplier order not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->order->id, 'commande_fournisseur', 'commande')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$contacts = array();
+
+		if ($source == 'all' || $source == 'external') {
+			$tmpContacts = $this->order->liste_contact(-1, 'external', 0, $type);
+			$contacts =	array_merge($contacts, $tmpContacts);
+		}
+
+		if ($source == 'all' || $source == 'internal') {
+			$tmpContacts = $this->order->liste_contact(-1, 'internal', 0, $type);
+			$contacts = array_merge($contacts, $tmpContacts);
+		}
+
+		return $this->_cleanObjectDatas($contacts);
+	}
+
+	/**
+	 * Add a contact type of given supplier order
+	 *
+	 * @param int    	$id				Id of supplier order to update
+	 * @param int    	$contactid		Id of contact/user to add
+	 * @param string 	$type			Type of the contact (BILLING, SHIPPING, CUSTOMER, SALESREPFOLL, ...)
+	 * @param string 	$source			Source of the contact (external, internal)
+	 * @return array
+	 *
+	 * @url	POST {id}/contact/{contactid}/{type}/{source}
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 */
+	public function postContact($id, $contactid, $type, $source)
+	{
+		if (!DolibarrApiAccess::$user->rights->fournisseur->commande->creer) {
+			throw new RestException(401);
+		}
+
+		$result = $this->order->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Supplier order not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->order->id, 'commande_fournisseur', 'commande')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$result = $this->order->add_contact($contactid, $type, $source);
+
+		if ($result < 0) {
+			throw new RestException(500, 'Error when added the contact');
+		}
+
+		if ($result == 0) {
+			throw new RestException(304, 'contact already added');
+		}
+
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Contact linked to the order'
+			)
+		);
+	}
+
+	/**
+	 * Unlink a contact type of given supplier order
+	 *
+	 * @param 	int    	$id             Id of supplier order to update
+	 * @param 	int    	$contactid      Id of contact/user to add
+	 * @param 	string 	$type           Type of the contact (BILLING, SHIPPING, CUSTOMER, SALESREPFOLL, ...).
+	 * @param 	string 	$source 		Source of the contact (internal, external).
+	 *
+	 * @url	DELETE {id}/contact/{contactid}/{type}/{source}
+	 *
+	 * @return array
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 500 System error
+	 */
+	public function deleteContact($id, $contactid, $type, $source)
+	{
+		if (!DolibarrApiAccess::$user->rights->fournisseur->commande->creer) {
+			throw new RestException(401);
+		}
+
+		$result = $this->order->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Supplier order not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->order->id, 'commande_fournisseur', 'commande')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$contacts = $this->order->liste_contact(-1, $source, 0, $type);
+
+		$contactToUnlink = 0;
+		foreach ($contacts as $contact) {
+			if ($contact['id'] == $contactid && $contact['code'] == $type) {
+				$contactToUnlink = $contact['rowid'];
+				break;
+			}
+		}
+
+		if ($contactToUnlink == 0) {
+			throw new RestException(404, 'Linked contact not found');
+		}
+
+		$result = $this->order->delete_contact($contact['rowid']);
+
+		if (!$result) {
+			throw new RestException(500, 'Error when deleted the contact');
+		}
+
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Contact unlinked from supplier order'
+			)
+		);
+	}
+
 	/**
 	 * Delete supplier order
 	 *

From 5c5d8d11f338906ee3feed954bfef0ab1a71dae1 Mon Sep 17 00:00:00 2001
From: Christian Humpel <christian.humpel@gmail.com>
Date: Sat, 21 Jan 2023 23:43:47 +0100
Subject: [PATCH 716/816] add parentId (example id for SupplierOrder)

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index b998fcbd71a..88fefed035f 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1397,6 +1397,7 @@ abstract class CommonObject
 					$transkey = "TypeContact_".$obj->element."_".$obj->source."_".$obj->code;
 					$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->libelle);
 					$tab[$i] = array(
+						'parentId' => $this->id,
 						'source' => $obj->source,
 						'socid' => $obj->socid,
 						'id' => $obj->id,

From 9806941217c7f96c2612276858b5c1f4464252c5 Mon Sep 17 00:00:00 2001
From: Faustin <boitel.faustin@gmail.com>
Date: Sun, 22 Jan 2023 12:37:40 +0100
Subject: [PATCH 717/816] Update what is needed

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

diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
index 1ed4683496e..6fadc36a285 100644
--- a/htdocs/admin/oauth.php
+++ b/htdocs/admin/oauth.php
@@ -109,13 +109,36 @@ if ($action == 'update') {
 					$error++;
 				}
 			}
-			print $newconstvalue.'_ID'."######".GETPOST($constvalue.'_ID')."\n";
 
+			// If name changed, we have to delete old const and proceed few other changes
 			if ($constvalue !== $newconstvalue) {
 				dolibarr_del_const($db, $constvalue.'_ID', $conf->entity);
 				dolibarr_del_const($db, $constvalue.'_SECRET', $conf->entity);
 				dolibarr_del_const($db, $constvalue.'_URLAUTHORIZE', $conf->entity);
 				dolibarr_del_const($db, $constvalue.'_SCOPE', $conf->entity);
+
+				// Update name of token
+				$oldname = preg_replace('/^OAUTH_/', '', $constvalue);
+				$oldprovider = ucfirst(strtolower(preg_replace('/-.*$/', '', $oldname)));
+				$oldlabel = preg_replace('/^.*-/', '', $oldname);
+				$newlabel = preg_replace('/^.*-/', '', $newconstvalue);
+
+				$sql = "UPDATE ".MAIN_DB_PREFIX."oauth_token";
+				$sql.= " SET service = '".$oldprovider."-".$newlabel."'";
+				$sql.= " WHERE  service = '".$oldprovider."-".$oldlabel."'";
+
+
+				$resql = $db->query($sql);
+				if (!$resql) {
+					$error++;
+				}
+
+				// Update const where the token was used, might not be exhaustive
+				if (getDolGlobalString('MAIN_MAIL_SMTPS_OAUTH_SERVICE') == $oldname) {
+					if (!dolibarr_set_const($db, 'MAIN_MAIL_SMTPS_OAUTH_SERVICE', strtoupper($oldprovider).'-'.$newlabel, 'chaine', 0, '', $conf->entity)) {
+						$error++;
+					}
+				}
 			}
 		}
 	}

From 70509d105c2bc99b2d199bbd2a083e8511c25ecd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 22 Jan 2023 13:27:22 +0100
Subject: [PATCH 718/816] Fix responsive

---
 htdocs/compta/prelevement/create.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 37a2d74c5e3..317136e1333 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -74,6 +74,8 @@ if ($type == 'bank-transfer') {
 
 $error = 0;
 $option = "";
+$mesg = '';
+
 
 /*
  * Actions
@@ -225,13 +227,13 @@ if ($type == 'bank-transfer') {
 	$title = $langs->trans("NbOfInvoiceToPayByBankTransfer");
 }
 
-print '<tr><td class="titlefieldcreate">'.$title.'</td>';
-print '<td>';
-print $nb;
+print '<tr><td class="titlefield">'.$title.'</td>';
+print '<td class="nowraponall">';
+print dol_escape_htmltag($nb);
 print '</td></tr>';
 
 print '<tr><td>'.$langs->trans("AmountTotal").'</td>';
-print '<td class="amount">';
+print '<td class="amount nowraponall">';
 print price($pricetowithdraw);
 print '</td>';
 print '</tr>';
@@ -417,6 +419,7 @@ if ($resql) {
 		$tradinvoice = "SupplierInvoice";
 	}
 
+	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans($tradinvoice).'</td>';
@@ -510,6 +513,8 @@ if ($resql) {
 		print '<tr class="oddeven"><td colspan="6"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 	}
 	print "</table>";
+	print "</div>";
+
 	print "</form>";
 	print "<br>\n";
 } else {

From 4208cb3bc67341ef7341f9a55aa70b327dd4c645 Mon Sep 17 00:00:00 2001
From: Faustin <boitel.faustin@gmail.com>
Date: Sun, 22 Jan 2023 13:54:39 +0100
Subject: [PATCH 719/816] escape missing in sql request

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

diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
index 6fadc36a285..8c082d674db 100644
--- a/htdocs/admin/oauth.php
+++ b/htdocs/admin/oauth.php
@@ -123,9 +123,10 @@ if ($action == 'update') {
 				$oldlabel = preg_replace('/^.*-/', '', $oldname);
 				$newlabel = preg_replace('/^.*-/', '', $newconstvalue);
 
+
 				$sql = "UPDATE ".MAIN_DB_PREFIX."oauth_token";
-				$sql.= " SET service = '".$oldprovider."-".$newlabel."'";
-				$sql.= " WHERE  service = '".$oldprovider."-".$oldlabel."'";
+				$sql.= " SET service = '".$db->escape($oldprovider."-".$newlabel)."'";
+				$sql.= " WHERE  service = '".$db->escape($oldprovider."-".$oldlabel)."'";
 
 
 				$resql = $db->query($sql);

From 1beb0ad3981ebf837a0f9600887c9617318bf5d2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 22 Jan 2023 14:09:19 +0100
Subject: [PATCH 720/816] Fix responsive

---
 htdocs/compta/prelevement/create.php | 48 ++++++++++++++++++----------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 317136e1333..b6e651029de 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -234,7 +234,7 @@ print '</td></tr>';
 
 print '<tr><td>'.$langs->trans("AmountTotal").'</td>';
 print '<td class="amount nowraponall">';
-print price($pricetowithdraw);
+print price($pricetowithdraw, 0, $langs, 1,-1, -1, $conf->currency);
 print '</td>';
 print '</tr>';
 
@@ -256,20 +256,20 @@ if ($nb) {
 		if ($type == 'bank-transfer') {
 			$title = $langs->trans('BankToPayCreditTransfer').': ';
 		}
-		print $title;
+		print '<span class="hideonsmartphone">'.$title.'</span>';
 		print img_picto('', 'bank_account');
 
 		$default_account = ($type == 'bank-transfer' ? 'PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT' : 'PRELEVEMENT_ID_BANKACCOUNT');
 
-		print $form->select_comptes($conf->global->$default_account, 'id_bankaccount', 0, "courant=1", 0, '', 0, '', 1);
-		print ' - ';
+		print $form->select_comptes(getDolGlobalInt($default_account), 'id_bankaccount', 0, "courant=1", 0, '', 0, 'widthcentpercentminusx maxwidth300', 1);
+		print ' &nbsp; &nbsp; ';
 
 		if (empty($executiondate)) {
 			$delayindays = 0;
 			if ($type != 'bank-transfer') {
-				$delayindays = $conf->global->PRELEVEMENT_ADDDAYS;
+				$delayindays = getDolGlobalInt('PRELEVEMENT_ADDDAYS');
 			} else {
-				$delayindays = $conf->global->PAYMENTBYBANKTRANSFER_ADDDAYS;
+				$delayindays = getDolGlobalInt('PAYMENTBYBANKTRANSFER_ADDDAYS');
 			}
 
 			$executiondate = dol_time_plus_duree(dol_now(), $delayindays, 'd');
@@ -292,14 +292,14 @@ if ($nb) {
 				print '<option value="RCUR"'.($format == 'RCUR' ? ' selected="selected"' : '').'>'.$langs->trans('SEPARCUR').'</option>';
 				print '</select>';
 			}
-			print '<input type="submit" class="butAction" value="'.$title.'"/>';
+			print '<input type="submit" class="butAction margintoponly maringbottomonly" value="'.$title.'"/>';
 		} else {
 			$title = $langs->trans("CreateAll");
 			if ($type == 'bank-transfer') {
 				$title = $langs->trans("CreateFileForPaymentByBankTransfer");
 			}
 			print '<input type="hidden" name="format" value="ALL">'."\n";
-			print '<input type="submit" class="butAction" value="'.$title.'">'."\n";
+			print '<input type="submit" class="butAction margintoponly maringbottomonly" value="'.$title.'">'."\n";
 		}
 	} else {
 		if ($mysoc->isInEEC()) {
@@ -307,18 +307,18 @@ if ($nb) {
 			if ($type == 'bank-transfer') {
 				$title = $langs->trans("CreateSepaFileForPaymentByBankTransfer");
 			}
-			print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("AmountMustBePositive").'">'.$title."</a>\n";
+			print '<a class="butActionRefused classfortooltip margintoponly maringbottomonly" href="#" title="'.$langs->trans("AmountMustBePositive").'">'.$title."</a>\n";
 
 			if ($type != 'bank-transfer') {
 				$title = $langs->trans("CreateForSepaRCUR");
-				print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("AmountMustBePositive").'">'.$title."</a>\n";
+				print '<a class="butActionRefused classfortooltip margintoponly maringbottomonly" href="#" title="'.$langs->trans("AmountMustBePositive").'">'.$title."</a>\n";
 			}
 		} else {
 			$title = $langs->trans("CreateAll");
 			if ($type == 'bank-transfer') {
 				$title = $langs->trans("CreateFileForPaymentByBankTransfer");
 			}
-			print '<a class="butActionRefused classfortooltip" href="#">'.$title."</a>\n";
+			print '<a class="butActionRefused classfortooltip margintoponly maringbottomonly" href="#">'.$title."</a>\n";
 		}
 	}
 } else {
@@ -328,7 +328,9 @@ if ($nb) {
 		$titlefortab = $langs->transnoentitiesnoconv("PaymentByBankTransfers");
 		$title = $langs->trans("CreateFileForPaymentByBankTransfer");
 	}
-	print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NoInvoiceToWithdraw", $titlefortab, $titlefortab)).'">'.$title."</a>\n";
+	print '<a class="butActionRefused classfortooltip margintoponly maringbottomonly" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NoInvoiceToWithdraw", $titlefortab, $titlefortab)).'">';
+	print $title;
+	print "</a>\n";
 }
 
 print "</form>\n";
@@ -343,6 +345,9 @@ print '<br>';
  */
 
 $sql = "SELECT f.ref, f.rowid, f.total_ttc, s.nom as name, s.rowid as socid,";
+if ($type == 'bank-transfer') {
+	$sql .= " f.ref_supplier,";
+}
 $sql .= " pfd.rowid as request_row_id, pfd.date_demande, pfd.amount";
 if ($type == 'bank-transfer') {
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f,";
@@ -423,6 +428,9 @@ if ($resql) {
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans($tradinvoice).'</td>';
+	if ($type == 'bank-transfer') {
+		print '<td>'.$langs->trans("RefSupplier").'</td>';
+	}
 	print '<td>'.$langs->trans("ThirdParty").'</td>';
 	print '<td>'.$langs->trans("RIB").'</td>';
 	print '<td>'.$langs->trans("RUM").'</td>';
@@ -442,17 +450,25 @@ if ($resql) {
 
 			$bac->fetch(0, $obj->socid);
 
+			$invoicestatic->id = $obj->rowid;
+			$invoicestatic->ref = $obj->ref;
+			$invoicestatic->ref_supplier = $obj->ref_supplier;
+
 			print '<tr class="oddeven">';
 
 			// Ref invoice
-			print '<td>';
-			$invoicestatic->id = $obj->rowid;
-			$invoicestatic->ref = $obj->ref;
+			print '<td class="tdoverflowmax150">';
 			print $invoicestatic->getNomUrl(1, 'withdraw');
 			print '</td>';
 
+			if ($type == 'bank-transfer') {
+				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($invoicestatic->ref_supplier).'">';
+				print dol_escape_htmltag($invoicestatic->ref_supplier);
+				print '</td>';
+			}
+
 			// Thirdparty
-			print '<td>';
+			print '<td class="tdoverflowmax100">';
 			$thirdpartystatic->fetch($obj->socid);
 			print $thirdpartystatic->getNomUrl(1, 'ban');
 			print '</td>';

From 9f8e368890d2e8d0bbd73423580417da63cee5ca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 22 Jan 2023 14:15:55 +0100
Subject: [PATCH 721/816] CSS

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

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index bef2e6e7800..a8a79e8bb34 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1638,7 +1638,7 @@ table[summary="list_of_modules"] .fa-cog {
 .maxwidth40  { max-width: 40px; }
 .maxwidth50  { max-width: 50px; }
 .maxwidth75  { max-width: 75px; }
-.maxwidthdate  { max-width: 80px; }
+.maxwidthdate  { max-width: 85px; }
 .maxwidth100 { max-width: 100px; }
 .maxwidth125 { max-width: 125px; }
 .maxwidth150 { max-width: 150px; }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index afc43936695..0fde8b72044 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1856,7 +1856,7 @@ tr.nobottom td {
 .maxwidth40  { max-width: 40px; }
 .maxwidth50  { max-width: 50px; }
 .maxwidth75  { max-width: 75px; }
-.maxwidthdate  { max-width: 80px; }
+.maxwidthdate  { max-width: 85px; }
 .maxwidth100 { max-width: 100px; }
 .maxwidth125 { max-width: 125px; }
 .maxwidth150 { max-width: 150px; }
@@ -7652,7 +7652,7 @@ div.clipboardCPValue.hidewithsize {
 	.lilevel1 span.paddingright {
 		padding-right: 3px;
 	}
-	
+
 	img.userphotopublicvcard {
 		left: unset;
 		top: unset;

From 260ef315d053a9ff1d0235c696fb801e73763899 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 22 Jan 2023 14:21:47 +0100
Subject: [PATCH 722/816] Fix missing include

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

diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index b6e651029de..56a047a387c 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -34,6 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 

From 642ba67a55730128a6c9af4f687111266277a498 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 22 Jan 2023 14:21:47 +0100
Subject: [PATCH 723/816] Fix missing include

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

diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 37a2d74c5e3..7c91bfcca8e 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -34,6 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 

From 29531b8cb425b639ee4499cdfb943722caa04845 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 22 Jan 2023 18:57:22 +0100
Subject: [PATCH 724/816] Fix phpcs

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

diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 56a047a387c..598b86fcda3 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -235,7 +235,7 @@ print '</td></tr>';
 
 print '<tr><td>'.$langs->trans("AmountTotal").'</td>';
 print '<td class="amount nowraponall">';
-print price($pricetowithdraw, 0, $langs, 1,-1, -1, $conf->currency);
+print price($pricetowithdraw, 0, $langs, 1, -1, -1, $conf->currency);
 print '</td>';
 print '</tr>';
 

From 1513c46c77fe21b1fd38d82f57e8db200a8273fc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 22 Jan 2023 19:25:37 +0100
Subject: [PATCH 725/816] Doxygen

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a25d083c251..1076d32602f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3885,14 +3885,14 @@ function dol_strlen($string, $stringencoding = 'UTF-8')
 /**
  * Make a substring. Works even if mbstring module is not enabled for better compatibility.
  *
- * @param	string	$string				String to scan
- * @param	string	$start				Start position
- * @param	int		$length				Length (in nb of characters or nb of bytes depending on trunconbytes param)
- * @param   string	$stringencoding		Page code used for input string encoding
- * @param	int		$trunconbytes		1=Length is max of bytes instead of max of characters
- * @return  string						substring
+ * @param	string		$string				String to scan
+ * @param	string		$start				Start position
+ * @param	int|null	$length				Length (in nb of characters or nb of bytes depending on trunconbytes param)
+ * @param   string		$stringencoding		Page code used for input string encoding
+ * @param	int			$trunconbytes		1=Length is max of bytes instead of max of characters
+ * @return  string							substring
  */
-function dol_substr($string, $start, $length, $stringencoding = '', $trunconbytes = 0)
+function dol_substr($string, $start, $length = null, $stringencoding = '', $trunconbytes = 0)
 {
 	global $langs;
 

From 545fa935e399faa293e7865294f76e7bf859fc81 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sun, 22 Jan 2023 20:41:25 +0100
Subject: [PATCH 726/816] Update ChangeLog

---
 ChangeLog | 136 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 70 insertions(+), 66 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 76ec4faf452..00fbde60b91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,10 +24,10 @@ For users:
 ---------------
 
 NEW: Minimal PHP version is now PHP 7.0 instead of PHP 5.6
-NEW: #21780 Add pid field to Cronjob class and store PID on job execution
 NEW: #19680 Add option PRODUCT_ALLOW_EXTERNAL_DOWNLOAD to automatically have uploaded files shared publicly by a link
 NEW: #20650 can move the checkbox column on left (experimental option MAIN_CHECKBOX_LEFT_COLUMN)
 NEW: #21000 Added columns 'alias_name' on project, supplier invoice, supplier order, supplier proposals and task list
+NEW: #21780 Add pid field to Cronjob class and store PID on job execution
 NEW: #21395 Added option for dark theme mode in display - color and theme
 NEW: #21397 added option to auto define barcode numbers for third-parties in barcode module setup
 NEW: #21399
@@ -46,15 +46,11 @@ NEW: #22676 massaction for updating product prices
 NEW: #22735 Massaction to affect users on projects
 NEW: #25594 can chose if VAT ID is unique or not for third parties
 NEW: #4482 adding js to hide/show advanced option on the export data page
+
 NEW: Add a constant to disallow modification of the product reference.
-NEW: Add a method doAutoRenewContracts that can be used as a cron task.
-NEW: Add " as enclosure by default for CSV export. Keep removing CR/LF.
 NEW: add attached file in presend email form of thirdparty card
 NEW: Add a way to enter LICENSE file content in property of website
-NEW: add constant PROPAL_BYPASS_VALIDATED_STATUS
 NEW: Add employment anniversary in birthday box
-NEW: Add fail2ban rules examples to limit access to /public pages
-NEW: Add filter "Product subject to lot/Serial" in stock per lot/serial
 NEW: Add hidden option MAIN_EMAIL_SUPPORT_ACK to restore Email ack checkbox (feature abandonned by mailers)
 NEW: Add link to create an element from the category page
 NEW: Add max size send for "backup and link to mail" option
@@ -63,43 +59,58 @@ NEW: Add more advices into the Setup security page
 NEW: Add new global variable for keeping the previous signature information on proposale (case of reopen a proposale)
 NEW: Add objectLink on expedition
 NEW: Add oldcopy to Ticket so triggers intercepting TICKET_MODIFY have access to old values of the updated properties
-NEW: Add option FICHINTER_ALLOW_EXTERNAL_DOWNLOAD
 NEW: Add option --force on CLI cron_run_jobs.php
 NEW: Add option "Show price on the generated documents for receptions"
-NEW: Add performance index (name for company and contact) and llx_bank_url(url_id)
-NEW: Add picto property on sub-module for password generation
+NEW: invoice export : add accounting affectation
+NEW: label on products categories filter
+NEW: manage no email with thirdparties (better for GDPR)
+NEW: Manage VAT on all lines on purchases cycle
+NEW: On a bank reconciled line, we can modify the bank receipt
+NEW: parent company column and filter in invoice and order list
+NEW: possibility to select scopes with checkbox for Oauth tokens
+NEW: private and public note on user, thirdparty and contact list
+NEW: Public counters feature
+NEW: Saved token of OAUTH module are now encrypted into llx_oauth_token
+NEW: Save one click to select on delivery ack, on emails.
+NEW: scheduled job to send unpaid invoice reminder can now use the cc and bcc from email template
+NEW: experimental SMTP using PhpImap allowing OAuth2 authentication (need to add option MAIN_IMAP_USE_PHPIMAP)
+NEW: can substitue project title in mail template
+NEW: The purge of files can purge only if older than a number of seconds
+NEW: Update ActionComm type_code on email message ticket
+NEW: Finance - VAT - Admin - Add information on deadline day for submission of VAT declaration
+NEW: Add the target to select attendees of event for emailings
 NEW: add redirect on action confirm addconsumedline and addproduceline
-NEW: Add a new advanced permission "read price"
-NEW: Add substitution key __SENDEREMAIL_SIGNATURE__
 NEW: Add the referrer-policy to "same-origin" by default on all public pages.
-NEW: Add the SMTP header References on ticket email created by email
 NEW: Add trigger to record the event of sending an email from a project #20912
-NEW: Allow download link option in module configuration (propal,invoice,supplier proposal, order)
-NEW: Can enter the unit price including the vat
+NEW: Allow download link option in module configuration (propal, order, invoice, supplier proposal)
+NEW: Can enter the unit price including the VAT
 NEW: Can invoice task time per different services
-NEW: Can join several files by default on email form
 NEW: Can set a commercial discount by entering amount including VAT
-NEW: Can set a monthly frequency (or multiple) in cron tasks.
 NEW: Can set start and end dates and comment on button "Activate all services"
 NEW: can sort and preselected best supplier price
-NEW: Can use products categories to make inventory
-NEW: Change filter type on tickets list into a multiselect combo
 NEW: show date delivery planned on orders linked to company and product
-NEW: Encrypt all sensitive constants in llx_const
 NEW: filter on reception dates (from / to) in cheque paiement card
+
 NEW: Accountancy - Add a graphic option to enable lettering function - FPC21
 NEW: Accountancy - Add a way to clean some words when you generate thirdparty accounting account
 NEW: Accountancy - Added an option during export to export or not the lettering FPC21
 NEW: Accountancy - Manage supplier deposit with specific account
 NEW: Accountancy - Model Digitaria - Add a way to clean some words when you generate thirdparty accounting account FPC22
+NEW: Agenda - start a simple support of recurrent events on agenda
 NEW: Bank - add salaries & VAT in tab planned entries
-NEW: Contracts - Default template of contract is not mandatory
+NEW: Contracts - add a method doAutoRenewContracts that can be used as a cron task
+NEW: Contracts - default template of contract is not mandatory
 NEW: Contracts - Manage Position (Rank) on Contract Lines
 NEW: EMail - can copy/paste images into emails sent
 NEW: EMail - can edit label of an emailing even once sent
+NEW: EMail - can join several files by default on email form
 NEW: EMail - can send an email on scheduled job error
+NEW: EMail - on a form to send an email, we show all emails of all contacts of object
+NEW: EMail - add the SMTP header References on ticket email created by email
+NEW: EMail - add substitution key __SENDEREMAIL_SIGNATURE__
 NEW: EMail-Collector - add IMAP port setting 
 NEW: EMail-Collector - add a button "Test collect"
+NEW: Export - Add " as enclosure by default for CSV export. Keep removing CR/LF.
 NEW: Event-Organization - add date event (!= date project) and location on event organization
 NEW: Extrafields - add badge in admin extrafields setup
 NEW: Extrafields - can edit property css, cssview, csslist on extrafields
@@ -111,8 +122,10 @@ NEW: Invoice - Add french mention on pdf when vat debit option is on
 NEW: Members - default_lang for members
 NEW: Members - Table of membership types
 NEW: Members - add free membership amounts at the membership type level
+NEW: Orders - resize parent company column in order list
+NEW: Products supplier price - autofill default supplier VAT
 NEW: Projects - add author on list
-NEW: Projects - add the thirdparty column to the time list (projet/tasks/time.php)
+NEW: Projects - add thirdparty column to the time list (projet/tasks/time.php)
 NEW: Proposals - show delivery mode on PDF for proposals
 NEW: Proposals - skip accept/refuse process for proposals (option PROPAL_SKIP_ACCEPT_REFUSE)
 NEW: Reception - add a from/to on search on date field
@@ -120,64 +133,55 @@ NEW: Stock - page for mass stock transfer can be used with no source stock
 NEW: Stock - product categories filter on inventory list
 NEW: Stock - show product label on inventory
 NEW: Stock - manage virtual stock at a future date
+NEW: Stock Inventory - add filter "Product subject to lot/Serial" in stock per lot/serial
+NEW: Stock Inventory - can use products categories to make inventory
+NEW: Supplier Order List - add column private and public note
 NEW: TakePOS - add margin infos to TakePOS invoice lines
-NEW: TakePOS - display currency in TakePOS menu
-NEW: TakePOS - Header Scroll in TakePOS
 NEW: TakePOS - add price to product box in TakePOS
 NEW: TakePOS - add setup parameters, can setup terminal name
-NEW: TakePOS - support of Stripe Terminal with TakePOS
-NEW: TakePOS - Receipt preview in TakePOS setup
 NEW: TakePOS - different product list on smartphone
+NEW: TakePOS - display currency in TakePOS menu
+NEW: TakePOS - Header Scroll in TakePOS
+NEW: TakePOS - Receipt preview in TakePOS setup
+NEW: TakePOS - support of Stripe Terminal with TakePOS
 NEW: Thirdparty - set thirdparty type with company modify trigger
+NEW: Tickets - change filter type on tickets list into a multiselect combo
 NEW: Website - can delete a whole website if disabled
 NEW: Website - can remove a website template
 NEW: Website - can set header "Strict-Transport-Security" in web sites.
 NEW: Website - can switch status of website and page from the website toolbar
 NEW: Website - Templates of websites are now directories and not zip into core repo
 NEW: Website - add 4 other templates in website module
-NEW: General - Bulk action to remove a category in list/search website pages
-NEW: General - If we select another view list mode, we keep it
-NEW: General - Introduce dolEncrypt and dolDecrypt to be able to encrypt data in db
-NEW: invoice export : add accounting affectation
-NEW: label on products categories filter
-NEW: The link "add to bookmark" is always on top in the bookmark popup
-NEW: manage no email with thirdparties (better for GDPR)
-NEW: Manage VAT on all lines on purchases cycle
-NEW: On a bank reconciled line, we can modify the bank receipt
-NEW: On a form to send an email, we show all emails of all contacts of object
-NEW: parent company column and filter in invoice and order list
-NEW: Add show "Sales rep" option for PDF
-NEW: Picto for shared link is clickable
-NEW: possibility to select scopes with checkbox for Oauth tokens
-NEW: private and public note on user, thirdparty and contact list
-NEW: Product supplier price: autofill default supplier VAT
-NEW: Public counters feature
-NEW: Start a simple support of recurrent events on agenda
-NEW: Resize parent company column in order list
-NEW: Saved token of OAUTH module are now encrypted into llx_oauth_token
-NEW: Save one click to select on delivery ack, on emails.
-NEW: scheduled job to send unpaid invoice reminder can now use the cc and bcc from email template
-NEW: Show also scheduled task never finished in scheduled task widget
-NEW: show badge with number of extrafields in setup
-NEW: show category tree in sellist and chkbxlst for common object
-NEW: Show picto and color into combo for selection of tags
-NEW: show sell-by and eat-by dates only if not empty
-NEW: show SellBy/EatBy dates for each batch product in shipment card
-NEW: experimental SMTP using PhpImap allowing OAuth2 authentication (need to add option MAIN_IMAP_USE_PHPIMAP)
-NEW: can substitue project title in mail template
-NEW: Supplier order list - Add column private and public note
-NEW: The purge of files can purge only if older than a number of seconds
-NEW: Update ActionComm type_code on email message ticket
-NEW: VAT - Admin - Add information on deadline day for submission of VAT declaration
-NEW: expand/collapse permissions on user permission page
-NEW: Add the target to select attendees of event for emailings
+
+General:
+NEW: Actions:  Bulk action to remove a category in list/search website pages
+NEW: Cronjobs: can set a monthly frequency (or multiple) in cron tasks
+NEW: Database: Encrypt all sensitive constants in llx_const
+NEW: Database: Add performance index (name for company and contact) and llx_bank_url(url_id)
+NEW: Database: Introduce dolEncrypt and dolDecrypt to be able to encrypt data in db
+NEW: GUI: If we select another view list mode, we keep it
+NEW: GUI: the link "add to bookmark" is always on top in the bookmark popup
+NEW: GUI: Picto for shared link is clickable
+NEW: GUI: add picto property on sub-module for password generation
+NEW: GUI: show also scheduled task never finished in scheduled task widget
+NEW: GUI: show badge with number of extrafields in setup
+NEW: GUI: show category tree in sellist and chkbxlst for common object
+NEW: GUI: show picto and color into combo for selection of tags
+NEW: GUI: show sell-by and eat-by dates only if not empty
+NEW: GUI: show SellBy/EatBy dates for each batch product in shipment card
+NEW: GUI/Permissions: expand/collapse permissions on user permission page
+NEW: Permissions: add a new advanced permission "read price"
+NEW: Print: add show "Sales rep" option for PDF
+NEW: Security: add fail2ban rules examples to limit access to /public pages
 
  Option / Const for System: 
-NEW: MAIN_SEARCH_CATEGORY_PRODUCT_ON_LISTS  const to show category customer filter
-NEW: PRODUCTBATCH_SHOW_WAREHOUSE_ON_SHIPMENT showing warehouse on PDF
-NEW: PRODUIT_DESC_IN_FORM accept (desktop only or +smartphone)
+NEW: FICHINTER_ALLOW_EXTERNAL_DOWNLOAD
+NEW: MAIN_SEARCH_CATEGORY_PRODUCT_ON_LISTS  -  const to show category customer filter
+NEW: PRODUCTBATCH_SHOW_WAREHOUSE_ON_SHIPMENT  -  showing warehouse on PDF
+NEW: PRODUIT_DESC_IN_FORM accept  -  desktop only or +smartphone
+NEW: PROPAL_BYPASS_VALIDATED_STATUS
 NEW: PROPAL_NEW_AS_SIGNED
-NEW: TIMESPENT_ALWAYS_UPDATE_THM, when it's on we always check current thm of user to update it in task time line
+NEW: TIMESPENT_ALWAYS_UPDATE_THM  -  when it's on we always check current thm of user to update it in task time line
 
  Localisation:
 NEW: adding JAPAN Chart-of-Account and regions/departments
@@ -207,7 +211,7 @@ NEW: support multilang in Civilities API
 
  Hooks:
 NEW: Actioncomm - add new hooks for actioncomm
-NEW: Actioncomm - hook formConfirm on action comm card
+NEW: Actioncomm - hook formConfirm on actioncomm card
 NEW: Agenda - hook on agenda pages
 NEW: Help - hook "changeHelpURL" to modify target of the help button
 NEW: Product - add hook to show virtual stock details on product stock card

From fb2d9b315a7496b03e2e2960e67bf9c53137708e Mon Sep 17 00:00:00 2001
From: Christian Humpel <christian.humpel@gmail.com>
Date: Sun, 22 Jan 2023 22:31:46 +0100
Subject: [PATCH 727/816] Fix bracket.

---
 htdocs/bom/bom_card.php | 301 ++++++++++++++++++++--------------------
 1 file changed, 150 insertions(+), 151 deletions(-)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 333b6232f9f..fbced8e6773 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -358,11 +358,11 @@ if (empty($reshook)) {
 
 		// 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);
+			$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);
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id . '&lineid=' . $lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
 		}
 
 		// Confirmation of validation
@@ -393,13 +393,13 @@ if (empty($reshook)) {
 					$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),
+					// '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
@@ -421,13 +421,13 @@ if (empty($reshook)) {
 					$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),
+					// '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
@@ -444,26 +444,26 @@ if (empty($reshook)) {
 			$formquestion = array();
 			if (isModEnabled('bom')) {
 				$langs->load("mrp");
-				require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+				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),
+					// '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);
+			$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
@@ -471,7 +471,7 @@ if (empty($reshook)) {
 			$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);
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('SetToDraft'), $text, 'confirm_setdraft', $formquestion, 0, 1, 220);
 		}
 
 		// Call Hook formConfirm
@@ -489,7 +489,7 @@ if (empty($reshook)) {
 
 		// Object card
 		// ------------------------------------------------------------
-		$linkback = '<a href="'.DOL_URL_ROOT.'/bom/bom_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+		$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">';
 		/*
@@ -538,17 +538,17 @@ if (empty($reshook)) {
 		print '<div class="fichecenter">';
 		print '<div class="fichehalfleft">';
 		print '<div class="underbanner clearboth"></div>';
-		print '<table class="border centpercent tableforfield">'."\n";
+		print '<table class="border centpercent tableforfield">' . "\n";
 
 		// Common attributes
 		$keyforbreak = 'duration';
-		include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
+		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 '<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';
+		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 		print '</table>';
 		print '</div>';
@@ -559,7 +559,6 @@ if (empty($reshook)) {
 		print dol_get_fiche_end();
 
 
-
 		/*
 		 * Lines
 		 */
@@ -580,7 +579,7 @@ if (empty($reshook)) {
     	';
 
 			if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
-				include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
+				include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
 			}
 
 			print '<div class="div-table-responsive-no-min">';
@@ -602,7 +601,7 @@ if (empty($reshook)) {
 					$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');
+						$object->formAddObjectLine(1, $mysoc, null, '/bom/tpl');
 				}
 			}
 
@@ -652,7 +651,7 @@ if (empty($reshook)) {
 					$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');
+						$object->formAddObjectLine(1, $mysoc, null, '/bom/tpl');
 				}
 			}
 		}
@@ -665,146 +664,146 @@ if (empty($reshook)) {
 		print "</form>\n";
 
 		mrpCollapseBomManagement();
-	}
 
-	$res = $object->fetchLines();
+		$res = $object->fetchLines();
 
-	// Buttons for actions
+		// Buttons for actions
 
-	if ($action != 'presend' && $action != 'editline') {
-		print '<div class="tabsAction">'."\n";
-		$parameters = array();
-		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-		if ($reshook < 0) {
-			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-		}
-
-		if (empty($reshook)) {
-			// Send
-			//if (empty($user->socid)) {
-			//	print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendMail') . '</a>'."\n";
-			//}
-
-			// Back to draft
-			if ($object->status == $object::STATUS_VALIDATED) {
-				if ($permissiontoadd) {
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=setdraft&token='.newToken().'">'.$langs->trans("SetToDraft").'</a>'."\n";
-				}
+		if ($action != 'presend' && $action != 'editline') {
+			print '<div class="tabsAction">' . "\n";
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			if ($reshook < 0) {
+				setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 			}
 
-			// Modify
-			if ($object->status == $object::STATUS_DRAFT) {
-				if ($permissiontoadd) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>'."\n";
-				} else {
-					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
-				}
-			}
+			if (empty($reshook)) {
+				// Send
+				//if (empty($user->socid)) {
+				//	print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendMail') . '</a>'."\n";
+				//}
 
-			// Validate
-			if ($object->status == $object::STATUS_DRAFT) {
-				if ($permissiontoadd) {
-					if (is_array($object->lines) && count($object->lines) > 0) {
-						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=validate&amp;token='.newToken().'">'.$langs->trans("Validate").'</a>'."\n";
-					} else {
-						$langs->load("errors");
-						print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>'."\n";
+				// Back to draft
+				if ($object->status == $object::STATUS_VALIDATED) {
+					if ($permissiontoadd) {
+						print '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=setdraft&token=' . newToken() . '">' . $langs->trans("SetToDraft") . '</a>' . "\n";
 					}
 				}
-			}
 
-			// Re-open
-			if ($permissiontoadd && $object->status == $object::STATUS_CANCELED) {
-				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("ReOpen").'</a>'."\n";
-			}
-
-			// Create MO
-			if (isModEnabled('mrp')) {
-				if ($object->status == $object::STATUS_VALIDATED && !empty($user->rights->mrp->write)) {
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/mrp/mo_card.php?action=create&fk_bom='.$object->id.'&token='.newToken().'&backtopageforcancel='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">'.$langs->trans("CreateMO").'</a>'."\n";
+				// Modify
+				if ($object->status == $object::STATUS_DRAFT) {
+					if ($permissiontoadd) {
+						print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=edit&token=' . newToken() . '">' . $langs->trans("Modify") . '</a>' . "\n";
+					} else {
+						print '<a class="butActionRefused classfortooltip" href="#" title="' . dol_escape_htmltag($langs->trans("NotEnoughPermissions")) . '">' . $langs->trans('Modify') . '</a>' . "\n";
+					}
 				}
-			}
 
-			// Clone
-			if ($permissiontoadd) {
-				print dolGetButtonAction($langs->trans("ToClone"), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.(!empty($object->socid) ? '&socid='.$object->socid : "").'&action=clone&object=bom', 'clone', $permissiontoadd);
-			}
+				// Validate
+				if ($object->status == $object::STATUS_DRAFT) {
+					if ($permissiontoadd) {
+						if (is_array($object->lines) && count($object->lines) > 0) {
+							print '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;action=validate&amp;token=' . newToken() . '">' . $langs->trans("Validate") . '</a>' . "\n";
+						} else {
+							$langs->load("errors");
+							print '<a class="butActionRefused" href="" title="' . $langs->trans("ErrorAddAtLeastOneLineFirst") . '">' . $langs->trans("Validate") . '</a>' . "\n";
+						}
+					}
+				}
 
-			// Close / Cancel
-			if ($permissiontoadd && $object->status == $object::STATUS_VALIDATED) {
-				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=close&token='.newToken().'">'.$langs->trans("Disable").'</a>'."\n";
-			}
+				// Re-open
+				if ($permissiontoadd && $object->status == $object::STATUS_CANCELED) {
+					print '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=reopen&token=' . newToken() . '">' . $langs->trans("ReOpen") . '</a>' . "\n";
+				}
 
-			/*
-			if ($user->rights->bom->write)
-			{
-				if ($object->status == 1)
-				 {
-					 print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=disable&token='.newToken().'">'.$langs->trans("Disable").'</a>'."\n";
-				 }
-				 else
-				 {
-					 print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=enable&token='.newToken().'">'.$langs->trans("Enable").'</a>'."\n";
-				 }
-			}
-			*/
+				// Create MO
+				if (isModEnabled('mrp')) {
+					if ($object->status == $object::STATUS_VALIDATED && !empty($user->rights->mrp->write)) {
+						print '<a class="butAction" href="' . DOL_URL_ROOT . '/mrp/mo_card.php?action=create&fk_bom=' . $object->id . '&token=' . newToken() . '&backtopageforcancel=' . urlencode($_SERVER["PHP_SELF"] . '?id=' . $object->id) . '">' . $langs->trans("CreateMO") . '</a>' . "\n";
+					}
+				}
 
-			// Delete
-			print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', $permissiontodelete);
+				// Clone
+				if ($permissiontoadd) {
+					print dolGetButtonAction($langs->trans("ToClone"), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . (!empty($object->socid) ? '&socid=' . $object->socid : "") . '&action=clone&object=bom', 'clone', $permissiontoadd);
+				}
+
+				// Close / Cancel
+				if ($permissiontoadd && $object->status == $object::STATUS_VALIDATED) {
+					print '<a class="butActionDelete" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=close&token=' . newToken() . '">' . $langs->trans("Disable") . '</a>' . "\n";
+				}
+
+				/*
+				if ($user->rights->bom->write)
+				{
+					if ($object->status == 1)
+					 {
+						 print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=disable&token='.newToken().'">'.$langs->trans("Disable").'</a>'."\n";
+					 }
+					 else
+					 {
+						 print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=enable&token='.newToken().'">'.$langs->trans("Enable").'</a>'."\n";
+					 }
+				}
+				*/
+
+				// Delete
+				print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=delete&token=' . newToken(), 'delete', $permissiontodelete);
+			}
+			print '</div>' . "\n";
 		}
-		print '</div>'."\n";
+
+
+		// Select mail models is same action as presend
+		if (GETPOST('modelselected')) {
+			$action = 'presend';
+		}
+
+		if ($action != 'presend') {
+			print '<div class="fichecenter"><div class="fichehalfleft">';
+			print '<a name="builddoc"></a>'; // ancre
+
+			// Documents
+			$objref = dol_sanitizeFileName($object->ref);
+			$relativepath = $objref . '/' . $objref . '.pdf';
+			$filedir = $conf->bom->dir_output . '/' . $objref;
+			$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
+			$genallowed = $user->rights->bom->read; // If you can read, you can build the PDF to read content
+			$delallowed = $user->rights->bom->write; // If you can create/edit, you can remove a file on card
+			print $formfile->showdocuments('bom', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
+
+			// Show links to link elements
+			$linktoelem = $form->showLinkToObjectBlock($object, null, array('bom'));
+			$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+
+
+			print '</div><div class="fichehalfright">';
+
+			$MAXEVENT = 10;
+
+			$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT . '/bom/bom_agenda.php?id=' . $object->id);
+
+			// List of actions on element
+			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+			$formactions = new FormActions($db);
+			$somethingshown = $formactions->showactions($object, $object->element, 0, 1, '', $MAXEVENT, '', $morehtmlcenter);
+
+			print '</div></div>';
+		}
+
+		//Select mail models is same action as presend
+		if (GETPOST('modelselected')) {
+			$action = 'presend';
+		}
+
+		// Presend form
+		$modelmail = 'bom';
+		$defaulttopic = 'InformationMessage';
+		$diroutput = $conf->bom->dir_output;
+		$trackid = 'bom' . $object->id;
+
+		include DOL_DOCUMENT_ROOT . '/core/tpl/card_presend.tpl.php';
 	}
-
-
-	// Select mail models is same action as presend
-	if (GETPOST('modelselected')) {
-		$action = 'presend';
-	}
-
-	if ($action != 'presend') {
-		print '<div class="fichecenter"><div class="fichehalfleft">';
-		print '<a name="builddoc"></a>'; // ancre
-
-		// Documents
-		$objref = dol_sanitizeFileName($object->ref);
-		$relativepath = $objref.'/'.$objref.'.pdf';
-		$filedir = $conf->bom->dir_output.'/'.$objref;
-		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
-		$genallowed = $user->rights->bom->read; // If you can read, you can build the PDF to read content
-		$delallowed = $user->rights->bom->write; // If you can create/edit, you can remove a file on card
-		print $formfile->showdocuments('bom', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
-
-		// Show links to link elements
-		$linktoelem = $form->showLinkToObjectBlock($object, null, array('bom'));
-		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-
-
-		print '</div><div class="fichehalfright">';
-
-		$MAXEVENT = 10;
-
-		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/bom/bom_agenda.php?id='.$object->id);
-
-		// List of actions on element
-		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-		$formactions = new FormActions($db);
-		$somethingshown = $formactions->showactions($object, $object->element, 0, 1, '', $MAXEVENT, '', $morehtmlcenter);
-
-		print '</div></div>';
-	}
-
-	//Select mail models is same action as presend
-	if (GETPOST('modelselected')) {
-		$action = 'presend';
-	}
-
-	// Presend form
-	$modelmail = 'bom';
-	$defaulttopic = 'InformationMessage';
-	$diroutput = $conf->bom->dir_output;
-	$trackid = 'bom'.$object->id;
-
-	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 }
 
 // End of page

From c067e52ec8c5896ff756d4b12d6c4ea220749f2c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 23 Jan 2023 11:28:37 +0100
Subject: [PATCH 728/816] Doc

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

diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index 2bdc9080b78..82fcabd557b 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -112,7 +112,7 @@ if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
 		// The constant WEBSITE_MAIN_SECURITY_FORCECSP should never be defined by page, but the variable used just after may be
 
 		// A default security policy that keep usage of js external component like ckeditor, stripe, google, working
-		//	$contentsecuritypolicy = "font-src *; img-src *; style-src * 'unsafe-inline' 'unsafe-eval'; default-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; script-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; frame-src 'self' *.stripe.com; connect-src 'self';";
+		//	$contentsecuritypolicy = "font-src *; img-src *; style-src * 'unsafe-inline' 'unsafe-eval'; default-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; script-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; frame-ancestors 'self'; frame-src 'self' *.stripe.com; connect-src 'self';";
 		$contentsecuritypolicy = getDolGlobalString('WEBSITE_MAIN_SECURITY_FORCECSP');
 
 		if (!is_object($hookmanager)) {
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 2904f576bf7..115be3cf0cf 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1473,7 +1473,7 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
 		// If CSP not forced from the page
 
 		// A default security policy that keep usage of js external component like ckeditor, stripe, google, working
-		//	$contentsecuritypolicy = "font-src *; img-src *; style-src * 'unsafe-inline' 'unsafe-eval'; default-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; script-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; frame-src 'self' *.stripe.com; connect-src 'self';";
+		//	$contentsecuritypolicy = "frame-ancestors 'self'; font-src *; img-src *; style-src * 'unsafe-inline' 'unsafe-eval'; default-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; script-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; frame-src 'self' *.stripe.com; connect-src 'self';";
 		$contentsecuritypolicy = getDolGlobalString('MAIN_SECURITY_FORCECSP');
 
 		if (!is_object($hookmanager)) {
@@ -1492,7 +1492,7 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
 
 		if (!empty($contentsecuritypolicy)) {
 			// For example, to restrict 'script', 'object', 'frames' or 'img' to some domains:
-			// script-src https://api.google.com https://anotherhost.com; object-src https://youtube.com; frame-src https://youtube.com; img-src: https://static.example.com
+			// frame-ancestors 'self'; script-src https://api.google.com https://anotherhost.com; object-src https://youtube.com; frame-src https://youtube.com; img-src https://static.example.com
 			// For example, to restrict everything to one domain, except 'object', ...:
 			// default-src https://cdn.example.net; object-src 'none'
 			// For example, to restrict everything to itself except img that can be on other servers:

From 58043c5d5e225fd61df58b6e5b65cb63ad7e7bf1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 23 Jan 2023 12:28:17 +0100
Subject: [PATCH 729/816] Add imgs

---
 doc/images/dolibarr_screenshot12_1280x800.jpg | Bin 0 -> 136840 bytes
 doc/images/dolibarr_screenshot4_1280x800.jpg  | Bin 0 -> 117180 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 doc/images/dolibarr_screenshot12_1280x800.jpg
 create mode 100644 doc/images/dolibarr_screenshot4_1280x800.jpg

diff --git a/doc/images/dolibarr_screenshot12_1280x800.jpg b/doc/images/dolibarr_screenshot12_1280x800.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..bdc3a13722803f97f641202bca8266bbd16578e0
GIT binary patch
literal 136840
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%0Di}e
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
Gb@bmGBB}KN

literal 0
HcmV?d00001

diff --git a/doc/images/dolibarr_screenshot4_1280x800.jpg b/doc/images/dolibarr_screenshot4_1280x800.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d67053631299c1ce7dd98a1b853f0c26711a3862
GIT binary patch
literal 117180
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

literal 0
HcmV?d00001


From e1c3b61ce80311580b7a1d8167776c2ef4644c22 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 23 Jan 2023 19:36:55 +0100
Subject: [PATCH 730/816] Update llx_10_c_regions.sql

add new Slovakia
---
 htdocs/install/mysql/data/llx_10_c_regions.sql | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql
index 52a1a3bbbb6..f86fbe069b8 100644
--- a/htdocs/install/mysql/data/llx_10_c_regions.sql
+++ b/htdocs/install/mysql/data/llx_10_c_regions.sql
@@ -78,6 +78,7 @@
 -- Portugal
 -- Romania -> for Departmements
 -- San Salvador
+-- Slovakia
 -- Slovenia
 -- Spain
 -- Switzerland/Suisse -> for Departmements/Cantons
@@ -450,6 +451,13 @@ INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 8
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 86, 8603, NULL, NULL, 'Occidental');
 
 
+-- Slovakia Regions (rowid country=201)
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 201, '20101', 'SK01', NULL, 'Bratislava Region');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 201, '20102', 'SK02', NULL, 'Western Slovakia');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 201, '20103', 'SK03', NULL, 'Central Slovakia');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 201, '20104', 'SK04', NULL, 'Eastern Slovakia');
+
+
 -- Slovenia Regions (rowid country=202)
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 202, '20203', 'SI03', NULL, 'East Slovenia');
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 202, '20204', 'SI04', NULL, 'West Slovenia');

From c5fcd99f6e92f6228cddc3c998c28b758230dbd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20NASSIET?= <sebastien.nassiet@comaite.com>
Date: Mon, 23 Jan 2023 19:51:00 +0100
Subject: [PATCH 731/816] Adding a hook addToLandingPageList in userihm context

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

diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 3d2e3240ce3..136da34e1bd 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -215,6 +215,16 @@ if (isModEnabled('ticket')) {
 	$tmparray['ticket/list.php?mainmenu=ticket&leftmenu='] = 'Tickets';
 }
 
+// Hook for insertion new items in the List of possible landing pages
+$reshook = $hookmanager->executeHooks('addToLandingPageList', $tmparray, $object);
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+} elseif ($reshook > 0) {
+	$tmparray=$hookmanager->resArray;
+} elseif ($reshook == 0) {
+	$tmparray=array_merge($tmparray, $hookmanager->resArray);
+}
+
 $head = user_prepare_head($object);
 
 $title = $langs->trans("User");

From 229b06a33309c794d862a96cb2ed6f66d303b32b Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Mon, 23 Jan 2023 19:56:52 +0100
Subject: [PATCH 732/816] fix sql request by adding left join for user table

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

diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php
index 308e48e153b..de86b3d41c5 100644
--- a/htdocs/hrm/position_list.php
+++ b/htdocs/hrm/position_list.php
@@ -234,7 +234,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
-$sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t, ".MAIN_DB_PREFIX.$userstatic->table_element." as u,".MAIN_DB_PREFIX."hrm_job as j";
+$sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t LEFT JOIN ".MAIN_DB_PREFIX.$userstatic->table_element." as u on t.fk_user = u.rowid, ".MAIN_DB_PREFIX."hrm_job as j";
 if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 }

From 5ad4f278ca4a77d83bf58652d9f568a751a1f5dc Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 23 Jan 2023 20:26:04 +0100
Subject: [PATCH 733/816] Update list.php

update parameters
(like  /modulebuilder/template/myobject_list.php)
---
 htdocs/adherents/list.php | 63 +++++++++++++++++++++------------------
 1 file changed, 34 insertions(+), 29 deletions(-)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index d06d91cbea6..2e04aba9167 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -30,9 +30,9 @@
 
 // Load Dolibarr environment
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 
@@ -41,47 +41,51 @@ $langs->loadLangs(array("members", "companies"));
 
 
 // Get parameters
-$action = GETPOST('action', 'aZ09');
+$action 	= GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
-$confirm = GETPOST('confirm', 'alpha');
-$toselect = GETPOST('toselect', 'array');
+$confirm 	= GETPOST('confirm', 'alpha');
+$cancel     = GETPOST('cancel', 'alpha');
+$toselect 	= GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'memberslist'; // To manage different context of search
-$mode        = GETPOST('mode', 'alpha');
-
+$backtopage = GETPOST('backtopage', 'alpha');
+$optioncss 	= GETPOST('optioncss', 'aZ');
+$mode 		= GETPOST('mode', 'alpha');
 
 // Search fields
-$search = GETPOST("search", 'alpha');
-$search_ref = GETPOST("search_ref", 'alpha');
-$search_lastname = GETPOST("search_lastname", 'alpha');
-$search_firstname = GETPOST("search_firstname", 'alpha');
-$search_gender = GETPOST("search_gender", 'alpha');
-$search_civility = GETPOST("search_civility", 'alpha');
-$search_company = GETPOST('search_company', 'alphanohtml');
-$search_login = GETPOST("search_login", 'alpha');
-$search_address = GETPOST("search_address", 'alpha');
-$search_zip = GETPOST("search_zip", 'alpha');
-$search_town = GETPOST("search_town", 'alpha');
-$search_state = GETPOST("search_state", 'alpha');
-$search_country = GETPOST("search_country", 'alpha');
-$search_phone = GETPOST("search_phone", 'alpha');
+$search 			= GETPOST("search", 'alpha');
+$search_ref 		= GETPOST("search_ref", 'alpha');
+$search_lastname 	= GETPOST("search_lastname", 'alpha');
+$search_firstname 	= GETPOST("search_firstname", 'alpha');
+$search_gender 		= GETPOST("search_gender", 'alpha');
+$search_civility 	= GETPOST("search_civility", 'alpha');
+$search_company 	= GETPOST('search_company', 'alphanohtml');
+$search_login 		= GETPOST("search_login", 'alpha');
+$search_address 	= GETPOST("search_address", 'alpha');
+$search_zip 		= GETPOST("search_zip", 'alpha');
+$search_town 		= GETPOST("search_town", 'alpha');
+$search_state 		= GETPOST("search_state", 'alpha');  // county / departement / federal state
+$search_country 	= GETPOST("search_country", 'alpha');
+$search_phone 		= GETPOST("search_phone", 'alpha');
 $search_phone_perso = GETPOST("search_phone_perso", 'alpha');
 $search_phone_mobile = GETPOST("search_phone_mobile", 'alpha');
-$search_type = GETPOST("search_type", 'alpha');
-$search_email = GETPOST("search_email", 'alpha');
-$search_categ = GETPOST("search_categ", 'int');
-$search_filter = GETPOST("search_filter", 'alpha');
-$search_status = GETPOST("search_status", 'intcomma');
-$search_morphy = GETPOST("search_morphy", 'alpha');
+$search_type 		= GETPOST("search_type", 'alpha');
+$search_email 		= GETPOST("search_email", 'alpha');
+$search_categ 		= GETPOST("search_categ", 'int');
+$search_morphy 		= GETPOST("search_morphy", 'alpha');
 $search_import_key  = trim(GETPOST("search_import_key", 'alpha'));
-$catid        = GETPOST("catid", 'int');
-$optioncss = GETPOST('optioncss', 'alpha');
-$socid = GETPOST('socid', 'int');
+
+$catid 		= GETPOST("catid", 'int');
+$socid 		= GETPOST('socid', 'int');
+
+$search_filter 		= GETPOST("search_filter", 'alpha');
+$search_status 		= GETPOST("search_status", 'intcomma');  // statut
 
 $filter = GETPOST("filter", 'alpha');
 if ($filter) {
 	$search_filter = $filter; // For backward compatibility
 }
+
 $statut = GETPOST("statut", 'alpha');
 if ($statut != '') {
 	$search_status = $statut; // For backward compatibility
@@ -93,6 +97,7 @@ if ($search_status < -2) {
 	$search_status = '';
 }
 
+// Pagination parameters
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');

From 2dcd811e37b1392b91090274e4e03974053878a5 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 23 Jan 2023 20:35:17 +0100
Subject: [PATCH 734/816] Update list.php

update parameters
---
 htdocs/bookmarks/list.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 2adef615a70..3eae08bb60a 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -29,15 +29,18 @@ require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php';
 $langs->loadLangs(array('bookmarks', 'admin'));
 
 // Get Parameters
-$action = GETPOST('action', 'aZ09');
+$id = GETPOST("id", 'int');
+
+$action 	= GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
-$confirm = GETPOST('confirm', 'alpha');
-$toselect = GETPOST('toselect', 'array');
+$confirm 	= GETPOST('confirm', 'alpha');
+$cancel     = GETPOST('cancel', 'alpha');
+$toselect 	= GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'bookmarklist'; // To manage different context of search
-$id = GETPOST("id", 'int');
-$optioncss = GETPOST('optioncss', 'alpha');
-$mode = GETPOST('mode', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+$optioncss 	= GETPOST('optioncss', 'alpha');
+$mode 		= GETPOST('mode', 'aZ09');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;

From 6cf41da7745a397956d9ab97cef9bb29a6d0c5e8 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 23 Jan 2023 20:41:39 +0100
Subject: [PATCH 735/816] Update list.php

---
 htdocs/comm/action/list.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 8807ccd4764..a0176ca18b0 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -33,18 +33,22 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
-include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
+include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+
 // Load translation files required by the page
 $langs->loadLangs(array("users", "companies", "agenda", "commercial", "other", "orders", "bills"));
 
-$action = GETPOST('action', 'aZ09');
+// Get Parameters
+$action 	= GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
+$confirm 	= GETPOST('confirm', 'alpha');
+$cancel     = GETPOST('cancel', 'alpha');
+$toselect 	= GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'actioncommlist'; // To manage different context of search
-$optioncss = GETPOST('optioncss', 'alpha');
-$toselect = GETPOST('toselect', 'array');
-$confirm = GETPOST('confirm', 'alpha');
+$optioncss 	= GETPOST('optioncss', 'alpha');
+
 
 $disabledefaultvalues = GETPOST('disabledefaultvalues', 'int');
 
@@ -70,6 +74,7 @@ if (GETPOST('search_actioncode', 'array')) {
 	$actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode") == '0' ? '0' : ((empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) || $disabledefaultvalues) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
 
+// Search Fields
 $search_id = GETPOST('search_id', 'alpha');
 $search_title = GETPOST('search_title', 'alpha');
 $search_note = GETPOST('search_note', 'alpha');
@@ -106,6 +111,7 @@ if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS)) {
 	$filtert = $user->id;
 }
 
+// Pagination parameters
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');

From cd13fcb0af0b687b61d60b416cac1d904ceff030 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 23 Jan 2023 21:04:31 +0100
Subject: [PATCH 736/816] Update list.php

---
 htdocs/comm/mailing/list.php | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index 6916a2dfe5d..501de4c11cf 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -27,20 +27,24 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
 
 // Load translation files required by the page
-$langs->load("mails");
+$langs->load('mails');
 
-$sortfield = GETPOST('sortfield', 'aZ09comma');
-$sortorder = GETPOST('sortorder', 'aZ09comma');
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$optioncss = GETPOST('optioncss', 'alpha');
+// Get Parameters
 $massaction = GETPOST('massaction', 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$optioncss 	= GETPOST('optioncss', 'alpha');
+
+// Pagination
+$limit 		= GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield 	= GETPOST('sortfield', 'aZ09comma');
+$sortorder 	= GETPOST('sortorder', 'aZ09comma');
+$page 		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
+
 if (!$sortorder) {
 	$sortorder = "DESC";
 }
@@ -48,10 +52,12 @@ if (!$sortfield) {
 	$sortfield = "m.date_creat";
 }
 
+// Search Fields
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_ref = GETPOST("search_ref", "alpha") ? GETPOST("search_ref", "alpha") : GETPOST("sref", "alpha");
 $filteremail = GETPOST('filteremail', 'alpha');
 
+// Initialize objects
 $object = new Mailing($db);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -128,7 +134,9 @@ if (empty($reshook)) {
  * View
  */
 
-llxHeader('', $langs->trans("Mailing"), 'EN:Module_EMailing|FR:Module_Mailing|ES:M&oacute;dulo_Mailing');
+// Page Header
+$help_url = 'EN:Module_EMailing|FR:Module_Mailing|ES:M&oacute;dulo_Mailing';
+llxHeader('', $langs->trans("Mailing"), $help_url);
 
 $form = new Form($db);
 

From 0c30837f154c3089a7562708587d58b6d30edc6c Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 23 Jan 2023 21:09:34 +0100
Subject: [PATCH 737/816] Update list.php

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

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index cc5872abb25..93d2298795c 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -62,21 +62,23 @@ if (isModEnabled("expedition")) {
 	$langs->loadLangs(array('sendings'));
 }
 
+// Get Parameters
 $socid = GETPOST('socid', 'int');
 
-$action = GETPOST('action', 'aZ09');
+$action 	= GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
-$confirm = GETPOST('confirm', 'alpha');
-$toselect = GETPOST('toselect', 'array');
+$confirm 	= GETPOST('confirm', 'alpha');
+$cancel     = GETPOST('cancel', 'alpha'); 
+$toselect 	= GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'proposallist';
-$mode = GETPOST('mode', 'alpha');
+$mode 		= GETPOST('mode', 'alpha');
 
-$search_user = GETPOST('search_user', 'int');
-$search_sale = GETPOST('search_sale', 'int');
-$search_ref = GETPOST('sf_ref') ?GETPOST('sf_ref', 'alpha') : GETPOST('search_ref', 'alpha');
+// Search Fields
+$search_user 	= GETPOST('search_user', 'int');
+$search_sale 	= GETPOST('search_sale', 'int');
+$search_ref 	= GETPOST('sf_ref') ?GETPOST('sf_ref', 'alpha') : GETPOST('search_ref', 'alpha');
 $search_refcustomer = GETPOST('search_refcustomer', 'alpha');
-
 $search_refproject = GETPOST('search_refproject', 'alpha');
 $search_project = GETPOST('search_project', 'alpha');
 
@@ -140,15 +142,15 @@ $search_date_signature_endyear = GETPOST('search_date_signature_endyear', 'int')
 $search_date_signature_start = dol_mktime(0, 0, 0, $search_date_signature_startmonth, $search_date_signature_startday, $search_date_signature_startyear);
 $search_date_signature_end = dol_mktime(23, 59, 59, $search_date_signature_endmonth, $search_date_signature_endday, $search_date_signature_endyear);
 
-
 $search_status = GETPOST('search_status', 'alpha');
+
 $optioncss = GETPOST('optioncss', 'alpha');
 $object_statut = GETPOST('search_statut', 'alpha');
 
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $mesg = (GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg"));
 
-
+// Pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
@@ -263,6 +265,7 @@ foreach ($object->fields as $key => $val) {
 		$fieldstosearchall['t.'.$key] = $val['label'];
 	}
 }*/
+
 // Definition of array of fields for columns
 /*$arrayfields = array();
 foreach ($object->fields as $key => $val) {
@@ -278,9 +281,11 @@ foreach ($object->fields as $key => $val) {
 		);
 	}
 }*/
+
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
+// Permissions
 $permissiontoread = $user->rights->propal->lire;
 $permissiontoadd = $user->rights->propal->creer;
 $permissiontodelete = $user->rights->propal->supprimer;

From 482c842895e925f547221787f8ce9f8ed0077ec1 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 23 Jan 2023 20:15:00 +0000
Subject: [PATCH 738/816] Fixing style errors.

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

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 93d2298795c..cc507041ac6 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -69,7 +69,7 @@ $action 	= GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm 	= GETPOST('confirm', 'alpha');
-$cancel     = GETPOST('cancel', 'alpha'); 
+$cancel     = GETPOST('cancel', 'alpha');
 $toselect 	= GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'proposallist';
 $mode 		= GETPOST('mode', 'alpha');

From 25a6be008a199bec10b4eeae055235d2296e946b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 23 Jan 2023 21:34:20 +0100
Subject: [PATCH 739/816] clean code emailcollectorfilter

---
 .../class/emailcollectorfilter.class.php      | 27 +++----------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/htdocs/emailcollector/class/emailcollectorfilter.class.php b/htdocs/emailcollector/class/emailcollectorfilter.class.php
index cff80aa4153..327159f61a4 100644
--- a/htdocs/emailcollector/class/emailcollectorfilter.class.php
+++ b/htdocs/emailcollector/class/emailcollectorfilter.class.php
@@ -206,16 +206,14 @@ class EmailCollectorFilter extends CommonObject
 
 		// Clear fields
 		$object->ref = "copy_of_".$object->ref;
-		$object->title = $langs->trans("CopyOf")." ".$object->title;
-		// ...
+		// $object->title = $langs->trans("CopyOf")." ".$object->title;
+
 		// Clear extrafields that are unique
 		if (is_array($object->array_options) && count($object->array_options) > 0) {
 			$extrafields->fetch_name_optionals_label($this->table_element);
 			foreach ($object->array_options as $key => $option) {
 				$shortkey = preg_replace('/options_/', '', $key);
 				if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey])) {
-					//var_dump($key);
-					//var_dump($clonedObj->array_options[$key]); exit;
 					unset($object->array_options[$key]);
 				}
 			}
@@ -252,26 +250,10 @@ class EmailCollectorFilter extends CommonObject
 	public function fetch($id, $ref = null)
 	{
 		$result = $this->fetchCommon($id, $ref);
-		if ($result > 0 && !empty($this->table_element_line)) {
-			$this->fetchLines();
-		}
+
 		return $result;
 	}
 
-	/**
-	 * Load object lines in memory from the database
-	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
-	 */
-	/*public function fetchLines()
-	{
-		$this->lines=array();
-
-		// Load lines with object EmailcollectorFilterLine
-
-		return count($this->lines)?1:0;
-	}*/
-
 	/**
 	 * Update object into database
 	 *
@@ -317,7 +299,6 @@ class EmailCollectorFilter extends CommonObject
 		}
 
 		$result = '';
-		$companylink = '';
 
 		$label = '<u>'.$langs->trans("EmailcollectorFilter").'</u>';
 		$label .= '<br>';
@@ -468,7 +449,7 @@ class EmailCollectorFilter extends CommonObject
 
 				$this->user_creation_id = $obj->fk_user_creat;
 				$this->user_modification_id = $obj->fk_user_modif;
-				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_creation = $this->db->jdate($obj->datec);
 				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 

From d08965c293ecee1409c4720e63bd6d19463d1afb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 23 Jan 2023 21:42:09 +0100
Subject: [PATCH 740/816] Update emailcollectoraction.class.php

---
 .../class/emailcollectoraction.class.php      | 60 ++-----------------
 1 file changed, 4 insertions(+), 56 deletions(-)

diff --git a/htdocs/emailcollector/class/emailcollectoraction.class.php b/htdocs/emailcollector/class/emailcollectoraction.class.php
index e43a86da515..5616abbbd35 100644
--- a/htdocs/emailcollector/class/emailcollectoraction.class.php
+++ b/htdocs/emailcollector/class/emailcollectoraction.class.php
@@ -24,8 +24,6 @@
 
 // Put here all includes required by your class file
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
 /**
  * Class for EmailCollectorAction
@@ -113,37 +111,6 @@ class EmailCollectorAction extends CommonObject
 	public $status;
 	// END MODULEBUILDER PROPERTIES
 
-
-
-	// If this object has a subtable with lines
-
-	// /**
-	//  * @var string    Name of subtable line
-	//  */
-	//public $table_element_line = 'emailcollectoractiondet';
-
-	// /**
-	//  * @var string    Field with ID of parent key if this field has a parent
-	//  */
-	//public $fk_element = 'fk_emailcollectoraction';
-
-	// /**
-	//  * @var string    Name of subtable class that manage subtable lines
-	//  */
-	//public $class_element_line = 'EmailcollectorActionline';
-
-	// /**
-	//	* @var array	List of child tables. To test if we can delete object.
-	//  */
-	//protected $childtables=array();
-
-	// /**
-	//  * @var EmailcollectorActionLine[]     Array of subtable lines
-	//  */
-	//public $lines = array();
-
-
-
 	/**
 	 * Constructor
 	 *
@@ -225,16 +192,14 @@ class EmailCollectorAction extends CommonObject
 
 		// Clear fields
 		$object->ref = "copy_of_".$object->ref;
-		$object->title = $langs->trans("CopyOf")." ".$object->title;
-		// ...
+		// $object->title = $langs->trans("CopyOf")." ".$object->title;
+
 		// Clear extrafields that are unique
 		if (is_array($object->array_options) && count($object->array_options) > 0) {
 			$extrafields->fetch_name_optionals_label($this->table_element);
 			foreach ($object->array_options as $key => $option) {
 				$shortkey = preg_replace('/options_/', '', $key);
 				if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey])) {
-					//var_dump($key);
-					//var_dump($clonedObj->array_options[$key]); exit;
 					unset($object->array_options[$key]);
 				}
 			}
@@ -271,26 +236,10 @@ class EmailCollectorAction extends CommonObject
 	public function fetch($id, $ref = null)
 	{
 		$result = $this->fetchCommon($id, $ref);
-		// if ($result > 0 && !empty($this->table_element_line)) {
-		// 	$this->fetchLinesCommon();
-		// }
+
 		return $result;
 	}
 
-	/**
-	 * Load object lines in memory from the database
-	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
-	 */
-	/*public function fetchLines()
-	{
-		$this->lines=array();
-
-		// Load lines with object EmailcollectorActionLine
-
-		return count($this->lines)?1:0;
-	}*/
-
 	/**
 	 * Update object into database
 	 *
@@ -336,7 +285,6 @@ class EmailCollectorAction extends CommonObject
 		}
 
 		$result = '';
-		$companylink = '';
 
 		$label = '<u>'.$langs->trans("EmailcollectorAction").'</u>';
 		$label .= '<br>';
@@ -487,7 +435,7 @@ class EmailCollectorAction extends CommonObject
 
 				$this->user_creation_id = $obj->fk_user_creat;
 				$this->user_modification_id = $obj->fk_user_modif;
-				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_creation = $this->db->jdate($obj->datec);
 				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 

From 124a76029ecdf541c4eef2428aea7a567f1ec497 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20NASSIET?= <sebastien.nassiet@comaite.com>
Date: Mon, 23 Jan 2023 21:45:28 +0100
Subject: [PATCH 741/816] Protection against deletion of ref_employee and
 national_registration_number while fields are not presents in the user tab

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

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index dbe1764f54e..21e18c94e99 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -417,8 +417,18 @@ if (empty($reshook)) {
 				$object->civility_code = GETPOST("civility_code", 'aZ09');
 				$object->lastname = GETPOST("lastname", 'alphanohtml');
 				$object->firstname = GETPOST("firstname", 'alphanohtml');
-				$object->ref_employee = GETPOST("ref_employee", 'alphanohtml');
-				$object->national_registration_number = GETPOST("national_registration_number", 'alphanohtml');
+				/*
+				* Protection against deletion of ref_employee while the field is not present in the user tab
+				*/
+				if (GETPOSTISSET("ref_employee")){
+					$object->ref_employee = GETPOST("ref_employee", 'alphanohtml');
+				}
+				/*
+				* Protection against deletion of national_registration_number while the field is not present in the user tab
+				*/
+				if (GETPOSTISSET("national_registration_number")){
+					$object->national_registration_number = GETPOST("national_registration_number", 'alphanohtml');
+				}
 				$object->gender = GETPOST("gender", 'aZ09');
 				$object->pass = GETPOST("password", 'none');	// We can keep 'none' for password fields
 				$object->api_key = (GETPOST("api_key", 'alphanohtml')) ? GETPOST("api_key", 'alphanohtml') : $object->api_key;

From cade14a80736678fa09c2033581bd1a4cb9c6415 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 23 Jan 2023 21:13:30 +0000
Subject: [PATCH 742/816] Fixing style errors.

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

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 21e18c94e99..688ac6c28ac 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -420,13 +420,13 @@ if (empty($reshook)) {
 				/*
 				* Protection against deletion of ref_employee while the field is not present in the user tab
 				*/
-				if (GETPOSTISSET("ref_employee")){
+				if (GETPOSTISSET("ref_employee")) {
 					$object->ref_employee = GETPOST("ref_employee", 'alphanohtml');
 				}
 				/*
 				* Protection against deletion of national_registration_number while the field is not present in the user tab
 				*/
-				if (GETPOSTISSET("national_registration_number")){
+				if (GETPOSTISSET("national_registration_number")) {
 					$object->national_registration_number = GETPOST("national_registration_number", 'alphanohtml');
 				}
 				$object->gender = GETPOST("gender", 'aZ09');

From 7f6d993040979d61a4a359d722cb2109c26c90a1 Mon Sep 17 00:00:00 2001
From: David Pareja Rodriguez <dpareja@energia-viva.com>
Date: Tue, 24 Jan 2023 10:54:48 +0100
Subject: [PATCH 743/816] Encase database name in backticks

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

diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index fa24e4a70ac..3514777dd45 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -678,7 +678,7 @@ class DoliDBMysqli extends DoliDB
 		}
 		$tmpdatabase = preg_replace('/[^a-z0-9\.\-\_]/i', '', $database);
 
-		$sql = "SHOW TABLES FROM ".$tmpdatabase." ".$like.";";
+		$sql = "SHOW TABLES FROM `".$tmpdatabase."` ".$like.";";
 		//print $sql;
 		$result = $this->query($sql);
 		if ($result) {

From 01e90a48541973b95743f27a7073a91fee1c07b3 Mon Sep 17 00:00:00 2001
From: David Pareja Rodriguez <dpareja@energia-viva.com>
Date: Tue, 24 Jan 2023 11:04:26 +0100
Subject: [PATCH 744/816] Fix wrong variable used to fetch replaced invoice

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

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index d1cd74099ae..fe952a31893 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2940,7 +2940,7 @@ if ($action == 'create') {
 		}
 		if (isset($objectidnext) && $objectidnext > 0) {
 			$facthatreplace = new FactureFournisseur($db);
-			$facthatreplace->fetch($facidnext);
+			$facthatreplace->fetch($objectidnext);
 			print ' ('.$langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1)).')';
 		}
 		if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT) {

From b2ac7a72bee80f7fe1ae197648cb707689db005d Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Tue, 24 Jan 2023 11:21:59 +0100
Subject: [PATCH 745/816] FIX simple quote in generated file name from build
 doc mass action

---
 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 34e2fe8b34e..3c33765c407 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1035,7 +1035,7 @@ if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('butto
 		$arrayofinclusion[] = '^'.preg_quote(dol_sanitizeFileName($tmppdf), '/').'\.pdf$';
 	}
 	foreach ($listofobjectref as $tmppdf) {
-		$arrayofinclusion[] = '^'.preg_quote(dol_sanitizeFileName($tmppdf), '/').'_[a-zA-Z0-9-_]+\.pdf$'; // To include PDF generated from ODX files
+		$arrayofinclusion[] = '^'.preg_quote(dol_sanitizeFileName($tmppdf), '/').'_[a-zA-Z0-9\-\_\']+\.pdf$'; // To include PDF generated from ODX files
 	}
 	$listoffiles = dol_dir_list($uploaddir, 'all', 1, implode('|', $arrayofinclusion), '\.meta$|\.png', 'date', SORT_DESC, 0, true);
 

From c463f0972d9577fb1833f549326782fd854c20a0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 24 Jan 2023 12:15:57 +0100
Subject: [PATCH 746/816] Clean code

---
 htdocs/accountancy/customer/list.php      | 5 ++---
 htdocs/accountancy/expensereport/list.php | 3 +--
 htdocs/accountancy/supplier/list.php      | 5 ++---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 021c1ec7821..a4a12b97b98 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -43,10 +43,11 @@ $langs->loadLangs(array("bills", "companies", "compta", "accountancy", "other",
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'accountancycustomerlist'; // To manage different context of search
 $optioncss = GETPOST('optioncss', 'alpha');
+
 $default_account = GETPOST('default_account', 'int');
 
 // Select Box
@@ -73,8 +74,6 @@ $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_en
 $search_country = GETPOST('search_country', 'alpha');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
 
-$btn_ventil = GETPOST('ventil', 'alpha');
-
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 25b86a8d527..39508332d40 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -40,10 +40,9 @@ $langs->loadLangs(array("bills", "companies", "compta", "accountancy", "other",
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
-$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'expensereportlist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'accountancyexpensereportlist'; // To manage different context of search
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 3b8e93cb54b..dfd8af7f68f 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -44,10 +44,11 @@ $langs->loadLangs(array("bills", "companies", "compta", "accountancy", "other",
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'accountancysupplierlist'; // To manage different context of search
 $optioncss = GETPOST('optioncss', 'alpha');
+
 $default_account = GETPOST('default_account', 'int');
 
 // Select Box
@@ -75,8 +76,6 @@ $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_en
 $search_country = GETPOST('search_country', 'alpha');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
 
-$btn_ventil = GETPOST('ventil', 'alpha');
-
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'aZ09comma');

From 5b5a3547e29a870ed6fed0485e8384df33ea72df Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 24 Jan 2023 13:00:09 +0100
Subject: [PATCH 747/816] Debug v17

---
 .../class/accountingaccount.class.php         |  4 +++-
 htdocs/accountancy/customer/list.php          | 19 +++++++++++++------
 htdocs/accountancy/expensereport/index.php    | 18 +++++++++++++-----
 htdocs/accountancy/expensereport/list.php     |  4 ++--
 htdocs/accountancy/supplier/list.php          | 15 ++++++++++-----
 htdocs/core/class/html.form.class.php         |  2 +-
 htdocs/core/lib/functions.lib.php             |  4 ++--
 htdocs/langs/en_US/accountancy.lang           |  9 +++++----
 8 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index 94ee1ac6029..8e5f7690dd1 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -723,7 +723,7 @@ class AccountingAccount extends CommonObject
 	}
 
 	/**
-	 * Return Suggest accounting accounts to bind
+	 * Return a suggested account (from chart of accounts) to bind
 	 *
 	 * @param 	Societe 							$buyer 				Object buyer
 	 * @param 	Societe 							$seller 			Object seller
@@ -733,6 +733,8 @@ class AccountingAccount extends CommonObject
 	 * @param 	array 								$accountingAccount 	Array of Accounting account
 	 * @param 	string 								$type 				Customer / Supplier
 	 * @return	array|int      											Accounting accounts suggested or < 0 if technical error.
+	 * 																	'suggestedaccountingaccountbydefaultfor'=>Will be used for the label to show on tooltip for account by default on any product
+	 * 																	'suggestedaccountingaccountfor'=>Is the account suggested for this product
 	 */
 	public function getAccountingCodeToBind(Societe $buyer, Societe $seller, Product $product, $facture, $factureDet, $accountingAccount = array(), $type = '')
 	{
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index a4a12b97b98..35be32d6b34 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -519,8 +519,8 @@ if ($result) {
 	print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("VATIntraShort", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', '', '', '', 'nowraponall ');
-	print_liste_field_titre("IntoAccount", '', '', '', '', '', '', '', 'center ');
+	print_liste_field_titre("DataUsedToSuggestAccount", '', '', '', '', '', '', '', 'nowraponall ');
+	print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', '', '', '', 'center ');
 	$checkpicto = '';
 	if ($massactionbutton) {
 		$checkpicto = $form->showCheckAddButtons('checkforselect', 1);
@@ -639,7 +639,7 @@ if ($result) {
 		print '<td class="center">'.dol_print_date($facture_static->date, 'day').'</td>';
 
 		// Ref Product
-		print '<td class="tdoverflowmax150">';
+		print '<td class="tdoverflowmax100">';
 		if ($product_static->id > 0) {
 			print $product_static->getNomUrl(1);
 		}
@@ -648,7 +648,7 @@ if ($result) {
 		}
 		print '</td>';
 
-		// Description
+		// Description of line
 		print '<td class="tdoverflowonsmartphone small">';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($facture_static_det->desc, 1));
 		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
@@ -682,15 +682,22 @@ if ($result) {
 
 		// Found accounts
 		print '<td class="small">';
+		// First show default account for any products
 		$s = '1. '.(($facture_static_det->product_type == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': ';
-		$shelp = '';
+		$shelp = ''; $ttype = 'help';
 		if ($suggestedaccountingaccountbydefaultfor == 'eec') {
 			$shelp .= $langs->trans("SaleEEC");
+		} elseif ($suggestedaccountingaccountbydefaultfor == 'eecwithvat') {
+			$shelp = $langs->trans("SaleEECWithVAT");
+		} elseif ($suggestedaccountingaccountbydefaultfor == 'eecwithoutvatnumber') {
+			$shelp = $langs->trans("SaleEECWithoutVATNumber");
+			$ttype = 'warning';
 		} elseif ($suggestedaccountingaccountbydefaultfor == 'export') {
 			$shelp .= $langs->trans("SaleExport");
 		}
 		$s .= ($code_sell_l > 0 ? length_accountg($code_sell_l) : '<span style="'.$code_sell_p_notset.'">'.$langs->trans("NotDefined").'</span>');
-		print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
+		print $form->textwithpicto($s, $shelp, 1, $ttype, '', 0, 2, '', 1);
+		// Now show account for product
 		if ($product_static->id > 0) {
 			print '<br>';
 			$s = '2. '.(($facture_static_det->product_type == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': ';
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index 5064003c7ff..948130dd98a 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -58,6 +58,8 @@ $year_current = $year_start;
 // Validate History
 $action = GETPOST('action', 'aZ09');
 
+$chartaccountcode = dol_getIdFromCode($db, $conf->global->CHARTOFACCOUNTS, 'accounting_system', 'rowid', 'pcg_version');
+
 // Security check
 if (!isModEnabled('accounting')) {
 	accessforbidden();
@@ -65,7 +67,7 @@ if (!isModEnabled('accounting')) {
 if ($user->socid > 0) {
 	accessforbidden();
 }
-if (empty($user->rights->accounting->mouvements->lire)) {
+if (!$user->hasRight('accounting', 'mouvements', 'lire')) {
 	accessforbidden();
 }
 
@@ -74,7 +76,7 @@ if (empty($user->rights->accounting->mouvements->lire)) {
  * Actions
  */
 
-if (($action == 'clean' || $action == 'validatehistory') && $user->rights->accounting->bind->write) {
+if (($action == 'clean' || $action == 'validatehistory') && $user->hasRight('accounting', 'bind', 'write')) {
 	// Clean database
 	$db->begin();
 	$sql1 = "UPDATE ".MAIN_DB_PREFIX."expensereport_det as erd";
@@ -109,8 +111,7 @@ if ($action == 'validatehistory') {
 	$sql1 = "SELECT erd.rowid, accnt.rowid as suggestedid";
 	$sql1 .= " FROM ".MAIN_DB_PREFIX."expensereport_det as erd";
 	$sql1 .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_fees as t ON erd.fk_c_type_fees = t.id";
-	$sql1 .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as accnt ON t.accountancy_code = accnt.account_number AND accnt.active = 1 AND accnt.entity =".((int) $conf->entity);
-	$sql1 .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_system as syst ON accnt.fk_pcg_version = syst.pcg_version AND syst.rowid = ".((int) $conf->global->CHARTOFACCOUNTS).' AND syst.active = 1,';
+	$sql1 .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as accnt ON t.accountancy_code = accnt.account_number AND accnt.active = 1 AND accnt.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND accnt.entity =".((int) $conf->entity);
 	$sql1 .= " ".MAIN_DB_PREFIX."expensereport as er";
 	$sql1 .= " WHERE erd.fk_expensereport = er.rowid AND er.entity = ".((int) $conf->entity);
 	$sql1 .= " AND er.fk_statut IN (".ExpenseReport::STATUS_APPROVED.", ".ExpenseReport::STATUS_CLOSED.") AND erd.fk_code_ventilation <= 0";
@@ -176,6 +177,7 @@ llxHeader('', $langs->trans("ExpenseReportsVentilation"));
 $textprevyear = '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_current - 1).'">'.img_previous().'</a>';
 $textnextyear = '&nbsp;<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_current + 1).'">'.img_next().'</a>';
 
+
 print load_fiche_titre($langs->trans("ExpenseReportsVentilation")."&nbsp;".$textprevyear."&nbsp;".$langs->trans("Year")."&nbsp;".$year_start."&nbsp;".$textnextyear, '', 'title_accountancy');
 
 print '<span class="opacitymedium">'.$langs->trans("DescVentilExpenseReport").'</span><br>';
@@ -247,7 +249,7 @@ $sql .= " AND aa.account_number IS NULL";
 $sql .= " GROUP BY erd.fk_code_ventilation,aa.account_number,aa.label";
 $sql .= ' ORDER BY aa.account_number';
 
-dol_syslog('/accountancy/expensereport/index.php:: sql='.$sql);
+dol_syslog('/accountancy/expensereport/index.php', LOG_DEBUG);
 $resql = $db->query($sql);
 if ($resql) {
 	$num = $db->num_rows($resql);
@@ -277,6 +279,12 @@ if ($resql) {
 		print '</tr>';
 	}
 	$db->free($resql);
+
+	if ($num == 0) {
+		print '<tr class="oddeven"><td colspan="16">';
+		print '<span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span>';
+		print '</td></tr>';
+	}
 } else {
 	print $db->lasterror(); // Show last sql error
 }
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 39508332d40..1cf9149024a 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -418,8 +418,8 @@ if ($result) {
 	print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "erd.comments", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "erd.total_ht", "", $param, '', $sortfield, $sortorder, 'right maxwidth50 ');
 	print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "erd.tva_tx", "", $param, '', $sortfield, $sortorder, 'right ');
-	print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', '', '', '', 'nowraponall ');
-	print_liste_field_titre("IntoAccount", '', '', '', '', '', '', '', '');
+	print_liste_field_titre("DataUsedToSuggestAccount", '', '', '', '', '', '', '', 'nowraponall ');
+	print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', '', '', '', '');
 	$checkpicto = '';
 	if ($massactionbutton) {
 		$checkpicto = $form->showCheckAddButtons('checkforselect', 1);
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index dfd8af7f68f..aae34a51e03 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -111,7 +111,7 @@ if (!isModEnabled('accounting')) {
 if ($user->socid > 0) {
 	accessforbidden();
 }
-if (empty($user->rights->accounting->mouvements->lire)) {
+if (!$user->hasRight('accounting', 'mouvements', 'lire')) {
 	accessforbidden();
 }
 
@@ -531,8 +531,8 @@ if ($result) {
 	print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("VATIntraShort", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', '', '', '', 'nowraponall ');
-	print_liste_field_titre("IntoAccount", '', '', '', '', '', '', '', 'center ');
+	print_liste_field_titre("DataUsedToSuggestAccount", '', '', '', '', '', '', '', 'nowraponall ');
+	print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', '', '', '', 'center ');
 	$checkpicto = '';
 	if ($massactionbutton) {
 		$checkpicto = $form->showCheckAddButtons('checkforselect', 1);
@@ -711,14 +711,19 @@ if ($result) {
 		// Found accounts
 		print '<td class="small">';
 		$s = '1. '.(($facturefourn_static_det->product_type == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': ';
-		$shelp = '';
+		$shelp = ''; $ttype = 'help';
 		if ($suggestedaccountingaccountbydefaultfor == 'eec') {
 			$shelp .= $langs->trans("SaleEEC");
+		} elseif ($suggestedaccountingaccountbydefaultfor == 'eecwithvat') {
+			$shelp = $langs->trans("SaleEECWithVAT");
+		} elseif ($suggestedaccountingaccountbydefaultfor == 'eecwithoutvatnumber') {
+			$shelp = $langs->trans("SaleEECWithoutVATNumber");
+			$ttype = 'warning';
 		} elseif ($suggestedaccountingaccountbydefaultfor == 'export') {
 			$shelp .= $langs->trans("SaleExport");
 		}
 		$s .= ($code_buy_l > 0 ? length_accountg($code_buy_l) : '<span style="'.$code_buy_p_notset.'">'.$langs->trans("NotDefined").'</span>');
-		print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
+		print $form->textwithpicto($s, $shelp, 1, $ttype, '', 0, 2, '', 1);
 		if ($product_static->id > 0) {
 			print '<br>';
 			$s = '2. '.(($facturefourn_static_det->product_type == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': ';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 1bdad2ed3c5..52f91f86963 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6273,7 +6273,7 @@ class Form
 		if (!empty($conf->global->SERVICE_ARE_ECOMMERCE_200238EC)) {    // If option to have vat for end customer for services is on
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 			if (!isInEEC($societe_vendeuse) && (!is_object($societe_acheteuse) || (isInEEC($societe_acheteuse) && !$societe_acheteuse->isACompany()))) {
-				// We also add the buyer
+				// We also add the buyer country code
 				if (is_numeric($type)) {
 					if ($type == 1) { // We know product is a service
 						$code_country .= ",'".$societe_acheteuse->country_code."'";
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 0d4e30f4a2a..6bfc788ddd4 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6490,7 +6490,7 @@ function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer,
 	if (!empty($conf->global->SERVICE_ARE_ECOMMERCE_200238EC)) {
 		if ($seller_in_cee && $buyer_in_cee) {
 			$isacompany = $thirdparty_buyer->isACompany();
-			if ($isacompany && !empty($conf->global->MAIN_USE_VAT_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID_ARE_INDIVIDUAL)) {
+			if ($isacompany && getDolGlobalString('MAIN_USE_VAT_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID_ARE_INDIVIDUAL')) {
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 				if (!isValidVATID($thirdparty_buyer)) {
 					$isacompany = 0;
@@ -6526,7 +6526,7 @@ function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer,
 	// Si (vendeur et acheteur dans Communaute europeenne) et (acheteur = particulier) alors TVA par defaut=TVA du produit vendu. Fin de regle
 	if (($seller_in_cee && $buyer_in_cee)) {
 		$isacompany = $thirdparty_buyer->isACompany();
-		if ($isacompany && !empty($conf->global->MAIN_USE_VAT_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID_ARE_INDIVIDUAL)) {
+		if ($isacompany && getDolGlobalString('MAIN_USE_VAT_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID_ARE_INDIVIDUAL')) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 			if (!isValidVATID($thirdparty_buyer)) {
 				$isacompany = 0;
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 5a1e51a2269..d44c86ceccd 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
 ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
 ThisService=This service
 ThisProduct=This product
-DefaultForService=Default for service
-DefaultForProduct=Default for product
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Product for this thirdparty
 ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=Can't suggest
@@ -101,7 +101,8 @@ ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
 ShowAccountingAccountInLedger=Show accounting account in ledger
 ShowAccountingAccountInJournals=Show accounting account in journals
-AccountAccountingSuggest=Accounting account suggested
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bank accounts
 MenuVatAccounts=Vat accounts
@@ -401,7 +402,7 @@ SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
 SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
-SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary

From b964f1a4761c8adf2de08162ced6cc50f2167e84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9=20Courtier?= <noe.courtier@scopen.fr>
Date: Tue, 24 Jan 2023 14:21:14 +0100
Subject: [PATCH 748/816] FIX: page was not reloaded after addline causing a
 new lline creation was page was reloaded

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

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 31cf21c34ae..3f0541c89b4 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1161,8 +1161,9 @@ if (empty($reshook)) {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-
-		$action = '';
+		
+        header("Location: ".$_SERVER["PHP_SELF"]."?id=".GETPOST('id', 'int'));
+        exit;
 	}
 
 	if ($action == 'confirm_delete_line' && GETPOST("confirm", 'alpha') == "yes" && $user->rights->expensereport->creer) {

From 08bd8caaf255fe5ec08dc9608238d9e99334d8b0 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 24 Jan 2023 13:28:59 +0000
Subject: [PATCH 749/816] Fixing style errors.

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

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 3f0541c89b4..0756cb1bc7f 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1161,9 +1161,9 @@ if (empty($reshook)) {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-		
-        header("Location: ".$_SERVER["PHP_SELF"]."?id=".GETPOST('id', 'int'));
-        exit;
+
+		header("Location: ".$_SERVER["PHP_SELF"]."?id=".GETPOST('id', 'int'));
+		exit;
 	}
 
 	if ($action == 'confirm_delete_line' && GETPOST("confirm", 'alpha') == "yes" && $user->rights->expensereport->creer) {

From 32da192db44a043b6d8e32f1b3339c5f9964289b Mon Sep 17 00:00:00 2001
From: hystepik <lucas.marcouiller@gmail.com>
Date: Tue, 24 Jan 2023 14:32:20 +0100
Subject: [PATCH 750/816] fix : php 8.1 warnings

---
 htdocs/compta/localtax/card.php  | 5 ++++-
 htdocs/contrat/services_list.php | 3 +++
 htdocs/loan/card.php             | 5 +++--
 htdocs/loan/list.php             | 2 ++
 htdocs/product/card.php          | 2 +-
 htdocs/product/reassort.php      | 2 +-
 htdocs/reception/contact.php     | 2 +-
 htdocs/salaries/payments.php     | 9 ++++++++-
 8 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index 8b6119db13a..ad80b6d1b6d 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -144,9 +144,12 @@ $form = new Form($db);
 
 $title = $langs->trans("LT".$object->ltt)." - ".$langs->trans("Card");
 $help_url = '';
-llxHeader('', $title, $helpurl);
+llxHeader('', $title, $help_url);
 
 if ($action == 'create') {
+	$datev = dol_mktime(12, 0, 0, GETPOST("datevmonth"), GETPOST("datevday"), GETPOST("datevyear"));
+	$datep = dol_mktime(12, 0, 0, GETPOST("datepmonth"), GETPOST("datepday"), GETPOST("datepyear"));
+
 	print load_fiche_titre($langs->transcountry($lttype == 2 ? "newLT2Payment" : "newLT1Payment", $mysoc->country_code));
 
 	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" name="formlocaltax" method="post">'."\n";
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index fb50283991b..d42dc70f49a 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -822,6 +822,9 @@ while ($i < min($num, $limit)) {
 		if (!$i) {
 			$totalarray['pos'][$totalarray['nbfield']] = 'cd.qty';
 		}
+		if (!$i) {
+			$totalarray['val']['cd.qty'] = $obj->qty;
+		}
 		$totalarray['val']['cd.qty'] += $obj->qty;
 	}
 	if (!empty($arrayfields['cd.total_ht']['checked'])) {
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index a45577b6608..afa7aa5eaa8 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -66,6 +66,7 @@ $error = 0;
  * Actions
  */
 
+$parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -291,13 +292,13 @@ if ($action == 'create') {
 	// Date Start
 	print "<tr>";
 	print '<td class="fieldrequired">'.$langs->trans("DateStart").'</td><td>';
-	print $form->selectDate($datestart ? $datestart : -1, 'start', '', '', '', 'add', 1, 1);
+	print $form->selectDate(!empty($datestart) ? $datestart : -1, 'start', '', '', '', 'add', 1, 1);
 	print '</td></tr>';
 
 	// Date End
 	print "<tr>";
 	print '<td class="fieldrequired">'.$langs->trans("DateEnd").'</td><td>';
-	print $form->selectDate($dateend ? $dateend : -1, 'end', '', '', '', 'add', 1, 1);
+	print $form->selectDate(!empty($dateend) ? $dateend : -1, 'end', '', '', '', 'add', 1, 1);
 	print '</td></tr>';
 
 	// Number of terms
diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php
index 1225f5304be..b664d784e7e 100644
--- a/htdocs/loan/list.php
+++ b/htdocs/loan/list.php
@@ -42,6 +42,7 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$massaction = GETPOST('massaction', 'alpha');
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
@@ -148,6 +149,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	}
 	$db->free($resql);
 }
+$arrayfields = array();
 
 // Complete request and execute it with limit
 $sql .= $db->order($sortfield, $sortorder);
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 8a5aecf1513..ac465b16bd7 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1485,7 +1485,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 		}
 
-		if ($type == 1  && $conf->workstation->enabled) {
+		if ($type == 1  && isModEnabled("workstation")) {
 				// Default workstation
 				print '<tr><td>'.$langs->trans("DefaultWorkstation").'</td><td>';
 				print img_picto($langs->trans("DefaultWorkstation"), 'workstation', 'class="pictofixedwidth"');
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index 10581d19b7c..9946e7a9077 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -133,7 +133,7 @@ $helpurl = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
 
 $form = new Form($db);
 $htmlother = new FormOther($db);
-if ($objp->stock_physique < 0) { print '<span class="warning">'; }
+if (!empty($objp->stock_physique) && $objp->stock_physique < 0) { print '<span class="warning">'; }
 
 $sql = 'SELECT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,';
 $sql .= ' p.fk_product_type, p.tms as datem,';
diff --git a/htdocs/reception/contact.php b/htdocs/reception/contact.php
index 02cbc9af957..11ab664c6c0 100644
--- a/htdocs/reception/contact.php
+++ b/htdocs/reception/contact.php
@@ -72,7 +72,7 @@ if ($origin == 'reception') {
 } else {
 	if ($origin == 'supplierorder' || $origin == 'order_supplier') {
 		$result = restrictedArea($user, 'fournisseur', $origin_id, 'commande_fournisseur', 'commande');
-	} elseif (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) {
+	} elseif (empty($user->hasRight($origin, "lire")) && empty($user->hasRight($origin, "read"))) {
 		accessforbidden();
 	}
 }
diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
index 5a5ccb08bf6..7bf61f3021f 100644
--- a/htdocs/salaries/payments.php
+++ b/htdocs/salaries/payments.php
@@ -97,6 +97,7 @@ $search_chq_number = GETPOST('search_chq_number', 'int');
 
 $filtre = GETPOST("filtre", 'restricthtml');
 
+$search_type_id = '';
 if (!GETPOST('search_type_id', 'int')) {
 	$newfiltre = str_replace('filtre=', '', $filtre);
 	$filterarray = explode('-', $newfiltre);
@@ -532,6 +533,7 @@ if (isset($extrafields->attributes[$object->table_element]['computed']) && is_ar
 $i = 0;
 $total = 0;
 $totalarray = array();
+$totalarray['nbfield'] = 0;
 while ($i < ($limit ? min($num, $limit) : $num)) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
@@ -697,7 +699,12 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		if (!$i) {
 			$totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
 		}
-		$totalarray['val']['totalttcfield'] += $obj->amount;
+		if (!$i) {
+			$totalarray['val']['totalttcfield'] = $obj->amount;
+		} else {
+			$totalarray['val']['totalttcfield'] += $obj->amount;
+		}
+
 
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';

From fe6d9730cdd8c2cc44749b56fed71401e4de9322 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 24 Jan 2023 16:58:35 +0100
Subject: [PATCH 751/816] Fix messages to avoid confusion.

---
 htdocs/accountancy/bookkeeping/list.php | 11 +++++++----
 htdocs/langs/en_US/accountancy.lang     |  2 ++
 htdocs/langs/en_US/main.lang            |  4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index fa42b5bd6fd..983da7502d9 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -474,7 +474,7 @@ if (empty($reshook)) {
 			if ($conf->global->ACCOUNTING_REEXPORT == 1) {
 				setEventMessages($langs->trans("ExportOfPiecesAlreadyExportedIsEnable"), null, 'mesgs');
 			} else {
-				setEventMessages($langs->trans("ExportOfPiecesAlreadyExportedIsDisable"), null, 'mesgs');
+				setEventMessages($langs->trans("ExportOfPiecesAlreadyExportedIsDisable"), null, 'warnings');
 			}
 		} else {
 			setEventMessages($langs->trans("Error"), null, 'errors');
@@ -953,11 +953,14 @@ $newcardbutton = empty($hookmanager->resPrint) ? '' : $hookmanager->resPrint;
 if (empty($reshook)) {
 	// Button re-export
 	if (!empty($conf->global->ACCOUNTING_REEXPORT)) {
-		$newcardbutton .= '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?action=setreexport&token='.newToken().'&value=0'.($param ? '&'.$param : '').'">'.img_picto($langs->trans("Activated"), 'switch_on').'</a> ';
+		$newcardbutton .= '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?action=setreexport&token='.newToken().'&value=0'.($param ? '&'.$param : '').'">'.img_picto($langs->trans("ClickToHideAlreadyExportedLines"), 'switch_off', 'class="small size15x valignmiddle"');
+		$newcardbutton .= '<span class="valignmiddle marginrightonly paddingleft">'.$langs->trans("ClickToHideAlreadyExportedLines").'</span>';
+		$newcardbutton .= '</a>';
 	} else {
-		$newcardbutton .= '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?action=setreexport&token='.newToken().'&value=1'.($param ? '&'.$param : '').'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a> ';
+		$newcardbutton .= '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?action=setreexport&token='.newToken().'&value=1'.($param ? '&'.$param : '').'">'.img_picto($langs->trans("DocsAlreadyExportedAreExcluded"), 'switch_on', 'class="warning size15x valignmiddle"').'';
+		$newcardbutton .= '<span class="valignmiddle marginrightonly paddingleft">'.$langs->trans("DocsAlreadyExportedAreExcluded").'</span>';
+		$newcardbutton .= '</a>';
 	}
-	$newcardbutton .= '<span class="valignmiddle marginrightonly">'.$langs->trans("IncludeDocsAlreadyExported").'</span>';
 
 	if ($user->hasRight('accounting', 'mouvements', 'export')) {
 		$newcardbutton .= dolGetButtonTitle($buttonLabel, $langs->trans("ExportFilteredList").' ('.$listofformat[$formatexportset].')', 'fa fa-file-export paddingleft', $_SERVER["PHP_SELF"].'?action=export_file&token='.newToken().($param ? '&'.$param : ''), $user->hasRight('accounting', 'mouvements', 'export'));
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index d44c86ceccd..801618352aa 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -472,5 +472,7 @@ FECFormatMulticurrencyCode=Multicurrency code (Idevise)
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s accounts
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 73dfee80a69..45119814420 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -912,8 +912,8 @@ ExportFilteredList=Export filtered list
 ExportList=Export list
 ExportOptions=Export Options
 IncludeDocsAlreadyExported=Include docs already exported
-ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
-ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
+ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
 AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
 NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Miscellaneous

From 891ba8f4ef6362639710058bc0d2f7242ef9fdea Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 24 Jan 2023 17:05:42 +0100
Subject: [PATCH 752/816] Debug v17

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

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 279ccded71c..2d6cc4f5715 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -783,6 +783,11 @@ class Conf
 				$this->global->USE_STRICT_CSV_RULES = 2;
 			}
 
+			// By default, option is on. Once set by user, this code is useless
+			if (!isset($this->global->ACCOUNTING_REEXPORT)) {
+				$this->global->ACCOUNTING_REEXPORT = 1;
+			}
+
 			// Use a SCA ready workflow with Stripe module (STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION by default if nothing defined)
 			if (!isset($this->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) && empty($this->global->STRIPE_USE_NEW_CHECKOUT)) {
 				$this->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = 1;

From 5429882147db304bd3fa533f443e6436a79290d6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 24 Jan 2023 18:23:46 +0100
Subject: [PATCH 753/816] Debug v17

---
 htdocs/accountancy/bookkeeping/list.php |   7 +-
 htdocs/core/lib/functions.lib.php       |   2 +-
 htdocs/hrm/job_list.php                 | 290 +++++++++++++++---------
 3 files changed, 182 insertions(+), 117 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 983da7502d9..086a5acd918 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -994,7 +994,7 @@ if ($massaction == 'preunletteringauto') {
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
 if ($massactionbutton && $contextpage != 'poslist') {
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 }
@@ -1010,7 +1010,7 @@ if (empty($reshook)) {
 }
 
 print '<div class="div-table-responsive">';
-print '<table class="tagtable liste centpercent">';
+print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">';
 
 // Filters lines
 print '<tr class="liste_titre_filter">';
@@ -1166,8 +1166,7 @@ print "</tr>\n";
 
 print '<tr class="liste_titre">';
 if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
-}
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch actioncolumn ');}
 if (!empty($arrayfields['t.piece_num']['checked'])) {
 	print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, "", $sortfield, $sortorder);
 }
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 6bfc788ddd4..4d38c7e5e5d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4085,7 +4085,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'delete', 'dolly', 'dollyrevert', 'donation', 'download', 'dynamicprice',
 				'edit', 'ellipsis-h', 'email', 'entity', 'envelope', 'eraser', 'establishment', 'expensereport', 'external-link-alt', 'external-link-square-alt', 'eye',
 				'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'autofill', 'folder', 'folder-open', 'folder-plus',
-				'generate', 'globe', 'globe-americas', 'graph', 'grip', 'grip_title', 'group',
+				'gears', 'generate', 'globe', 'globe-americas', 'graph', 'grip', 'grip_title', 'group',
 				'help', 'holiday',
 				'images', 'incoterm', 'info', 'intervention', 'inventory', 'intracommreport', 'knowledgemanagement',
 				'label', 'language', 'line', 'link', 'list', 'list-alt', 'listlight', 'loan', 'lock', 'lot', 'long-arrow-alt-right',
diff --git a/htdocs/hrm/job_list.php b/htdocs/hrm/job_list.php
index ed0fb480a3a..6cb1a4bf62c 100644
--- a/htdocs/hrm/job_list.php
+++ b/htdocs/hrm/job_list.php
@@ -115,11 +115,11 @@ $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$visible = (int) dol_eval($val['visible'], 1, 1, '1');
+		$visible = (int) dol_eval($val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
+			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
@@ -136,18 +136,15 @@ $permissiontoread = $user->rights->hrm->all->read;
 $permissiontoadd  = $user->rights->hrm->all->write;
 $permissiontodelete = $user->rights->hrm->all->delete;
 
-// Security check
-if (empty($conf->hrm->enabled)) {
-	accessforbidden('Module not enabled');
-}
-
 // Security check (enable the most restrictive one)
 if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) accessforbidden();
 //$socid = 0; if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
+if (!isModEnabled('hrm')) {
+	accessforbidden('Module hrm not enabled');
+}
 if (!$permissiontoread) accessforbidden();
 
 
@@ -256,17 +253,17 @@ foreach ($search as $key => $val) {
 			$mode_search = 2;
 		}
 		if ($search[$key] != '') {
-			$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+			$sql .= natural_search("t.".$db->escape($key), $search[$key], (($key == 'status') ? 2 : $mode_search));
 		}
 	} else {
 		if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
 			$columnName=preg_replace('/(_dtstart|_dtend)$/', '', $key);
 			if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
 				if (preg_match('/_dtstart$/', $key)) {
-					$sql .= " AND t." . $columnName . " >= '" . $db->idate($search[$key]) . "'";
+					$sql .= " AND t.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
 				}
 				if (preg_match('/_dtend$/', $key)) {
-					$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
+					$sql .= " AND t.".$db->escape($columnName)." <= '".$db->idate($search[$key])."'";
 				}
 			}
 		}
@@ -286,7 +283,7 @@ $sql .= $hookmanager->resPrint;
 /* If a group by is required
 $sql .= " GROUP BY ";
 foreach($object->fields as $key => $val) {
-	$sql .= "t.".$key.", ";
+	$sql .= "t.".$db->escape($key).", ";
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -301,8 +298,6 @@ $sql .= $hookmanager->resPrint;
 $sql = preg_replace('/,\s*$/', '', $sql);
 */
 
-$sql .= $db->order($sortfield, $sortorder);
-
 // Count total nb of records
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
@@ -312,24 +307,24 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 		$page = 0;
 		$offset = 0;
 	}
+	$db->free($resql);
 }
-// if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
-if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit))) {
-	$num = $nbtotalofrecords;
-} else {
-	if ($limit) {
-		$sql .= $db->plimit($limit + 1, $offset);
-	}
 
-	$resql = $db->query($sql);
-	if (!$resql) {
-		dol_print_error($db);
-		exit;
-	}
-
-	$num = $db->num_rows($resql);
+// Complete request and execute it with limit
+$sql .= $db->order($sortfield, $sortorder);
+if ($limit) {
+	$sql .= $db->plimit($limit + 1, $offset);
 }
 
+$resql = $db->query($sql);
+if (!$resql) {
+	dol_print_error($db);
+	exit;
+}
+
+$num = $db->num_rows($resql);
+
+
 // Direct jump if only one record found
 if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
@@ -362,6 +357,9 @@ llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', '');
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
+if (!empty($mode)) {
+	$param .= '&mode='.urlencode($mode);
+}
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 	$param .= '&contextpage='.urlencode($contextpage);
 }
@@ -369,11 +367,17 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.urlencode($limit);
 }
 foreach ($search as $key => $val) {
-	if (is_array($search[$key]) && count($search[$key])) {
+	if (is_array($search[$key])) {
 		foreach ($search[$key] as $skey) {
-			$param .= '&search_'.$key.'[]='.urlencode($skey);
+			if ($skey != '') {
+				$param .= '&search_'.$key.'[]='.urlencode($skey);
+			}
 		}
-	} else {
+	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
+		$param .= '&search_'.$key.'month='.((int) GETPOST('search_'.$key.'month', 'int'));
+		$param .= '&search_'.$key.'day='.((int) GETPOST('search_'.$key.'day', 'int'));
+		$param .= '&search_'.$key.'year='.((int) GETPOST('search_'.$key.'year', 'int'));
+	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
 }
@@ -394,7 +398,7 @@ $arrayofmassactions = array(
 	//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 	//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 );
-if ($permissiontodelete) {
+if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
@@ -413,6 +417,7 @@ print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 $newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/job_card.php', 1).'?action=create', '', $permissiontoadd);
 
@@ -426,9 +431,12 @@ $trackid = 'xxxx'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($search_all) {
+	$setupstring = '';
 	foreach ($fieldstosearchall as $key => $val) {
 		$fieldstosearchall[$key] = $langs->trans($val);
+		$setupstring .= $key."=".$val.";";
 	}
+	print '<!-- Search done like if JOBPOSITION_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
 }
 
@@ -452,7 +460,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
@@ -462,7 +470,15 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+// Action column
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 foreach ($object->fields as $key => $val) {
+	$searchkey = empty($search[$key]) ? '' : $search[$key];
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
@@ -470,7 +486,7 @@ foreach ($object->fields as $key => $val) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'rowid' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
@@ -478,9 +494,7 @@ foreach ($object->fields as $key => $val) {
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
 			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
-			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth125', 1);
-		} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
+			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', $cssforfield.' maxwidth125', 1);
 		} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
 			print '<div class="nowrap">';
 			print $form->selectDate($search[$key.'_dtstart'] ? $search[$key.'_dtstart'] : '', "search_".$key."_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
@@ -488,6 +502,12 @@ foreach ($object->fields as $key => $val) {
 			print '<div class="nowrap">';
 			print $form->selectDate($search[$key.'_dtend'] ? $search[$key.'_dtend'] : '', "search_".$key."_dtend", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 			print '</div>';
+		} elseif ($key == 'lang') {
+			require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+			$formadmin = new FormAdmin($db);
+			print $formadmin->select_language($search[$key], 'search_lang', 0, null, 1, 0, 0, 'minwidth150 maxwidth200', 2);
+		} else {
+			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 		}
 		print '</td>';
 	}
@@ -500,16 +520,23 @@ $parameters = array('arrayfields'=>$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-print '<td class="liste_titre maxwidthsearch">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 print '</tr>'."\n";
 
+$totalarray = array();
+$totalarray['nbfield'] = 0;
 
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
 foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
@@ -518,21 +545,26 @@ foreach ($object->fields as $key => $val) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'rowid' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
+	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
+		$totalarray['nbfield']++;
 	}
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
+$totalarray['nbfield']++;
 print '</tr>'."\n";
 
 
@@ -550,9 +582,11 @@ if (isset($extrafields->attributes[$object->table_element]['computed']) && is_ar
 // Loop on record
 // --------------------------------------------------------------------
 $i = 0;
+$savnbfield = $totalarray['nbfield'];
 $totalarray = array();
 $totalarray['nbfield'] = 0;
-while ($i < ($limit ? min($num, $limit) : $num)) {
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
 		break; // Should not happen
@@ -561,77 +595,109 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
 
-	// Show here line of result
-	print '<tr class="oddeven">';
-	foreach ($object->fields as $key => $val) {
-		$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
-		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'center';
-		} elseif ($key == 'status') {
-			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr><td colspan="'.$savnbfield.'">';
+			print '<div class="box-flex-container">';
 		}
-
-		if (in_array($val['type'], array('timestamp'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-		} elseif ($key == 'ref') {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		// Output Kanban
+		print $object->getKanbanView('');
+		if ($i == ($imaxinloop - 1)) {
+			print '</div>';
+			print '</td></tr>';
 		}
-
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'right';
-		}
-		//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
-
-		if (!empty($arrayfields['t.'.$key]['checked'])) {
-			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
-			if ($key == 'status') {
-				print $object->getLibStatut(5);
-			} elseif ($key == 'rowid') {
-				print $object->showOutputField($val, $key, $object->id, '');
-			} elseif ($key == 'label') {
-				print $object->getNomUrl(1);
-			} else {
-				print $object->showOutputField($val, $key, $object->$key, '');
+	} else {
+		// Show here line of result
+		$j = 0;
+		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
+		// Action column
+		if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($object->id, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
 			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
-				}
-				if (!isset($totalarray['val'])) {
-					$totalarray['val'] = array();
-				}
-				if (!isset($totalarray['val']['t.'.$key])) {
-					$totalarray['val']['t.'.$key] = 0;
-				}
-				$totalarray['val']['t.'.$key] += $object->$key;
-			}
 		}
-	}
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	// Action column
-	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		$selected = 0;
-		if (in_array($object->id, $arrayofselected)) {
-			$selected = 1;
-		}
-		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
-	}
-	print '</td>';
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
+		foreach ($object->fields as $key => $val) {
+			$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
+			if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'center';
+			} elseif ($key == 'status') {
+				$cssforfield .= ($cssforfield ? ' ' : '').'center';
+			}
 
-	print '</tr>'."\n";
+			if (in_array($val['type'], array('timestamp'))) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+			} elseif ($key == 'ref') {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+			}
+
+			if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'right';
+			}
+			//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
+
+			if (!empty($arrayfields['t.'.$key]['checked'])) {
+				print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '');
+				if (preg_match('/tdoverflow/', $cssforfield)) {
+					print ' title="'.dol_escape_htmltag($object->$key).'"';
+				}
+				print '>';
+				if ($key == 'status') {
+					print $object->getLibStatut(5);
+				} elseif ($key == 'rowid') {
+					print $object->showOutputField($val, $key, $object->id, '');
+				} elseif ($key == 'label') {
+					print $object->getNomUrl(1);
+				} else {
+					print $object->showOutputField($val, $key, $object->$key, '');
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
+					if (!$i) {
+						$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+					}
+					if (!isset($totalarray['val'])) {
+						$totalarray['val'] = array();
+					}
+					if (!isset($totalarray['val']['t.'.$key])) {
+						$totalarray['val']['t.'.$key] = 0;
+					}
+					$totalarray['val']['t.'.$key] += $object->$key;
+				}
+			}
+		}
+		// Extra fields
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+		// Fields from hook
+		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		// Action column
+		if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($object->id, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+		}
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+
+		print '</tr>'."\n";
+	}
 
 	$i++;
 }
@@ -647,14 +713,14 @@ if ($num == 0) {
 			$colspan++;
 		}
 	}
-	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
 }
 
 
 $db->free($resql);
 
 $parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
 print '</table>'."\n";

From 87d9b8075bb88d8a12fb2a82a45f96c7be42514e Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Tue, 24 Jan 2023 20:40:16 +0100
Subject: [PATCH 754/816] fix error style

---
 htdocs/hrm/position_list.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php
index de86b3d41c5..4518d28bf65 100644
--- a/htdocs/hrm/position_list.php
+++ b/htdocs/hrm/position_list.php
@@ -247,7 +247,6 @@ if ($object->ismultientitymanaged == 1) {
 } else {
 	$sql .= " WHERE 1 = 1";
 }
-$sql .= " AND t.fk_user = u.rowid";
 $sql .= " AND t.fk_job = j.rowid";
 foreach ($search as $key => $val) {
 	if (array_key_exists($key, $object->fields)) {

From 373c8d83df1c50cea5270b126c35af984a1966ba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 24 Jan 2023 23:26:17 +0100
Subject: [PATCH 755/816] Doc

---
 htdocs/core/class/commoninvoice.class.php | 8 +++++---
 htdocs/stripe/class/stripe.class.php      | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 17c9c7deae3..cb737a8bdd4 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -1079,10 +1079,12 @@ abstract class CommonInvoice extends CommonObject
 									if ($companypaymentmode->type == 'ban') {
 										$sepaMode = true;
 										// Check into societe_rib if a payment mode for Stripe and ban payment exists
+										// To make a Stripe SEPA payment request, we must have the payment mode source already saved into societe_rib and retreived with ->sepaStripe
+										// The payment mode source is created when we create the bank account on Stripe with paymentmodes.php?action=create
 										$stripecard = $stripe->sepaStripe($customer, $companypaymentmode, $stripeacc, $servicestatus, 0);
 									}
 
-									if ($stripecard) {  // Can be src_... (for sepa). Note that card_... (old card mode) or pm_... (new card mode) should not happen here.
+									if ($stripecard) {  // Can be src_... (for sepa) or pm_... (new card mode). Note that card_... (old card mode) should not happen here.
 										$FULLTAG = 'INV=' . $this->id . '-CUS=' . $thirdparty->id;
 										$description = 'Stripe payment from makeStripeSepaRequest: ' . $FULLTAG . ' ref=' . $this->ref;
 
@@ -1097,7 +1099,7 @@ abstract class CommonInvoice extends CommonObject
 										$paymentintent = $stripe->getPaymentIntent($amounttopay, $currency, $FULLTAG, $description, $this, $customer->id, $stripeacc, $servicestatus, 0, 'automatic', true, $stripecard->id, 1);
 
 										$charge = new stdClass();
-										//erics add processing sepa is like success ?
+
 										if ($paymentintent->status === 'succeeded' || $paymentintent->status === 'processing') {
 											$charge->status = 'ok';
 											$charge->id = $paymentintent->id;
@@ -1185,7 +1187,7 @@ abstract class CommonInvoice extends CommonObject
 											$description = 'Stripe payment request OK (' . $charge->id . ') from makeStripeSepaRequest: ' . $FULLTAG;
 
 
-											// TODO Save request to status pending. Done should be set with a webhook.
+											// @TODO LMR Save request to status pending instead of done. Done should be set with a webhook.
 
 
 											$db = $this->db;
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 6a6ad66a96a..bc98a085d08 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -1013,8 +1013,8 @@ class Stripe extends CommonObject
 
 						$s = new \Stripe\StripeClient($stripeacc);
 
-						// TODO Deprecated with the new Stripe API and SCA.
-						// TODO Replace ->create() and ->createSource() and replace with ->getSetupIntent() to get a Payment mode with $payment_method = \Stripe\PaymentMethod::retrieve($setupintent->payment_method); ?
+						// TODO LMR Deprecated with the new Stripe API and SCA.
+						// TODO LMR Replace ->create() and ->createSource() and replace with ->getSetupIntent() to then, get the Payment mode with $payment_method = \Stripe\PaymentMethod::retrieve($setupintent->payment_method); ?
 						$sepa = $s->sources->create($dataforcard);
 						if (!$sepa) {
 							$this->error = 'Creation of sepa_debit on Stripe has failed';

From fe8a870f5a4dadb581c10433daba81b3e4feb21d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 25 Jan 2023 09:51:18 +0100
Subject: [PATCH 756/816] Add TODO

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

diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index cb737a8bdd4..d1eb324cc7f 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -1175,9 +1175,9 @@ abstract class CommonInvoice extends CommonObject
 											$postactionmessages[] = $errmsg . ' (' . $stripearrayofkeys['publishable_key'] . ')';
 											$this->errors[] = $errmsg;
 										} else {
-											dol_syslog('Successfuly charge direct debit ' . $stripecard->id);
+											dol_syslog('Successfuly request direct debit ' . $stripecard->id);
 
-											$postactionmessages[] = 'Success to charge direct debit (' . $charge->id . ' with ' . $stripearrayofkeys['publishable_key'] . ')';
+											$postactionmessages[] = 'Success to request direct debit (' . $charge->id . ' with ' . $stripearrayofkeys['publishable_key'] . ')';
 
 											// Save a stripe payment was done in realy life so later we will be able to force a commit on recorded payments
 											// even if in batch mode (method doTakePaymentStripe), we will always make all action in one transaction with a forced commit.
@@ -1229,6 +1229,7 @@ abstract class CommonInvoice extends CommonObject
 											$ispostactionok = 1;
 
 											// Creation of payment line
+											// TODO LMR This must be move into the stripe server listening hooks public/stripe/ipn.php
 											include_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
 											$paiement = new Paiement($this->db);
 											$paiement->datepaye = $now;

From ae118f2109b171f28bef55b6205df209b56d1423 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 25 Jan 2023 14:48:41 +0100
Subject: [PATCH 757/816] Clean code

---
 htdocs/contrat/list.php                       | 51 ++++++++++++-------
 .../modulebuilder/template/myobject_list.php  |  2 +-
 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 7ea26bf6f1b..ce3ac212b68 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -63,7 +63,7 @@ $search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
 $search_contract = GETPOST('search_contract', 'alpha');
 $search_ref_customer = GETPOST('search_ref_customer', 'alpha');
 $search_ref_supplier = GETPOST('search_ref_supplier', 'alpha');
-$sall = (GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
+$search_all = (GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
 $search_status = GETPOST('search_status', 'alpha');
 $socid = GETPOST('socid', 'int');
 $search_user = GETPOST('search_user', 'int');
@@ -167,9 +167,12 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
+$permissiontoread = $user->rights->contrat->lire;
+$permissiontodelete = $user->rights->contrat->supprimer;
+
 
 /*
- * Action
+ * Actions
  */
 
 if (GETPOST('cancel', 'alpha')) {
@@ -213,7 +216,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_date_endyear = '';
 	$search_date_start = '';
 	$search_date_end = '';
-	$sall = "";
+	$search_all = "";
 	$search_status = "";
 	$toselect = array();
 	$search_type_thirdparty = '';
@@ -224,8 +227,6 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 if (empty($reshook)) {
 	$objectclass = 'Contrat';
 	$objectlabel = 'Contracts';
-	$permissiontoread = $user->rights->contrat->lire;
-	$permissiontodelete = $user->rights->contrat->supprimer;
 	$uploaddir = $conf->contrat->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
@@ -265,6 +266,9 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
+
+$sqlfields = $sql; // $sql fields to remove for count total
+
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
@@ -325,8 +329,8 @@ if ($search_country && $search_country != '-1') {
 if ($search_sale > 0) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $search_sale);
 }
-if ($sall) {
-	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
+if ($search_all) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
 if ($search_user > 0) {
 	$sql .= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='contrat' AND tc.source='internal' AND ec.element_id = c.rowid AND ec.fk_socpeople = ".((int) $search_user);
@@ -456,13 +460,17 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 			}
 		}
 	} else {
-		$sqlforcount = preg_replace('/^SELECT[a-zA-Z0-9\._\s\(\),=<>\:\-\']+\sFROM/Ui', 'SELECT COUNT(*) as nbtotalofrecords FROM', $sql);
-		$sqlforcount = preg_replace('/LEFT JOIN '.MAIN_DB_PREFIX.'contratdet as cd ON c.rowid = cd.fk_contrat/', '', $sqlforcount);
+		/* The fast and low memory method to get and count full list converts the sql into a sql count */
+		$sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
 		$sqlforcount = preg_replace('/GROUP BY.*$/', '', $sqlforcount);
 
 		$resql = $db->query($sqlforcount);
-		$objforcount = $db->fetch_object($resql);
-		$nbtotalofrecords = $objforcount->nbtotalofrecords;
+		if ($resql) {
+			$objforcount = $db->fetch_object($resql);
+			$nbtotalofrecords = $objforcount->nbtotalofrecords;
+		} else {
+			dol_print_error($db);
+		}
 	}
 
 	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
@@ -485,7 +493,7 @@ if (!$resql) {
 $num = $db->num_rows($resql);
 
 // Direct jump if only one record found
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall && !$page) {
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".DOL_URL_ROOT.'/contrat/card.php?id='.$id);
@@ -520,8 +528,8 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.urlencode($limit);
 }
-if ($sall != '') {
-	$param .= '&sall='.urlencode($sall);
+if ($search_all != '') {
+	$param .= '&search_all='.urlencode($search_all);
 }
 if ($search_contract != '') {
 	$param .= '&search_contract='.urlencode($search_contract);
@@ -598,10 +606,10 @@ $arrayofmassactions = array(
 	'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 	'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 );
-if ($user->rights->contrat->supprimer) {
+if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
@@ -615,7 +623,7 @@ $newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars i
 $newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
 $newcardbutton .= dolGetButtonTitle($langs->trans('NewContractSubscription'), '', 'fa fa-plus-circle', $url, '', $user->rights->contrat->creer);
 
-print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<form method="POST" id="searchFormList" action="'.$_SERVER['PHP_SELF'].'">';
 if ($optioncss != '') {
 	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 }
@@ -624,7 +632,9 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="page_y" value="">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 print_barre_liste($langs->trans("Contracts"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'contract', 0, $newcardbutton, '', $limit, 0, 0, 1);
@@ -635,11 +645,14 @@ $objecttmp = new Contrat($db);
 $trackid = 'con'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-if ($sall) {
+if ($search_all) {
+	$setupstring = '';
 	foreach ($fieldstosearchall as $key => $val) {
 		$fieldstosearchall[$key] = $langs->trans($val);
+		$setupstring .= $key."=".$val.";";
 	}
-	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
+	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
 $moreforfilter = '';
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 58231ee7de5..e9a33177f67 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -527,7 +527,7 @@ $moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_
 $moreforfilter.= '</div>';*/
 
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
 	$moreforfilter .= $hookmanager->resPrint;
 } else {

From b41776e6c008ab101e7ae5ae8f59e66c7a73cb7c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 25 Jan 2023 14:55:05 +0100
Subject: [PATCH 758/816] Merge branch 'develop' of
 git@github.com:Dolibarr/dolibarr.git into develop

---
 htdocs/contrat/list.php                         | 2 +-
 htdocs/modulebuilder/template/myobject_list.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index ce3ac212b68..f24bbad4a85 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -651,7 +651,7 @@ if ($search_all) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 		$setupstring .= $key."=".$val.";";
 	}
-	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<!-- Search done like if MYOBJECT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index e9a33177f67..88775b823f5 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -517,7 +517,7 @@ if ($search_all) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 		$setupstring .= $key."=".$val.";";
 	}
-	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<!-- Search done like if MYOBJECT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 

From d0e9290dafaed4b781425b0d23da6a7bf4339413 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 25 Jan 2023 15:27:10 +0100
Subject: [PATCH 759/816] NEW An external module can modify the quick search
 fields

---
 htdocs/bom/bom_list.php                       |  2 +-
 htdocs/bookcal/availabilities_list.php        |  2 +-
 htdocs/bookcal/booking_list.php               |  2 +-
 .../compta/cashcontrol/cashcontrol_list.php   |  2 +-
 htdocs/contrat/class/contrat.class.php        |  9 ++++----
 htdocs/contrat/list.php                       | 23 ++++++++++++-------
 .../conferenceorbooth_list.php                |  2 +-
 .../knowledgerecord_list.php                  |  2 +-
 .../modulebuilder/template/myobject_list.php  |  9 +++++++-
 htdocs/partnership/partnership_list.php       |  2 +-
 .../recruitmentcandidature_list.php           |  2 +-
 htdocs/ticket/list.php                        |  2 +-
 htdocs/user/group/list.php                    |  2 +-
 13 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index 601eb9b75b3..c5e5491dff8 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -517,7 +517,7 @@ if ($search_all) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 		$setupstring .= $key."=".$val.";";
 	}
-	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<!-- Search done like if BOM_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
diff --git a/htdocs/bookcal/availabilities_list.php b/htdocs/bookcal/availabilities_list.php
index 26d66ce0ca4..414faf2dc5a 100644
--- a/htdocs/bookcal/availabilities_list.php
+++ b/htdocs/bookcal/availabilities_list.php
@@ -470,7 +470,7 @@ if ($search_all) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 		$setupstring .= $key."=".$val.";";
 	}
-	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<!-- Search done like if BOOKCAL_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
diff --git a/htdocs/bookcal/booking_list.php b/htdocs/bookcal/booking_list.php
index 2e4fbfccd16..3c78ffea120 100644
--- a/htdocs/bookcal/booking_list.php
+++ b/htdocs/bookcal/booking_list.php
@@ -470,7 +470,7 @@ if ($search_all) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 		$setupstring .= $key."=".$val.";";
 	}
-	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<!-- Search done like if BOOKCAL_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index a1e5dae0c91..05612f54166 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -423,7 +423,7 @@ if ($search_all) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 		$setupstring .= $key."=".$val.";";
 	}
-	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<!-- Search done like if BOOKCAL_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 4d08fdb96cd..bf945eeae96 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -225,9 +225,10 @@ class Contrat extends CommonObject
 	 */
 	public $fields = array(
 		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
-		'ref' =>array('type'=>'varchar(50)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'showoncombobox'=>1, 'position'=>15),
+		'ref' =>array('type'=>'varchar(50)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'showoncombobox'=>1, 'position'=>15, 'searchall'=>1),
 		'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'Ref ext', 'enabled'=>1, 'visible'=>0, 'position'=>20),
-		'ref_supplier' =>array('type'=>'varchar(50)', 'label'=>'Ref supplier', 'enabled'=>1, 'visible'=>-1, 'position'=>25),
+		'ref_customer' =>array('type'=>'varchar(50)', 'label'=>'RefCustomer', 'enabled'=>1, 'visible'=>-1, 'position'=>25, 'searchall'=>1),
+		'ref_supplier' =>array('type'=>'varchar(50)', 'label'=>'RefSupplier', 'enabled'=>1, 'visible'=>-1, 'position'=>26, 'searchall'=>1),
 		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>30, 'index'=>1),
 		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>35),
 		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>40),
@@ -237,8 +238,8 @@ class Contrat extends CommonObject
 		'fk_commercial_signature' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'SaleRepresentative Signature', 'enabled'=>1, 'visible'=>-1, 'position'=>80),
 		'fk_commercial_suivi' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'SaleRepresentative follower', 'enabled'=>1, 'visible'=>-1, 'position'=>85),
 		'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>90),
-		'note_public' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>105),
-		'note_private' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>110),
+		'note_public' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>105, 'searchall'=>1),
+		'note_private' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>110, 'searchall'=>1),
 		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>115),
 		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>120),
 		'extraparams' =>array('type'=>'varchar(255)', 'label'=>'Extraparams', 'enabled'=>1, 'visible'=>-1, 'position'=>125),
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index f24bbad4a85..31d489c4b1f 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -133,16 +133,23 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 // List of fields to search into when doing a "search in all"
-$fieldstosearchall = array(
-	'c.ref'=>'Ref',
-	'c.ref_customer'=>'RefCustomer',
-	'c.ref_supplier'=>'RefSupplier',
-	's.nom'=>"ThirdParty",
-	'c.note_public'=>'NotePublic',
-);
+$fieldstosearchall = array();
+foreach ($object->fields as $key => $val) {
+	if (!empty($val['searchall'])) {
+		$fieldstosearchall['c.'.$key] = $val['label'];
+	}
+}
+$fieldstosearchall["s.nom"] = "ThirdParty";
 if (empty($user->socid)) {
 	$fieldstosearchall["c.note_private"] = "NotePrivate";
 }
+$parameters = array('fieldstosearchall'=>$fieldstosearchall);
+$reshook = $hookmanager->executeHooks('completeFieldsToSearchAll', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook > 0) {
+	$fieldstosearchall = $hookmanager->resArray['fieldstosearchall'];
+} elseif ($reshook == 0) {
+	$fieldstosearchall = array_merge($fieldstosearchall, $hookmanager->resArray['fieldstosearchall']);
+}
 
 $arrayfields = array(
 	'c.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1, 'position'=>10),
@@ -651,7 +658,7 @@ if ($search_all) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 		$setupstring .= $key."=".$val.";";
 	}
-	print '<!-- Search done like if MYOBJECT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<!-- Search done like if CONTRACT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index 21172d774d9..06fb65a8b10 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -721,7 +721,7 @@ if ($search_all) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 		$setupstring .= $key."=".$val.";";
 	}
-	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<!-- Search done like if EVENTORGANIZATION_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index 7f3e3cec2c1..7cd5a24c764 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -469,7 +469,7 @@ if ($search_all) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 		$setupstring .= $key."=".$val.";";
 	}
-	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<!-- Search done like if KNOWLEDGEMANAGEMENT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 88775b823f5..66aa7b0b35e 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -118,7 +118,7 @@ $pagenext = $page + 1;
 $object = new MyObject($db);
 $extrafields = new ExtraFields($db);
 $diroutputmassaction = $conf->mymodule->dir_output.'/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('myobjectlist')); // Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array($contextpage)); 	// Note that conf->hooks_modules contains array of activated contexes
 
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -155,6 +155,13 @@ foreach ($object->fields as $key => $val) {
 		$fieldstosearchall['t.'.$key] = $val['label'];
 	}
 }
+$parameters = array('fieldstosearchall'=>$fieldstosearchall);
+$reshook = $hookmanager->executeHooks('completeFieldsToSearchAll', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook > 0) {
+	$fieldstosearchall = $hookmanager->resArray['fieldstosearchall'];
+} elseif ($reshook == 0) {
+	$fieldstosearchall = array_merge($fieldstosearchall, $hookmanager->resArray['fieldstosearchall']);
+}
 
 // Definition of array of fields for columns
 $arrayfields = array();
diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index a795d8d33f4..7144f201022 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -664,7 +664,7 @@ if ($search_all) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 		$setupstring .= $key."=".$val.";";
 	}
-	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<!-- Search done like if PARTNERSHIP_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php
index aff8c86a955..95b6ac6203d 100644
--- a/htdocs/recruitment/recruitmentcandidature_list.php
+++ b/htdocs/recruitment/recruitmentcandidature_list.php
@@ -571,7 +571,7 @@ if ($search_all) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 		$setupstring .= $key."=".$val.";";
 	}
-	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<!-- Search done like if RECRUITMENT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 1d2cefaf622..f3e2c82d703 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -782,7 +782,7 @@ if ($search_all) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 		$setupstring .= $key."=".$val.";";
 	}
-	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<!-- Search done like if TICKET_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index 7e707b6b4fc..b0327eebe08 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -285,7 +285,7 @@ if ($search_all) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 		$setupstring .= $key."=".$val.";";
 	}
-	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<!-- Search done like if USER_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 

From e8c2c6b6999f2ef060565c92f0e971d1de0a2ca5 Mon Sep 17 00:00:00 2001
From: kkhelifa <kkhelifa@open-dsi.fr>
Date: Wed, 25 Jan 2023 15:28:34 +0100
Subject: [PATCH 760/816] FIX: Rights on action for payments by bank transfer

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

diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index c9f90b8b240..33a4409bac9 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -272,7 +272,7 @@ if ($id > 0 || $ref) {
 	print $formconfirm;
 
 
-	if (empty($object->date_trans) && $user->rights->prelevement->bons->send && $action == 'settransmitted') {
+	if (empty($object->date_trans) && (($user->rights->prelevement->bons->send && $object->type != 'bank-transfer') || ($user->rights->paymentbybanktransfer->send && $object->type == 'bank-transfer')) && $action == 'settransmitted') {
 		print '<form method="post" name="userfile" action="card.php?id='.$object->id.'" enctype="multipart/form-data">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="infotrans">';
@@ -291,7 +291,7 @@ if ($id > 0 || $ref) {
 		print '<br>';
 	}
 
-	if (!empty($object->date_trans) && empty($object->date_credit) && $user->rights->prelevement->bons->credit && $action == 'setcredited') {
+	if (!empty($object->date_trans) && empty($object->date_credit) && (($user->rights->prelevement->bons->credit && $object->type != 'bank-transfer') || ($user->rights->paymentbybanktransfer->debit && $object->type == 'bank-transfer')) && $action == 'setcredited') {
 		$btnLabel = ($object->type == 'bank-transfer') ? $langs->trans("ClassDebited") : $langs->trans("ClassCredited");
 		print '<form name="infocredit" method="post" action="card.php?id='.$object->id.'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';

From 79b7b106fc1f1fdf6baf93bb5c1fe42c9a7c8c14 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Wed, 25 Jan 2023 15:35:09 +0100
Subject: [PATCH 761/816] FIX - PHP8  Warnning admin commande

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

diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 79c42f6e2db..20064ca099c 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -117,7 +117,7 @@ if ($action == 'updateMask') {
 } elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
-		if ($conf->global->COMMANDE_ADDON_PDF == "$value") {
+		if (getDolGlobalString('COMMANDE_ADDON_PDF') == $value) {
 			dolibarr_del_const($db, 'COMMANDE_ADDON_PDF', $conf->entity);
 		}
 	}

From 4e289bf5baf343a10db140561e8b90587aa0fa2a Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Wed, 25 Jan 2023 15:36:47 +0100
Subject: [PATCH 762/816] next

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

diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 20064ca099c..b366ea928ef 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -461,7 +461,7 @@ foreach ($dirmodels as $reldir) {
 
 								// Default
 								print '<td class="center">';
-								if ($conf->global->COMMANDE_ADDON_PDF == $name) {
+								if (getDolGlobalString('COMMANDE_ADDON_PDF') == $name) {
 									print img_picto($langs->trans("Default"), 'on');
 								} else {
 									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';

From 8c7f0e8e93739e2781d3cce2ab9a8ed8fe7f5efe Mon Sep 17 00:00:00 2001
From: hystepik <lucas.marcouiller@gmail.com>
Date: Wed, 25 Jan 2023 16:06:41 +0100
Subject: [PATCH 763/816] fix travis

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

diff --git a/htdocs/reception/contact.php b/htdocs/reception/contact.php
index 11ab664c6c0..97d6d19a4f9 100644
--- a/htdocs/reception/contact.php
+++ b/htdocs/reception/contact.php
@@ -72,7 +72,7 @@ if ($origin == 'reception') {
 } else {
 	if ($origin == 'supplierorder' || $origin == 'order_supplier') {
 		$result = restrictedArea($user, 'fournisseur', $origin_id, 'commande_fournisseur', 'commande');
-	} elseif (empty($user->hasRight($origin, "lire")) && empty($user->hasRight($origin, "read"))) {
+	} elseif (!$user->hasRight($origin, "lire") && !$user->hasRight($origin, "read")) {
 		accessforbidden();
 	}
 }

From 8c0c69c4952ebb4c73ef4d416aa7278d06f51ecd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 25 Jan 2023 16:38:05 +0100
Subject: [PATCH 764/816] Debug set/edit date/end of contrat lines

---
 htdocs/contrat/card.php                | 61 +++++++++++---------------
 htdocs/contrat/class/contrat.class.php | 14 +++---
 2 files changed, 32 insertions(+), 43 deletions(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index b29f001bda2..54779bb692d 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -143,7 +143,16 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';  // Must be include, not include_once
 
 	if ($action == 'confirm_active' && $confirm == 'yes' && $user->rights->contrat->activer) {
-		$result = $object->active_line($user, GETPOST('ligne', 'int'), GETPOST('date'), GETPOST('dateend'), GETPOST('comment'));
+		$date_start = '';
+		$date_end = '';
+		if (GETPOST('startmonth') && GETPOST('startday') && GETPOST('startyear')) {
+			$date_start = dol_mktime(GETPOST('starthour'), GETPOST('startmin'), 0, GETPOST('startmonth'), GETPOST('startday'), GETPOST('startyear'));
+		}
+		if (GETPOST('endmonth') && GETPOST('endday') && GETPOST('endyear')) {
+			$date_end = dol_mktime(GETPOST('endhour'), GETPOST('endmin'), 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
+		}
+
+		$result = $object->active_line($user, GETPOST('ligne', 'int'), $date_start, $date_end, GETPOST('comment'));
 
 		if ($result > 0) {
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
@@ -152,12 +161,16 @@ if (empty($reshook)) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} elseif ($action == 'confirm_closeline' && $confirm == 'yes' && $user->rights->contrat->activer) {
-		if (!GETPOST('dateend')) {
+		$date_end = '';
+		if (GETPOST('endmonth') && GETPOST('endday') && GETPOST('endyear')) {
+			$date_end = dol_mktime(GETPOST('endhour'), GETPOST('endmin'), 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
+		}
+		if (!$date_end) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEnd")), null, 'errors');
 		}
 		if (!$error) {
-			$result = $object->close_line($user, GETPOST('ligne', 'int'), GETPOST('dateend'), urldecode(GETPOST('comment')));
+			$result = $object->close_line($user, GETPOST('ligne', 'int'), $date_end, urldecode(GETPOST('comment')));
 			if ($result > 0) {
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
@@ -1838,34 +1851,6 @@ if ($action == 'create') {
 				print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
 			}
 
-			/*
-			 * Confirmation de la validation activation
-			 */
-			if ($action == 'active' && !$cancel && $user->rights->contrat->activer && $object->lines[$cursorline - 1]->id == GETPOST('ligne', 'int')) {
-				$dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-				$dateactend   = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
-				$comment      = GETPOST('comment', 'alpha');
-				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne', 'int')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("ActivateService"), $langs->trans("ConfirmActivateService", dol_print_date($dateactstart, "%A %d %B %Y")), "confirm_active", '', 0, 1);
-				print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
-			}
-
-			/*
-			 * Confirmation de la validation fermeture
-			 */
-			if ($action == 'closeline' && !$cancel && $user->rights->contrat->activer && $object->lines[$cursorline - 1]->id == GETPOST('ligne', 'int')) {
-				$dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-				$dateactend   = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
-				$comment      = GETPOST('comment', 'alpha');
-
-				if (empty($dateactend)) {
-					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEndReal")), null, 'errors');
-				} else {
-					print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne', 'int')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("CloseService"), $langs->trans("ConfirmCloseService", dol_print_date($dateactend, "%A %d %B %Y")), "confirm_closeline", '', 0, 1);
-				}
-				print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
-			}
-
-
 			// Area with status and activation info of line
 			if ($object->statut > 0) {
 				print '<table class="notopnoleftnoright tableforservicepart2'.($cursorline < $nbofservices ? ' boxtablenobottom' : '').'" width="100%">';
@@ -1931,8 +1916,12 @@ if ($action == 'create') {
 
 			// Form to activate line
 			if ($user->rights->contrat->activer && $action == 'activateline' && $object->lines[$cursorline - 1]->id == GETPOST('ligne', 'int')) {
-				print '<form name="active" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.GETPOST('ligne', 'int').'&amp;action=active" method="post">';
+				print '<form name="active" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input type="hidden" name="action" value="confirm_active">';
+				print '<input type="hidden" name="id" value="'.$object->id.'">';
+				print '<input type="hidden" name="ligne" value="'.GETPOST('ligne', 'int').'">';
+				print '<input type="hidden" name="confirm" value="yes">';
 
 				print '<table class="noborder tableforservicepart2'.($cursorline < $nbofservices ? ' boxtablenobottom' : '').'" width="100%">';
 
@@ -1957,7 +1946,7 @@ if ($action == 'create') {
 
 				print '<tr class="oddeven">';
 				print '<td class="nohover">'.$langs->trans("DateServiceActivate").'</td><td class="nohover">';
-				print $form->selectDate($dateactstart, '', $usehm, $usehm, '', "active", 1, 0);
+				print $form->selectDate($dateactstart, 'start', $usehm, $usehm, '', "active", 1, 0);
 				print '</td>';
 				print '<td class="nohover">'.$langs->trans("DateEndPlanned").'</td><td class="nohover">';
 				print $form->selectDate($dateactend, "end", $usehm, $usehm, '', "active", 1, 0);
@@ -1985,10 +1974,10 @@ if ($action == 'create') {
 				 * Disable a contract line
 				 */
 				print '<!-- Form to disabled a line -->'."\n";
-				print '<form name="closeline" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.$object->lines[$cursorline - 1]->id.'" method="post">';
-
+				print '<form name="confirm_closeline" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.$object->lines[$cursorline - 1]->id.'" method="post">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
-				print '<input type="hidden" name="action" value="closeline">';
+				print '<input type="hidden" name="confirm" value="yes">';
+				print '<input type="hidden" name="action" value="confirm_closeline">';
 
 				print '<table class="noborder tableforservicepart2'.($cursorline < $nbofservices ? ' boxtablenobottom' : '').'" width="100%">';
 
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index bf945eeae96..0357459052b 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -321,15 +321,15 @@ class Contrat extends CommonObject
 	 *
 	 *  @param	User		$user       Objet User who activate contract
 	 *  @param  int			$line_id    Id of line to activate
-	 *  @param  int			$date       Opening date
+	 *  @param  int			$date_start Opening date
 	 *  @param  int|string	$date_end   Expected end date
 	 * 	@param	string		$comment	A comment typed by user
 	 *  @return int         			<0 if KO, >0 if OK
 	 */
-	public function active_line($user, $line_id, $date, $date_end = '', $comment = '')
+	public function active_line($user, $line_id, $date_start, $date_end = '', $comment = '')
 	{
 		// phpcs:enable
-		$result = $this->lines[$this->lines_id_index_mapper[$line_id]]->active_line($user, $date, $date_end, $comment);
+		$result = $this->lines[$this->lines_id_index_mapper[$line_id]]->active_line($user, $date_start, $date_end, $comment);
 		if ($result < 0) {
 			$this->error = $this->lines[$this->lines_id_index_mapper[$line_id]]->error;
 			$this->errors = $this->lines[$this->lines_id_index_mapper[$line_id]]->errors;
@@ -3588,7 +3588,7 @@ class ContratLigne extends CommonObjectLine
 	 *  Activate a contract line
 	 *
 	 * @param   User 		$user 		Objet User who activate contract
-	 * @param  	int 		$date 		Date activation
+	 * @param  	int 		$date 		Date real activation
 	 * @param  	int|string 	$date_end 	Date planned end. Use '-1' to keep it unchanged.
 	 * @param   string 		$comment 	A comment typed by user
 	 * @return 	int                    	<0 if KO, >0 if OK
@@ -3603,13 +3603,13 @@ class ContratLigne extends CommonObjectLine
 		$this->db->begin();
 
 		$this->statut = ContratLigne::STATUS_OPEN;
-		$this->date_start = $date;
+		$this->date_start_real = $date;
 		$this->date_end = $date_end;
 		$this->fk_user_ouverture = $user->id;
 		$this->date_end_real = null;
 		$this->commentaire = $comment;
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET statut = ".$this->statut.",";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET statut = ".((int) $this->statut).",";
 		$sql .= " date_ouverture = ".(dol_strlen($this->date_start_real) != 0 ? "'".$this->db->idate($this->date_start_real)."'" : "null").",";
 		if ($date_end >= 0) {
 			$sql .= " date_fin_validite = ".(dol_strlen($this->date_end) != 0 ? "'".$this->db->idate($this->date_end)."'" : "null").",";
@@ -3648,7 +3648,7 @@ class ContratLigne extends CommonObjectLine
 	 *  Close a contract line
 	 *
 	 * @param    User 	$user 			Objet User who close contract
-	 * @param  	 int 	$date_end_real 		Date end
+	 * @param  	 int 	$date_end_real 	Date end
 	 * @param    string $comment 		A comment typed by user
 	 * @param    int	$notrigger		1=Does not execute triggers, 0=Execute triggers
 	 * @return int                    	<0 if KO, >0 if OK

From 1d5e2bd0256a3c2ea3b204a3a0b8fd304d8c826c Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 25 Jan 2023 16:39:45 +0100
Subject: [PATCH 765/816] fix : Warning: Undefined array key xStartPos in
 /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/core/class/commondocgenerator.class.php
 on line 1109

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

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 7c136f446d9..b4eddcc252f 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1104,7 +1104,7 @@ abstract class CommonDocGenerator
 	public function getColumnContentXStart($colKey)
 	{
 		$colDef = $this->cols[$colKey];
-		return  $colDef['xStartPos'] + $colDef['content']['padding'][3];
+		return  (isset($colDef['xStartPos']) ? $colDef['xStartPos'] : 0) + $colDef['content']['padding'][3];
 	}
 
 	/**

From 3d814ac3d3fb6982e6b5cc391d721827746b64f3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 25 Jan 2023 16:38:05 +0100
Subject: [PATCH 766/816] Debug set/edit date/end of contrat lines

---
 htdocs/contrat/card.php                | 61 +++++++++++---------------
 htdocs/contrat/class/contrat.class.php | 14 +++---
 2 files changed, 32 insertions(+), 43 deletions(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index db501e113fb..6b3937df76a 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -143,7 +143,16 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';  // Must be include, not include_once
 
 	if ($action == 'confirm_active' && $confirm == 'yes' && $user->rights->contrat->activer) {
-		$result = $object->active_line($user, GETPOST('ligne', 'int'), GETPOST('date'), GETPOST('dateend'), GETPOST('comment'));
+		$date_start = '';
+		$date_end = '';
+		if (GETPOST('startmonth') && GETPOST('startday') && GETPOST('startyear')) {
+			$date_start = dol_mktime(GETPOST('starthour'), GETPOST('startmin'), 0, GETPOST('startmonth'), GETPOST('startday'), GETPOST('startyear'));
+		}
+		if (GETPOST('endmonth') && GETPOST('endday') && GETPOST('endyear')) {
+			$date_end = dol_mktime(GETPOST('endhour'), GETPOST('endmin'), 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
+		}
+
+		$result = $object->active_line($user, GETPOST('ligne', 'int'), $date_start, $date_end, GETPOST('comment'));
 
 		if ($result > 0) {
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
@@ -152,12 +161,16 @@ if (empty($reshook)) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} elseif ($action == 'confirm_closeline' && $confirm == 'yes' && $user->rights->contrat->activer) {
-		if (!GETPOST('dateend')) {
+		$date_end = '';
+		if (GETPOST('endmonth') && GETPOST('endday') && GETPOST('endyear')) {
+			$date_end = dol_mktime(GETPOST('endhour'), GETPOST('endmin'), 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
+		}
+		if (!$date_end) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEnd")), null, 'errors');
 		}
 		if (!$error) {
-			$result = $object->close_line($user, GETPOST('ligne', 'int'), GETPOST('dateend'), urldecode(GETPOST('comment')));
+			$result = $object->close_line($user, GETPOST('ligne', 'int'), $date_end, urldecode(GETPOST('comment')));
 			if ($result > 0) {
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
@@ -1837,34 +1850,6 @@ if ($action == 'create') {
 				print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
 			}
 
-			/*
-			 * Confirmation de la validation activation
-			 */
-			if ($action == 'active' && !$cancel && $user->rights->contrat->activer && $object->lines[$cursorline - 1]->id == GETPOST('ligne', 'int')) {
-				$dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-				$dateactend   = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
-				$comment      = GETPOST('comment', 'alpha');
-				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne', 'int')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("ActivateService"), $langs->trans("ConfirmActivateService", dol_print_date($dateactstart, "%A %d %B %Y")), "confirm_active", '', 0, 1);
-				print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
-			}
-
-			/*
-			 * Confirmation de la validation fermeture
-			 */
-			if ($action == 'closeline' && !$cancel && $user->rights->contrat->activer && $object->lines[$cursorline - 1]->id == GETPOST('ligne', 'int')) {
-				$dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-				$dateactend   = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
-				$comment      = GETPOST('comment', 'alpha');
-
-				if (empty($dateactend)) {
-					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEndReal")), null, 'errors');
-				} else {
-					print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne', 'int')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("CloseService"), $langs->trans("ConfirmCloseService", dol_print_date($dateactend, "%A %d %B %Y")), "confirm_closeline", '', 0, 1);
-				}
-				print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
-			}
-
-
 			// Area with status and activation info of line
 			if ($object->statut > 0) {
 				print '<table class="notopnoleftnoright tableforservicepart2'.($cursorline < $nbofservices ? ' boxtablenobottom' : '').'" width="100%">';
@@ -1930,8 +1915,12 @@ if ($action == 'create') {
 
 			// Form to activate line
 			if ($user->rights->contrat->activer && $action == 'activateline' && $object->lines[$cursorline - 1]->id == GETPOST('ligne', 'int')) {
-				print '<form name="active" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.GETPOST('ligne', 'int').'&amp;action=active" method="post">';
+				print '<form name="active" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input type="hidden" name="action" value="confirm_active">';
+				print '<input type="hidden" name="id" value="'.$object->id.'">';
+				print '<input type="hidden" name="ligne" value="'.GETPOST('ligne', 'int').'">';
+				print '<input type="hidden" name="confirm" value="yes">';
 
 				print '<table class="noborder tableforservicepart2'.($cursorline < $nbofservices ? ' boxtablenobottom' : '').'" width="100%">';
 
@@ -1956,7 +1945,7 @@ if ($action == 'create') {
 
 				print '<tr class="oddeven">';
 				print '<td class="nohover">'.$langs->trans("DateServiceActivate").'</td><td class="nohover">';
-				print $form->selectDate($dateactstart, '', $usehm, $usehm, '', "active", 1, 0);
+				print $form->selectDate($dateactstart, 'start', $usehm, $usehm, '', "active", 1, 0);
 				print '</td>';
 				print '<td class="nohover">'.$langs->trans("DateEndPlanned").'</td><td class="nohover">';
 				print $form->selectDate($dateactend, "end", $usehm, $usehm, '', "active", 1, 0);
@@ -1984,10 +1973,10 @@ if ($action == 'create') {
 				 * Disable a contract line
 				 */
 				print '<!-- Form to disabled a line -->'."\n";
-				print '<form name="closeline" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.$object->lines[$cursorline - 1]->id.'" method="post">';
-
+				print '<form name="confirm_closeline" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.$object->lines[$cursorline - 1]->id.'" method="post">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
-				print '<input type="hidden" name="action" value="closeline">';
+				print '<input type="hidden" name="confirm" value="yes">';
+				print '<input type="hidden" name="action" value="confirm_closeline">';
 
 				print '<table class="noborder tableforservicepart2'.($cursorline < $nbofservices ? ' boxtablenobottom' : '').'" width="100%">';
 
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 486a647fb68..1e8f0e1f7e5 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -320,15 +320,15 @@ class Contrat extends CommonObject
 	 *
 	 *  @param	User		$user       Objet User who activate contract
 	 *  @param  int			$line_id    Id of line to activate
-	 *  @param  int			$date       Opening date
+	 *  @param  int			$date_start Opening date
 	 *  @param  int|string	$date_end   Expected end date
 	 * 	@param	string		$comment	A comment typed by user
 	 *  @return int         			<0 if KO, >0 if OK
 	 */
-	public function active_line($user, $line_id, $date, $date_end = '', $comment = '')
+	public function active_line($user, $line_id, $date_start, $date_end = '', $comment = '')
 	{
 		// phpcs:enable
-		$result = $this->lines[$this->lines_id_index_mapper[$line_id]]->active_line($user, $date, $date_end, $comment);
+		$result = $this->lines[$this->lines_id_index_mapper[$line_id]]->active_line($user, $date_start, $date_end, $comment);
 		if ($result < 0) {
 			$this->error = $this->lines[$this->lines_id_index_mapper[$line_id]]->error;
 			$this->errors = $this->lines[$this->lines_id_index_mapper[$line_id]]->errors;
@@ -3554,7 +3554,7 @@ class ContratLigne extends CommonObjectLine
 	 *  Activate a contract line
 	 *
 	 * @param   User 		$user 		Objet User who activate contract
-	 * @param  	int 		$date 		Date activation
+	 * @param  	int 		$date 		Date real activation
 	 * @param  	int|string 	$date_end 	Date planned end. Use '-1' to keep it unchanged.
 	 * @param   string 		$comment 	A comment typed by user
 	 * @return 	int                    	<0 if KO, >0 if OK
@@ -3569,13 +3569,13 @@ class ContratLigne extends CommonObjectLine
 		$this->db->begin();
 
 		$this->statut = ContratLigne::STATUS_OPEN;
-		$this->date_start = $date;
+		$this->date_start_real = $date;
 		$this->date_end = $date_end;
 		$this->fk_user_ouverture = $user->id;
 		$this->date_end_real = null;
 		$this->commentaire = $comment;
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET statut = ".$this->statut.",";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET statut = ".((int) $this->statut).",";
 		$sql .= " date_ouverture = ".(dol_strlen($this->date_start_real) != 0 ? "'".$this->db->idate($this->date_start_real)."'" : "null").",";
 		if ($date_end >= 0) {
 			$sql .= " date_fin_validite = ".(dol_strlen($this->date_end) != 0 ? "'".$this->db->idate($this->date_end)."'" : "null").",";
@@ -3614,7 +3614,7 @@ class ContratLigne extends CommonObjectLine
 	 *  Close a contract line
 	 *
 	 * @param    User 	$user 			Objet User who close contract
-	 * @param  	 int 	$date_end_real 		Date end
+	 * @param  	 int 	$date_end_real 	Date end
 	 * @param    string $comment 		A comment typed by user
 	 * @param    int	$notrigger		1=Does not execute triggers, 0=Execute triggers
 	 * @return int                    	<0 if KO, >0 if OK

From d8ce744e4c4dc70c897775203f56f1c28c1ce588 Mon Sep 17 00:00:00 2001
From: hystepik <lucas.marcouiller@gmail.com>
Date: Wed, 25 Jan 2023 16:56:27 +0100
Subject: [PATCH 767/816] New : Export for module ticket

---
 htdocs/core/modules/modTicket.class.php | 28 +++++++++++++++++++++++++
 htdocs/langs/en_US/ticket.lang          |  3 +++
 2 files changed, 31 insertions(+)

diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php
index 37e6552af2f..ff80385235f 100644
--- a/htdocs/core/modules/modTicket.class.php
+++ b/htdocs/core/modules/modTicket.class.php
@@ -208,6 +208,13 @@ class modTicket extends DolibarrModules
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'manage';
 
+		$r++;
+		$this->rights[$r][0] = 56006; // id de la permission
+		$this->rights[$r][1] = "Export ticket"; // libelle de la permission
+		//$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][4] = 'export';
+
 		/* Seems not used and in conflict with societe->client->voir (see all thirdparties)
 		$r++;
 		$this->rights[$r][0] = 56005; // id de la permission
@@ -318,6 +325,27 @@ class modTicket extends DolibarrModules
 			'target' => '',
 			'user' => 0);
 		$r++;
+
+		// Exports
+		//--------
+		$r = 1;
+
+		// Export list of tickets and attributes
+		$langs->load("ticket");
+		$this->export_code[$r]=$this->rights_class.'_'.$r;
+		$this->export_label[$r]='ExportDataset_ticket_1';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_permission[$r] = array(array("ticket", "export"));
+		$this->export_icon[$r]='ticket';
+		$keyforclass = 'Ticket';$keyforclassfile='/ticket/class/ticket.class.php';$keyforelement='ticket';
+		include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
+		$keyforselect='ticket'; $keyforaliasextra='extra'; $keyforelement='ticket';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		$this->export_sql_start[$r]='SELECT DISTINCT ';
+		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'ticket as t';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'ticket_extrafields as extra on (t.rowid = extra.fk_object)';
+		$this->export_sql_end[$r] .=' WHERE 1 = 1';
+		$this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('ticket').')';
+		$r++;
 	}
 
 	/**
diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index ea560012afc..de54d475591 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=Modify tickets
 Permission56003=Delete tickets
 Permission56004=Manage tickets
 Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
+Permission56006=Export tickets
 
 Tickets=Tickets
 TicketDictType=Ticket - Types
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=External contributor
 OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
+ExportDataset_ticket_1=Tickets
+
 # Status
 Read=Read
 Assigned=Assigned

From 934bcc72c489799d451f0c49642728460bed1880 Mon Sep 17 00:00:00 2001
From: GregM <gregory.maza@atm-consulting.fr>
Date: Wed, 25 Jan 2023 17:34:57 +0100
Subject: [PATCH 768/816] update space

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

diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
index 0c9adf0be59..a7fb11e624f 100644
--- a/htdocs/core/class/html.formsetup.class.php
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -1069,7 +1069,7 @@ class FormSetupItem
 		} elseif ($this->type == 'yesno') {
 			$out.= ajax_constantonoff($this->confKey);
 		} elseif (preg_match('/emailtemplate:/', $this->type)) {
-			if ($this->fieldValue > 0){
+			if ($this->fieldValue > 0) {
 				include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
 				$formmail = new FormMail($this->db);
 

From faa44379e81aef112835b254644ea5b49ffb28eb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 25 Jan 2023 17:38:04 +0100
Subject: [PATCH 769/816] Debug view of thumbs for svg

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 88fefed035f..b67f518d2af 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -8652,7 +8652,10 @@ abstract class CommonObject
 						// Find name of thumb file
 						$photo_vignette = basename(getImageFileNameForSize($dir.$file, '_small'));
 						if (!dol_is_file($dirthumb.$photo_vignette)) {
-							$photo_vignette = '';
+							// The thumb does not exists, so we will use the original file
+							$dirthumb = $dir;
+							$pdirthumb = $pdir;
+							$photo_vignette = basename($file);
 						}
 
 						// Get filesize of original file
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 1076d32602f..fe47ecc64d7 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -9943,7 +9943,7 @@ function showDirectDownloadLink($object)
  * @param   string  $file           Original filename (full or relative path)
  * @param   string  $extName        Extension to differenciate thumb file name ('', '_small', '_mini')
  * @param   string  $extImgTarget   Force image extension for thumbs. Use '' to keep same extension than original image (default).
- * @return  string                  New file name (full or relative path, including the thumbs/)
+ * @return  string                  New file name (full or relative path, including the thumbs/). May be the original path if no thumb can exists.
  */
 function getImageFileNameForSize($file, $extName, $extImgTarget = '')
 {

From dbfa172e195be8d007792aaefbfa50cbddc04f65 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 25 Jan 2023 17:38:04 +0100
Subject: [PATCH 770/816] Debug view of thumbs for svg

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 471d835f4a3..2c9bb0c14c0 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -8650,7 +8650,10 @@ abstract class CommonObject
 						// Find name of thumb file
 						$photo_vignette = basename(getImageFileNameForSize($dir.$file, '_small'));
 						if (!dol_is_file($dirthumb.$photo_vignette)) {
-							$photo_vignette = '';
+							// The thumb does not exists, so we will use the original file
+							$dirthumb = $dir;
+							$pdirthumb = $pdir;
+							$photo_vignette = basename($file);
 						}
 
 						// Get filesize of original file
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4d38c7e5e5d..81f830d6456 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -9903,7 +9903,7 @@ function showDirectDownloadLink($object)
  * @param   string  $file           Original filename (full or relative path)
  * @param   string  $extName        Extension to differenciate thumb file name ('', '_small', '_mini')
  * @param   string  $extImgTarget   Force image extension for thumbs. Use '' to keep same extension than original image (default).
- * @return  string                  New file name (full or relative path, including the thumbs/)
+ * @return  string                  New file name (full or relative path, including the thumbs/). May be the original path if no thumb can exists.
  */
 function getImageFileNameForSize($file, $extName, $extImgTarget = '')
 {

From 35f16e821da3843fa93cefe5a284f9676b6501e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 25 Jan 2023 21:56:49 +0100
Subject: [PATCH 771/816] fix php8.2 warnings

---
 htdocs/debugbar/class/DataCollector/DolLogsCollector.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/debugbar/class/DataCollector/DolLogsCollector.php b/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
index 44885296bae..3d3b3b25a0e 100644
--- a/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
@@ -41,6 +41,11 @@ class DolLogsCollector extends MessagesCollector
 	 */
 	protected $maxnboflines;
 
+	/**
+	 * @var int number of lines
+	 */
+	protected $nboflines;
+
 	/**
 	 * Constructor
 	 *
@@ -54,7 +59,7 @@ class DolLogsCollector extends MessagesCollector
 		parent::__construct($name);
 
 		$this->nboflines = 0;
-		$this->maxnboflines = empty($conf->global->DEBUGBAR_LOGS_LINES_NUMBER) ? 250 : $conf->global->DEBUGBAR_LOGS_LINES_NUMBER; // High number slows seriously output
+		$this->maxnboflines = getDolGlobalInt('DEBUGBAR_LOGS_LINES_NUMBER', 250); // High number slows seriously output
 
 		$this->path = $path ?: $this->getLogsFile();
 	}

From 1a4cb5b4e2057f2b66254fdcaf9100abb438fe1f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 26 Jan 2023 02:06:40 +0100
Subject: [PATCH 772/816] FIX #22964 #23012

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 63858fa28e2..ed74194d492 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1207,7 +1207,7 @@ abstract class CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *    Delete all links between an object $this and all its contacts
+	 *    Delete all links between an object $this and all its contacts in llx_element_contact
 	 *
 	 *	  @param	string	$source		'' or 'internal' or 'external'
 	 *	  @param	string	$code		Type of contact (code or id)
@@ -1224,12 +1224,16 @@ abstract class CommonObject
 		}
 		$listId = implode(",", $temp);
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
-		$sql .= " WHERE element_id = ".((int) $this->id);
-		if ($listId) {
-			$sql .= " AND fk_c_type_contact IN (".$this->db->sanitize($listId).")";
+		// If $listId is empty, we have not criteria on fk_c_type_contact so we will delete record on element_id for
+		// any type or record instead of only the ones of the current object. So we do nothing in such a case.
+		if (empty($listId)) {
+			return 0;
 		}
 
+		$sql = "DELETE FROM ".$this->db->prefix()."element_contact";
+		$sql .= " WHERE element_id = ".((int) $this->id);
+		$sql .= " AND fk_c_type_contact IN (".$this->db->sanitize($listId).")";
+
 		dol_syslog(get_class($this)."::delete_linked_contact", LOG_DEBUG);
 		if ($this->db->query($sql)) {
 			return 1;

From 59f163f6998d5929607528513e305e5538539332 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 26 Jan 2023 02:12:42 +0100
Subject: [PATCH 773/816] Fix regression

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

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 0756cb1bc7f..0201dfdd7f6 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1158,12 +1158,17 @@ if (empty($reshook)) {
 
 				unset($date);
 			} else {
+				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
 
-		header("Location: ".$_SERVER["PHP_SELF"]."?id=".GETPOST('id', 'int'));
-		exit;
+		if (!$error) {
+			header("Location: ".$_SERVER["PHP_SELF"]."?id=".GETPOST('id', 'int'));
+			exit;
+		} else {
+			$action = '';
+		}
 	}
 
 	if ($action == 'confirm_delete_line' && GETPOST("confirm", 'alpha') == "yes" && $user->rights->expensereport->creer) {

From 6aadb7b9ccf4150c5b1dbf45ff974cf3eb5cbea3 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Thu, 26 Jan 2023 10:36:44 +0100
Subject: [PATCH 774/816] =?UTF-8?q?FIX=20-=20Error=20to=20g=C3=A9n=C3=A9ra?=
 =?UTF-8?q?te=20product=20doc=20-=20NEW=20-=20Add=20photo=20on=20product?=
 =?UTF-8?q?=20doc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/doc/pdf_standard.modules.php      | 73 ++++++++++++++-----
 1 file changed, 56 insertions(+), 17 deletions(-)

diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index 8baef2ffa75..9247e8c7e34 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -209,10 +209,10 @@ class pdf_standard extends ModelePDFProduct
 				$pdf->SetDrawColor(128, 128, 128);
 
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
-				$pdf->SetSubject($outputlangs->transnoentities("Order"));
+				$pdf->SetSubject($outputlangs->transnoentities("Product"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Order")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Product"));
 				if (getDolGlobalString('MAIN_DISABLE_PDF_COMPRESSION')) {
 					$pdf->SetCompression(false);
 				}
@@ -242,6 +242,53 @@ class pdf_standard extends ModelePDFProduct
 				$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $tab_top, dol_htmlentitiesbr($object->label), 0, 1);
 				$nexY = $pdf->GetY();
 
+				// Show photo
+				if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO')) {
+					$pdir[0] = get_exdir($object->id, 2, 0, 0, $object, 'product').$object->id."/photos/";
+					$pdir[1] = get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref).'/';
+				} else {
+					$pdir[0] = get_exdir(0, 0, 0, 0, $object, 'product'); // default
+					$pdir[1] = get_exdir($object->id, 2, 0, 0, $object, 'product').$object->id."/photos/"; // alternative
+				}
+
+				$arephoto = false;
+				foreach ($pdir as $midir) {
+					if (!$arephoto) {
+						if ($conf->entity != $object->entity) {
+							$dir = $conf->product->multidir_output[$object->entity].'/'.$midir; //Check repertories of current entities
+						} else {
+							$dir = $conf->product->dir_output.'/'.$midir; //Check repertory of the current product
+						}
+						foreach ($object->liste_photos($dir, 1) as $key => $obj) {
+							if (!getDolGlobalInt('CAT_HIGH_QUALITY_IMAGES')) {		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
+								if ($obj['photo_vignette']) {
+									$filename = $obj['photo_vignette'];
+								} else {
+									$filename = $obj['photo'];
+								}
+							} else {
+								$filename = $obj['photo'];
+							}
+							$realpath = $dir.$filename;
+							$arephoto = true;
+						}
+					}
+				}
+				// Define size of image if we need it
+				$imglinesize = array();
+				if (!empty($realpath) && $arephoto) {
+					$imgsize = pdf_getSizeForImage($realpath);
+					$imgsizewidth = $imgsize['width'] + 20;
+					$imgsizeheight = $imgsize['height'] + 20;
+
+					$midelpage = ($this->page_largeur - $this->marge_gauche - $this->marge_droite) / 2;
+					$posxphoto = $midelpage + ($midelpage / 2) - ($imgsizewidth / 2);
+					$posyphoto = $tab_top - 1;
+					$pdf->Image($realpath, $posxphoto, $posyphoto, $imgsizewidth, $imgsizeheight, '', '', '', 2, 300); // Use 300 dpi
+					$nexyafterphoto = $tab_top + $imgsizeheight;
+				}
+
+				// Description
 				$pdf->SetFont('', '', $default_font_size);
 				$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, dol_htmlentitiesbr($object->description), 0, 1);
 				$nexY = $pdf->GetY();
@@ -276,30 +323,22 @@ class pdf_standard extends ModelePDFProduct
 					$nexY = $pdf->GetY();
 				}
 
+				$tab_top = 88;
+				if (!empty($nexyafterphoto) && $nexyafterphoto > $tab_top) {
+					$tab_top = $nexyafterphoto;
+				}
+
 				// Show notes
 				// TODO There is no public note on product yet
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
-				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE)) {
-					// Get first sale rep
-					if (is_object($object->thirdparty)) {
-						$salereparray = $object->thirdparty->getSalesRepresentatives($user);
-						$salerepobj = new User($this->db);
-						$salerepobj->fetch($salereparray[0]['id']);
-						if (!empty($salerepobj->signature)) {
-							$notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
-						}
-					}
-				}
 				if ($notetoshow) {
 					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
 					complete_substitutions_array($substitutionarray, $outputlangs, $object);
 					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
 					$notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
 
-					$tab_top = 88;
-
 					$pdf->SetFont('', '', $default_font_size - 1);
-					$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+					$pdf->writeHTMLCell(190, 3, $this->marge_gauche - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
 					$nexY = $pdf->GetY();
 					$height_note = $nexY - $tab_top;
 
@@ -687,7 +726,7 @@ class pdf_standard extends ModelePDFProduct
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		// Show Draft Watermark
-		if ($object->statut == 0 && getDolGlobalString('COMMANDE_DRAFT_WATERMARK')) {
+		if ($object->statut == 0 && getDolGlobalString('PRODUCT_DRAFT_WATERMARK')) {
 			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', getDolGlobalString('COMMANDE_DRAFT_WATERMARK'));
 		}
 

From 2a26ca7212c177091e3e68ed91f46acde90a52cc Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Thu, 26 Jan 2023 10:40:41 +0100
Subject: [PATCH 775/816] Cop

---
 htdocs/core/modules/product/doc/pdf_standard.modules.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index 9247e8c7e34..44d75b99726 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2017 	Laurent Destailleur <eldy@products.sourceforge.net>
+/* Copyright (C) 2017 	Laurent Destailleur		<eldy@products.sourceforge.net>
+ * Copyright (C) 2017 	Anthony Berton			<anthony.berton@bb2a.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

From 890f9120d71e59af514a02fcb5f8a10cf7e5a49d Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Thu, 26 Jan 2023 10:48:27 +0100
Subject: [PATCH 776/816] Cop

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

diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index 44d75b99726..7427fc7170e 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2017 	Laurent Destailleur		<eldy@products.sourceforge.net>
- * Copyright (C) 2017 	Anthony Berton			<anthony.berton@bb2a.fr>
+ * Copyright (C) 2023 	Anthony Berton			<anthony.berton@bb2a.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

From 35b05cfc7b45ad79cad9c3ebccb0135c65d7158d Mon Sep 17 00:00:00 2001
From: mgabriel <m.gabriel@aycad.com>
Date: Thu, 26 Jan 2023 11:00:00 +0100
Subject: [PATCH 777/816] Implements MAIN_SECURITY_ALLOW_UNSECURED_REF_LABELS
 for product refs and labels.

---
 htdocs/product/card.php                | 12 ++++++++++--
 htdocs/product/class/product.class.php | 18 +++++++++++++++---
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index ac465b16bd7..ba1bc47046f 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -93,7 +93,11 @@ $refalreadyexists = 0;
 
 // Get parameters
 $id  = GETPOST('id', 'int');
-$ref = (GETPOSTISSET('ref') ? GETPOST('ref', 'alpha') : null);
+if (!empty($conf->global->MAIN_SECURITY_ALLOW_UNSECURED_REF_LABELS)) {
+	$ref = (GETPOSTISSET('ref') ? GETPOST('ref', 'nohtml') : null);
+} else {
+	$ref = (GETPOSTISSET('ref') ? GETPOST('ref', 'alpha') : null);
+}
 $type = (GETPOSTISSET('type') ? GETPOST('type', 'int') : Product::TYPE_PRODUCT);
 $action = (GETPOST('action', 'alpha') ? GETPOST('action', 'alpha') : 'view');
 $cancel = GETPOST('cancel', 'alpha');
@@ -113,7 +117,11 @@ $accountancy_code_buy_export = GETPOST('accountancy_code_buy_export', 'alpha');
 $checkmandatory = GETPOST('accountancy_code_buy_export', 'alpha');
 
 // by default 'alphanohtml' (better security); hidden conf MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML allows basic html
-$label_security_check = empty($conf->global->MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML) ? 'alphanohtml' : 'restricthtml';
+if (!empty($conf->global->MAIN_SECURITY_ALLOW_UNSECURED_REF_LABELS)) {
+	$label_security_check = 'nohtml';
+} else {
+	$label_security_check = empty($conf->global->MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML) ? 'alphanohtml' : 'restricthtml';
+}
 
 if (!empty($user->socid)) {
 	$socid = $user->socid;
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index d464871941a..1a2b3fa4cf2 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -572,7 +572,11 @@ class Product extends CommonObject
 	 */
 	public function check()
 	{
-		$this->ref = dol_sanitizeFileName(stripslashes($this->ref));
+		if (!empty($conf->global->MAIN_SECURITY_ALLOW_UNSECURED_REF_LABELS)) {
+			$this->ref = trim($this->ref);
+		} else {
+			$this->ref = dol_sanitizeFileName(stripslashes($this->ref));
+		}
 
 		$err = 0;
 		if (dol_strlen(trim($this->ref)) == 0) {
@@ -604,7 +608,11 @@ class Product extends CommonObject
 		$error = 0;
 
 		// Clean parameters
-		$this->ref = dol_sanitizeFileName(dol_string_nospecial(trim($this->ref)));
+		if (!empty($conf->global->MAIN_SECURITY_ALLOW_UNSECURED_REF_LABELS)) {
+			$this->ref = trim($this->ref);
+		} else {
+			$this->ref = dol_sanitizeFileName(dol_string_nospecial(trim($this->ref)));
+		}
 		$this->label = trim($this->label);
 		$this->price_ttc = price2num($this->price_ttc);
 		$this->price = price2num($this->price);
@@ -999,7 +1007,11 @@ class Product extends CommonObject
 		}
 
 		// Clean parameters
-		$this->ref = dol_string_nospecial(trim($this->ref));
+		if (!empty($conf->global->MAIN_SECURITY_ALLOW_UNSECURED_REF_LABELS)) {
+			$this->ref = trim($this->ref);
+		} else {
+			$this->ref = dol_string_nospecial(trim($this->ref));
+		}
 		$this->label = trim($this->label);
 		$this->description = trim($this->description);
 		$this->note_private = (isset($this->note_private) ? trim($this->note_private) : null);

From d4f7b3e42f0aa3e2c0e8e69812f25aade4c0a79f Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Thu, 26 Jan 2023 11:01:44 +0100
Subject: [PATCH 778/816] FIX - Logo MYCOMPANY

---
 .../product/doc/pdf_standard.modules.php      | 40 +++++++++++++------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index 7427fc7170e..c8190a362f5 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -713,6 +713,9 @@ class pdf_standard extends ModelePDFProduct
 	{
 		global $conf, $langs, $hookmanager;
 
+		$ltrdirection = 'L';
+		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
+
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "propal", "companies", "bills", "orders"));
 
@@ -734,28 +737,41 @@ class pdf_standard extends ModelePDFProduct
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 
+		$w = 100;
+
 		$posy = $this->marge_haute;
 		$posx = $this->page_largeur - $this->marge_droite - 100;
 
 		$pdf->SetXY($this->marge_gauche, $posy);
 
 		// Logo
-		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
-		if ($this->emetteur->logo) {
-			if (is_readable($logo)) {
-				$height = pdf_getHeightForLogo($logo);
-				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
+		if (!getDolGlobalInt('PDF_DISABLE_MYCOMPANY_LOGO')) {
+			if ($this->emetteur->logo) {
+				$logodir = $conf->mycompany->dir_output;
+				if (!empty($conf->mycompany->multidir_output[$object->entity])) {
+					$logodir = $conf->mycompany->multidir_output[$object->entity];
+				}
+				if (!getDolGlobalInt('MAIN_PDF_USE_LARGE_LOGO')) {
+					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
+				} else {
+					$logo = $logodir.'/logos/'.$this->emetteur->logo;
+				}
+				if (is_readable($logo)) {
+					$height = pdf_getHeightForLogo($logo);
+					$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
+				} else {
+					$pdf->SetTextColor(200, 0, 0);
+					$pdf->SetFont('', 'B', $default_font_size - 2);
+					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
+					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+				}
 			} else {
-				$pdf->SetTextColor(200, 0, 0);
-				$pdf->SetFont('', 'B', $default_font_size - 2);
-				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
-				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+				$text = $this->emetteur->name;
+				$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, $ltrdirection);
 			}
-		} else {
-			$text = $this->emetteur->name;
-			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
 
+
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);

From c5f0ac9f29557c9842738f1e637f7c73d2663fcc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 26 Jan 2023 12:07:04 +0100
Subject: [PATCH 779/816] Fix public page for user

---
 htdocs/public/users/view.php     | 26 ++++++++++++++++----------
 htdocs/theme/eldy/global.inc.php |  7 +++++++
 htdocs/theme/md/style.css.php    |  7 +++++++
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/htdocs/public/users/view.php b/htdocs/public/users/view.php
index d63a2a66eee..b0b4b3ae32f 100644
--- a/htdocs/public/users/view.php
+++ b/htdocs/public/users/view.php
@@ -229,6 +229,12 @@ if ($object->job && !getDolUserInt('USER_PUBLIC_HIDE_JOBPOSITION', 0, $object))
 	print dol_escape_htmltag($object->job);
 	print '</div>';
 }
+if (!getDolUserInt('USER_PUBLIC_HIDE_COMPANY', 0, $object)) {
+	print '<div class="bold">';
+	print dol_escape_htmltag($mysoc->name);
+	print '</div>';
+}
+
 
 
 print '</div>';
@@ -240,7 +246,7 @@ print '</div>';
 
 if (!empty($conf->global->USER_IMAGE_PUBLIC_INTERFACE)) {
 	print '<div class="backimagepublicrecruitment">';
-	print '<img id="idUSER_IMAGE_PUBLIC_SUGGEST_BOOTH" src="'.$conf->global->USER_IMAGE_PUBLIC_INTERFACE.'">';
+	print '<img id="idUSER_IMAGE_PUBLIC_INTERFACE" src="'.$conf->global->USER_IMAGE_PUBLIC_INTERFACE.'">';
 	print '</div>';
 }
 
@@ -292,19 +298,19 @@ if ($object->office_phone && !getDolUserInt('USER_PUBLIC_HIDE_OFFICE_PHONE', 0,
 	$usersection .= '<div class="flexitemsmall">';
 	$usersection .= img_picto('', 'phone', 'class="pictofixedwidth"');
 	$usersection .= dol_print_phone($object->office_phone, $object->country_code, 0, $mysoc->id, 'tel', ' ', 0, '');
-	$usersection .= '<div>';
+	$usersection .= '</div>';
 }
 if ($object->office_fax && !getDolUserInt('USER_PUBLIC_HIDE_OFFICE_FAX', 0, $object)) {
 	$usersection .= '<div class="flexitemsmall">';
 	$usersection .= img_picto('', 'phoning_fax', 'class="pictofixedwidth"');
 	$usersection .= dol_print_phone($object->office_fax, $object->country_code, 0, $mysoc->id, 'fax', ' ', 0, '');
-	$usersection .= '<div>';
+	$usersection .= '</div>';
 }
 if ($object->user_mobile && !getDolUserInt('USER_PUBLIC_HIDE_USER_MOBILE', 0, $object)) {
 	$usersection .= '<div class="flexitemsmall">';
 	$usersection .= img_picto('', 'phone', 'class="pictofixedwidth"');
 	$usersection .= dol_print_phone($object->user_mobile, $object->country_code, 0, $mysoc->id, 'tel', ' ', 0, '');
-	$usersection .= '<div>';
+	$usersection .= '</div>';
 }
 
 // Social networks
@@ -324,7 +330,7 @@ if ($usersection) {
 	// Output payment summary form
 	print '<tr><td class="left">';
 
-	print '<div class="nowidthimp" id="tablepublicpayment">';
+	print '<div class="nowidthimp nopaddingtoponsmartphone" id="tablepublicpayment">';
 
 	print $usersection;
 
@@ -344,7 +350,7 @@ if (!getDolUserInt('USER_PUBLIC_HIDE_COMPANY', 0, $object)) {
 		$companysection .= '<div class="flexitemsmall">';
 		$companysection .= img_picto('', 'email', 'class="pictofixedwidth"');
 		$companysection .= dol_print_email($mysoc->email, 0, 0, 1);
-		$companysection .= '<div>';
+		$companysection .= '</div>';
 	}
 
 	if ($mysoc->url) {
@@ -358,13 +364,13 @@ if (!getDolUserInt('USER_PUBLIC_HIDE_COMPANY', 0, $object)) {
 		$companysection .= '<div class="flexitemsmall">';
 		$companysection .= img_picto('', 'phone', 'class="pictofixedwidth"');
 		$companysection .= dol_print_phone($mysoc->phone, $mysoc->country_code, 0, $mysoc->id, 'tel', ' ', 0, '');
-		$companysection .= '<div>';
+		$companysection .= '</div>';
 	}
 	if ($mysoc->fax) {
 		$companysection .= '<div class="flexitemsmall">';
 		$companysection .= img_picto('', 'phoning_fax', 'class="pictofixedwidth"');
 		$companysection .= dol_print_phone($mysoc->fax, $mysoc->country_code, 0, $mysoc->id, 'fax', ' ', 0, '');
-		$companysection .= '<div>';
+		$companysection .= '</div>';
 	}
 
 	// Social networks
@@ -414,12 +420,12 @@ if (!getDolUserInt('USER_PUBLIC_HIDE_COMPANY', 0, $object)) {
 	// Output payment summary form
 	print '<tr><td class="left">';
 
-	print '<div class="nowidthimp" id="tablepublicpayment">';
+	print '<div class="nowidthimp nopaddingtoponsmartphone" id="tablepublicpayment">';
 
 	// Add company info
 	if ($mysoc->name) {
 		print '<div class="center bold">';
-		print $mysoc->name;
+		print dol_escape_htmltag($mysoc->name);
 		print '</div>';
 		print '<br>';
 	}
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 0b987de469e..e3df53d52cb 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1770,6 +1770,13 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
 	.smallonsmartphone {
 		font-size: 0.8em;
 	}
+
+	.nopaddingtoponsmartphone {
+		padding-top: 0 !important;
+	}
+	.nopaddingbottomonsmartphone {
+		padding-bottom: 0 !important;
+	}
 }
 
 /* Force values for small screen 570 */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 0fde8b72044..429940fd537 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1981,6 +1981,13 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
 	.smallonsmartphone {
 		font-size: 0.8em;
 	}
+	
+	.nopaddingtoponsmartphone {
+		padding-top: 0 !important;
+	}
+	.nopaddingbottomonsmartphone {
+		padding-bottom: 0 !important;
+	}	
 }
 
 /* Force values for small screen 570 */

From 8735894a61e8b4dfb2e383e1b9432bce1796899b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 26 Jan 2023 12:09:33 +0100
Subject: [PATCH 780/816] Fix missing new Form

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

diff --git a/htdocs/admin/company_socialnetworks.php b/htdocs/admin/company_socialnetworks.php
index e9171431187..fb496c1dce1 100644
--- a/htdocs/admin/company_socialnetworks.php
+++ b/htdocs/admin/company_socialnetworks.php
@@ -84,6 +84,8 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))) {
  * View
  */
 
+$form = new Form($db);
+
 $wikihelp = 'EN:First_setup|FR:Premiers_paramétrages|ES:Primeras_configuraciones';
 llxHeader('', $langs->trans("Setup"), $wikihelp);
 

From 3de3b421b92938e037fc26a3e56996fcca2ba22d Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Thu, 26 Jan 2023 14:37:15 +0100
Subject: [PATCH 781/816] fix :  Warning: Trying to access array offset on
 value of type bool in
 /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/includes/tcpdi/tcpdi_parser.php
 on line 1377

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

diff --git a/htdocs/includes/tcpdi/tcpdi_parser.php b/htdocs/includes/tcpdi/tcpdi_parser.php
index 13e9839f2b4..6d3cf789b6a 100644
--- a/htdocs/includes/tcpdi/tcpdi_parser.php
+++ b/htdocs/includes/tcpdi/tcpdi_parser.php
@@ -1373,7 +1373,7 @@ class tcpdi_parser {
     			return false;
     		} else {
                 $res = $this->_getPageRotation($obj[1][1]['/Parent']);
-                if ($res[0] == PDF_TYPE_OBJECT)
+                if ($res && $res[0] == PDF_TYPE_OBJECT)
                     return $res[1];
                 return $res;
     		}

From 777cfd5753a3d41fe75d3724a736a1e81e0426c8 Mon Sep 17 00:00:00 2001
From: Adrien Raze <adrien.raze@atm-consulting.fr>
Date: Thu, 26 Jan 2023 15:26:24 +0100
Subject: [PATCH 782/816] FIX : Sub-Bom costs were not good

---
 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 5992578a6e0..2df13e9af83 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -171,7 +171,7 @@ $tmpbom->calculateCosts();
 print '<td id="costline_'.$line->id.'" class="linecolcost nowrap right">';
 $coldisplay++;
 if (!empty($line->fk_bom_child)) {
-	echo '<span class="amount">'.price($tmpbom->total_cost).'</span>';
+	echo '<span class="amount">'.price($tmpbom->total_cost * $line->qty).'</span>';
 } else {
 	echo '<span class="amount">'.price($line->total_cost).'</span>';
 }

From 52c39d05f796f2435f061e3ee18d0555f2e5590a Mon Sep 17 00:00:00 2001
From: Adrien Raze <adrien.raze@atm-consulting.fr>
Date: Thu, 26 Jan 2023 15:32:37 +0100
Subject: [PATCH 783/816] FIX : Make help text part bold

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

diff --git a/htdocs/langs/fr_FR/mrp.lang b/htdocs/langs/fr_FR/mrp.lang
index 557b1f09175..47e8dcf13d3 100644
--- a/htdocs/langs/fr_FR/mrp.lang
+++ b/htdocs/langs/fr_FR/mrp.lang
@@ -82,7 +82,7 @@ ProductsToConsume=Produits à consommer
 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 cout de la sous BOM si existante, sinon le prix de revient du produit si défini, sinon le PMP si défini, sinon le meilleur prix d'achat)
+BOMTotalCost=Le coût de production de cette nomenclature basé sur chaque quantité et produit à consommer (utilise <b>le cout de la sous BOM si existante, sinon le prix de revient du produit si défini, sinon le PMP si défini, sinon le meilleur prix d'achat</b>)
 BOMTotalCostService=Si le module "Poste de travail" est activé et qu'un poste de travail est défini par défaut sur la ligne, alors le calcul est "quantité (convertie en heures) x poste de travail ahr", sinon "quantité (convertie en heures) x prix de revient du service"
 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.

From 331dd7d4792ab881701845a053628da4087fa7c8 Mon Sep 17 00:00:00 2001
From: Adrien Raze <adrien.raze@atm-consulting.fr>
Date: Thu, 26 Jan 2023 15:56:04 +0100
Subject: [PATCH 784/816] FIX : Sub-Bom indentations were not good

---
 htdocs/bom/tpl/objectline_view.tpl.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index 2df13e9af83..ac277f6e880 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -269,16 +269,20 @@ if ($resql) {
 		$label = $sub_bom_product->getLabelOfUnit('long');
 		if ($sub_bom_line->qty_frozen > 0) {
 			print '<td class="linecolqty nowrap right" id="sub_bom_qty_'.$sub_bom_line->id.'">'.price($sub_bom_line->qty, 0, '', 0, 0).'</td>';
-			print '<td class="linecoluseunit nowrap left">';
-			if ($label !== '') print $langs->trans($label);
-			print '</td>';
+			if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+				print '<td class="linecoluseunit nowrap left">';
+				if ($label !== '') print $langs->trans($label);
+				print '</td>';
+			}
 			print '<td class="linecolqtyfrozen nowrap right" id="sub_bom_qty_frozen_'.$sub_bom_line->id.'">'.$langs->trans('Yes').'</td>';
 		} else {
 			print '<td class="linecolqty nowrap right" id="sub_bom_qty_'.$sub_bom_line->id.'">'.price($sub_bom_line->qty * $line->qty, 0, '', 0, 0).'</td>';
-			print '<td class="linecoluseunit nowrap left">';
-			if ($label !== '') print $langs->trans($label);
-			print '</td>';
-			print '</td>';
+			if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+				print '<td class="linecoluseunit nowrap left">';
+				if ($label !== '') print $langs->trans($label);
+				print '</td>';
+			}
+
 			print '<td class="linecolqtyfrozen nowrap right" id="sub_bom_qty_frozen_'.$sub_bom_line->id.'">&nbsp;</td>';
 		}
 

From 1200174b83e2974d9c07c5d442527feb55a7a2d4 Mon Sep 17 00:00:00 2001
From: Adrien Raze <adrien.raze@atm-consulting.fr>
Date: Thu, 26 Jan 2023 18:03:18 +0100
Subject: [PATCH 785/816] FIX : The folder on BOM card who display or not the
 sub BOM was not working

---
 htdocs/bom/bom_card.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 333b6232f9f..b25785ae368 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -613,9 +613,6 @@ if (empty($reshook)) {
 
 			print "</form>\n";
 
-			mrpCollapseBomManagement();
-
-
 			//Services
 			$filtertype = 1;
 			$res = $object->fetchLinesbytypeproduct(1);

From 072ee3f1eac56895ef660761213f456bf634d123 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 26 Jan 2023 19:20:03 +0100
Subject: [PATCH 786/816] Fix regression

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

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 9c848883332..2e259a2c8bc 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -1427,7 +1427,7 @@ if ($object->id > 0) {
 		$sql .= " WHERE f.fk_soc = s.rowid AND s.rowid = ".((int) $object->id);
 		$sql .= " AND f.entity IN (".getEntity('invoice').")";
 		$sql .= ' GROUP BY f.rowid, f.ref, f.type, f.total_ht, f.total_tva, f.total_ttc,';
-		$sql .= ' f.entity, f.datef, f.datec, f.paye, f.fk_statut,';
+		$sql .= ' f.entity, f.datef, f.date_lim_reglement, f.datec, f.paye, f.fk_statut,';
 		$sql .= ' s.nom, s.rowid';
 		$sql .= " ORDER BY f.datef DESC, f.datec DESC";
 
@@ -1441,7 +1441,7 @@ if ($object->id > 0) {
 				print '<table class="noborder centpercent lastrecordtable">';
 
 				print '<tr class="liste_titre">';
-				print '<td colspan="5"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastCustomersBills", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->id.'">'.$langs->trans("AllBills").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
+				print '<td colspan="5"><table class="centpercent nobordernopadding"><tr><td>'.$langs->trans("LastCustomersBills", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->id.'">'.$langs->trans("AllBills").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
 				print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
 				print '</tr></table></td>';
 				print '</tr>';
@@ -1493,14 +1493,14 @@ if ($object->id > 0) {
 				//print $formfile->getDocumentsLink($facturestatic->element, $filename, $filedir);
 				print '</td>';
 				if ($objp->df > 0) {
-					print '<td class="right" width="80px">'.$langs->trans('DateInvoice').": ".dol_print_date($db->jdate($objp->df), 'day').'</td>';
+					print '<td width="80px" title="'.dol_escape_htmltag($langs->trans('DateInvoice')).'">'.dol_print_date($db->jdate($objp->df), 'day').'</td>';
 				} else {
-					print '<td class="right"><b>!!!</b></td>';
+					print '<td><b>!!!</b></td>';
 				}
 				if ($objp->dl > 0) {
-					print '<td class="right" width="80px">'.$langs->trans('DateMaxPayment').": ".dol_print_date($db->jdate($objp->dl), 'day').'</td>';
+					print '<td width="80px" title="'.dol_escape_htmltag($langs->trans('DateMaxPayment')).'">'.dol_print_date($db->jdate($objp->dl), 'day').'</td>';
 				} else {
-					print '<td class="right"><b>!!!</b></td>';
+					print '<td><b>!!!</b></td>';
 				}
 				print '<td class="right" style="min-width: 60px">';
 				print price($objp->total_ht);

From 2493732edb0dc0ea3081e6537e051e47dd272308 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 26 Jan 2023 19:23:43 +0100
Subject: [PATCH 787/816] Fix properties

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

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 2e259a2c8bc..46343919cb6 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -1458,6 +1458,8 @@ if ($object->id > 0) {
 				$facturestatic->total_tva = $objp->total_tva;
 				$facturestatic->total_ttc = $objp->total_ttc;
 				$facturestatic->statut = $objp->status;
+				$facturestatic->date = $db->jdate($objp->df);
+				$facturestatic->date_lim_reglement = $db->jdate($objp->dl);
 
 				print '<tr class="oddeven">';
 				print '<td class="nowraponall">';

From cedd0792f38598d6183e5531ef2d35035fce69ba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 27 Jan 2023 01:03:44 +0100
Subject: [PATCH 788/816] Fix duplicate

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

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 0357459052b..4c7fe585d32 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -243,7 +243,6 @@ class Contrat extends CommonObject
 		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>115),
 		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>120),
 		'extraparams' =>array('type'=>'varchar(255)', 'label'=>'Extraparams', 'enabled'=>1, 'visible'=>-1, 'position'=>125),
-		'ref_customer' =>array('type'=>'varchar(50)', 'label'=>'Ref customer', 'enabled'=>1, 'visible'=>-1, 'position'=>130),
 		'fk_user_modif' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>135),
 		'last_main_doc' =>array('type'=>'varchar(255)', 'label'=>'Last main doc', 'enabled'=>1, 'visible'=>-1, 'position'=>140),
 		'statut' =>array('type'=>'smallint(6)', 'label'=>'Statut', 'enabled'=>1, 'visible'=>-1, 'position'=>500, 'notnull'=>1, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Validated', 2=>'Closed'))

From 31652fd7324ceb755111fcafcbb035e5a380728c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 27 Jan 2023 02:43:41 +0100
Subject: [PATCH 789/816] css

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

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index f9a353b81b0..3b911a4c2c7 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -1456,7 +1456,7 @@ while ($i < $imaxinloop) {
 
 		// Ref
 		if (!empty($arrayfields['p.ref']['checked'])) {
-			print '<td class="tdoverflowmax200">';
+			print '<td class="tdoverflowmax250">';
 			print $product_static->getNomUrl(1);
 			print "</td>\n";
 			if (!$i) {

From 82f73da1ac7288d1cda74cb272b09cd69d225e83 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 27 Jan 2023 10:31:12 +0100
Subject: [PATCH 790/816] Fix debug filter list services

---
 htdocs/contrat/services_list.php | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index fb50283991b..e66b5eaa273 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -36,6 +36,7 @@ require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
 $langs->loadLangs(array('products', 'contracts', 'companies'));
 
 $optioncss = GETPOST('optioncss', 'aZ09');
+$mode = GETPOST("mode");
 
 $massaction = GETPOST('massaction', 'alpha');
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
@@ -55,11 +56,10 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
-$mode = GETPOST("mode");
 $filter = GETPOST("filter");
 $search_name = GETPOST("search_name", 'alpha');
 $search_subprice = GETPOST("search_subprice", 'alpha');
-$search_qty = GETPOST("search_name", 'alpha');
+$search_qty = GETPOST("search_qty", 'alpha');
 $search_total_ht = GETPOST("search_total_ht", 'alpha');
 $search_total_tva = GETPOST("search_total_tva", 'alpha');
 $search_total_ttc = GETPOST("search_total_ttc", 'alpha');
@@ -144,10 +144,10 @@ $arrayfields = array(
 	'cd.qty'=>array('label'=>"Qty", 'checked'=>1, 'position'=>108),
 	'cd.total_ht'=>array('label'=>"TotalHT", 'checked'=>-1, 'position'=>109, 'isameasure'=>1),
 	'cd.total_tva'=>array('label'=>"TotalVAT", 'checked'=>-1, 'position'=>110),
-	'cd.date_ouverture_prevue'=>array('label'=>"DateStartPlannedShort", 'checked'=>(($mode == "" || $mode == -1) || $mode == "0"), 'position'=>150),
-	'cd.date_ouverture'=>array('label'=>"DateStartRealShort", 'checked'=>(($mode == "" || $mode == -1) || $mode > 0), 'position'=>160),
-	'cd.date_fin_validite'=>array('label'=>"DateEndPlannedShort", 'checked'=>(($mode == "" || $mode == -1) || $mode < 5), 'position'=>170),
-	'cd.date_cloture'=>array('label'=>"DateEndRealShort", 'checked'=>(($mode == "" || $mode == -1) || $mode >= 5), 'position'=>180),
+	'cd.date_ouverture_prevue'=>array('label'=>"DateStartPlannedShort", 'checked'=>1, 'position'=>150),
+	'cd.date_ouverture'=>array('label'=>"DateStartRealShort", 'checked'=>1, 'position'=>160),
+	'cd.date_fin_validite'=>array('label'=>"DateEndPlannedShort", 'checked'=>1, 'position'=>170),
+	'cd.date_cloture'=>array('label'=>"DateEndRealShort", 'checked'=>1, 'position'=>180),
 	//'cd.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
 	'cd.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
 	'status'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000)
@@ -294,7 +294,7 @@ if ($search_subprice) {
 	$sql .= natural_search("cd.subprice", $search_subprice, 1);
 }
 if ($search_qty) {
-	$sql .= natural_search("cd.total_qty", $search_qty, 1);
+	$sql .= natural_search("cd.qty", $search_qty, 1);
 }
 if ($search_total_ht) {
 	$sql .= natural_search("cd.total_ht", $search_total_ht, 1);
@@ -563,7 +563,7 @@ if (!empty($arrayfields['c.ref']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input type="hidden" name="filter" value="'.$filter.'">';
 	print '<input type="hidden" name="mode" value="'.$mode.'">';
-	print '<input type="text" class="flat" size="3" name="search_contract" value="'.dol_escape_htmltag($search_contract).'">';
+	print '<input type="text" class="flat maxwidth75" name="search_contract" value="'.dol_escape_htmltag($search_contract).'">';
 	print '</td>';
 }
 // Service label
@@ -961,6 +961,17 @@ while ($i < min($num, $limit)) {
 // Show total line
 include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
+// If no record found
+if ($num == 0) {
+	$colspan = 1;
+	foreach ($arrayfields as $key => $val) {
+		if (!empty($val['checked'])) {
+			$colspan++;
+		}
+	}
+	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
+}
+
 $db->free($resql);
 
 $parameters = array('sql' => $sql);

From b84bd58fdc35252673a4dd1c35e91f87ed3b5126 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 27 Jan 2023 10:42:32 +0100
Subject: [PATCH 791/816] Standardize code

---
 htdocs/contrat/class/contrat.class.php  |  6 ++---
 htdocs/contrat/index.php                |  6 ++---
 htdocs/contrat/services_list.php        | 33 ++++++++++---------------
 htdocs/core/menus/init_menu_auguria.sql |  8 +++---
 htdocs/core/menus/standard/eldy.lib.php |  8 +++---
 5 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 4c7fe585d32..ad2cbcea84b 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2249,15 +2249,15 @@ class Contrat extends CommonObject
 				$warning_delay = $conf->contrat->services->inactifs->warning_delay;
 				$label = $langs->trans("BoardNotActivatedServices");
 				$labelShort = $langs->trans("BoardNotActivatedServicesShort");
-				$url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&mode=0&sortfield=cd.date_fin_validite&sortorder=asc';
+				$url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&search_status=0&sortfield=cd.date_fin_validite&sortorder=asc';
 			} elseif ($mode == 'expired') {
 				$warning_delay = $conf->contrat->services->expires->warning_delay;
-				$url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&mode=4&filter=expired&sortfield=cd.date_fin_validite&sortorder=asc';
+				$url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&search_status=4&filter=expired&sortfield=cd.date_fin_validite&sortorder=asc';
 				$label = $langs->trans("BoardExpiredServices");
 				$labelShort = $langs->trans("BoardExpiredServicesShort");
 			} else {
 				$warning_delay = $conf->contrat->services->expires->warning_delay;
-				$url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&mode=4&sortfield=cd.date_fin_validite&sortorder=asc';
+				$url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&search_status=4&sortfield=cd.date_fin_validite&sortorder=asc';
 				//$url.= '&op2day='.$arraydatetouse['mday'].'&op2month='.$arraydatetouse['mon'].'&op2year='.$arraydatetouse['year'];
 				//if ($warning_delay >= 0) $url.='&amp;filter=expired';
 				$label = $langs->trans("BoardRunningServices");
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index c14775449c6..c40453ec7af 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -194,7 +194,7 @@ foreach ($listofstatus as $status) {
 	if (empty($conf->use_javascript_ajax)) {
 		print '<tr class="oddeven">';
 		print '<td>'.$staticcontratligne->LibStatut($status, 0, ($bool ? 1 : 0)).'</td>';
-		print '<td class="right"><a href="services_list.php?mode='.$status.($bool ? '&filter=expired' : '').'">'.($nb[$status.$bool] ? $nb[$status.$bool] : 0).' '.$staticcontratligne->LibStatut($status, 3, ($bool ? 1 : 0)).'</a></td>';
+		print '<td class="right"><a href="services_list.php?search_status='.((int) $status).($bool ? '&filter=expired' : '').'">'.($nb[$status.$bool] ? $nb[$status.$bool] : 0).' '.$staticcontratligne->LibStatut($status, 3, ($bool ? 1 : 0)).'</a></td>';
 		print "</tr>\n";
 	}
 	if ($status == 4 && !$bool) {
@@ -224,7 +224,7 @@ foreach ($listofstatus as $status) {
 	if (empty($conf->use_javascript_ajax)) {
 		print '<tr class="oddeven">';
 		print '<td>'.$staticcontratligne->LibStatut($status, 0, ($bool ? 1 : 0)).'</td>';
-		print '<td class="right"><a href="services_list.php?mode='.$status.($bool ? '&filter=expired' : '').'">'.($nb[$status.$bool] ? $nb[$status.$bool] : 0).' '.$staticcontratligne->LibStatut($status, 3, ($bool ? 1 : 0)).'</a></td>';
+		print '<td class="right"><a href="services_list.php?search_status='.((int) $status).($bool ? '&filter=expired' : '').'">'.($nb[$status.$bool] ? $nb[$status.$bool] : 0).' '.$staticcontratligne->LibStatut($status, 3, ($bool ? 1 : 0)).'</a></td>';
 		if ($status == 4 && !$bool) {
 			$bool = true;
 		} else {
@@ -622,7 +622,7 @@ if ($resql) {
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 
-	print '<tr class="liste_titre"><th colspan="4">'.$langs->trans("ListOfExpiredServices").' <a href="'.DOL_URL_ROOT.'/contrat/services_list.php?mode=4&amp;filter=expired"><span class="badge">'.$num.'</span></a></th>';
+	print '<tr class="liste_titre"><th colspan="4">'.$langs->trans("ListOfExpiredServices").' <a href="'.DOL_URL_ROOT.'/contrat/services_list.php?search_status=4&amp;filter=expired"><span class="badge">'.$num.'</span></a></th>';
 	print "</tr>\n";
 
 	while ($i < $num) {
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index a4713c14b6b..47818081448 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -56,7 +56,7 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
-$filter = GETPOST("filter");
+$filter = GETPOST("filter", 'alpha');
 $search_name = GETPOST("search_name", 'alpha');
 $search_subprice = GETPOST("search_subprice", 'alpha');
 $search_qty = GETPOST("search_qty", 'alpha');
@@ -110,7 +110,6 @@ $result = restrictedArea($user, 'contrat', $contratid);
 
 if ($search_status != '') {
 	$tmp = explode('&', $search_status);
-	$mode = $tmp[0];
 	if (empty($tmp[1])) {
 		$filter = '';
 	} else {
@@ -121,14 +120,6 @@ if ($search_status != '') {
 			$filter = 'expired';
 		}
 	}
-} else {
-	$search_status = $mode;
-	if ($filter == 'expired') {
-		$search_status .= '&filter=expired';
-	}
-	if ($filter == 'notexpired') {
-		$search_status .= '&filter=notexpired';
-	}
 }
 
 $staticcontrat = new Contrat($db);
@@ -209,7 +200,6 @@ if (empty($reshook)) {
 		$opclotureday = "";
 		$opclotureyear = "";
 		$filter_opcloture = "";
-		$mode = '';
 		$filter = '';
 		$toselect = array();
 		$search_array_options = array();
@@ -275,13 +265,13 @@ $sql .= " AND c.fk_soc = s.rowid";
 if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
-if ($mode == "0") {
+if ($search_status == "0") {
 	$sql .= " AND cd.statut = 0";
 }
-if ($mode == "4") {
+if ($search_status == "4") {
 	$sql .= " AND cd.statut = 4";
 }
-if ($mode == "5") {
+if ($search_status == "5") {
 	$sql .= " AND cd.statut = 5";
 }
 if ($filter == "expired") {
@@ -417,6 +407,9 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.$limit;
 }
+if ($mode) {
+	$param .= '&amp;mode='.urlencode($mode);
+}
 if ($search_contract) {
 	$param .= '&amp;search_contract='.urlencode($search_contract);
 }
@@ -441,8 +434,8 @@ if ($search_total_ttc) {
 if ($search_service) {
 	$param .= '&amp;search_service='.urlencode($search_service);
 }
-if ($mode) {
-	$param .= '&amp;mode='.urlencode($mode);
+if ($search_status) {
+	$param .= '&amp;search_status='.urlencode($search_status);
 }
 if ($filter) {
 	$param .= '&amp;filter='.urlencode($filter);
@@ -500,16 +493,16 @@ print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $title = $langs->trans("ListOfServices");
-if ($mode == "0") {
+if ($search_status == "0") {
 	$title = $langs->trans("ListOfInactiveServices"); // Must use == "0"
 }
-if ($mode == "4" && $filter != "expired") {
+if ($search_status == "4" && $filter != "expired") {
 	$title = $langs->trans("ListOfRunningServices");
 }
-if ($mode == "4" && $filter == "expired") {
+if ($search_status == "4" && $filter == "expired") {
 	$title = $langs->trans("ListOfExpiredServices");
 }
-if ($mode == "5") {
+if ($search_status == "5") {
 	$title = $langs->trans("ListOfClosedServices");
 }
 
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index cef586ad1da..5c819488971 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -205,10 +205,10 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled', __HANDLER__, 'left', 1401__+MAX_llx_menu__, 'commercial', '', 1400__+MAX_llx_menu__, '/contrat/card.php?mainmenu=commercial&amp;action=create&amp;leftmenu=contracts', 'NewContract', 1, 'contracts', '$user->rights->contrat->creer', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled', __HANDLER__, 'left', 1402__+MAX_llx_menu__, 'commercial', '', 1400__+MAX_llx_menu__, '/contrat/list.php?mainmenu=commercial&amp;leftmenu=contracts', 'List', 1, 'contracts', '$user->rights->contrat->lire', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled', __HANDLER__, 'left', 1403__+MAX_llx_menu__, 'commercial', '', 1400__+MAX_llx_menu__, '/contrat/services_list.php?mainmenu=commercial&amp;leftmenu=contracts', 'MenuServices', 1, 'contracts', '$user->rights->contrat->lire', '', 2, 2, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled && $leftmenu=="contracts"', __HANDLER__, 'left', 1404__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services_list.php?mainmenu=commercial&amp;leftmenu=contracts&amp;mode=0', 'MenuInactiveServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 0, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled && $leftmenu=="contracts"', __HANDLER__, 'left', 1405__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services_list.php?mainmenu=commercial&amp;leftmenu=contracts&amp;mode=4', 'MenuRunningServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled && $leftmenu=="contracts"', __HANDLER__, 'left', 1406__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services_list.php?mainmenu=commercial&amp;leftmenu=contracts&amp;mode=4&amp;filter=expired', 'MenuExpiredServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 2, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled && $leftmenu=="contracts"', __HANDLER__, 'left', 1407__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services_list.php?mainmenu=commercial&amp;leftmenu=contracts&amp;mode=5', 'MenuClosedServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 3, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled && $leftmenu=="contracts"', __HANDLER__, 'left', 1404__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services_list.php?mainmenu=commercial&amp;leftmenu=contracts&amp;search_status=0', 'MenuInactiveServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled && $leftmenu=="contracts"', __HANDLER__, 'left', 1405__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services_list.php?mainmenu=commercial&amp;leftmenu=contracts&amp;search_status=4', 'MenuRunningServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled && $leftmenu=="contracts"', __HANDLER__, 'left', 1406__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services_list.php?mainmenu=commercial&amp;leftmenu=contracts&amp;search_status=4&amp;filter=expired', 'MenuExpiredServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 2, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled && $leftmenu=="contracts"', __HANDLER__, 'left', 1407__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services_list.php?mainmenu=commercial&amp;leftmenu=contracts&amp;search_status=5', 'MenuClosedServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 3, __ENTITY__);
 
 -- Commercial - Interventions
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->ficheinter->enabled', __HANDLER__, 'left', 1500__+MAX_llx_menu__, 'commercial', 'ficheinter', 5__+MAX_llx_menu__, '/fichinter/list.php?mainmenu=commercial&amp;leftmenu=ficheinter', 'Interventions', 0, 'interventions', '$user->rights->ficheinter->lire', '', 2, 8, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index dbc2be872eb..a0b8be128c4 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1385,10 +1385,10 @@ function get_left_menu_commercial($mainmenu, &$newmenu, $usemenuhider = 1, $left
 			$newmenu->add("/contrat/list.php?leftmenu=contracts", $langs->trans("List"), 1, $user->hasRight('contrat',  'lire'));
 			$newmenu->add("/contrat/services_list.php?leftmenu=contracts", $langs->trans("MenuServices"), 1, $user->hasRight('contrat',  'lire'));
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "contracts") {
-				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=0", $langs->trans("MenuInactiveServices"), 2, $user->hasRight('contrat',  'lire'));
-				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=4", $langs->trans("MenuRunningServices"), 2, $user->hasRight('contrat',  'lire'));
-				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=4&amp;filter=expired", $langs->trans("MenuExpiredServices"), 2, $user->hasRight('contrat',  'lire'));
-				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=5", $langs->trans("MenuClosedServices"), 2, $user->hasRight('contrat',  'lire'));
+				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;search_status=0", $langs->trans("MenuInactiveServices"), 2, $user->hasRight('contrat',  'lire'));
+				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;search_status=4", $langs->trans("MenuRunningServices"), 2, $user->hasRight('contrat',  'lire'));
+				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;search_status=4&amp;filter=expired", $langs->trans("MenuExpiredServices"), 2, $user->hasRight('contrat',  'lire'));
+				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;search_status=5", $langs->trans("MenuClosedServices"), 2, $user->hasRight('contrat',  'lire'));
 			}
 		}
 

From f6ad2c3a7628e73c815bcbe7863d380c1bea5af9 Mon Sep 17 00:00:00 2001
From: hystepik <lucas.marcouiller@gmail.com>
Date: Fri, 27 Jan 2023 11:01:16 +0100
Subject: [PATCH 792/816] Fix : php 8.1 warning

---
 htdocs/compta/paiement/card.php | 4 ++++
 htdocs/compta/paiement/list.php | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 073365fa876..14442e6c965 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -46,6 +46,10 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
+$socid = GETPOST('socid', 'int'); if ($socid < 0) {
+	$socid = 0;
+}
+
 $object = new Paiement($db);
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('paymentcard', 'globalcard'));
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 658f2c150f1..6db18f6aa55 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -513,6 +513,7 @@ foreach ($arrayfields as $column) {
 
 $i = 0;
 $totalarray = array();
+$totalarray['nbfield'] = 0;
 while ($i < min($num, $limit)) {
 	$objp = $db->fetch_object($resql);
 
@@ -620,7 +621,11 @@ while ($i < min($num, $limit)) {
 			$totalarray['nbfield']++;
 		}
 		$totalarray['pos'][$checkedCount] = 'amount';
-		$totalarray['val']['amount'] += $objp->amount;
+		if (empty($totalarray['val']['amount'])) {
+			$totalarray['val']['amount'] = $objp->amount;
+		} else {
+			$totalarray['val']['amount'] += $objp->amount;
+		}
 	}
 
 	// Status

From 923e63c8e31bda7139fe3f973c307fb2101ba8da Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 27 Jan 2023 11:05:06 +0100
Subject: [PATCH 793/816] Trans

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

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 405417d7da6..f22666c4197 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1220,4 +1220,5 @@ NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or
 HideOnVCard=Hide %s
 AddToContacts=Add address to my contacts
 LastAccess=Last access
-UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
\ No newline at end of file
+UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
+LastPasswordChangeDate=Last password change date 
\ No newline at end of file

From 9c904236c43998d5b04e828fc2b7b93a9a4e0fcb Mon Sep 17 00:00:00 2001
From: Anthony Berton <anthony.berton@bb2a.fr>
Date: Fri, 27 Jan 2023 11:25:55 +0100
Subject: [PATCH 794/816] NEW - Add hook online sign

---
 htdocs/public/onlinesign/newonlinesign.php | 27 +++++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index c47bbd7f734..c6f11e6b2ac 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -156,6 +156,8 @@ if ($source == 'proposal') {
 	httponly_accessforbidden($langs->trans('ErrorBadParameters')." - Bad value for source", 400, 1);
 }
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('onlinesign'));
 
 /*
  * Actions
@@ -346,10 +348,21 @@ if ($source == 'proposal') {
 	print '</td></tr>'."\n";
 
 	// Amount
-	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Amount");
-	print '</td><td class="CTableRow2">';
-	print '<b>'.price($object->total_ttc, 0, $langs, 1, -1, -1, $conf->currency).'</b>';
-	print '</td></tr>'."\n";
+	$amount = '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Amount");
+	$amount .= '</td><td class="CTableRow2">';
+	$amount .= '<b>'.price($object->total_ttc, 0, $langs, 1, -1, -1, $conf->currency).'</b>';
+	$amount .= '</td></tr>'."\n";
+
+	// Call Hook formConfirm
+	$parameters = array('source' => $source);
+	$reshook = $hookmanager->executeHooks('amountpropalsign', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	if (empty($reshook)) {
+		$amount .= $hookmanager->resPrint;
+	} elseif ($reshook > 0) {
+		$amount = $hookmanager->resPrint;
+	}
+
+	print $amount;
 
 	// Object
 	$text = '<b>'.$langs->trans("SignatureProposalRef", $object->ref).'</b>';
@@ -457,6 +470,7 @@ if ($source == 'proposal') {
 	$langs->load("fichinter");
 
 	$result = $object->fetch_thirdparty($object->socid);
+
 	// Proposer
 	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Proposer");
 	print '</td><td class="CTableRow2">';
@@ -496,13 +510,14 @@ if ($source == 'proposal') {
 			print $langs->trans("DownloadDocument").'</a>';
 		}
 	}
-
-
 	print '<input type="hidden" name="source" value="'.GETPOST("source", 'alpha').'">';
 	print '<input type="hidden" name="ref" value="'.$object->ref.'">';
 	print '</td></tr>'."\n";
 }
 
+// Call Hook addformsign
+$parameters = array('source' => $source);
+$reshook = $hookmanager->executeHooks('addformsign', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 
 if (!$found && !$mesg) {
 	$mesg = $langs->transnoentitiesnoconv("ErrorBadParameters");

From 6715cdec0fa4719920148a29627d23c90edfcbba Mon Sep 17 00:00:00 2001
From: Anthony Berton <anthony.berton@bb2a.fr>
Date: Fri, 27 Jan 2023 11:27:25 +0100
Subject: [PATCH 795/816] case

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

diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index c6f11e6b2ac..e5a195471de 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -353,9 +353,9 @@ if ($source == 'proposal') {
 	$amount .= '<b>'.price($object->total_ttc, 0, $langs, 1, -1, -1, $conf->currency).'</b>';
 	$amount .= '</td></tr>'."\n";
 
-	// Call Hook formConfirm
+	// Call Hook amountPropalSign
 	$parameters = array('source' => $source);
-	$reshook = $hookmanager->executeHooks('amountpropalsign', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	$reshook = $hookmanager->executeHooks('amountPropalSign', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) {
 		$amount .= $hookmanager->resPrint;
 	} elseif ($reshook > 0) {
@@ -515,9 +515,9 @@ if ($source == 'proposal') {
 	print '</td></tr>'."\n";
 }
 
-// Call Hook addformsign
+// Call Hook addFormSign
 $parameters = array('source' => $source);
-$reshook = $hookmanager->executeHooks('addformsign', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('addFormSign', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 
 if (!$found && !$mesg) {
 	$mesg = $langs->transnoentitiesnoconv("ErrorBadParameters");

From c4245e2c05ede1ac4a0d9072e6d0d822542909c6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 27 Jan 2023 11:52:58 +0100
Subject: [PATCH 796/816] Prepare use of upgrade.unlock

---
 htdocs/install/step5.php | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index 31b086636f2..c516cc70aef 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -368,13 +368,16 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action)) {
 if ($action == "set") {
 	if ($success) {
 		if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) || ($conf->global->MAIN_VERSION_LAST_UPGRADE == DOL_VERSION)) {
-			// Install is finished
+			// Install is finished (database is on same version than files)
 			print '<br>'.$langs->trans("SystemIsInstalled")."<br>";
 
+			// Create install.lock file
+			// No need for the moment to create it automatically, creation by web assistant means permissions are given
+			// to the web user, it is better to show a warning to say to create it manually with correct user/permission (not erasable by a web process)
 			$createlock = 0;
-
 			if (!empty($force_install_lockinstall) || !empty($conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE)) {
-				// Install is finished, we create the lock file
+				// Install is finished, we create the "install.lock" file, so install won't be possible anymore.
+				// TODO Upgrade will be still be possible if a file "upgrade.unlock" is present
 				$lockfile = DOL_DATA_ROOT.'/install.lock';
 				$fp = @fopen($lockfile, "w");
 				if ($fp) {
@@ -413,13 +416,14 @@ if ($action == "set") {
 } elseif (empty($action) || preg_match('/upgrade/i', $action)) {
 	// If upgrade
 	if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) || ($conf->global->MAIN_VERSION_LAST_UPGRADE == DOL_VERSION)) {
-		// Upgrade is finished
+		// Upgrade is finished (database is on same version than files)
 		print '<img class="valignmiddle inline-block paddingright" src="../theme/common/octicons/build/svg/checklist.svg" width="20" alt="Configuration"> <span class="valignmiddle">'.$langs->trans("SystemIsUpgraded")."</span><br>";
 
+		// Create install.lock file if it does not exists.
+		// Note: it should always exists. A better solution to allow upgrade will be to add an upgrade.unlock file
 		$createlock = 0;
-
 		if (!empty($force_install_lockinstall) || !empty($conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE)) {
-			// Upgrade is finished, we create the lock file
+			// Upgrade is finished, we modify the lock file
 			$lockfile = DOL_DATA_ROOT.'/install.lock';
 			$fp = @fopen($lockfile, "w");
 			if ($fp) {
@@ -436,6 +440,10 @@ if ($action == "set") {
 			print '<br><div class="warning">'.$langs->trans("WarningRemoveInstallDir")."</div>";
 		}
 
+		// Delete the upgrade.unlock file it it exists
+		$unlockupgradefile = DOL_DATA_ROOT.'/upgrade.unlock';
+		dol_delete_file($unlockupgradefile, 0, 0, 0, null, false, 0);
+
 		print "<br>";
 
 		$morehtml = '<br><div class="center"><a href="../index.php?mainmenu=home'.(isset($login) ? '&username='.urlencode($login) : '').'">';

From dfcba305775af1d5fd1fab9515e87a52ee6421c0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 27 Jan 2023 14:06:31 +0100
Subject: [PATCH 797/816] FIX Check of date of validity

---
 htdocs/api/class/api_access.class.php    | 18 +++++++------
 htdocs/core/lib/security2.lib.php        |  3 ++-
 htdocs/core/login/functions_dolibarr.php | 20 +--------------
 htdocs/dav/fileserver.php                | 19 +++++++++++---
 htdocs/main.inc.php                      | 23 ++++++++++++-----
 htdocs/user/class/user.class.php         | 32 ++++++++++++++++++++++--
 6 files changed, 76 insertions(+), 39 deletions(-)

diff --git a/htdocs/api/class/api_access.class.php b/htdocs/api/class/api_access.class.php
index e5cc664fa0e..6874d3faaed 100644
--- a/htdocs/api/class/api_access.class.php
+++ b/htdocs/api/class/api_access.class.php
@@ -155,17 +155,19 @@ class DolibarrApiAccess implements iAuthenticate
 				throw new RestException(503, 'Error when fetching user. This user has been locked or disabled');
 			}
 
-			$now = dol_now();
-
-			// Check date start validity
-			if ($fuser->datestartvalidity && $this->db->jdate($fuser->datestartvalidity) > $now) {
-				throw new RestException(503, $genericmessageerroruser);
-			}
-			// Check date end validity
-			if ($fuser->dateendvalidity && $this->db->jdate($fuser->dateendvalidity) < dol_get_first_hour($now)) {
+			// Check if session was unvalidated by a password change
+			if (($fuser->flagdelsessionsbefore && !empty($_SESSION["dol_logindate"]) && $fuser->flagdelsessionsbefore > $_SESSION["dol_logindate"])) {
+				// Session is no more valid
+				dol_syslog("The user has a date for session invalidation = ".$fuser->flagdelsessionsbefore." and a session date = ".$_SESSION["dol_logindate"].". We must invalidate its sessions.");
 				throw new RestException(503, $genericmessageerroruser);
 			}
 
+			// Check date validity
+			if ($fuser->isNotIntoValidityDateRange()) {
+				// User validity dates are no more valid
+				dol_syslog("The user login has a validity between [".$fuser->datestartvalidity." and ".$fuser->dateendvalidity."], curren date is ".dol_now());
+				throw new RestException(503, $genericmessageerroruser);
+			}
 
 			// User seems valid
 			$fuser->getrights();
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index f450d390dff..93da106aebd 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -96,7 +96,8 @@ function checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $auth
 					// Call function to check user/password
 					$function = 'check_user_password_'.$mode;
 					$login = call_user_func($function, $usertotest, $passwordtotest, $entitytotest, $context);
-					if ($login && $login != '--bad-login-validity--') {	// Login is successfull
+					if ($login && $login != '--bad-login-validity--') {
+						// Login is successfull with this method
 						$test = false; // To stop once at first login success
 						$conf->authmode = $mode; // This properties is defined only when logged to say what mode was successfully used
 						/*$dol_tz = GETPOST('tz');
diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php
index 5f4b722ea1c..9b65bf4d877 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -74,24 +74,6 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 		if ($resql) {
 			$obj = $db->fetch_object($resql);
 			if ($obj) {
-				$now = dol_now();
-				// Check date start validity
-				if ($obj->datestartvalidity && $db->jdate($obj->datestartvalidity) > $now) {
-					// Load translation files required by the page
-					$langs->loadLangs(array('main', 'errors'));
-					$_SESSION["dol_loginmesg"] = $langs->transnoentitiesnoconv("ErrorLoginDateValidity");
-					dol_syslog("functions_dolibarr::check_user_password_dolibarr bad datestart validity", LOG_WARNING);
-					return '--bad-login-validity--';
-				}
-				// Check date end validity
-				if ($obj->dateendvalidity && $db->jdate($obj->dateendvalidity) < dol_get_first_hour($now)) {
-					// Load translation files required by the page
-					$langs->loadLangs(array('main', 'errors'));
-					$_SESSION["dol_loginmesg"] = $langs->transnoentitiesnoconv("ErrorLoginDateValidity");
-					dol_syslog("functions_dolibarr::check_user_password_dolibarr bad date end validity", LOG_WARNING);
-					return '--bad-login-validity--';
-				}
-
 				$passclear = $obj->pass;
 				$passcrypted = $obj->pass_crypted;
 				$passtyped = $passwordtotest;
@@ -121,7 +103,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 					if ((!$passcrypted || $passtyped)
 						&& ($passclear && ($passtyped == $passclear))) {
 						$passok = true;
-						dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - found pass in database");
+						dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - found old pass in database", LOG_WARNING);
 					}
 				}
 
diff --git a/htdocs/dav/fileserver.php b/htdocs/dav/fileserver.php
index 7abe3f2bacf..15d9cd1764f 100644
--- a/htdocs/dav/fileserver.php
+++ b/htdocs/dav/fileserver.php
@@ -92,8 +92,7 @@ $tmpDir = $conf->dav->multidir_output[$entity]; // We need root dir, not a dir t
 
 // Authentication callback function
 $authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function ($username, $password) {
-	global $user;
-	global $conf;
+	global $user, $conf;
 	global $dolibarr_main_authentication, $dolibarr_auto_user;
 
 	if (empty($user->login)) {
@@ -101,7 +100,7 @@ $authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function ($username, $p
 		return false;
 	}
 	if ($user->socid > 0) {
-		dol_syslog("Failed to authenticate to DAV, use is an external user", LOG_WARNING);
+		dol_syslog("Failed to authenticate to DAV, user is an external user", LOG_WARNING);
 		return false;
 	}
 	if ($user->login != $username) {
@@ -132,6 +131,20 @@ $authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function ($username, $p
 		return false;
 	}
 
+	// Check if session was unvalidated by a password change
+	if (($user->flagdelsessionsbefore && !empty($_SESSION["dol_logindate"]) && $user->flagdelsessionsbefore > $_SESSION["dol_logindate"])) {
+		// Session is no more valid
+		dol_syslog("The user has a date for session invalidation = ".$user->flagdelsessionsbefore." and a session date = ".$_SESSION["dol_logindate"].". We must invalidate its sessions.");
+		return false;
+	}
+
+	// Check date validity
+	if ($user->isNotIntoValidityDateRange()) {
+		// User validity dates are no more valid
+		dol_syslog("The user login has a validity between [".$user->datestartvalidity." and ".$user->dateendvalidity."], curren date is ".dol_now());
+		return false;
+	}
+
 	return true;
 });
 
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 115be3cf0cf..24ce10ea7c1 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -879,8 +879,8 @@ if (!defined('NOLOGIN')) {
 			exit;
 		}
 
-		$resultFetchUser = $user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1)); // login was retrieved previously when checking password.
-		if ($resultFetchUser <= 0) {
+		$resultFetchUser = $user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1)); // value for $login was retrieved previously when checking password.
+		if ($resultFetchUser <= 0 || $user->isNotIntoValidityDateRange()) {
 			dol_syslog('User not found, connexion refused');
 			session_destroy();
 			session_set_cookie_params(0, '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Add tag secure and httponly on session cookie
@@ -894,11 +894,17 @@ if (!defined('NOLOGIN')) {
 				$_SESSION["dol_loginmesg"] = $langs->transnoentitiesnoconv("ErrorCantLoadUserFromDolibarrDatabase", $login);
 
 				$user->trigger_mesg = 'ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
-			}
-			if ($resultFetchUser < 0) {
+			} elseif ($resultFetchUser < 0) {
 				$_SESSION["dol_loginmesg"] = $user->error;
 
 				$user->trigger_mesg = $user->error;
+			} else {
+				// Load translation files required by the page
+				$langs->loadLangs(array('main', 'errors'));
+
+				$_SESSION["dol_loginmesg"] = $langs->transnoentitiesnoconv("ErrorLoginDateValidity");
+
+				$user->trigger_mesg = $langs->trans("ErrorLoginDateValidity").' - login='.$login;
 			}
 
 			// Call trigger
@@ -943,13 +949,18 @@ if (!defined('NOLOGIN')) {
 		dol_syslog("- This is an already logged session. _SESSION['dol_login']=".$login." _SESSION['dol_entity']=".$entity, LOG_DEBUG);
 
 		$resultFetchUser = $user->fetch('', $login, '', 1, ($entity > 0 ? $entity : -1));
-		if ($resultFetchUser <= 0 || ($user->flagdelsessionsbefore && !empty($_SESSION["dol_logindate"]) && $user->flagdelsessionsbefore > $_SESSION["dol_logindate"])) {
+		if ($resultFetchUser <= 0
+			|| ($user->flagdelsessionsbefore && !empty($_SESSION["dol_logindate"]) && $user->flagdelsessionsbefore > $_SESSION["dol_logindate"])
+			|| ($user->isNotIntoValidtyDateRange())) {
 			if ($resultFetchUser <= 0) {
 				// Account has been removed after login
 				dol_syslog("Can't load user even if session logged. _SESSION['dol_login']=".$login, LOG_WARNING);
-			} else {
+			} elseif ($user->flagdelsessionsbefore && !empty($_SESSION["dol_logindate"]) && $user->flagdelsessionsbefore > $_SESSION["dol_logindate"]) {
 				// Session is no more valid
 				dol_syslog("The user has a date for session invalidation = ".$user->flagdelsessionsbefore." and a session date = ".$_SESSION["dol_logindate"].". We must invalidate its sessions.");
+			} else {
+				// User validity dates are no more valid
+				dol_syslog("The user login has a validity between [".$user->datestartvalidity." and ".$user->dateendvalidity."], curren date is ".dol_now());
 			}
 			session_destroy();
 			session_set_cookie_params(0, '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Add tag secure and httponly on session cookie
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index b32c23ab7fc..f8d437d4fa0 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1885,8 +1885,12 @@ class User extends CommonObject
 		$this->employee						= ($this->employee > 0 ? $this->employee : 0);
 		$this->login						= trim((string) $this->login);
 		$this->gender						= trim((string) $this->gender);
+
 		$this->pass							= trim((string) $this->pass);
 		$this->api_key						= trim((string) $this->api_key);
+		$this->datestartvalidity			= empty($this->datestartvalidity) ? '' : $this->datestartvalidity;
+		$this->dateendvalidity				= empty($this->dateendvalidity) ? '' : $this->dateendvalidity;
+
 		$this->address						= trim((string) $this->address);
 		$this->zip							= trim((string) $this->zip);
 		$this->town							= trim((string) $this->town);
@@ -1911,8 +1915,7 @@ class User extends CommonObject
 		$this->color						= trim((string) $this->color);
 		$this->dateemployment				= empty($this->dateemployment) ? '' : $this->dateemployment;
 		$this->dateemploymentend			= empty($this->dateemploymentend) ? '' : $this->dateemploymentend;
-		$this->datestartvalidity			= empty($this->datestartvalidity) ? '' : $this->datestartvalidity;
-		$this->dateendvalidity				= empty($this->dateendvalidity) ? '' : $this->dateendvalidity;
+
 		$this->birth						= empty($this->birth) ? '' : $this->birth;
 		$this->fk_warehouse					= (int) $this->fk_warehouse;
 
@@ -2695,6 +2698,31 @@ class User extends CommonObject
 	}
 
 
+	/**
+	 *  Return a link with photo
+	 * 	Use this->id,this->photo
+	 *
+	 *	@return	int		0=No more valid, >0 if OK
+	 */
+	public function isNotIntoValidtyDateRange()
+	{
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+
+		$now = dol_now();
+
+		// Check date start validity
+		if ($this->datestartvalidity && $this->datestartvalidity > dol_get_last_hour($now)) {
+			return 0;
+		}
+		// Check date end validity
+		if ($this->dateendvalidity && $this->dateendvalidity < dol_get_first_hour($now)) {
+			return 0;
+		}
+
+		return 1;
+	}
+
+
 	/**
 	 *  Return a link with photo
 	 * 	Use this->id,this->photo

From e7c63bfe1ba64c520bf382f62bb467ba3e8265cf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 27 Jan 2023 14:27:51 +0100
Subject: [PATCH 798/816] FIX Check of date of validity

---
 htdocs/langs/en_US/errors.lang   |  2 +-
 htdocs/main.inc.php              |  7 +++++--
 htdocs/user/class/user.class.php | 12 +++++++-----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index b779c901b54..240dd7c4c41 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -303,7 +303,7 @@ ErrorValueForTooLow=Value for <b>%s</b> is too low
 ErrorValueCantBeNull=Value for <b>%s</b> can't be null
 ErrorDateOfMovementLowerThanDateOfFileTransmission=The date of the bank transaction can't be lower than the date of the file transmission
 ErrorTooMuchFileInForm=Too much files in form, the maximum number is %s file(s)
-ErrorSessionInvalidatedAfterPasswordChange=The session was invalidated after a password change. Please relogin.
+ErrorSessionInvalidatedAfterPasswordChange=The session was invalidated after a password or dates of validity change. Please relogin.
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 24ce10ea7c1..df62eea68c4 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -881,7 +881,7 @@ if (!defined('NOLOGIN')) {
 
 		$resultFetchUser = $user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1)); // value for $login was retrieved previously when checking password.
 		if ($resultFetchUser <= 0 || $user->isNotIntoValidityDateRange()) {
-			dol_syslog('User not found, connexion refused');
+			dol_syslog('User not found or not valid, connexion refused');
 			session_destroy();
 			session_set_cookie_params(0, '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Add tag secure and httponly on session cookie
 			session_name($sessionname);
@@ -949,9 +949,12 @@ if (!defined('NOLOGIN')) {
 		dol_syslog("- This is an already logged session. _SESSION['dol_login']=".$login." _SESSION['dol_entity']=".$entity, LOG_DEBUG);
 
 		$resultFetchUser = $user->fetch('', $login, '', 1, ($entity > 0 ? $entity : -1));
+
+		//var_dump(dol_print_date($user->flagdelsessionsbefore, 'dayhour', 'gmt')." ".dol_print_date($_SESSION["dol_logindate"], 'dayhour', 'gmt'));
+
 		if ($resultFetchUser <= 0
 			|| ($user->flagdelsessionsbefore && !empty($_SESSION["dol_logindate"]) && $user->flagdelsessionsbefore > $_SESSION["dol_logindate"])
-			|| ($user->isNotIntoValidtyDateRange())) {
+			|| ($user->isNotIntoValidityDateRange())) {
 			if ($resultFetchUser <= 0) {
 				// Account has been removed after login
 				dol_syslog("Can't load user even if session logged. _SESSION['dol_login']=".$login, LOG_WARNING);
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index f8d437d4fa0..2893378bdd9 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2702,24 +2702,26 @@ class User extends CommonObject
 	 *  Return a link with photo
 	 * 	Use this->id,this->photo
 	 *
-	 *	@return	int		0=No more valid, >0 if OK
+	 *	@return	int		0=Valid, >0 if not valid
 	 */
-	public function isNotIntoValidtyDateRange()
+	public function isNotIntoValidityDateRange()
 	{
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 		$now = dol_now();
 
+		//dol_syslog("isNotIntoValidityDateRange ".$this->datestartvalidity);
+
 		// Check date start validity
 		if ($this->datestartvalidity && $this->datestartvalidity > dol_get_last_hour($now)) {
-			return 0;
+			return 1;
 		}
 		// Check date end validity
 		if ($this->dateendvalidity && $this->dateendvalidity < dol_get_first_hour($now)) {
-			return 0;
+			return 1;
 		}
 
-		return 1;
+		return 0;
 	}
 
 

From 0765a1196f421c4aeff269c416985ea4d61ddf00 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 27 Jan 2023 14:27:51 +0100
Subject: [PATCH 799/816] FIX Check of date of validity

---
 htdocs/api/class/api_access.class.php |  9 +++++++--
 htdocs/dav/fileserver.php             |  7 +++++++
 htdocs/langs/en_US/errors.lang        |  2 +-
 htdocs/main.inc.php                   | 11 +++++++++--
 htdocs/user/class/user.class.php      | 12 +++++++-----
 5 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/htdocs/api/class/api_access.class.php b/htdocs/api/class/api_access.class.php
index 6874d3faaed..541682101c6 100644
--- a/htdocs/api/class/api_access.class.php
+++ b/htdocs/api/class/api_access.class.php
@@ -144,6 +144,7 @@ class DolibarrApiAccess implements iAuthenticate
 				throw new RestException(503, 'Error when searching login user from api key');
 			}
 
+
 			$genericmessageerroruser = 'Error user not valid (not found or bad status or bad validity dates) (conf->entity='.$conf->entity.')';
 
 			$fuser = new User($this->db);
@@ -151,8 +152,12 @@ class DolibarrApiAccess implements iAuthenticate
 			if ($result <= 0) {
 				throw new RestException(503, $genericmessageerroruser);
 			}
-			if ($fuser->statut == 0) {
-				throw new RestException(503, 'Error when fetching user. This user has been locked or disabled');
+
+			// Check if user status is enabled
+			if ($fuser->statut != $fuser::STATUS_ENABLED) {
+				// Status is disabled
+				dol_syslog("The user has been disabled");
+				throw new RestException(503, $genericmessageerroruser);
 			}
 
 			// Check if session was unvalidated by a password change
diff --git a/htdocs/dav/fileserver.php b/htdocs/dav/fileserver.php
index 15d9cd1764f..af23fde5fff 100644
--- a/htdocs/dav/fileserver.php
+++ b/htdocs/dav/fileserver.php
@@ -131,6 +131,13 @@ $authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function ($username, $p
 		return false;
 	}
 
+	// Check if user status is enabled
+	if ($user->statut != $user::STATUS_ENABLED) {
+		// Status is disabled
+		dol_syslog("The user has been disabled.");
+		return false;
+	}
+
 	// Check if session was unvalidated by a password change
 	if (($user->flagdelsessionsbefore && !empty($_SESSION["dol_logindate"]) && $user->flagdelsessionsbefore > $_SESSION["dol_logindate"])) {
 		// Session is no more valid
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index b779c901b54..240dd7c4c41 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -303,7 +303,7 @@ ErrorValueForTooLow=Value for <b>%s</b> is too low
 ErrorValueCantBeNull=Value for <b>%s</b> can't be null
 ErrorDateOfMovementLowerThanDateOfFileTransmission=The date of the bank transaction can't be lower than the date of the file transmission
 ErrorTooMuchFileInForm=Too much files in form, the maximum number is %s file(s)
-ErrorSessionInvalidatedAfterPasswordChange=The session was invalidated after a password change. Please relogin.
+ErrorSessionInvalidatedAfterPasswordChange=The session was invalidated after a password or dates of validity change. Please relogin.
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 24ce10ea7c1..8a4efc8466b 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -881,7 +881,7 @@ if (!defined('NOLOGIN')) {
 
 		$resultFetchUser = $user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1)); // value for $login was retrieved previously when checking password.
 		if ($resultFetchUser <= 0 || $user->isNotIntoValidityDateRange()) {
-			dol_syslog('User not found, connexion refused');
+			dol_syslog('User not found or not valid, connexion refused');
 			session_destroy();
 			session_set_cookie_params(0, '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Add tag secure and httponly on session cookie
 			session_name($sessionname);
@@ -949,15 +949,22 @@ if (!defined('NOLOGIN')) {
 		dol_syslog("- This is an already logged session. _SESSION['dol_login']=".$login." _SESSION['dol_entity']=".$entity, LOG_DEBUG);
 
 		$resultFetchUser = $user->fetch('', $login, '', 1, ($entity > 0 ? $entity : -1));
+
+		//var_dump(dol_print_date($user->flagdelsessionsbefore, 'dayhour', 'gmt')." ".dol_print_date($_SESSION["dol_logindate"], 'dayhour', 'gmt'));
+
 		if ($resultFetchUser <= 0
 			|| ($user->flagdelsessionsbefore && !empty($_SESSION["dol_logindate"]) && $user->flagdelsessionsbefore > $_SESSION["dol_logindate"])
-			|| ($user->isNotIntoValidtyDateRange())) {
+			|| ($user->status != $user::STATUS_ENABLED)
+			|| ($user->isNotIntoValidityDateRange())) {
 			if ($resultFetchUser <= 0) {
 				// Account has been removed after login
 				dol_syslog("Can't load user even if session logged. _SESSION['dol_login']=".$login, LOG_WARNING);
 			} elseif ($user->flagdelsessionsbefore && !empty($_SESSION["dol_logindate"]) && $user->flagdelsessionsbefore > $_SESSION["dol_logindate"]) {
 				// Session is no more valid
 				dol_syslog("The user has a date for session invalidation = ".$user->flagdelsessionsbefore." and a session date = ".$_SESSION["dol_logindate"].". We must invalidate its sessions.");
+			} elseif ($user->status != $user::STATUS_ENABLED) {
+				// User is not enabled
+				dol_syslog("The user login is disabled");
 			} else {
 				// User validity dates are no more valid
 				dol_syslog("The user login has a validity between [".$user->datestartvalidity." and ".$user->dateendvalidity."], curren date is ".dol_now());
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index f8d437d4fa0..2893378bdd9 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2702,24 +2702,26 @@ class User extends CommonObject
 	 *  Return a link with photo
 	 * 	Use this->id,this->photo
 	 *
-	 *	@return	int		0=No more valid, >0 if OK
+	 *	@return	int		0=Valid, >0 if not valid
 	 */
-	public function isNotIntoValidtyDateRange()
+	public function isNotIntoValidityDateRange()
 	{
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 		$now = dol_now();
 
+		//dol_syslog("isNotIntoValidityDateRange ".$this->datestartvalidity);
+
 		// Check date start validity
 		if ($this->datestartvalidity && $this->datestartvalidity > dol_get_last_hour($now)) {
-			return 0;
+			return 1;
 		}
 		// Check date end validity
 		if ($this->dateendvalidity && $this->dateendvalidity < dol_get_first_hour($now)) {
-			return 0;
+			return 1;
 		}
 
-		return 1;
+		return 0;
 	}
 
 

From 9ecd2c4beef7af17e3e029e05a12827cb12c63b1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 27 Jan 2023 14:47:43 +0100
Subject: [PATCH 800/816] Trans

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

diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 240dd7c4c41..50d5c0e90d7 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -303,7 +303,7 @@ ErrorValueForTooLow=Value for <b>%s</b> is too low
 ErrorValueCantBeNull=Value for <b>%s</b> can't be null
 ErrorDateOfMovementLowerThanDateOfFileTransmission=The date of the bank transaction can't be lower than the date of the file transmission
 ErrorTooMuchFileInForm=Too much files in form, the maximum number is %s file(s)
-ErrorSessionInvalidatedAfterPasswordChange=The session was invalidated after a password or dates of validity change. Please relogin.
+ErrorSessionInvalidatedAfterPasswordChange=The session was been invalidated following a change of password, status or dates of validity. Please relogin.
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.

From 2a104af20e111b7c92bbd9e7e375a2b2bc3cee14 Mon Sep 17 00:00:00 2001
From: Anthony Berton <anthony.berton@bb2a.fr>
Date: Fri, 27 Jan 2023 15:11:14 +0100
Subject: [PATCH 801/816] Cop

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

diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index e5a195471de..cd793a91bfc 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2006-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2023		anthony Berton			<anthony.berton@bb2a.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

From 791a69dd09b8c487f57ce4b7175f22f68355e732 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 28 Jan 2023 04:48:55 +0100
Subject: [PATCH 802/816] FIX Accountancy - Quadra export

---
 .../class/accountancyexport.class.php         | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 73035c55d5d..2215ed1352e 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2016       Pierre-Henry Favre  <phf@atm-consulting.fr>
- * Copyright (C) 2016-2021  Alexandre Spangaro  <aspangaro@open-dsi.fr>
+ * Copyright (C) 2016-2023  Alexandre Spangaro  <aspangaro@open-dsi.fr>
  * Copyright (C) 2013-2017  Olivier Geffroy     <jeff@jeffinfo.com>
  * Copyright (C) 2017       Elarifr. Ari Elbaz  <github@accedinfo.com>
  * Copyright (C) 2017-2019  Frédéric France     <frederic.france@netlogic.fr>
@@ -518,7 +518,7 @@ class AccountancyExport
 	/**
 	 * Export format : Quadratus (Format ASCII)
 	 * Format since 2015 compatible QuadraCOMPTA
-	 * Last review for this format : 2021/09/13 Alexandre Spangaro (aspangaro@open-dsi.fr)
+	 * Last review for this format : 2023/01/28 Alexandre Spangaro (aspangaro@open-dsi.fr)
 	 *
 	 * Help : https://docplayer.fr/20769649-Fichier-d-entree-ascii-dans-quadracompta.html
 	 * In QuadraCompta | Use menu : "Outils" > "Suivi des dossiers" > "Import ASCII(Compta)"
@@ -536,6 +536,14 @@ class AccountancyExport
 		// $date_ecriture = dol_print_date(dol_now(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
 		// $date_ecriture = dol_print_date(time(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
 		foreach ($TData as $data) {
+			// Clean some data
+			$data->doc_ref = dol_string_unaccent($data->doc_ref);
+			$data->label_operation = dol_string_unaccent($data->label_operation);
+			$data->numero_compte = dol_string_unaccent($data->numero_compte);
+			$data->label_compte = dol_string_unaccent($data->label_compte);
+			$data->subledger_account = dol_string_unaccent($data->subledger_account);
+			$data->subledger_label = dol_string_unaccent($data->subledger_label);
+
 			$code_compta = $data->numero_compte;
 			if (!empty($data->subledger_account)) {
 				$code_compta = $data->subledger_account;
@@ -567,9 +575,9 @@ class AccountancyExport
 				if ($data->doc_type == 'customer_invoice') {
 					$Tab['type_compte'] = 'C';
 				} elseif ($data->doc_type == 'supplier_invoice') {
-					$Tab['coll_compte'] = 'F';
+					$Tab['type_compte'] = 'F';
 				} else {
-					$Tab['coll_compte'] = 'G';
+					$Tab['type_compte'] = 'G';
 				}
 
 				$Tab['filler3'] = str_repeat(' ', 235);
@@ -590,7 +598,7 @@ class AccountancyExport
 			//$Tab['date_ecriture'] = $date_ecriture;
 			$Tab['date_ecriture'] = dol_print_date($data->doc_date, '%d%m%y');
 			$Tab['filler'] = ' ';
-			$Tab['libelle_ecriture'] = str_pad(self::trunc(dol_string_unaccent($data->doc_ref).' '.dol_string_unaccent($data->label_operation), 20), 20);
+			$Tab['libelle_ecriture'] = str_pad(self::trunc($data->doc_ref.' '.$data->label_operation, 20), 20);
 
 			// Credit invoice - invert sens
 			/*
@@ -640,8 +648,8 @@ class AccountancyExport
 			// TODO: we should filter more than only accent to avoid wrong line size
 			// TODO: remove invoice number doc_ref in libelle,
 			// TODO: we should offer an option for customer to build the libelle using invoice number / name / date in accounting software
-			//$Tab['libelle_ecriture2'] = str_pad(self::trunc(dol_string_unaccent($data->doc_ref) . ' ' . dol_string_unaccent($data->label_operation), 30), 30);
-			$Tab['libelle_ecriture2'] = str_pad(self::trunc(dol_string_unaccent($data->label_operation), 30), 30);
+			//$Tab['libelle_ecriture2'] = str_pad(self::trunc($data->doc_ref . ' ' . $data->label_operation, 30), 30);
+			$Tab['libelle_ecriture2'] = str_pad(self::trunc($data->label_operation, 30), 30);
 			$Tab['codetva'] = str_repeat(' ', 2);
 
 			// We need to keep the 10 lastest number of invoice doc_ref not the beginning part that is the unusefull almost same part

From a27642cbfe91dd09627af0ab7600e9d5602aedf7 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 28 Jan 2023 10:32:07 +0100
Subject: [PATCH 803/816] better comment

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

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index b4eddcc252f..dda475e8c89 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1279,7 +1279,7 @@ abstract class CommonDocGenerator
 		$extrafieldOptionsKey = $extrafieldsKeyPrefix.$extrafieldKey;
 
 
-		// Load extrafiels if not allready does
+		// Load extra fields if they haven't been loaded already.
 		if (empty($this->extrafieldsCache)) {
 			$this->extrafieldsCache = new ExtraFields($this->db);
 		}
@@ -1605,7 +1605,7 @@ abstract class CommonDocGenerator
 			return 0;
 		}
 
-		// Load extrafiels if not allready does
+		// Load extra fields if they haven't been loaded already.
 		if (empty($this->extrafieldsCache)) {
 			$this->extrafieldsCache = new ExtraFields($this->db);
 		}

From 6cfe70dfe5144b07ef2c63bd6e74a96c12bcc9e9 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 28 Jan 2023 10:36:34 +0100
Subject: [PATCH 804/816] fix : Warning: Undefined array key label

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

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index dda475e8c89..9d18fccf423 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1615,7 +1615,7 @@ abstract class CommonDocGenerator
 		$extrafields = $this->extrafieldsCache;
 
 
-		if (!empty($extrafields->attributes[$object->table_element]) && is_array($extrafields->attributes[$object->table_element]['label'])) {
+		if (!empty($extrafields->attributes[$object->table_element]) && is_array($extrafields->attributes[$object->table_element]) && array_key_exists('label', $extrafields->attributes[$object->table_element]) && is_array($extrafields->attributes[$object->table_element]['label'])) {
 			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label) {
 				// Dont display separator yet even is set to be displayed (not compatible yet)
 				if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') {

From d3b1ee367ac0dec93e5d5be52a6f2b7a40500ff3 Mon Sep 17 00:00:00 2001
From: Eric Seigne <eric.seigne@cap-rel.fr>
Date: Sat, 28 Jan 2023 14:27:45 +0100
Subject: [PATCH 805/816] fix #23716 : handle hookmanagers returns

---
 htdocs/public/payment/newpayment.php | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 9cecbc90885..69ce8977030 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -212,6 +212,11 @@ $parameters = [
 	'validpaymentmethod' => &$validpaymentmethod
 ];
 $reshook = $hookmanager->executeHooks('doValidatePayment', $parameters, $object, $action);
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+} elseif ($reshook > 0) {
+	print $hookmanager->resPrint;
+}
 
 // Check security token
 $valid = true;
@@ -1674,6 +1679,12 @@ if ($action != 'dopayment')
 			'object' => $object
 		];
 		$reshook = $hookmanager->executeHooks('doCheckStatus', $parameters, $object, $action);
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		} elseif ($reshook > 0) {
+			print $hookmanager->resPrint;
+		}
+
 		if ($source == 'order' && $object->billed)
 		{
 			print '<br><br><span class="amountpaymentcomplete size15x">'.$langs->trans("OrderBilled").'</span>';
@@ -1699,6 +1710,12 @@ if ($action != 'dopayment')
 				'paymentmethod' => $paymentmethod
 			];
 			$reshook = $hookmanager->executeHooks('doAddButton', $parameters, $object, $action);
+			if ($reshook < 0) {
+				setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+			} elseif ($reshook > 0) {
+				print $hookmanager->resPrint;
+			}
+
 			if ((empty($paymentmethod) || $paymentmethod == 'paybox') && !empty($conf->paybox->enabled))
 			{
 				print '<div class="button buttonpayment" id="div_dopayment_paybox"><span class="fa fa-credit-card"></span> <input class="" type="submit" id="dopayment_paybox" name="dopayment_paybox" value="'.$langs->trans("PayBoxDoPayment").'">';
@@ -2299,9 +2316,13 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
 		'dopayment' => GETPOST('dopayment', 'alpha')
 	];
 	$reshook = $hookmanager->executeHooks('doPayment', $parameters, $object, $action);
+	if ($reshook < 0) {
+		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	} elseif ($reshook > 0) {
+		print $hookmanager->resPrint;
+	}
 }
 
-
 htmlPrintOnlinePaymentFooter($mysoc, $langs, 1, $suffix, $object);
 
 llxFooter('', 'public');

From f4bfe865214047ebdec4deefb901469e9f2b4016 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 28 Jan 2023 17:48:43 +0100
Subject: [PATCH 806/816] css

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index d464871941a..2a1ac8dc932 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -515,7 +515,7 @@ class Product extends CommonObject
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
 		'ref'           =>array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
 		'entity'        =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>5),
-		'label'         =>array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>2, 'position'=>15),
+		'label'         =>array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>2, 'position'=>15, 'csslist'=>'tdoverflowmax250'),
 		'barcode'       =>array('type'=>'varchar(255)', 'label'=>'Barcode', 'enabled'=>'isModEnabled("barcode")', 'position'=>20, 'visible'=>-1, 'showoncombobox'=>3),
 		'fk_barcode_type' => array('type'=>'integer', 'label'=>'BarcodeType', 'enabled'=>'1', 'position'=>21, 'notnull'=>0, 'visible'=>-1,),
 		'note_public'   =>array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61),

From a2a18ffb7173f05befdab55ebe8e827df39af969 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 28 Jan 2023 18:35:01 +0100
Subject: [PATCH 807/816] Trans

---
 htdocs/langs/en_US/mrp.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang
index 6bdea0cc951..82cf7c38012 100644
--- a/htdocs/langs/en_US/mrp.lang
+++ b/htdocs/langs/en_US/mrp.lang
@@ -102,6 +102,7 @@ NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
 WorkstationType=Workstation type
+DefaultWorkstation=Default workstation
 Human=Human
 Machine=Machine
 HumanMachine=Human / Machine

From da3e228504bb3444c5e29af99cfd9159d95d536f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 28 Jan 2023 18:45:37 +0100
Subject: [PATCH 808/816] input is too small

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

diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index 95f57d5dfc5..a73b899dd00 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -416,7 +416,7 @@ if ($action != 'create') {
 	print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="label" class="width300" value="'.GETPOST('label', 'alphanohtml').'" autofocus></td></tr>';
 	print '<tr><td class="fieldrequired">'.$langs->trans("Email").'</td><td>';
 	print img_picto('', 'email', 'class="pictofixedwidth"');
-	print '<input type="text" name="email" value="'.GETPOST('email', 'alphanohtml').'"></td></tr>';
+	print '<input type="text" name="email" class="width300" value="'.GETPOST('email', 'alphanohtml').'"></td></tr>';
 	print '<tr><td>'.$langs->trans("Signature").'</td><td>';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 	$doleditor = new DolEditor('signature', GETPOST('signature'), '', 138, 'dolibarr_notes', 'In', true, true, empty($conf->global->FCKEDITOR_ENABLE_USERSIGN) ? 0 : 1, ROWS_4, '90%');

From 474f5d74a2262b8d3937f5cd398269e5ba038eae Mon Sep 17 00:00:00 2001
From: notmarrco <marrco@wohecha.fr>
Date: Sun, 29 Jan 2023 01:31:44 +0100
Subject: [PATCH 809/816] feat(invoice): Add bankline id to listOfPayments
 fields

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

diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index d1eb324cc7f..dd0ec988062 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -332,6 +332,7 @@ abstract class CommonInvoice extends CommonObject
 		$field = 'fk_facture';
 		$field2 = 'fk_paiement';
 		$field3 = ', p.ref_ext';
+		$field4 = ', p.fk_bank'; // Bank line id
 		$sharedentity = 'facture';
 		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') {
 			$table = 'paiementfourn_facturefourn';
@@ -342,7 +343,7 @@ abstract class CommonInvoice extends CommonObject
 			$sharedentity = 'facture_fourn';
 		}
 
-		$sql = "SELECT p.ref, pf.amount, pf.multicurrency_amount, p.fk_paiement, p.datep, p.num_paiement as num, t.code".$field3;
+		$sql = "SELECT p.ref, pf.amount, pf.multicurrency_amount, p.fk_paiement, p.datep, p.num_paiement as num, t.code".$field3 . $field4;
 		$sql .= " FROM ".$this->db->prefix().$table." as pf, ".$this->db->prefix().$table2." as p, ".$this->db->prefix()."c_paiement as t";
 		$sql .= " WHERE pf.".$field." = ".((int) $this->id);
 		$sql .= " AND pf.".$field2." = p.rowid";
@@ -363,6 +364,9 @@ abstract class CommonInvoice extends CommonObject
 				if (!empty($field3)) {
 					$tmp['ref_ext'] = $obj->ref_ext;
 				}
+				if (!empty($field4)) {
+					$tmp['fk_bank_line'] = $obj->fk_bank;
+				}
 				$retarray[] = $tmp;
 				$i++;
 			}

From b963ddb0bc27daae5e2cb6e1d13c9720a6b83386 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Sun, 29 Jan 2023 14:33:13 +0100
Subject: [PATCH 810/816] Fix PHP8 Warning

---
 htdocs/core/modules/project/task/mod_task_universal.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/core/modules/project/task/mod_task_universal.php b/htdocs/core/modules/project/task/mod_task_universal.php
index 6de02dcaf99..ba61a0363df 100644
--- a/htdocs/core/modules/project/task/mod_task_universal.php
+++ b/htdocs/core/modules/project/task/mod_task_universal.php
@@ -128,8 +128,7 @@ class mod_task_universal extends ModeleNumRefTask
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-		// On defini critere recherche compteur
-		$mask = $conf->global->PROJECT_TASK_UNIVERSAL_MASK;
+		$mask = !empty($conf->global->PROJECT_TASK_UNIVERSAL_MASK) ? $conf->global->PROJECT_TASK_UNIVERSAL_MASK : '';
 
 		if (!$mask) {
 			$this->error = 'NotConfigured';

From b0332730a6e9ac64f4757c043fa2baced81278dd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 29 Jan 2023 18:45:09 +0100
Subject: [PATCH 811/816] Fix count

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

diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 31d489c4b1f..38c37c1389e 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -469,6 +469,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	} else {
 		/* The fast and low memory method to get and count full list converts the sql into a sql count */
 		$sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
+		$sqlforcount = preg_replace('/LEFT JOIN '.MAIN_DB_PREFIX.'contratdet as cd ON c.rowid = cd.fk_contrat /', '', $sqlforcount);
 		$sqlforcount = preg_replace('/GROUP BY.*$/', '', $sqlforcount);
 
 		$resql = $db->query($sqlforcount);

From 22ffef7b4e2b2e1fa40863256167eb35b391b91f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 29 Jan 2023 20:25:42 +0100
Subject: [PATCH 812/816] Update card.php

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

diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 14442e6c965..36f14dca2fc 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -46,7 +46,8 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-$socid = GETPOST('socid', 'int'); if ($socid < 0) {
+$socid = GETPOST('socid', 'int'); 
+if ($socid < 0) {
 	$socid = 0;
 }
 

From 244239d44db2104570f37dcc13016a95d51174e9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 29 Jan 2023 20:52:24 +0100
Subject: [PATCH 813/816] Doc

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

diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt
index 461db52f959..e12c237e28e 100644
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -209,6 +209,11 @@ with
 with
 	foreach ($value[1] as $k => $v) {
 
+* Fix by replacing 
+	if ($res[0] == PDF_TYPE_OBJECT)
+with
+	if ($res && $res[0] == PDF_TYPE_OBJECT)
+
 
 
 JSGANTT:

From d03ec374d083c832f8858e515b04c7c098bf09a3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 30 Jan 2023 02:21:54 +0100
Subject: [PATCH 814/816] NEW Can set a checkbox in formconfirm by clicking on
 the label

---
 htdocs/accountancy/class/accountancyexport.class.php | 2 +-
 htdocs/core/class/html.form.class.php                | 2 +-
 htdocs/core/modules/modAccounting.class.php          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 4c6e2d09838..cec3cc5be73 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -203,7 +203,7 @@ class AccountancyExport
 					'ACCOUNTING_EXPORT_FORMAT' => empty($conf->global->ACCOUNTING_EXPORT_FORMAT) ? 'txt' : $conf->global->ACCOUNTING_EXPORT_FORMAT,
 					'ACCOUNTING_EXPORT_SEPARATORCSV' => empty($conf->global->ACCOUNTING_EXPORT_SEPARATORCSV) ? ',' : $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV,
 					'ACCOUNTING_EXPORT_ENDLINE' => empty($conf->global->ACCOUNTING_EXPORT_ENDLINE) ? 1 : $conf->global->ACCOUNTING_EXPORT_ENDLINE,
-					'ACCOUNTING_EXPORT_DATE' => empty($conf->global->ACCOUNTING_EXPORT_DATE) ? '%d%m%Y' : $conf->global->ACCOUNTING_EXPORT_DATE,
+					'ACCOUNTING_EXPORT_DATE' => getDolGlobalString('ACCOUNTING_EXPORT_DATE', '%Y-%m-%d'),
 				),
 				self::$EXPORT_TYPE_CEGID => array(
 					'label' => $langs->trans('Modelcsv_CEGID'),
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 7ed3f76c4bf..a9e69ed9b2b 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5109,7 +5109,7 @@ class Form
 						$more .= '</div></div>'."\n";
 					} elseif ($input['type'] == 'checkbox') {
 						$more .= '<div class="tagtr">';
-						$more .= '<div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].' </div><div class="tagtd">';
+						$more .= '<div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'"><label for="'.dol_escape_htmltag($input['name']).'">'.$input['label'].'</label></div><div class="tagtd">';
 						$more .= '<input type="checkbox" class="flat'.($morecss ? ' '.$morecss : '').'" id="'.dol_escape_htmltag($input['name']).'" name="'.dol_escape_htmltag($input['name']).'"'.$moreattr;
 						if (!is_bool($input['value']) && $input['value'] != 'false' && $input['value'] != '0' && $input['value'] != '') {
 							$more .= ' checked';
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index e5cff7e9301..8aa1b0ec9ef 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -139,7 +139,7 @@ class modAccounting extends DolibarrModules
 		$this->const[11] = array(
 				"ACCOUNTING_EXPORT_DATE",
 				"chaine",
-				"%d%m%Y",
+				"%Y-%m-%d",
 				"", 0, 'current', 0
 		);
 		$this->const[12] = array(
@@ -338,7 +338,7 @@ class modAccounting extends DolibarrModules
 			'b.sens'=>'C'	// This field is still used by accounting export. We can remove it once it has been replace into accountancyexport.class.php by a detection using ->debit and ->credit
 		);
 
-		// General ledger - Fichier FEC
+		// General ledger - File FEC
 		$r++;
 		$this->import_code[$r] = $this->rights_class.'_'.$r;
 		$this->import_label[$r] = 'ImportAccountingEntriesFECFormat';

From 3fdc32337871ce06dda75eda1b251cc452fbfe7d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 30 Jan 2023 02:41:13 +0100
Subject: [PATCH 815/816] Fix menu

---
 htdocs/core/menus/standard/eldy.lib.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index bf75035f333..d04cf9edc1a 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1726,7 +1726,10 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 
 							if ($nature) {
 								$langs->load('accountancy');
-								$journallabel = $langs->transnoentities($objp->label); // Label of bank account in llx_accounting_journal
+								$journallabel = '';
+								if ($objp->label) {
+									$journallabel = '<span class="opacitymedium">('.$langs->transnoentities($objp->label).')</span>'; // Label of bank account in llx_accounting_journal
+								}
 
 								$key = $langs->trans("AccountingJournalType".strtoupper($objp->nature));
 								$transferlabel = ($objp->nature && $key != "AccountingJournalType".strtoupper($langs->trans($objp->nature)) ? $key.($journallabel != $key ? ' '.$journallabel : ''): $journallabel);

From 1fe08ad3b84beb95fece41902c98a936c6729b13 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 30 Jan 2023 02:56:29 +0100
Subject: [PATCH 816/816] Fix missing hook

---
 htdocs/core/lib/payments.lib.php | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index 44691f7c2c4..29947dda57c 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -146,7 +146,7 @@ function payment_supplier_prepare_head(Paiement $object)
  */
 function getValidOnlinePaymentMethods($paymentmethod = '')
 {
-	global $conf, $langs;
+	global $conf, $langs, $hookmanager, $action;
 
 	$validpaymentmethod = array();
 
@@ -162,8 +162,24 @@ function getValidOnlinePaymentMethods($paymentmethod = '')
 		$langs->load("stripe");
 		$validpaymentmethod['stripe'] = 'valid';
 	}
-	// TODO Add trigger
 
+	// This hook is used to complete the $validpaymentmethod array so an external payment modules
+	// can add its own key (ie 'payzen' for Payzen, ...)
+	$parameters = [
+		'paymentmethod' => $paymentmethod,
+		'validpaymentmethod' => &$validpaymentmethod
+	];
+	$tmpobject = new stdClass();
+	$reshook = $hookmanager->executeHooks('getValidPayment', $parameters, $tmpobject, $action);
+	if ($reshook < 0) {
+		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	} elseif (!empty($hookmanager->resArray['validpaymentmethod'])) {
+		if ($reshook == 0) {
+			$validpaymentmethod = array_merge($validpaymentmethod, $hookmanager->resArray['validpaymentmethod']);
+		} else {
+			$validpaymentmethod = $hookmanager->resArray['validpaymentmethod'];
+		}
+	}
 
 	return $validpaymentmethod;
 }