lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0

Browse Source
This commit is contained in:
Laurent Destailleur 2021-03-04 15:34:44 +01:00
commit 98eb0fc969
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/class/html.formticket.class.php
View File

@ -2,6 +2,7 @@
/* Copyright (C) 2013-2015 Jean-François FERRY <hello@librethic.io> /* Copyright (C) 2013-2015 Jean-François FERRY <hello@librethic.io>
* Copyright (C) 2016 Christophe Battarel <christophe@altairis.fr> * Copyright (C) 2016 Christophe Battarel <christophe@altairis.fr>
* Copyright (C) 2019 Frédéric France <frederic.france@netlogic.fr> * Copyright (C) 2019 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2021 Juanjo Menent <jmenent@2byte.es>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -503,7 +504,7 @@ class FormTicket
print ' selected="selected"'; print ' selected="selected"';
} elseif ($selected == $id) { } elseif ($selected == $id) {
print ' selected="selected"'; print ' selected="selected"';
} elseif ($arraytypes['use_default'] == "1" && !$empty) { } elseif ($arraytypes['use_default'] == "1" && !$selected && !$empty) {
print ' selected="selected"'; print ' selected="selected"';
} }
@ -598,7 +599,7 @@ class FormTicket
print ' selected="selected"'; print ' selected="selected"';
} elseif ($selected == $id) { } elseif ($selected == $id) {
print ' selected="selected"'; print ' selected="selected"';
} elseif ($arraycategories['use_default'] == "1" && !$empty) { } elseif ($arraycategories['use_default'] == "1" && !$selected && !$empty) {
print ' selected="selected"'; print ' selected="selected"';
} }
@ -699,7 +700,7 @@ class FormTicket
print ' selected="selected"'; print ' selected="selected"';
} elseif ($selected == $id) { } elseif ($selected == $id) {
print ' selected="selected"'; print ' selected="selected"';
} elseif ($arrayseverities['use_default'] == "1" && !$empty) { } elseif ($arrayseverities['use_default'] == "1" && !$selected && !$empty) {
print ' selected="selected"'; print ' selected="selected"';
} }

2
htdocs/ticket/list.php
View File

@ -362,7 +362,7 @@ foreach ($search as $key => $val)
} }
if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all); if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
if ($search_societe) $sql .= natural_search('s.nom', $search_societe); 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_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_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)."'"; if ($search_dateread_start) $sql .= " AND t.date_read >= '".$db->idate($search_dateread_start)."'";