From 348a0d7779b56c33d5eb01f91b2870189b28cb0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 16 Oct 2024 10:37:41 +0200
Subject: [PATCH 01/29] can filter on object properties

---
 htdocs/core/class/commonobject.class.php |  2 +-
 htdocs/core/class/extrafields.class.php  | 15 ++++++++++++++-
 htdocs/core/tpl/extrafields_view.tpl.php |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 3aee2589b3246..aeb99aad12572 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -9339,7 +9339,7 @@ public function showOptionals($extrafields, $mode = 'view', $params = null, $key
 								if (in_array($extrafields->attributes[$this->table_element]['type'][$key], $listoftypestoshowpicto)) {
 									$out .= getPictoForType($extrafields->attributes[$this->table_element]['type'][$key], ($extrafields->attributes[$this->table_element]['type'][$key] == 'text' ? 'tdtop' : ''));
 								}
-								$out .= $extrafields->showInputField($key, $value, '', $keysuffix, '', 0, $this->id, $this->table_element);
+								$out .= $extrafields->showInputField($key, $value, '', $keysuffix, '', 0, $this->id, $this->table_element, 0, $this);
 								break;
 						}
 
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index c1a76a53a9e4c..26b6586cec22f 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1074,9 +1074,10 @@ public function fetch_name_optionals_label($elementtype, $forceload = false, $at
 	 * @param  int           $objectid       		Current object id
 	 * @param  string        $extrafieldsobjectkey	The key to use to store retrieved data (commonly $object->table_element)
 	 * @param  int	         $mode                  1=Used for search filters
+	 * @param  ?CommonObject $object                Common object dolibarr
 	 * @return string
 	 */
-	public function showInputField($key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = '', $objectid = 0, $extrafieldsobjectkey = '', $mode = 0)
+	public function showInputField($key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = '', $objectid = 0, $extrafieldsobjectkey = '', $mode = 0, $object = null)
 	{
 		global $conf, $langs, $form;
 
@@ -1433,6 +1434,18 @@ public function showInputField($key, $value, $moreparam = '', $keysuffix = '', $
 
 					// Add filter from 4th field
 					if (!empty($InfoFieldList[4])) {
+						if (is_object($object)) {
+							$tags = [];
+							preg_match_all('/\$(.*?)\$/', $InfoFieldList[4], $tags);
+							foreach ($tags[0] as $keytag => $valuetag) {
+								$property = strtolower($tags[1][$keytag]);
+								if (strpos($InfoFieldList[4], $valuetag) !== false && property_exists($object, $property) && !empty($object->$property)) {
+									$InfoFieldList[4] = str_replace($valuetag, (string) $object->$property, $InfoFieldList[4]);
+								} else {
+									$InfoFieldList[4] = str_replace($valuetag, '0', $InfoFieldList[4]);
+								}
+							}
+						}
 						// can use current entity filter
 						if (strpos($InfoFieldList[4], '$ENTITY$') !== false) {
 							$InfoFieldList[4] = str_replace('$ENTITY$', (string) $conf->entity, $InfoFieldList[4]);
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index e93596d2726ad..78045ca09f2e1 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -249,7 +249,7 @@
 				print '<input type="hidden" name="attribute" value="'.$tmpkeyextra.'">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
 				print '<input type="hidden" name="'.$fieldid.'" value="'.$object->id.'">';
-				print $extrafields->showInputField($tmpkeyextra, $value, '', '', '', 0, $object->id, $object->table_element);
+				print $extrafields->showInputField($tmpkeyextra, $value, '', '', '', 0, $object->id, $object->table_element, 0, $object);
 
 				print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans('Modify')).'">';
 

From 9b44b5e3a07464f097fc5ffc09519855797348ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 16 Oct 2024 10:51:52 +0200
Subject: [PATCH 02/29] can filter on object properties

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

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 26b6586cec22f..7d23ad247b407 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1454,6 +1454,10 @@ public function showInputField($key, $value, $moreparam = '', $keysuffix = '', $
 						if (strpos($InfoFieldList[4], '$SEL$') !== false) {
 							$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
 						}
+						// can use MODE request (list or view)
+						if (strpos($InfoFieldList[4], '$MODE$') !== false) {
+							$InfoFieldList[4] = str_replace('$MODE$', $mode, $InfoFieldList[4]);
+						}
 
 						// current object id can be use into filter
 						if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {
@@ -1474,7 +1478,7 @@ public function showInputField($key, $value, $moreparam = '', $keysuffix = '', $
 					} else {
 						$sqlwhere .= ' WHERE 1=1';
 					}
-
+print $sqlwhere;
 					// Add Usf filter on second line
 					/*
 					 if ($Usf) {

From f0f8bc595e4c7a0cb5b8470bb2426d151e8988f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 16 Oct 2024 10:53:27 +0200
Subject: [PATCH 03/29] can filter on object properties

---
 htdocs/core/class/extrafields.class.php | 4 ++--
 htdocs/core/upload_page.php             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 7d23ad247b407..29d1011eb8620 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1456,7 +1456,7 @@ public function showInputField($key, $value, $moreparam = '', $keysuffix = '', $
 						}
 						// can use MODE request (list or view)
 						if (strpos($InfoFieldList[4], '$MODE$') !== false) {
-							$InfoFieldList[4] = str_replace('$MODE$', $mode, $InfoFieldList[4]);
+							$InfoFieldList[4] = str_replace('$MODE$', (string) $mode, $InfoFieldList[4]);
 						}
 
 						// current object id can be use into filter
@@ -1478,7 +1478,7 @@ public function showInputField($key, $value, $moreparam = '', $keysuffix = '', $
 					} else {
 						$sqlwhere .= ' WHERE 1=1';
 					}
-print $sqlwhere;
+
 					// Add Usf filter on second line
 					/*
 					 if ($Usf) {
diff --git a/htdocs/core/upload_page.php b/htdocs/core/upload_page.php
index b1964d5eff071..cbac75cea9fdc 100644
--- a/htdocs/core/upload_page.php
+++ b/htdocs/core/upload_page.php
@@ -97,7 +97,7 @@
 llxHeader('', $title, $help_url, '', 0, 0, $arrayofjs, $arrayofcss, '', 'mod-upload page-card');
 //top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);
 
-print load_fiche_titre('', '', '', 0, '', 0, '<h2>'.$title.'</h2>');
+print load_fiche_titre('', '', '', 0, '', '', '<h2>'.$title.'</h2>');
 
 
 // Instantiate hooks of thirdparty module

From befaf262d93f1b6ea87eaf403c03688bc2558b43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 16 Oct 2024 11:17:24 +0200
Subject: [PATCH 04/29] can filter on object properties

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

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 29d1011eb8620..850082d9363b4 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1497,9 +1497,10 @@ public function showInputField($key, $value, $moreparam = '', $keysuffix = '', $
 						$sqlwhere .= ' AND entity = '.((int) $conf->entity);
 					}
 					$sql .= $sqlwhere;
-					//print $sql;
 
 					$sql .= ' ORDER BY '.implode(', ', $fields_label);
+					$sql .= ' LIMIT ' . getDolGlobalString('MAIN_EXTRAFIELDS_LIMIT_SELLIST_SQL', 1000);
+					// print $sql;
 
 					dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);
 					$resql = $this->db->query($sql);

From 324fe1e7a7e4f85cd7e24671aeef3e6d83da5c30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 16 Oct 2024 11:56:49 +0200
Subject: [PATCH 05/29] can filter on object properties

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index aeb99aad12572..6c4be4bf97f35 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7829,7 +7829,6 @@ function handlemultiinputdisabling(htmlname){
 						$sqlwhere .= " AND entity = " . ((int) $conf->entity);
 					}
 					$sql .= $sqlwhere;
-					//print $sql;
 
 					// Note: $InfoFieldList can be 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter[:CategoryIdType[:CategoryIdList[:Sortfield]]]]]]'
 					if (isset($InfoFieldList[7]) && preg_match('/^[a-z0-9_\-,]+$/i', $InfoFieldList[7])) {
@@ -7837,6 +7836,8 @@ function handlemultiinputdisabling(htmlname){
 					} else {
 						$sql .= " ORDER BY ".$this->db->sanitize(implode(', ', $fields_label));
 					}
+					$sql .= ' LIMIT ' . getDolGlobalString('MAIN_EXTRAFIELDS_LIMIT_SELLIST_SQL', 1000);
+					// print $sql;
 
 					dol_syslog(get_class($this) . '::showInputField type=sellist', LOG_DEBUG);
 					$resql = $this->db->query($sql);

From c23f06d5db4fbbcb5be4b16e1f1a93ebbab20a99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 17 Oct 2024 08:34:08 +0200
Subject: [PATCH 06/29] fix sql

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 6c4be4bf97f35..1153567e667ce 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7836,7 +7836,7 @@ function handlemultiinputdisabling(htmlname){
 					} else {
 						$sql .= " ORDER BY ".$this->db->sanitize(implode(', ', $fields_label));
 					}
-					$sql .= ' LIMIT ' . getDolGlobalString('MAIN_EXTRAFIELDS_LIMIT_SELLIST_SQL', 1000);
+					$sql .= ' LIMIT ' . getDolGlobalInt('MAIN_EXTRAFIELDS_LIMIT_SELLIST_SQL', 1000);
 					// print $sql;
 
 					dol_syslog(get_class($this) . '::showInputField type=sellist', LOG_DEBUG);
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 850082d9363b4..8419bf8e99602 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1499,7 +1499,7 @@ public function showInputField($key, $value, $moreparam = '', $keysuffix = '', $
 					$sql .= $sqlwhere;
 
 					$sql .= ' ORDER BY '.implode(', ', $fields_label);
-					$sql .= ' LIMIT ' . getDolGlobalString('MAIN_EXTRAFIELDS_LIMIT_SELLIST_SQL', 1000);
+					$sql .= ' LIMIT ' . getDolGlobalInt('MAIN_EXTRAFIELDS_LIMIT_SELLIST_SQL', 1000);
 					// print $sql;
 
 					dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);

From 35935a5e17b9a60df14c98437430e87f4ca4993f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 17 Oct 2024 13:28:33 +0200
Subject: [PATCH 07/29] fix

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 2ee906b4b5744..d007d51c8d9c9 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1,22 +1,22 @@
 <?php
-/* Copyright (C) 2006-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2013 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2010-2020 Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2012-2013 Christophe Battarel  <christophe.battarel@altairis.fr>
- * Copyright (C) 2011-2022 Philippe Grand       <philippe.grand@atoo-net.com>
- * Copyright (C) 2012-2015 Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2012-2015 Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2012      Cedric Salvador      <csalvador@gpcsolutions.fr>
- * Copyright (C) 2015-2022 Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2016      Bahfir abbes         <bafbes@gmail.com>
- * Copyright (C) 2017      ATM Consulting       <support@atm-consulting.fr>
- * Copyright (C) 2017-2019 Nicolas ZABOURI      <info@inovea-conseil.com>
- * Copyright (C) 2017      Rui Strecht          <rui.strecht@aliartalentos.com>
+/* Copyright (C) 2006-2015  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2013  Regis Houssin       <regis.houssin@inodbox.com>
+ * Copyright (C) 2010-2020  Juanjo Menent       <jmenent@2byte.es>
+ * Copyright (C) 2012-2013  Christophe Battarel <christophe.battarel@altairis.fr>
+ * Copyright (C) 2011-2022  Philippe Grand      <philippe.grand@atoo-net.com>
+ * Copyright (C) 2012-2015  Marcos García       <marcosgdf@gmail.com>
+ * Copyright (C) 2012-2015  Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2012       Cedric Salvador     <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2015-2022  Alexandre Spangaro  <aspangaro@open-dsi.fr>
+ * Copyright (C) 2016       Bahfir abbes        <bafbes@gmail.com>
+ * Copyright (C) 2017       ATM Consulting      <support@atm-consulting.fr>
+ * Copyright (C) 2017-2019  Nicolas ZABOURI     <info@inovea-conseil.com>
+ * Copyright (C) 2017       Rui Strecht         <rui.strecht@aliartalentos.com>
  * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
- * Copyright (C) 2018      Josep Lluís Amador   <joseplluis@lliuretic.cat>
- * Copyright (C) 2023      Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2021      Grégory Blémand      <gregory.blemand@atm-consulting.fr>
- * Copyright (C) 2023      Lenin Rivas      	<lenin.rivas777@gmail.com>
+ * Copyright (C) 2018       Josep Lluís Amador  <joseplluis@lliuretic.cat>
+ * Copyright (C) 2023       Gauthier VERDOL     <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021       Grégory Blémand     <gregory.blemand@atm-consulting.fr>
+ * Copyright (C) 2023       Lenin Rivas      	<lenin.rivas777@gmail.com>
  * Copyright (C) 2024		MDW					<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		William Mead		<william.mead@manchenumerique.fr>
  *

From 2a0d4bf2ae265ca272072aa422b99a45a362b116 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 22 Oct 2024 21:46:04 +0200
Subject: [PATCH 08/29] new ajax search with infinite scroll

---
 htdocs/core/ajax/ajaxextrafield.php     | 328 +++++++++++++++++++
 htdocs/core/class/extrafields.class.php | 407 +++++++++++++-----------
 2 files changed, 546 insertions(+), 189 deletions(-)
 create mode 100644 htdocs/core/ajax/ajaxextrafield.php

diff --git a/htdocs/core/ajax/ajaxextrafield.php b/htdocs/core/ajax/ajaxextrafield.php
new file mode 100644
index 0000000000000..48538b0edff16
--- /dev/null
+++ b/htdocs/core/ajax/ajaxextrafield.php
@@ -0,0 +1,328 @@
+<?php
+/* Copyright (C) 2007-2024  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/core/ajax/ajaxtooltip.php
+ *      \ingroup    tooltip
+ *      \brief      This script returns content of tooltip
+ */
+
+if (!defined('NOTOKENRENEWAL')) {
+	// Disables token renewal
+	define('NOTOKENRENEWAL', 1);
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOHEADERNOFOOTER')) {
+	define('NOHEADERNOFOOTER', '1');
+}
+
+include '../../main.inc.php';
+include_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php';
+/** @var DoliDB $db */
+
+// object id
+$id = GETPOST('id', 'aZ09');
+// 'module' or 'myobject@mymodule', 'mymodule_myobject'
+$objecttype = GETPOST('objecttype', 'aZ09arobase');
+$objectkey = GETPOST('objectkey', 'restricthtml');
+$search = GETPOST('search', 'restricthtml');
+$page = GETPOSTINT('page');
+$limit = 10;
+$offset = (($page - 1) * $limit);
+
+// Load object according to $element
+$object = fetchObjectByElement($id, $objecttype);
+if (empty($object->element)) {
+	httponly_accessforbidden('Failed to get object with fetchObjectByElement(id=' . $id . ', objecttype=' . $objecttype . ')');
+}
+
+$module = $object->module;
+$element = $object->element;
+
+$usesublevelpermission = ($module != $element ? $element : '');
+if ($usesublevelpermission && !$user->hasRight($module, $element)) {	// There is no permission on object defined, we will check permission on module directly
+	$usesublevelpermission = '';
+}
+
+// print $object->id.' - '.$object->module.' - '.$object->element.' - '.$object->table_element.' - '.$usesublevelpermission."\n";
+
+// Security check
+restrictedArea($user, $object->module, $object, $object->table_element, $usesublevelpermission);
+
+
+/*
+ * View
+ */
+
+top_httphead();
+
+$data = [
+	'results' => [],
+	'pagination' => [
+		'more' => true,
+	]
+];
+if ($page == 1) {
+	$data['results'][] = [
+		'id' => -1,
+		'text' => '&nbsp;',
+	];
+}
+if (is_object($object)) {
+	$extrafields = new ExtraFields($db);
+	$extrafields->fetch_name_optionals_label($element);
+	$options = $extrafields->attributes[$element]['param'][$objectkey]['options'];
+	if (is_array($options)) {
+		$tmpparamoptions = array_keys($options);
+		$paramoptions = preg_split('/[\r\n]+/', $tmpparamoptions[0]);
+
+		$InfoFieldList = explode(":", $paramoptions[0], 5);
+		// 0 : tableName
+		// 1 : label field name
+		// 2 : key fields name (if different of rowid)
+		// optional parameters...
+		// 3 : key field parent (for dependent lists). How this is used ?
+		// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value. Or use USF on the second line.
+		// 5 : string category type. This replace the filter.
+		// 6 : ids categories list separated by comma for category root. This replace the filter.
+		// 7 : sort field (not used here but used into format for commobject)
+
+		// If there is a filter, we extract it by taking all content inside parenthesis.
+		if (! empty($InfoFieldList[4])) {
+			$pos = 0;	// $pos will be position of ending filter
+			$parenthesisopen = 0;
+			while (substr($InfoFieldList[4], $pos, 1) !== '' && ($parenthesisopen || $pos == 0 || substr($InfoFieldList[4], $pos, 1) != ':')) {
+				if (substr($InfoFieldList[4], $pos, 1) == '(') {
+					$parenthesisopen++;
+				}
+				if (substr($InfoFieldList[4], $pos, 1) == ')') {
+					$parenthesisopen--;
+				}
+				$pos++;
+			}
+			$tmpbefore = substr($InfoFieldList[4], 0, $pos);
+			$tmpafter = substr($InfoFieldList[4], $pos + 1);
+			//var_dump($InfoFieldList[4].' -> '.$pos); var_dump($tmpafter);
+			$InfoFieldList[4] = $tmpbefore;
+			if ($tmpafter !== '') {
+				$InfoFieldList = array_merge($InfoFieldList, explode(':', $tmpafter));
+			}
+
+			// Fix better compatibility with some old extrafield syntax filter "(field=123)"
+			$reg = array();
+			if (preg_match('/^\(?([a-z0-9]+)([=<>]+)(\d+)\)?$/i', $InfoFieldList[4], $reg)) {
+				$InfoFieldList[4] = '(' . $reg[1] . ':' . $reg[2] . ':' . $reg[3] . ')';
+			}
+
+			//var_dump($InfoFieldList);
+		}
+
+		$parentName = '';
+		$parentField = '';
+		$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2] . ' as rowid');
+
+		if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {
+			list($parentName, $parentField) = explode('|', $InfoFieldList[3]);
+			$keyList .= ', ' . $parentField;
+		}
+		if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {
+			if (strpos($InfoFieldList[4], 'extra.') !== false) {
+				$keyList = 'main.' . $InfoFieldList[2] . ' as rowid';
+			} else {
+				$keyList = $InfoFieldList[2] . ' as rowid';
+			}
+		}
+
+		$filter_categorie = false;
+		if (count($InfoFieldList) > 5) {
+			if ($InfoFieldList[0] == 'categorie') {
+				$filter_categorie = true;
+			}
+		}
+
+		if (!$filter_categorie) {
+			$fields_label = explode('|', $InfoFieldList[1]);
+			if (is_array($fields_label)) {
+				$keyList .= ', ';
+				$keyList .= implode(', ', $fields_label);
+			}
+
+			$sqlwhere = '';
+			$sql = "SELECT " . $keyList;
+			$sql .= ' FROM ' . $db->prefix() . $InfoFieldList[0];
+
+			// Add filter from 4th field
+			if (!empty($InfoFieldList[4])) {
+				if (is_object($object)) {
+					$tags = [];
+					preg_match_all('/\$(.*?)\$/', $InfoFieldList[4], $tags);
+					foreach ($tags[0] as $keytag => $valuetag) {
+						$property = strtolower($tags[1][$keytag]);
+						if (strpos($InfoFieldList[4], $valuetag) !== false && property_exists($object, $property) && !empty($object->$property)) {
+							$InfoFieldList[4] = str_replace($valuetag, (string) $object->$property, $InfoFieldList[4]);
+						} else {
+							$InfoFieldList[4] = str_replace($valuetag, '0', $InfoFieldList[4]);
+						}
+					}
+				}
+				// can use current entity filter
+				if (strpos($InfoFieldList[4], '$ENTITY$') !== false) {
+					$InfoFieldList[4] = str_replace('$ENTITY$', (string) $conf->entity, $InfoFieldList[4]);
+				}
+				// can use SELECT request
+				if (strpos($InfoFieldList[4], '$SEL$') !== false) {
+					$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
+				}
+				// can use MODE request (list or view)
+				if (strpos($InfoFieldList[4], '$MODE$') !== false) {
+					$InfoFieldList[4] = str_replace('$MODE$', (string) $mode, $InfoFieldList[4]);
+				}
+
+				// current object id can be use into filter
+				if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {
+					$InfoFieldList[4] = str_replace('$ID$', (string) $objectid, $InfoFieldList[4]);
+				} else {
+					$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
+				}
+
+				// We have to join on extrafield table
+				$errstr = '';
+				if (strpos($InfoFieldList[4], 'extra.') !== false) {
+					$sql .= ' as main, ' . $db->sanitize($db->prefix() . $InfoFieldList[0]) . '_extrafields as extra';
+					$sqlwhere .= " WHERE extra.fk_object = main." . $db->sanitize($InfoFieldList[2]);
+					$sqlwhere .= " AND " . forgeSQLFromUniversalSearchCriteria($InfoFieldList[4], $errstr, 1);
+				} else {
+					$sqlwhere .= " WHERE " . forgeSQLFromUniversalSearchCriteria($InfoFieldList[4], $errstr, 1);
+				}
+			} else {
+				$sqlwhere .= ' WHERE 1=1';
+			}
+
+			// Some tables may have field, some other not. For the moment we disable it.
+			if (in_array($InfoFieldList[0], array('tablewithentity'))) {
+				$sqlwhere .= ' AND entity = ' . ((int) $conf->entity);
+			}
+			if ($search) {
+				if ($fields_label) {
+					$sqlwhere .= " " . natural_search($fields_label, $search, 0);
+				}
+			}
+			$sql .= $sqlwhere;
+
+			$sql .= ' ORDER BY ' . implode(', ', $fields_label);
+			$sql .= $db->plimit($limit, $offset);
+			// print $sql;
+			$data['sql'] = $sql;
+
+			$resql = $db->query($sql);
+			if ($resql) {
+				// $out .= '<option value="0">&nbsp;</option>';
+				// $data['results'][] = [
+				// 	'id' => 0,
+				// 	'text' => '&nbsp;',
+				// ];
+				$num = $db->num_rows($resql);
+				$i = 0;
+				while ($i < $num) {
+					$labeltoshow = '';
+					$obj = $db->fetch_object($resql);
+
+					// Several field into label (eq table:code|label:rowid)
+					$notrans = false;
+					$fields_label = explode('|', $InfoFieldList[1]);
+					if (is_array($fields_label) && count($fields_label) > 1) {
+						$notrans = true;
+						foreach ($fields_label as $field_toshow) {
+							$labeltoshow .= $obj->$field_toshow . ' ';
+						}
+					} else {
+						$labeltoshow = $obj->{$InfoFieldList[1]};
+					}
+
+					if ($value == $obj->rowid) {
+						if (!$notrans) {
+							foreach ($fields_label as $field_toshow) {
+								$translabel = $langs->trans($obj->$field_toshow);
+								$labeltoshow = $translabel . ' ';
+							}
+						}
+						// $out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+						$data['results'][] = [
+							'id' => $obj->rowid,
+							'text' => $labeltoshow,
+						];
+					} else {
+						if (!$notrans) {
+							$translabel = $langs->trans($obj->{$InfoFieldList[1]});
+							$labeltoshow = $translabel;
+						}
+						if (empty($labeltoshow)) {
+							$labeltoshow = '(not defined)';
+						}
+
+						if (!empty($InfoFieldList[3]) && $parentField) {
+							$parent = $parentName . ':' . $obj->{$parentField};
+						}
+
+						// $out .= '<option value="'.$obj->rowid.'"';
+						// $out .= ($value == $obj->rowid ? ' selected' : '');
+						// $out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
+						// $out .= '>'.$labeltoshow.'</option>';
+						$data['results'][] = [
+							'id' => $obj->rowid,
+							'text' => $labeltoshow,
+						];
+					}
+
+					$i++;
+				}
+				$db->free($resql);
+			} else {
+				print 'Error in request ' . $sql . ' ' . $db->lasterror() . '. Check setup of extra parameters.<br>';
+			}
+		} else {
+			// require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+			// $data = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);
+			// $out .= '<option value="0">&nbsp;</option>';
+			// if (is_array($data)) {
+			// 	foreach ($data as $data_key => $data_value) {
+			// 		$out .= '<option value="'.$data_key.'"';
+			// 		$out .= ($value == $data_key ? ' selected' : '');
+			// 		$out .= '>'.$data_value.'</option>';
+			// 	}
+			// }
+		}
+	}
+}
+
+if ($page > 1 && $i < 9) {
+	$data['pagination'] = [
+		'more' => false,
+	];
+}
+print json_encode($data);
+
+$db->close();
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index abb28560b0bce..33747f812f10a 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1346,232 +1346,261 @@ public function showInputField($key, $value, $moreparam = '', $keysuffix = '', $
 			}
 		} elseif ($type == 'sellist') {		// List of values selected from a table (1 choice)
 			$out = '';
-			if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_EXTRAFIELDS_DISABLE_SELECT2')) {
-				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
+			if (!empty($conf->use_javascript_ajax)) {
+				if (getDolGlobalString('MAIN_EXTRAFIELDS_ENABLE_NEW_SELECT2')) {
+					$out .= "
+					<script>
+					$(document).ready(function () {
+						$('#".$keyprefix.$key.$keysuffix."').select2({
+							ajax: {
+								url: '".DOL_URL_ROOT.'/core/ajax/ajaxextrafield.php'."',
+								dataType: 'json',
+								delay: 250, // wait 250 milliseconds before triggering the request
+								data: function (params) {
+									var query = {
+										search: params.term,
+										page: params.page || 1,
+										objecttype: '".$extrafieldsobjectkey."',
+										id: '".$object->id."',
+										objectkey: '".$key."'
+									}
+									return query;
+								}
+							}
+						})
+					});
+					</script>";
+					$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
+					$out .= '	<option value="'.$value.'" selected>'.$this->showOutputField($key, $value, $moreparam, $extrafieldsobjectkey).'</option>';
+					$out .= '</select>';
+				} elseif (!getDolGlobalString('MAIN_EXTRAFIELDS_DISABLE_SELECT2')) {
+					include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+					$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
+				}
 			}
-
-			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
-			if (is_array($param['options'])) {
-				$tmpparamoptions = array_keys($param['options']);
-				$paramoptions = preg_split('/[\r\n]+/', $tmpparamoptions[0]);
-
-				$InfoFieldList = explode(":", $paramoptions[0], 5);
-				// 0 : tableName
-				// 1 : label field name
-				// 2 : key fields name (if different of rowid)
-				// optional parameters...
-				// 3 : key field parent (for dependent lists). How this is used ?
-				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value. Or use USF on the second line.
-				// 5 : string category type. This replace the filter.
-				// 6 : ids categories list separated by comma for category root. This replace the filter.
-				// 7 : sort field (not used here but used into format for commobject)
-
-				// If there is a filter, we extract it by taking all content inside parenthesis.
-				if (! empty($InfoFieldList[4])) {
-					$pos = 0;	// $pos will be position of ending filter
-					$parenthesisopen = 0;
-					while (substr($InfoFieldList[4], $pos, 1) !== '' && ($parenthesisopen || $pos == 0 || substr($InfoFieldList[4], $pos, 1) != ':')) {
-						if (substr($InfoFieldList[4], $pos, 1) == '(') {
-							$parenthesisopen++;
+			if (!getDolGlobalString('MAIN_EXTRAFIELDS_ENABLE_NEW_SELECT2')) {
+				$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
+				if (is_array($param['options'])) {
+					$tmpparamoptions = array_keys($param['options']);
+					$paramoptions = preg_split('/[\r\n]+/', $tmpparamoptions[0]);
+
+					$InfoFieldList = explode(":", $paramoptions[0], 5);
+					// 0 : tableName
+					// 1 : label field name
+					// 2 : key fields name (if different of rowid)
+					// optional parameters...
+					// 3 : key field parent (for dependent lists). How this is used ?
+					// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value. Or use USF on the second line.
+					// 5 : string category type. This replace the filter.
+					// 6 : ids categories list separated by comma for category root. This replace the filter.
+					// 7 : sort field (not used here but used into format for commobject)
+
+					// If there is a filter, we extract it by taking all content inside parenthesis.
+					if (! empty($InfoFieldList[4])) {
+						$pos = 0;	// $pos will be position of ending filter
+						$parenthesisopen = 0;
+						while (substr($InfoFieldList[4], $pos, 1) !== '' && ($parenthesisopen || $pos == 0 || substr($InfoFieldList[4], $pos, 1) != ':')) {
+							if (substr($InfoFieldList[4], $pos, 1) == '(') {
+								$parenthesisopen++;
+							}
+							if (substr($InfoFieldList[4], $pos, 1) == ')') {
+								$parenthesisopen--;
+							}
+							$pos++;
 						}
-						if (substr($InfoFieldList[4], $pos, 1) == ')') {
-							$parenthesisopen--;
+						$tmpbefore = substr($InfoFieldList[4], 0, $pos);
+						$tmpafter = substr($InfoFieldList[4], $pos + 1);
+						//var_dump($InfoFieldList[4].' -> '.$pos); var_dump($tmpafter);
+						$InfoFieldList[4] = $tmpbefore;
+						if ($tmpafter !== '') {
+							$InfoFieldList = array_merge($InfoFieldList, explode(':', $tmpafter));
 						}
-						$pos++;
-					}
-					$tmpbefore = substr($InfoFieldList[4], 0, $pos);
-					$tmpafter = substr($InfoFieldList[4], $pos + 1);
-					//var_dump($InfoFieldList[4].' -> '.$pos); var_dump($tmpafter);
-					$InfoFieldList[4] = $tmpbefore;
-					if ($tmpafter !== '') {
-						$InfoFieldList = array_merge($InfoFieldList, explode(':', $tmpafter));
-					}
 
-					// Fix better compatibility with some old extrafield syntax filter "(field=123)"
-					$reg = array();
-					if (preg_match('/^\(?([a-z0-9]+)([=<>]+)(\d+)\)?$/i', $InfoFieldList[4], $reg)) {
-						$InfoFieldList[4] = '('.$reg[1].':'.$reg[2].':'.$reg[3].')';
-					}
+						// Fix better compatibility with some old extrafield syntax filter "(field=123)"
+						$reg = array();
+						if (preg_match('/^\(?([a-z0-9]+)([=<>]+)(\d+)\)?$/i', $InfoFieldList[4], $reg)) {
+							$InfoFieldList[4] = '('.$reg[1].':'.$reg[2].':'.$reg[3].')';
+						}
 
-					//var_dump($InfoFieldList);
-				}
+						//var_dump($InfoFieldList);
+					}
 
-				//$Usf = empty($paramoptions[1]) ? '' :$paramoptions[1];
+					//$Usf = empty($paramoptions[1]) ? '' :$paramoptions[1];
 
-				$parentName = '';
-				$parentField = '';
-				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
+					$parentName = '';
+					$parentField = '';
+					$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
 
-				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {
-					list($parentName, $parentField) = explode('|', $InfoFieldList[3]);
-					$keyList .= ', '.$parentField;
-				}
-				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {
-					if (strpos($InfoFieldList[4], 'extra.') !== false) {
-						$keyList = 'main.'.$InfoFieldList[2].' as rowid';
-					} else {
-						$keyList = $InfoFieldList[2].' as rowid';
+					if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {
+						list($parentName, $parentField) = explode('|', $InfoFieldList[3]);
+						$keyList .= ', '.$parentField;
 					}
-				}
-
-				$filter_categorie = false;
-				if (count($InfoFieldList) > 5) {
-					if ($InfoFieldList[0] == 'categorie') {
-						$filter_categorie = true;
+					if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {
+						if (strpos($InfoFieldList[4], 'extra.') !== false) {
+							$keyList = 'main.'.$InfoFieldList[2].' as rowid';
+						} else {
+							$keyList = $InfoFieldList[2].' as rowid';
+						}
 					}
-				}
 
-				if (!$filter_categorie) {
-					$fields_label = explode('|', $InfoFieldList[1]);
-					if (is_array($fields_label)) {
-						$keyList .= ', ';
-						$keyList .= implode(', ', $fields_label);
+					$filter_categorie = false;
+					if (count($InfoFieldList) > 5) {
+						if ($InfoFieldList[0] == 'categorie') {
+							$filter_categorie = true;
+						}
 					}
 
-					$sqlwhere = '';
-					$sql = "SELECT ".$keyList;
-					$sql .= ' FROM '.$this->db->prefix().$InfoFieldList[0];
+					if (!$filter_categorie) {
+						$fields_label = explode('|', $InfoFieldList[1]);
+						if (is_array($fields_label)) {
+							$keyList .= ', ';
+							$keyList .= implode(', ', $fields_label);
+						}
 
-					// Add filter from 4th field
-					if (!empty($InfoFieldList[4])) {
-						if (is_object($object)) {
-							$tags = [];
-							preg_match_all('/\$(.*?)\$/', $InfoFieldList[4], $tags);
-							foreach ($tags[0] as $keytag => $valuetag) {
-								$property = strtolower($tags[1][$keytag]);
-								if (strpos($InfoFieldList[4], $valuetag) !== false && property_exists($object, $property) && !empty($object->$property)) {
-									$InfoFieldList[4] = str_replace($valuetag, (string) $object->$property, $InfoFieldList[4]);
-								} else {
-									$InfoFieldList[4] = str_replace($valuetag, '0', $InfoFieldList[4]);
+						$sqlwhere = '';
+						$sql = "SELECT ".$keyList;
+						$sql .= ' FROM '.$this->db->prefix().$InfoFieldList[0];
+
+						// Add filter from 4th field
+						if (!empty($InfoFieldList[4])) {
+							if (is_object($object)) {
+								$tags = [];
+								preg_match_all('/\$(.*?)\$/', $InfoFieldList[4], $tags);
+								foreach ($tags[0] as $keytag => $valuetag) {
+									$property = strtolower($tags[1][$keytag]);
+									if (strpos($InfoFieldList[4], $valuetag) !== false && property_exists($object, $property) && !empty($object->$property)) {
+										$InfoFieldList[4] = str_replace($valuetag, (string) $object->$property, $InfoFieldList[4]);
+									} else {
+										$InfoFieldList[4] = str_replace($valuetag, '0', $InfoFieldList[4]);
+									}
 								}
 							}
-						}
-						// can use current entity filter
-						if (strpos($InfoFieldList[4], '$ENTITY$') !== false) {
-							$InfoFieldList[4] = str_replace('$ENTITY$', (string) $conf->entity, $InfoFieldList[4]);
-						}
-						// can use SELECT request
-						if (strpos($InfoFieldList[4], '$SEL$') !== false) {
-							$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
-						}
-						// can use MODE request (list or view)
-						if (strpos($InfoFieldList[4], '$MODE$') !== false) {
-							$InfoFieldList[4] = str_replace('$MODE$', (string) $mode, $InfoFieldList[4]);
-						}
+							// can use current entity filter
+							if (strpos($InfoFieldList[4], '$ENTITY$') !== false) {
+								$InfoFieldList[4] = str_replace('$ENTITY$', (string) $conf->entity, $InfoFieldList[4]);
+							}
+							// can use SELECT request
+							if (strpos($InfoFieldList[4], '$SEL$') !== false) {
+								$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
+							}
+							// can use MODE request (list or view)
+							if (strpos($InfoFieldList[4], '$MODE$') !== false) {
+								$InfoFieldList[4] = str_replace('$MODE$', (string) $mode, $InfoFieldList[4]);
+							}
 
-						// current object id can be use into filter
-						if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {
-							$InfoFieldList[4] = str_replace('$ID$', (string) $objectid, $InfoFieldList[4]);
+							// current object id can be use into filter
+							if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {
+								$InfoFieldList[4] = str_replace('$ID$', (string) $objectid, $InfoFieldList[4]);
+							} else {
+								$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
+							}
+
+							// We have to join on extrafield table
+							$errstr = '';
+							if (strpos($InfoFieldList[4], 'extra.') !== false) {
+								$sql .= ' as main, '.$this->db->sanitize($this->db->prefix().$InfoFieldList[0]).'_extrafields as extra';
+								$sqlwhere .= " WHERE extra.fk_object = main.".$this->db->sanitize($InfoFieldList[2]);
+								$sqlwhere .= " AND " . forgeSQLFromUniversalSearchCriteria($InfoFieldList[4], $errstr, 1);
+							} else {
+								$sqlwhere .= " WHERE " . forgeSQLFromUniversalSearchCriteria($InfoFieldList[4], $errstr, 1);
+							}
 						} else {
-							$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
+							$sqlwhere .= ' WHERE 1=1';
 						}
 
-						// We have to join on extrafield table
-						$errstr = '';
-						if (strpos($InfoFieldList[4], 'extra.') !== false) {
-							$sql .= ' as main, '.$this->db->sanitize($this->db->prefix().$InfoFieldList[0]).'_extrafields as extra';
-							$sqlwhere .= " WHERE extra.fk_object = main.".$this->db->sanitize($InfoFieldList[2]);
-							$sqlwhere .= " AND " . forgeSQLFromUniversalSearchCriteria($InfoFieldList[4], $errstr, 1);
+						// Add Usf filter on second line
+						/*
+						if ($Usf) {
+						$errorstr = '';
+						$sqlusf .= forgeSQLFromUniversalSearchCriteria($Usf, $errorstr);
+						if (!$errorstr) {
+						$sqlwhere .= $sqlusf;
 						} else {
-							$sqlwhere .= " WHERE " . forgeSQLFromUniversalSearchCriteria($InfoFieldList[4], $errstr, 1);
+						$sqlwhere .= " AND invalid_usf_filter_of_extrafield";
 						}
-					} else {
-						$sqlwhere .= ' WHERE 1=1';
-					}
-
-					// Add Usf filter on second line
-					/*
-					 if ($Usf) {
-					 $errorstr = '';
-					 $sqlusf .= forgeSQLFromUniversalSearchCriteria($Usf, $errorstr);
-					 if (!$errorstr) {
-					 $sqlwhere .= $sqlusf;
-					 } else {
-					 $sqlwhere .= " AND invalid_usf_filter_of_extrafield";
-					 }
-					 }
-					 */
-
-					// Some tables may have field, some other not. For the moment we disable it.
-					if (in_array($InfoFieldList[0], array('tablewithentity'))) {
-						$sqlwhere .= ' AND entity = '.((int) $conf->entity);
-					}
-					$sql .= $sqlwhere;
-
-					$sql .= ' ORDER BY '.implode(', ', $fields_label);
-					$sql .= ' LIMIT ' . getDolGlobalInt('MAIN_EXTRAFIELDS_LIMIT_SELLIST_SQL', 1000);
-					// print $sql;
-
-					dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);
-					$resql = $this->db->query($sql);
-					if ($resql) {
-						$out .= '<option value="0">&nbsp;</option>';
-						$num = $this->db->num_rows($resql);
-						$i = 0;
-						while ($i < $num) {
-							$labeltoshow = '';
-							$obj = $this->db->fetch_object($resql);
+						}
+						*/
 
-							// Several field into label (eq table:code|label:rowid)
-							$notrans = false;
-							$fields_label = explode('|', $InfoFieldList[1]);
-							if (is_array($fields_label) && count($fields_label) > 1) {
-								$notrans = true;
-								foreach ($fields_label as $field_toshow) {
-									$labeltoshow .= $obj->$field_toshow.' ';
-								}
-							} else {
-								$labeltoshow = $obj->{$InfoFieldList[1]};
-							}
+						// Some tables may have field, some other not. For the moment we disable it.
+						if (in_array($InfoFieldList[0], array('tablewithentity'))) {
+							$sqlwhere .= ' AND entity = '.((int) $conf->entity);
+						}
+						$sql .= $sqlwhere;
+
+						$sql .= ' ORDER BY '.implode(', ', $fields_label);
+						$sql .= ' LIMIT ' . getDolGlobalInt('MAIN_EXTRAFIELDS_LIMIT_SELLIST_SQL', 1000);
+						// print $sql;
+
+						dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);
+						$resql = $this->db->query($sql);
+						if ($resql) {
+							$out .= '<option value="0">&nbsp;</option>';
+							$num = $this->db->num_rows($resql);
+							$i = 0;
+							while ($i < $num) {
+								$labeltoshow = '';
+								$obj = $this->db->fetch_object($resql);
 
-							if ($value == $obj->rowid) {
-								if (!$notrans) {
+								// Several field into label (eq table:code|label:rowid)
+								$notrans = false;
+								$fields_label = explode('|', $InfoFieldList[1]);
+								if (is_array($fields_label) && count($fields_label) > 1) {
+									$notrans = true;
 									foreach ($fields_label as $field_toshow) {
-										$translabel = $langs->trans($obj->$field_toshow);
-										$labeltoshow = $translabel.' ';
+										$labeltoshow .= $obj->$field_toshow.' ';
 									}
-								}
-								$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-							} else {
-								if (!$notrans) {
-									$translabel = $langs->trans($obj->{$InfoFieldList[1]});
-									$labeltoshow = $translabel;
-								}
-								if (empty($labeltoshow)) {
-									$labeltoshow = '(not defined)';
+								} else {
+									$labeltoshow = $obj->{$InfoFieldList[1]};
 								}
 
-								if (!empty($InfoFieldList[3]) && $parentField) {
-									$parent = $parentName.':'.$obj->{$parentField};
+								if ($value == $obj->rowid) {
+									if (!$notrans) {
+										foreach ($fields_label as $field_toshow) {
+											$translabel = $langs->trans($obj->$field_toshow);
+											$labeltoshow = $translabel.' ';
+										}
+									}
+									$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+								} else {
+									if (!$notrans) {
+										$translabel = $langs->trans($obj->{$InfoFieldList[1]});
+										$labeltoshow = $translabel;
+									}
+									if (empty($labeltoshow)) {
+										$labeltoshow = '(not defined)';
+									}
+
+									if (!empty($InfoFieldList[3]) && $parentField) {
+										$parent = $parentName.':'.$obj->{$parentField};
+									}
+
+									$out .= '<option value="'.$obj->rowid.'"';
+									$out .= ($value == $obj->rowid ? ' selected' : '');
+									$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
+									$out .= '>'.$labeltoshow.'</option>';
 								}
 
-								$out .= '<option value="'.$obj->rowid.'"';
-								$out .= ($value == $obj->rowid ? ' selected' : '');
-								$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
-								$out .= '>'.$labeltoshow.'</option>';
+								$i++;
 							}
-
-							$i++;
+							$this->db->free($resql);
+						} else {
+							print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
 						}
-						$this->db->free($resql);
 					} else {
-						print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
-					}
-				} else {
-					require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-					$data = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);
-					$out .= '<option value="0">&nbsp;</option>';
-					if (is_array($data)) {
-						foreach ($data as $data_key => $data_value) {
-							$out .= '<option value="'.$data_key.'"';
-							$out .= ($value == $data_key ? ' selected' : '');
-							$out .= '>'.$data_value.'</option>';
+						require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+						$data = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);
+						$out .= '<option value="0">&nbsp;</option>';
+						if (is_array($data)) {
+							foreach ($data as $data_key => $data_value) {
+								$out .= '<option value="'.$data_key.'"';
+								$out .= ($value == $data_key ? ' selected' : '');
+								$out .= '>'.$data_value.'</option>';
+							}
 						}
 					}
 				}
+				$out .= '</select>';
 			}
-			$out .= '</select>';
 		} elseif ($type == 'checkbox') {
 			$value_arr = $value;
 			if (!is_array($value)) {

From a7ee5b6a294421ace47350e08fe092f191e15d33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 22 Oct 2024 22:29:41 +0200
Subject: [PATCH 09/29] new ajax search with infinite scroll

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

diff --git a/htdocs/core/ajax/ajaxextrafield.php b/htdocs/core/ajax/ajaxextrafield.php
index 48538b0edff16..92e50a084c0c9 100644
--- a/htdocs/core/ajax/ajaxextrafield.php
+++ b/htdocs/core/ajax/ajaxextrafield.php
@@ -231,19 +231,19 @@
 				}
 			}
 			$sql .= $sqlwhere;
-
-			$sql .= ' ORDER BY ' . implode(', ', $fields_label);
+			$orderfields = explode('|', $InfoFieldList[1]);
+			$keyList = $InfoFieldList[1];
+			if (is_array($orderfields)) {
+				$keyList = implode(', ', $orderfields);
+			}
+			$sql .= $db->order($keyList);
 			$sql .= $db->plimit($limit, $offset);
-			// print $sql;
+
 			$data['sql'] = $sql;
 
 			$resql = $db->query($sql);
 			if ($resql) {
 				// $out .= '<option value="0">&nbsp;</option>';
-				// $data['results'][] = [
-				// 	'id' => 0,
-				// 	'text' => '&nbsp;',
-				// ];
 				$num = $db->num_rows($resql);
 				$i = 0;
 				while ($i < $num) {

From 12a9b43dee1343dedef5c815f83b6423281beb69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 22 Oct 2024 22:37:48 +0200
Subject: [PATCH 10/29] new ajax search with infinite scroll

---
 htdocs/core/ajax/ajaxextrafield.php     | 2 +-
 htdocs/core/class/extrafields.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/ajax/ajaxextrafield.php b/htdocs/core/ajax/ajaxextrafield.php
index 92e50a084c0c9..059ec0a305c84 100644
--- a/htdocs/core/ajax/ajaxextrafield.php
+++ b/htdocs/core/ajax/ajaxextrafield.php
@@ -301,7 +301,7 @@
 				}
 				$db->free($resql);
 			} else {
-				print 'Error in request ' . $sql . ' ' . $db->lasterror() . '. Check setup of extra parameters.<br>';
+				dol_syslog('Error in request ' . $db->lasterror() . '. Check setup of extra parameters.', LOG_ERR);
 			}
 		} else {
 			// require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 33747f812f10a..1e35efd18f03b 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1527,7 +1527,7 @@ public function showInputField($key, $value, $moreparam = '', $keysuffix = '', $
 						}
 						$sql .= $sqlwhere;
 
-						$sql .= ' ORDER BY '.implode(', ', $fields_label);
+						$sql .= $db->order(implode(', ', $fields_label));
 						$sql .= ' LIMIT ' . getDolGlobalInt('MAIN_EXTRAFIELDS_LIMIT_SELLIST_SQL', 1000);
 						// print $sql;
 

From 05c4dbcf097c27f0942e78fe0a94c4b5541619ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 22 Oct 2024 22:45:51 +0200
Subject: [PATCH 11/29] new ajax search with infinite scroll

---
 htdocs/core/ajax/ajaxextrafield.php     | 16 +++++++++-------
 htdocs/core/class/extrafields.class.php |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/ajax/ajaxextrafield.php b/htdocs/core/ajax/ajaxextrafield.php
index 059ec0a305c84..012651776f7ef 100644
--- a/htdocs/core/ajax/ajaxextrafield.php
+++ b/htdocs/core/ajax/ajaxextrafield.php
@@ -304,14 +304,16 @@
 				dol_syslog('Error in request ' . $db->lasterror() . '. Check setup of extra parameters.', LOG_ERR);
 			}
 		} else {
-			// require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-			// $data = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);
+			require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+			require_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php';
+			$form = new Form($db);
+			$categories = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);
 			// $out .= '<option value="0">&nbsp;</option>';
-			// if (is_array($data)) {
-			// 	foreach ($data as $data_key => $data_value) {
-			// 		$out .= '<option value="'.$data_key.'"';
-			// 		$out .= ($value == $data_key ? ' selected' : '');
-			// 		$out .= '>'.$data_value.'</option>';
+			// if (is_array($categories)) {
+			// 	foreach ($categories as $category_key => $category_value) {
+			// 		$out .= '<option value="'.$category_key.'"';
+			// 		$out .= ($value == $category_key ? ' selected' : '');
+			// 		$out .= '>'.$category_value.'</option>';
 			// 	}
 			// }
 		}
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 1e35efd18f03b..f08ce7920b334 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1527,7 +1527,7 @@ public function showInputField($key, $value, $moreparam = '', $keysuffix = '', $
 						}
 						$sql .= $sqlwhere;
 
-						$sql .= $db->order(implode(', ', $fields_label));
+						$sql .= $this->db->order(implode(', ', $fields_label));
 						$sql .= ' LIMIT ' . getDolGlobalInt('MAIN_EXTRAFIELDS_LIMIT_SELLIST_SQL', 1000);
 						// print $sql;
 

From 3fcb57f91146d1c5a142f138b3b1ab2041ba8e28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 23 Oct 2024 19:06:21 +0200
Subject: [PATCH 12/29] wip

---
 htdocs/core/class/commonobject.class.php | 2 +-
 htdocs/core/tpl/extrafields_edit.tpl.php | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 5f847ddc7ec83..cd632c778ba7d 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -9340,7 +9340,7 @@ public function showOptionals($extrafields, $mode = 'view', $params = null, $key
 								if (in_array($extrafields->attributes[$this->table_element]['type'][$key], $listoftypestoshowpicto)) {
 									$out .= getPictoForType($extrafields->attributes[$this->table_element]['type'][$key], ($extrafields->attributes[$this->table_element]['type'][$key] == 'text' ? 'tdtop' : ''));
 								}
-								$out .= $extrafields->showInputField($key, $value, '', $keysuffix, '', 0, $this->id, $this->table_element, 0, $this);
+								$out .= $extrafields->showInputField($key, $value, '', $keysuffix, '', '', $this->id, $this->table_element, 0, $this);
 								break;
 						}
 
diff --git a/htdocs/core/tpl/extrafields_edit.tpl.php b/htdocs/core/tpl/extrafields_edit.tpl.php
index a449b0444c343..77908ee98e3a7 100644
--- a/htdocs/core/tpl/extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/extrafields_edit.tpl.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2014	Maxime Kohlhaas		<support@atm-consulting.fr>
  * Copyright (C) 2014	Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -52,7 +53,8 @@
 @phan-var-force Translate $conf
 @phan-var-force array<string,mixed> $parameters
 ';
-
+/** @var CommonObject $object */
+/** @var HookManager $hookmanager */
 $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (empty($reshook)) {

From 36b507ad4d340bbd26287d7b533e9005a8edf195 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 24 Oct 2024 19:04:12 +0200
Subject: [PATCH 13/29] wip

---
 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 59308c3ca6d8d..5180f24167088 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8409,7 +8409,7 @@ public function selectForForms($objectdesc, $htmlname, $preSelectedValue, $showe
 			return 'selectForForms: Error bad setup of field objectdescorig=' . $objectdescorig.', objectfield='.$objectfield.', objectdesc='.$objectdesc;
 		}
 		'@phan-var-force CommonObject $objecttmp';
-
+		/** @var CommonObject $objecttmp */
 		//var_dump($filter);
 		$prefixforautocompletemode = $objecttmp->element;
 		if ($prefixforautocompletemode == 'societe') {

From 3e685dffb2758a1c751fa7b6fd98a0f19d67fc8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sat, 26 Oct 2024 18:23:33 +0200
Subject: [PATCH 14/29] fix phpstan

---
 htdocs/core/ajax/ajaxextrafield.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/ajax/ajaxextrafield.php b/htdocs/core/ajax/ajaxextrafield.php
index 012651776f7ef..de0ea3d79a6f1 100644
--- a/htdocs/core/ajax/ajaxextrafield.php
+++ b/htdocs/core/ajax/ajaxextrafield.php
@@ -52,9 +52,15 @@
 $page = GETPOSTINT('page');
 $limit = 10;
 $offset = (($page - 1) * $limit);
-
+$element_ref = '';
+if (is_numeric($id)) {
+	$id = (int) $id;
+} else {
+	$element_ref = $id;
+	$id = 0;
+}
 // Load object according to $element
-$object = fetchObjectByElement($id, $objecttype);
+$object = fetchObjectByElement($id, $objecttype, $element_ref);
 if (empty($object->element)) {
 	httponly_accessforbidden('Failed to get object with fetchObjectByElement(id=' . $id . ', objecttype=' . $objecttype . ')');
 }

From 8d149c0b6f32c6595a3fa8854c5eb71a42350c30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sat, 26 Oct 2024 21:56:17 +0200
Subject: [PATCH 15/29] wip

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

diff --git a/htdocs/core/tpl/extrafields_edit.tpl.php b/htdocs/core/tpl/extrafields_edit.tpl.php
index 77908ee98e3a7..70745f58bc5ea 100644
--- a/htdocs/core/tpl/extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/extrafields_edit.tpl.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2014	Maxime Kohlhaas		<support@atm-consulting.fr>
- * Copyright (C) 2014	Juanjo Menent		<jmenent@2byte.es>
+/* Copyright (C) 2014	    Maxime Kohlhaas			<support@atm-consulting.fr>
+ * Copyright (C) 2014	    Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify

From 1471626cf4fc4ac527e22604284714c204d25b8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sat, 9 Nov 2024 11:50:10 +0100
Subject: [PATCH 16/29] clean code

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

diff --git a/htdocs/core/tpl/extrafields_edit.tpl.php b/htdocs/core/tpl/extrafields_edit.tpl.php
index 6df5279913373..9b33b53b796db 100644
--- a/htdocs/core/tpl/extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/extrafields_edit.tpl.php
@@ -27,6 +27,7 @@
  /**
  * @var CommonObject $object
  * @var Conf $conf
+ * @var HookManager $hookmanager
  * @var Translate $langs
  * @var string $action
  * @var array<string,mixed> $parameters
@@ -61,8 +62,7 @@
 @phan-var-force Translate $conf
 @phan-var-force array<string,mixed> $parameters
 ';
-/** @var CommonObject $object */
-/** @var HookManager $hookmanager */
+
 $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (empty($reshook)) {

From 4492cedc5435f8d7ea62263113c164400dfd338d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sat, 16 Nov 2024 01:15:25 +0100
Subject: [PATCH 17/29] fix

---
 build/phpstan/phpstan-baseline.neon | 60 ++++++++++++-----------------
 htdocs/core/ajax/ajaxextrafield.php |  8 +++-
 2 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/build/phpstan/phpstan-baseline.neon b/build/phpstan/phpstan-baseline.neon
index bbacb30775f1f..b6f764ecdd576 100644
--- a/build/phpstan/phpstan-baseline.neon
+++ b/build/phpstan/phpstan-baseline.neon
@@ -9558,6 +9558,30 @@ parameters:
 			count: 5
 			path: ../../htdocs/core/ajax/ajaxdirtree.php
 
+		-
+			message: '#^Call to function is_array\(\) with list\<string\> will always evaluate to true\.$#'
+			identifier: function.alreadyNarrowedType
+			count: 3
+			path: ../../htdocs/core/ajax/ajaxextrafield.php
+
+		-
+			message: '#^Call to function is_object\(\) with object will always evaluate to true\.$#'
+			identifier: function.alreadyNarrowedType
+			count: 2
+			path: ../../htdocs/core/ajax/ajaxextrafield.php
+
+		-
+			message: '#^Variable \$mode might not be defined\.$#'
+			identifier: variable.undefined
+			count: 1
+			path: ../../htdocs/core/ajax/ajaxextrafield.php
+
+		-
+			message: '#^Variable \$value might not be defined\.$#'
+			identifier: variable.undefined
+			count: 1
+			path: ../../htdocs/core/ajax/ajaxextrafield.php
+
 		-
 			message: '#^Call to function is_object\(\) with object will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
@@ -31884,30 +31908,6 @@ parameters:
 			count: 1
 			path: ../../htdocs/public/test/test_arrays.php
 
-		-
-			message: '#^Variable \$conf might not be defined\.$#'
-			identifier: variable.undefined
-			count: 3
-			path: ../../htdocs/public/test/test_badges.php
-
-		-
-			message: '#^Variable \$dolibarr_main_prod might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../htdocs/public/test/test_badges.php
-
-		-
-			message: '#^Parameter \#7 \$params of function dolGetButtonAction expects array\{confirm\?\: array\{url\?\: string, title\?\: string, content\?\: string, action\-btn\-label\?\: string, cancel\-btn\-label\?\: string, modal\?\: bool\}, attr\?\: array\<string, mixed\>, areDropdownButtons\?\: bool, backtopage\?\: string, lang\?\: string, enabled\?\: bool, perm\?\: int\<0, 1\>, label\?\: string, \.\.\.\}, array\{confirm\: true\} given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../htdocs/public/test/test_buttons.php
-
-		-
-			message: '#^Variable \$dolibarr_main_prod might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../htdocs/public/test/test_buttons.php
-
 		-
 			message: '#^Variable \$dolibarr_main_prod might not be defined\.$#'
 			identifier: variable.undefined
@@ -31920,18 +31920,6 @@ parameters:
 			count: 1
 			path: ../../htdocs/public/test/test_exec.php
 
-		-
-			message: '#^Variable \$db might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../htdocs/public/test/test_forms.php
-
-		-
-			message: '#^Variable \$dolibarr_main_prod might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../htdocs/public/test/test_forms.php
-
 		-
 			message: '#^Variable \$dolibarr_main_prod might not be defined\.$#'
 			identifier: variable.undefined
diff --git a/htdocs/core/ajax/ajaxextrafield.php b/htdocs/core/ajax/ajaxextrafield.php
index de0ea3d79a6f1..1416bbb105ab4 100644
--- a/htdocs/core/ajax/ajaxextrafield.php
+++ b/htdocs/core/ajax/ajaxextrafield.php
@@ -41,7 +41,12 @@
 
 include '../../main.inc.php';
 include_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php';
-/** @var DoliDB $db */
+/**
+ * @var Conf $conf
+ * @var DoliDB $db
+ * @var Translate $langs
+ * @var User $user
+ */
 
 // object id
 $id = GETPOST('id', 'aZ09');
@@ -97,6 +102,7 @@
 		'text' => '&nbsp;',
 	];
 }
+$i = 0;
 if (is_object($object)) {
 	$extrafields = new ExtraFields($db);
 	$extrafields->fetch_name_optionals_label($element);

From 4425f38afd42c56e904d6ed71505cae0b71d68b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 19 Nov 2024 23:25:01 +0100
Subject: [PATCH 18/29] test

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

diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index ea2723b02c0ed..3e32bd967c059 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -29,6 +29,7 @@
  * @var CommonObject $object
  * @var Conf $conf
  * @var DoliDB $db
+ * @var ExtraFields $extrafields
  * @var Form $form
  * @var Translate $langs
  * @var User $user

From af925191c9a1c395d165af9481195c6b651e3cc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 19 Nov 2024 23:37:10 +0100
Subject: [PATCH 19/29] test

---
 build/phpstan/phpstan-baseline.neon            | 18 ------------------
 htdocs/core/class/extrafields.class.php        |  2 +-
 htdocs/core/tpl/extrafields_view.tpl.php       |  2 +-
 htdocs/core/tpl/object_currency_amount.tpl.php |  5 +++++
 4 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/build/phpstan/phpstan-baseline.neon b/build/phpstan/phpstan-baseline.neon
index 3f1b83cbd4100..7f2f9c78236ba 100644
--- a/build/phpstan/phpstan-baseline.neon
+++ b/build/phpstan/phpstan-baseline.neon
@@ -17526,24 +17526,6 @@ parameters:
 			count: 2
 			path: ../../htdocs/core/tpl/list_print_total.tpl.php
 
-		-
-			message: '#^Variable \$action might not be defined\.$#'
-			identifier: variable.undefined
-			count: 5
-			path: ../../htdocs/core/tpl/object_currency_amount.tpl.php
-
-		-
-			message: '#^Variable \$object might not be defined\.$#'
-			identifier: variable.undefined
-			count: 3
-			path: ../../htdocs/core/tpl/object_currency_amount.tpl.php
-
-		-
-			message: '#^Variable \$usercancreate might not be defined\.$#'
-			identifier: variable.undefined
-			count: 4
-			path: ../../htdocs/core/tpl/object_currency_amount.tpl.php
-
 		-
 			message: '#^Left side of && is always true\.$#'
 			identifier: booleanAnd.leftAlwaysTrue
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 913c8937a7a2f..70d529ff0fa32 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -51,7 +51,7 @@ class ExtraFields
 	public $attributes = array();
 
 	/**
-	 * @var array<string,bool|int<0,1>>	Array with boolean of status of groups
+	 * @var array<string,bool|int<0,1>>|null	Array with boolean of status of groups
 	 */
 	public $expand_display;
 
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index 3e32bd967c059..fae196d797bc6 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -82,7 +82,7 @@
 
 		$enabled = 1;
 		if ($enabled && isset($extrafields->attributes[$object->table_element]['enabled'][$tmpkeyextra])) {
-			$enabled = (int) dol_eval($extrafields->attributes[$object->table_element]['enabled'][$tmpkeyextra], 1, 1, '2');
+			$enabled = (int) dol_eval((string) $extrafields->attributes[$object->table_element]['enabled'][$tmpkeyextra], 1, 1, '2');
 		}
 		if ($enabled && isset($extrafields->attributes[$object->table_element]['list'][$tmpkeyextra])) {
 			$enabled = (int) dol_eval($extrafields->attributes[$object->table_element]['list'][$tmpkeyextra], 1, 1, '2');
diff --git a/htdocs/core/tpl/object_currency_amount.tpl.php b/htdocs/core/tpl/object_currency_amount.tpl.php
index 73e7d78069f7d..88ceb97b9b9d9 100644
--- a/htdocs/core/tpl/object_currency_amount.tpl.php
+++ b/htdocs/core/tpl/object_currency_amount.tpl.php
@@ -24,8 +24,13 @@
  * $langs
  */
 /**
+ * @var CommonObject $object
+ * @var Conf $conf
  * @var Form $form
  * @var Translate $langs
+ *
+ * @var string $action
+ * @var int $usercancreate
  */
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {

From 6741eadc644cabbb5c0aab49dfd714167de35496 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 25 Nov 2024 21:47:27 +0100
Subject: [PATCH 20/29] fix with last updates

---
 htdocs/core/class/commonobject.class.php | 2 +-
 htdocs/core/tpl/extrafields_view.tpl.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index b76e51d2d171f..30f3d0739ee35 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -9426,7 +9426,7 @@ public function showOptionals($extrafields, $mode = 'view', $params = null, $key
 								if (in_array($extrafields->attributes[$this->table_element]['type'][$key], $listoftypestoshowpicto)) {
 									$out .= getPictoForType($extrafields->attributes[$this->table_element]['type'][$key], ($extrafields->attributes[$this->table_element]['type'][$key] == 'text' ? 'tdtop' : ''));
 								}
-								$out .= $extrafields->showInputField($key, $value, '', $keysuffix, '', '', $this, $this->table_element, 0, $this);
+								$out .= $extrafields->showInputField($key, $value, '', $keysuffix, '', '', $this, $this->table_element);
 								break;
 						}
 
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index fae196d797bc6..8d17be75f402a 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -257,7 +257,7 @@
 				print '<input type="hidden" name="attribute" value="'.$tmpkeyextra.'">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
 				print '<input type="hidden" name="'.$fieldid.'" value="'.$object->id.'">';
-				print $extrafields->showInputField($tmpkeyextra, $value, '', '', '', 0, $object->id, $object->table_element, 0, $object);
+				print $extrafields->showInputField($tmpkeyextra, $value, '', '', '', 0, $object, $object->table_element);
 
 				print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans('Modify')).'">';
 

From cdf71ad042c819f30bbf685255c985dca7cf917d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 25 Nov 2024 22:26:15 +0100
Subject: [PATCH 21/29] doc

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

diff --git a/htdocs/core/ajax/ajaxextrafield.php b/htdocs/core/ajax/ajaxextrafield.php
index 1416bbb105ab4..d17fbf3d0cb73 100644
--- a/htdocs/core/ajax/ajaxextrafield.php
+++ b/htdocs/core/ajax/ajaxextrafield.php
@@ -17,9 +17,9 @@
  */
 
 /**
- *      \file       htdocs/core/ajax/ajaxtooltip.php
- *      \ingroup    tooltip
- *      \brief      This script returns content of tooltip
+ *      \file       htdocs/core/ajax/ajaxextrafield.php
+ *      \ingroup    extrafield
+ *      \brief      This script returns content of extrafield
  */
 
 if (!defined('NOTOKENRENEWAL')) {

From 02937ac100f299cca97662cd750bc293c2d5ab29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 27 Nov 2024 18:25:18 +0100
Subject: [PATCH 22/29] fix phpstan

---
 build/phpstan/phpstan-baseline.neon     | 24 --------------
 htdocs/core/ajax/ajaxextrafield.php     | 42 ++++++++++++-------------
 htdocs/core/class/extrafields.class.php |  6 ++--
 3 files changed, 25 insertions(+), 47 deletions(-)

diff --git a/build/phpstan/phpstan-baseline.neon b/build/phpstan/phpstan-baseline.neon
index a4ab1b9dc0018..333dacb95402f 100644
--- a/build/phpstan/phpstan-baseline.neon
+++ b/build/phpstan/phpstan-baseline.neon
@@ -8718,30 +8718,6 @@ parameters:
 			count: 5
 			path: ../../htdocs/core/ajax/ajaxdirtree.php
 
-		-
-			message: '#^Call to function is_array\(\) with list\<string\> will always evaluate to true\.$#'
-			identifier: function.alreadyNarrowedType
-			count: 3
-			path: ../../htdocs/core/ajax/ajaxextrafield.php
-
-		-
-			message: '#^Call to function is_object\(\) with object will always evaluate to true\.$#'
-			identifier: function.alreadyNarrowedType
-			count: 2
-			path: ../../htdocs/core/ajax/ajaxextrafield.php
-
-		-
-			message: '#^Variable \$mode might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../htdocs/core/ajax/ajaxextrafield.php
-
-		-
-			message: '#^Variable \$value might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../htdocs/core/ajax/ajaxextrafield.php
-
 		-
 			message: '#^Call to function is_object\(\) with object will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
diff --git a/htdocs/core/ajax/ajaxextrafield.php b/htdocs/core/ajax/ajaxextrafield.php
index d17fbf3d0cb73..43b43fd1094da 100644
--- a/htdocs/core/ajax/ajaxextrafield.php
+++ b/htdocs/core/ajax/ajaxextrafield.php
@@ -49,25 +49,27 @@
  */
 
 // object id
-$id = GETPOST('id', 'aZ09');
+$objectid = GETPOST('objectid', 'aZ09');
 // 'module' or 'myobject@mymodule', 'mymodule_myobject'
 $objecttype = GETPOST('objecttype', 'aZ09arobase');
 $objectkey = GETPOST('objectkey', 'restricthtml');
 $search = GETPOST('search', 'restricthtml');
 $page = GETPOSTINT('page');
+$mode = GETPOSTINT('mode');
+$value = GETPOST('value', 'alphanohtml');
 $limit = 10;
 $offset = (($page - 1) * $limit);
 $element_ref = '';
-if (is_numeric($id)) {
-	$id = (int) $id;
+if (is_numeric($objectid)) {
+	$objectid = (int) $objectid;
 } else {
-	$element_ref = $id;
-	$id = 0;
+	$element_ref = $objectid;
+	$objectid = 0;
 }
 // Load object according to $element
-$object = fetchObjectByElement($id, $objecttype, $element_ref);
+$object = fetchObjectByElement($objectid, $objecttype, $element_ref);
 if (empty($object->element)) {
-	httponly_accessforbidden('Failed to get object with fetchObjectByElement(id=' . $id . ', objecttype=' . $objecttype . ')');
+	httponly_accessforbidden('Failed to get object with fetchObjectByElement(id=' . $objectid . ', objecttype=' . $objecttype . ')');
 }
 
 $module = $object->module;
@@ -103,7 +105,7 @@
 	];
 }
 $i = 0;
-if (is_object($object)) {
+if ($object instanceof CommonObject) {
 	$extrafields = new ExtraFields($db);
 	$extrafields->fetch_name_optionals_label($element);
 	$options = $extrafields->attributes[$element]['param'][$objectkey]['options'];
@@ -177,7 +179,7 @@
 
 		if (!$filter_categorie) {
 			$fields_label = explode('|', $InfoFieldList[1]);
-			if (is_array($fields_label)) {
+			if (count($fields_label) > 0) {
 				$keyList .= ', ';
 				$keyList .= implode(', ', $fields_label);
 			}
@@ -188,16 +190,14 @@
 
 			// Add filter from 4th field
 			if (!empty($InfoFieldList[4])) {
-				if (is_object($object)) {
-					$tags = [];
-					preg_match_all('/\$(.*?)\$/', $InfoFieldList[4], $tags);
-					foreach ($tags[0] as $keytag => $valuetag) {
-						$property = strtolower($tags[1][$keytag]);
-						if (strpos($InfoFieldList[4], $valuetag) !== false && property_exists($object, $property) && !empty($object->$property)) {
-							$InfoFieldList[4] = str_replace($valuetag, (string) $object->$property, $InfoFieldList[4]);
-						} else {
-							$InfoFieldList[4] = str_replace($valuetag, '0', $InfoFieldList[4]);
-						}
+				$tags = [];
+				preg_match_all('/\$(.*?)\$/', $InfoFieldList[4], $tags);
+				foreach ($tags[0] as $keytag => $valuetag) {
+					$property = strtolower($tags[1][$keytag]);
+					if (strpos($InfoFieldList[4], $valuetag) !== false && property_exists($object, $property) && !empty($object->$property)) {
+						$InfoFieldList[4] = str_replace($valuetag, (string) $object->$property, $InfoFieldList[4]);
+					} else {
+						$InfoFieldList[4] = str_replace($valuetag, '0', $InfoFieldList[4]);
 					}
 				}
 				// can use current entity filter
@@ -245,7 +245,7 @@
 			$sql .= $sqlwhere;
 			$orderfields = explode('|', $InfoFieldList[1]);
 			$keyList = $InfoFieldList[1];
-			if (is_array($orderfields)) {
+			if (count($orderfields)) {
 				$keyList = implode(', ', $orderfields);
 			}
 			$sql .= $db->order($keyList);
@@ -265,7 +265,7 @@
 					// Several field into label (eq table:code|label:rowid)
 					$notrans = false;
 					$fields_label = explode('|', $InfoFieldList[1]);
-					if (is_array($fields_label) && count($fields_label) > 1) {
+					if (count($fields_label) > 1) {
 						$notrans = true;
 						foreach ($fields_label as $field_toshow) {
 							$labeltoshow .= $obj->$field_toshow . ' ';
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index ee4e149f9edf6..2953a6aba341e 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1376,8 +1376,10 @@ public function showInputField($key, $value, $moreparam = '', $keysuffix = '', $
 										search: params.term,
 										page: params.page || 1,
 										objecttype: '".$extrafieldsobjectkey."',
-										id: '".$object->id."',
-										objectkey: '".$key."'
+										objectid: '".$object->id."',
+										objectkey: '".$key."',
+										mode: '".$mode."',
+										value: '".$value."'
 									}
 									return query;
 								}

From 365873a48d4ed8a685005e04a9147dd550e2145b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 27 Nov 2024 18:53:43 +0100
Subject: [PATCH 23/29] fix

---
 htdocs/core/class/commonobject.class.php |  2 +-
 htdocs/core/lib/functions.lib.php        | 13 ++++-
 htdocs/public/payment/newpayment.php     | 72 ++++++++++++------------
 3 files changed, 47 insertions(+), 40 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 3fbc64df5b576..30f3d0739ee35 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -177,7 +177,7 @@ abstract class CommonObject
 	private $linkedObjectsFullLoaded = array();
 
 	/**
-	 * @var ?mixed		To store a cloned copy of the object before editing it (to keep track of its former properties)
+	 * @var ?static		To store a cloned copy of the object before editing it (to keep track of its former properties)
 	 */
 	public $oldcopy;
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 275614c37a053..b65b36547aa26 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1543,14 +1543,21 @@ function dol_get_object_properties($obj, $properties = [])
 
 
 /**
- *	Create a clone of instance of object (new instance with same value for each properties)
+ *  Create a clone of instance of object (new instance with same value for each properties)
  *  With native = 0: Property that are references are different memory area in the new object (full isolation clone). This means $this->object of new object may not be valid (except this->db that is voluntarly kept).
  *  With native = 1: Use PHP clone. Property that are reference are same pointer. This means $this->db of new object is still valid but point to same this->db than original object.
  *  With native = 2: Property that are reference are different memory area in the new object (full isolation clone). Only scalar and array values are cloned. This means method are not availables and $this->db of new object is not valid.
  *
- * 	@param	T		          $object		Object to clone
+ *  @phpstan-template T
+ *  @phan-template T of CommonObject
+ *
+ *  @param	CommonObject      $object		Object to clone
+ *  @phpstan-param T $object
+ *  @phan-param T $object
  *  @param	int		          $native		0=Full isolation method, 1=Native PHP method, 2=Full isolation method keeping only scalar and array properties (recommended)
- *	@return T                				Clone object
+ *  @return CommonObject                	Clone object
+ *  @phpstan-return T
+ *  @phan-return T  // Seems useful
  *  @see https://php.net/manual/language.oop5.cloning.php
  *  @phan-suppress PhanTypeExpectedObjectPropAccess
  */
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index aef2adf13efc0..275b4f6bb27d8 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -1707,7 +1707,7 @@
 	}
 	// - If a new amount was posted from the form
 	if ($caneditamount && GETPOSTISSET('newamount') && GETPOSTFLOAT('newamount', 'MT') > 0) {
-	    $amount = GETPOSTFLOAT('newamount', 'MT');
+		$amount = GETPOSTFLOAT('newamount', 'MT');
 	}
 	// - If a min is set or an amount from the posted form, we take them into account
 	$amount = max(0, (float) $amount, (float) getDolGlobalInt("MEMBER_MIN_AMOUNT"));
@@ -2182,7 +2182,7 @@
 							});
 							$("#dopayment_paybox").click(function(e){
 								$("#div_dopayment_paybox").css( \'cursor\', \'wait\' );
-							    e.stopPropagation();
+								e.stopPropagation();
 							});
 						});
 					  </script>
@@ -2212,7 +2212,7 @@
 								});
 								$("#dopayment_stripe").click(function(e){
 									$("#div_dopayment_stripe").css( \'cursor\', \'wait\' );
-								    e.stopPropagation();
+									e.stopPropagation();
 									return true;
 								});
 							});
@@ -2254,7 +2254,7 @@
 								});
 								$("#dopayment_paypal").click(function(e){
 									$("#div_dopayment_paypal").css( \'cursor\', \'wait\' );
-								    e.stopPropagation();
+									e.stopPropagation();
 									return true;
 								});
 							});
@@ -2296,32 +2296,32 @@
 	if (GETPOST('dopayment_stripe', 'alpha')) {
 		// Personalized checkout
 		print '<style>
-	    /**
-	     * The CSS shown here will not be introduced in the Quickstart guide, but shows
-	     * how you can use CSS to style your Element s container.
-	     */
-	    .StripeElement {
-	        background-color: white;
-	        padding: 8px 12px;
-	        border-radius: 4px;
-	        border: 1px solid transparent;
-	        box-shadow: 0 1px 3px 0 #e6ebf1;
-	        -webkit-transition: box-shadow 150ms ease;
-	        transition: box-shadow 150ms ease;
-	    }
-
-	    .StripeElement--focus {
-	        box-shadow: 0 1px 3px 0 #cfd7df;
-	    }
-
-	    .StripeElement--invalid {
-	        border-color: #fa755a;
-	    }
-
-	    .StripeElement--webkit-autofill {
-	        background-color: #fefde5 !important;
-	    }
-	    </style>';
+		/**
+		 * The CSS shown here will not be introduced in the Quickstart guide, but shows
+		 * how you can use CSS to style your Element s container.
+		 */
+		.StripeElement {
+			background-color: white;
+			padding: 8px 12px;
+			border-radius: 4px;
+			border: 1px solid transparent;
+			box-shadow: 0 1px 3px 0 #e6ebf1;
+			-webkit-transition: box-shadow 150ms ease;
+			transition: box-shadow 150ms ease;
+		}
+
+		.StripeElement--focus {
+			box-shadow: 0 1px 3px 0 #cfd7df;
+		}
+
+		.StripeElement--invalid {
+			border-color: #fa755a;
+		}
+
+		.StripeElement--webkit-autofill {
+			background-color: #fefde5 !important;
+		}
+		</style>';
 
 		//print '<br>';
 
@@ -2380,8 +2380,8 @@
 		// $conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = 2 = use payment object (suggest both card payment mode but also sepa, ...)
 
 		print '
-        <table id="dolpaymenttable" summary="Payment form" class="center centpercent">
-        <tbody><tr><td class="textpublicpayment">';
+		<table id="dolpaymenttable" summary="Payment form" class="center centpercent">
+		<tbody><tr><td class="textpublicpayment">';
 
 		if (getDolGlobalString('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION')) {
 			print '<div id="payment-request-button"><!-- A Stripe Element will be inserted here. --></div>';
@@ -2395,8 +2395,8 @@
 
 		if (getDolGlobalInt('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION') == 1) {
 			print '<div id="card-element">
-	        <!-- a Stripe Element will be inserted here. -->
-    	    </div>';
+			<!-- a Stripe Element will be inserted here. -->
+			</div>';
 		}
 		if (getDolGlobalInt('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION') == 2) {
 			print '<div id="payment-element">
@@ -2405,8 +2405,8 @@
 		}
 
 		print '<!-- Used to display form errors -->
-        <div id="card-errors" role="alert"></div>
-        </div>';
+		<div id="card-errors" role="alert"></div>
+		</div>';
 
 		print '<br>';
 		print '<button class="button buttonpayment" style="text-align: center; padding-left: 0; padding-right: 0;" id="buttontopay" data-secret="'.(is_object($paymentintent) ? $paymentintent->client_secret : '').'">'.$langs->trans("ValidatePayment").'</button>';

From 07eab5003dec5552d9595598d5e0066e461878c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 27 Nov 2024 18:54:25 +0100
Subject: [PATCH 24/29] fix

---
 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 db077fa32a55c..475c580400ffb 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -308,7 +308,7 @@
 llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'bodyforlist');
 
 // Define list of all external calendars
-// $listofextcals = array(); Not used yet in lists 
+// $listofextcals = array(); Not used yet in lists
 
 $param = '';
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {

From da8ac805885e5d157140a9ad93c5db07e1788fef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 27 Nov 2024 18:59:23 +0100
Subject: [PATCH 25/29] fix merge

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 7d8c6b1b52fbe..b65b36547aa26 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1548,18 +1548,12 @@ function dol_get_object_properties($obj, $properties = [])
  *  With native = 1: Use PHP clone. Property that are reference are same pointer. This means $this->db of new object is still valid but point to same this->db than original object.
  *  With native = 2: Property that are reference are different memory area in the new object (full isolation clone). Only scalar and array values are cloned. This means method are not availables and $this->db of new object is not valid.
  *
-<<<<<<< HEAD
  *  @phpstan-template T
  *  @phan-template T of CommonObject
  *
  *  @param	CommonObject      $object		Object to clone
  *  @phpstan-param T $object
  *  @phan-param T $object
-=======
- *  @template T
- *
- * 	@param	T		          $object		Object to clone
->>>>>>> upstream/develop
  *  @param	int		          $native		0=Full isolation method, 1=Native PHP method, 2=Full isolation method keeping only scalar and array properties (recommended)
  *  @return CommonObject                	Clone object
  *  @phpstan-return T

From 4c97950f2a0348ddc938090e37e5818f2d8685c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 27 Nov 2024 20:10:41 +0100
Subject: [PATCH 26/29] fix

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 30f3d0739ee35..7fca337ee5b9a 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -177,7 +177,7 @@ abstract class CommonObject
 	private $linkedObjectsFullLoaded = array();
 
 	/**
-	 * @var ?static		To store a cloned copy of the object before editing it (to keep track of its former properties)
+	 * @var static		To store a cloned copy of the object before editing it (to keep track of its former properties)
 	 */
 	public $oldcopy;
 

From 076ae6a3c282b61bb2d27b2e2a0e974ac63b6d78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 27 Nov 2024 20:20:41 +0100
Subject: [PATCH 27/29] fix

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 7fca337ee5b9a..9176a70ede7fb 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -177,7 +177,7 @@ abstract class CommonObject
 	private $linkedObjectsFullLoaded = array();
 
 	/**
-	 * @var static		To store a cloned copy of the object before editing it (to keep track of its former properties)
+	 * @var static|null		To store a cloned copy of the object before editing it (to keep track of its former properties)
 	 */
 	public $oldcopy;
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index b65b36547aa26..4ab0c8a3a1afb 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1548,16 +1548,12 @@ function dol_get_object_properties($obj, $properties = [])
  *  With native = 1: Use PHP clone. Property that are reference are same pointer. This means $this->db of new object is still valid but point to same this->db than original object.
  *  With native = 2: Property that are reference are different memory area in the new object (full isolation clone). Only scalar and array values are cloned. This means method are not availables and $this->db of new object is not valid.
  *
- *  @phpstan-template T
- *  @phan-template T of CommonObject
+ *  @template T
  *
- *  @param	CommonObject      $object		Object to clone
- *  @phpstan-param T $object
- *  @phan-param T $object
+ *  @param	T      $object		Object to clone
  *  @param	int		          $native		0=Full isolation method, 1=Native PHP method, 2=Full isolation method keeping only scalar and array properties (recommended)
- *  @return CommonObject                	Clone object
- *  @phpstan-return T
- *  @phan-return T  // Seems useful
+ *  @return T                	Clone object
+ *
  *  @see https://php.net/manual/language.oop5.cloning.php
  *  @phan-suppress PhanTypeExpectedObjectPropAccess
  */

From a45494099fb27943651364d81cc7d3e579f7fbdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sun, 8 Dec 2024 09:29:38 +0100
Subject: [PATCH 28/29] wip

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

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 2953a6aba341e..6633aa9c7b876 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1546,7 +1546,7 @@ public function showInputField($key, $value, $moreparam = '', $keysuffix = '', $
 
 						$sql .= $this->db->order(implode(', ', $fields_label));
 						$sql .= ' LIMIT ' . getDolGlobalInt('MAIN_EXTRAFIELDS_LIMIT_SELLIST_SQL', 1000);
-						// print $sql;
+						//print $sql;
 
 						dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);
 						$resql = $this->db->query($sql);

From 2e18d20a3b9bb4a7caafa0a7c154a81889265a3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sun, 8 Dec 2024 09:36:11 +0100
Subject: [PATCH 29/29] wip

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

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 6633aa9c7b876..b9a46a4ba3a92 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1527,16 +1527,16 @@ public function showInputField($key, $value, $moreparam = '', $keysuffix = '', $
 
 						// Add Usf filter on second line
 						/*
-						if ($Usf) {
-						$errorstr = '';
-						$sqlusf .= forgeSQLFromUniversalSearchCriteria($Usf, $errorstr);
-						if (!$errorstr) {
-						$sqlwhere .= $sqlusf;
-						} else {
-						$sqlwhere .= " AND invalid_usf_filter_of_extrafield";
-						}
-						}
-						*/
+						 if ($Usf) {
+						 $errorstr = '';
+						 $sqlusf .= forgeSQLFromUniversalSearchCriteria($Usf, $errorstr);
+						 if (!$errorstr) {
+						 $sqlwhere .= $sqlusf;
+						 } else {
+						 $sqlwhere .= " AND invalid_usf_filter_of_extrafield";
+						 }
+						 }
+						 */
 
 						// Some tables may have field, some other not. For the moment we disable it.
 						if (in_array($InfoFieldList[0], array('tablewithentity'))) {