From b01dbdb3a2b0acef1c40dec34b03a6919bdab968 Mon Sep 17 00:00:00 2001 From: javieralapps4up Date: Tue, 6 Sep 2022 15:25:25 +0200 Subject: [PATCH] Update myobject_list.php --- htdocs/modulebuilder/template/myobject_list.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php index 87ecc59d33c..3f24016ffe6 100644 --- a/htdocs/modulebuilder/template/myobject_list.php +++ b/htdocs/modulebuilder/template/myobject_list.php @@ -147,13 +147,9 @@ foreach ($object->fields as $key => $val) { if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) { if (empty(GETPOST('search_'.$key.'_dtstart', 'int'))) { $search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int')); - } else { - $search[$key.'_dtstart'] = GETPOST('search_'.$key.'_dtstart', 'int'); } if (empty(GETPOST('search_'.$key.'_dtend', 'int'))) { $search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int')); - } else { - $search[$key.'_dtend'] = GETPOST('search_'.$key.'_dtend', 'int'); } } } @@ -465,6 +461,14 @@ foreach ($search as $key => $val) { $param .= '&search_'.$key.'[]='.urlencode($skey); } } + } elseif (preg_match('/dtstart/', $key) && !empty($val)) { + $param .= '&search'.$key.'month='.urlencode(GETPOST('search_'.$key.'month', 'int')); + $param .= '&search_'.$key.'day='.urlencode(GETPOST('search_'.$key.'day', 'int')); + $param .= '&search_'.$key.'year='.urlencode(GETPOST('search_'.$key.'year', 'int')); + } elseif (preg_match('/dtend/', $key) && !empty($val)) { + $param .= '&search'.$key.'month='.urlencode(GETPOST('search_'.$key.'month', 'int')); + $param .= '&search_'.$key.'day='.urlencode(GETPOST('search_'.$key.'day', 'int')); + $param .= '&search_'.$key.'year='.urlencode(GETPOST('search_'.$key.'year', 'int')); } elseif ($search[$key] != '') { $param .= '&search_'.$key.'='.urlencode($search[$key]); }