From 602da43195f7763a8f2b6aada9055c29f5743580 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 25 Mar 2021 01:03:18 +0100 Subject: [PATCH] Fix filters --- htdocs/ticket/list.php | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php index 4137680b0f7..0c726db3f62 100644 --- a/htdocs/ticket/list.php +++ b/htdocs/ticket/list.php @@ -608,30 +608,50 @@ if ($optioncss != '') { } // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; -if ($socid) { +if ($socid > 0) { $param .= '&socid='.urlencode($socid); } -if ($projectid) { +if ($search_societe) { + $param .= '&search_societe='.urlencode($search_societe); +} +if ($projectid > 0) { $param .= '&projectid='.urlencode($projectid); } - if ($search_date_start) { - $param .= '&search_date_start='.urlencode($search_date_start); + $tmparray = dol_getdate($search_date_start); + $param .= '&search_date_startday='.urlencode($tmparray['mday']); + $param .= '&search_date_startmonth='.urlencode($tmparray['mon']); + $param .= '&search_date_startyear='.urlencode($tmparray['year']); } if ($search_date_end) { - $param .= '&search_date_end='.urlencode($search_date_end); + $tmparray = dol_getdate($search_date_end); + $param .= '&search_date_endday='.urlencode($tmparray['mday']); + $param .= '&search_date_endmonth='.urlencode($tmparray['mon']); + $param .= '&search_date_endyear='.urlencode($tmparray['year']); } if ($search_dateread_start) { - $param .= '&search_dateread_start='.urlencode($search_dateread_start); + $tmparray = dol_getdate($search_dateread_start); + $param .= '&search_dateread_startday='.urlencode($tmparray['mday']); + $param .= '&search_dateread_startmonth='.urlencode($tmparray['mon']); + $param .= '&search_dateread_startyear='.urlencode($tmparray['year']); } if ($search_dateread_end) { - $param .= '&search_dateread_end='.urlencode($search_dateread_end); + $tmparray = dol_getdate($search_dateread_end); + $param .= '&search_dateread_endday='.urlencode($tmparray['mday']); + $param .= '&search_dateread_endmonth='.urlencode($tmparray['mon']); + $param .= '&search_dateread_endyear='.urlencode($tmparray['year']); } if ($search_dateclose_start) { - $param .= '&search_dateclose_start='.urlencode($search_dateclose_start); + $tmparray = dol_getdate($search_dateclose_start); + $param .= '&search_dateclose_startday='.urlencode($tmparray['mday']); + $param .= '&search_dateclose_startmonth='.urlencode($tmparray['mon']); + $param .= '&search_dateclose_startyear='.urlencode($tmparray['year']); } if ($search_dateclose_end) { - $param .= '&search_dateclose_end='.urlencode($search_dateclose_end); + $tmparray = dol_getdate($search_dateclose_end); + $param .= '&search_date_endday='.urlencode($tmparray['mday']); + $param .= '&search_date_endmonth='.urlencode($tmparray['mon']); + $param .= '&search_date_endyear='.urlencode($tmparray['year']); } // List of mass actions available