Merge branch '17.0' of [email protected]:Dolibarr/dolibarr.git into 18.0

Dolibarr · Dec 2, 2024 · c547362 · c547362
2 parents 4962dd1 + 9ec4575
commit c547362
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
@@ -43,7 +43,7 @@
 
 $usersignature = $user->signature;
 // For action = test or send, we ensure that content is not html, even for signature, because for this we want a test with NO html.
-if ($action == 'test' || ($action == 'send' && $trackid = 'test')) {
+if ($action == 'test' || ($action == 'send' && $trackid == 'test')) {
 	$usersignature = dol_string_nohtmltag($usersignature, 2);
 }
 

diff --git a/htdocs/core/tpl/extrafields_list_search_param.tpl.php b/htdocs/core/tpl/extrafields_list_search_param.tpl.php
@@ -37,6 +37,16 @@
 					$param .= '&'.$search_options_pattern.$tmpkey.'[]='.urlencode($val2);
 				}
 			} else {
+				// test if we have checkbox type, we add the _multiselect needed into param
+				$tmpkey = preg_replace('/'.$search_options_pattern.'/', '', $key);
+				if (in_array($extrafields->attributes[$extrafieldsobjectkey]['type'][$tmpkey], array('checkbox', 'chkbxlst'))) {
+					$param .= '&'.$search_options_pattern.$tmpkey.'_multiselect='.urlencode($val);
+				}
+				// test if we have boolean type, we add the _booleand needed into param
+				if (in_array($extrafields->attributes[$extrafieldsobjectkey]['type'][$tmpkey], array('boolean'))) {
+					$param .= '&'.$search_options_pattern.$tmpkey.'_boolean='.urlencode($val);
+				}
+
 				$param .= '&'.$search_options_pattern.$tmpkey.'='.urlencode($val);
 			}
 		}