From fbd9229f9b28c400368731a16f342f83c242e718 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 8 Oct 2020 20:03:16 +0200 Subject: [PATCH] Fix: no formatting when storing into memory. Formatting when forging sql --- htdocs/holiday/view_log.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php index 862f8c33b70..7043f436e87 100644 --- a/htdocs/holiday/view_log.php +++ b/htdocs/holiday/view_log.php @@ -164,14 +164,14 @@ $sqlwhere = ''; if (!empty($search_year) && $search_year > 0) { if (!empty($search_month) && $search_month > 0) { - $from_date = $db->idate(dol_get_first_day($search_year, $search_month, 1)); - $to_date = $db->idate(dol_get_last_day($search_year, $search_month, 1)); + $from_date = dol_get_first_day($search_year, $search_month, 1); + $to_date = dol_get_last_day($search_year, $search_month, 1); } else { - $from_date = $db->idate(dol_get_first_day($search_year, 1, 1)); - $to_date = $db->idate(dol_get_last_day($search_year, 12, 1)); + $from_date = dol_get_first_day($search_year, 1, 1); + $to_date = dol_get_last_day($search_year, 12, 1); } - $sqlwhere .= "AND date_action BETWEEN '".$from_date."' AND '".$to_date."'"; + $sqlwhere .= "AND date_action BETWEEN '".$db->idate($from_date)."' AND '".$db->idate($to_date)."'"; } if (!empty($search_id) && $search_id > 0) $sqlwhere.= natural_search('rowid', $search_id, 1);