Merge branch '20.0_cdcconseil' of github.com:ATM-Consulting/dolibarr …

…into FIX/131/DA025748_SELECT_INACTIVE_USERS

ChangeLog_cdcconseil

@@ -1,5 +1,6 @@
+- FIX/SUPPORT/DA025922/SetSpecialCharacter because the character '<' was not set into the whitelist  of special character which causes an issue when you try to fetch this type of extrafields - *30/12/2024*
 - FIX/SUPPORT/DA025748/SELECT_INACTIVE_USERS - *19/12/2024*
+- FIX/SUPPORT/DA025737/HIDDEN_DROPDOWN - *19/12/2024*
 - FIX/SUPPORT/DA025871/FiltreEvalListe - **16/12/2024**
 - FIX/SUPPORT/DA025787/HRM_closed_job_position_on_application - *04/12/2024*
 - FIX/SUPPORT/DA025778/Missing_trigger_on_situation_invoice for demat4dolibarr Easya - *03/12/2024*
-

htdocs/core/lib/functions.lib.php

@@ -10308,7 +10308,7 @@ function dol_eval($s, $returnvalue = 1, $hideerrors = 1, $onlysimplestring = '1'
 			// We must accept with 2: (($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : "Parent project not found"
 
 			// Check if there is dynamic call (first we check chars are all into use a whitelist chars)
-			$specialcharsallowed = '^$_+-.*>&|=!?():"\',/@';
+			$specialcharsallowed = '^$_+-.*><&|=!?():"\',/@';
 			if ($onlysimplestring == '2') {
 				$specialcharsallowed .= '[]';
 			}

htdocs/projet/element.php

@@ -1287,11 +1287,13 @@
 				}
 				print "</td>\n";
 
+				// BACKPORT STD #32102
 				// Ref
-				print '<td class="left nowraponall tdoverflowmax250">';
+				print '<td class="left nowraponall">';
 				if ($tablename == 'expensereport_det') {
 					print $expensereport->getNomUrl(1);
 				} else {
+					print '<table><tr><td style="border-bottom: none;">';
 					// Show ref with link
 					if ($element instanceof Task) {
 						print $element->getNomUrl(1, 'withproject', 'time');
@@ -1327,6 +1329,10 @@
 					}
 					print '</div>';
 
+					print '</td>';
+
+					print '<td class="tdoverflowmax250" style="border-bottom: none;">';
+
 					// Show supplier ref
 					if (!empty($element->ref_supplier)) {
 						print ' - '.$element->ref_supplier;
@@ -1339,8 +1345,12 @@
 					if (empty($element->ref_customer) && !empty($element->ref_client)) {
 						print ' - '.$element->ref_client;
 					}
+
+					print '</td></tr></table>';
 				}
 				print "</td>\n";
+				// END BACKPORT STD
+
 				// Product and qty on stock movement
 				if ('MouvementStock' == $classname) {
 					$mvsProd = new Product($element->db);