diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index d7cf03c41e0..2bd674e1c99 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -2,6 +2,7 @@
/* Copyright (C) 2013-2015 Jean-François FERRY
* Copyright (C) 2016 Christophe Battarel
* Copyright (C) 2019 Frédéric France
+ * Copyright (C) 2021 Juanjo Menent
*
* 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
@@ -503,7 +504,7 @@ class FormTicket
print ' selected="selected"';
} elseif ($selected == $id) {
print ' selected="selected"';
- } elseif ($arraytypes['use_default'] == "1" && !$empty) {
+ } elseif ($arraytypes['use_default'] == "1" && !$selected && !$empty) {
print ' selected="selected"';
}
@@ -598,7 +599,7 @@ class FormTicket
print ' selected="selected"';
} elseif ($selected == $id) {
print ' selected="selected"';
- } elseif ($arraycategories['use_default'] == "1" && !$empty) {
+ } elseif ($arraycategories['use_default'] == "1" && !$selected && !$empty) {
print ' selected="selected"';
}
@@ -699,7 +700,7 @@ class FormTicket
print ' selected="selected"';
} elseif ($selected == $id) {
print ' selected="selected"';
- } elseif ($arrayseverities['use_default'] == "1" && !$empty) {
+ } elseif ($arrayseverities['use_default'] == "1" && !$selected && !$empty) {
print ' selected="selected"';
}
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index e9b36a2d364..91cefc88d42 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -362,7 +362,7 @@ foreach ($search as $key => $val)
}
if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
if ($search_societe) $sql .= natural_search('s.nom', $search_societe);
-if ($search_fk_project) $sql .= natural_search('fk_project', $search_fk_project, 2);
+if ($search_fk_project > 0) $sql .= natural_search('fk_project', $search_fk_project, 2);
if ($search_date_start) $sql .= " AND t.datec >= '".$db->idate($search_date_start)."'";
if ($search_date_end) $sql .= " AND t.datec <= '".$db->idate($search_date_end)."'";
if ($search_dateread_start) $sql .= " AND t.date_read >= '".$db->idate($search_dateread_start)."'";