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

Fix: no formatting when storing into memory. Formatting when forging sql

Browse Source
This commit is contained in:
Laurent Destailleur 2020-10-08 20:03:16 +02:00 committed by GitHub
parent f4c3d9d7bb
commit fbd9229f9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/holiday/view_log.php
View File

@ -164,14 +164,14 @@ $sqlwhere = '';
if (!empty($search_year) && $search_year > 0) { if (!empty($search_year) && $search_year > 0) {
if (!empty($search_month) && $search_month > 0) { if (!empty($search_month) && $search_month > 0) {
$from_date = $db->idate(dol_get_first_day($search_year, $search_month, 1)); $from_date = dol_get_first_day($search_year, $search_month, 1);
$to_date = $db->idate(dol_get_last_day($search_year, $search_month, 1)); $to_date = dol_get_last_day($search_year, $search_month, 1);
} else { } else {
$from_date = $db->idate(dol_get_first_day($search_year, 1, 1)); $from_date = dol_get_first_day($search_year, 1, 1);
$to_date = $db->idate(dol_get_last_day($search_year, 12, 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); if (!empty($search_id) && $search_id > 0) $sqlwhere.= natural_search('rowid', $search_id, 1);