From 337fa2ac67064853c6a070d5f43def2def0c88cd Mon Sep 17 00:00:00 2001
From: Eric <1468823+rycks@users.noreply.github.com>
Date: Fri, 17 Nov 2023 03:44:15 +0100
Subject: [PATCH 1/2] add category map to categorie (#26649)

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 633ce04a1eb..34b84dc24af 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -212,7 +212,8 @@ function isModEnabled($module)
 	$arrayconv = array(
 		'project' => 'projet',
 		'contract' => 'contrat',
-		'bank' => 'banque'
+		'bank' => 'banque',
+		'category' => 'categorie'
 	);
 	if (empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) {
 		$arrayconv['supplier_order'] = 'fournisseur';

From dd0b78fb555798c8e4125e5a839af46ab998d54c Mon Sep 17 00:00:00 2001
From: HENRY Florian <florian.henry@open-concept.pro>
Date: Fri, 17 Nov 2023 11:45:37 +0100
Subject: [PATCH 2/2] fix: keep filter on type code : dol_escape_htmltag an
 array is not possible (#26639)

* fix: filter type code on ticket list

* fix: keep filter on type code : dol_escape_htmltag an array is not possible
---
 htdocs/ticket/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 17338093ed6..763df3df2fe 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -851,7 +851,7 @@ foreach ($object->fields as $key => $val) {
 			print '</td>';
 		} elseif ($key == 'type_code') {
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-			$formTicket->selectTypesTickets(dol_escape_htmltag(empty($search[$key]) ? '' : $search[$key]), 'search_'.$key, '', 2, 1, 1, 0, (!empty($val['css']) ? $val['css'] : 'maxwidth150'), 1);
+			$formTicket->selectTypesTickets(empty($search[$key]) ? '' : $search[$key], 'search_'.$key, '', 2, 1, 1, 0, (!empty($val['css']) ? $val['css'] : 'maxwidth150'), 1);
 			print '</td>';
 		} elseif ($key == 'category_code') {
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';