Index: branches/5.3.x/units/reports/reports_tag_processor.php =================================================================== diff -u -r15695 -r15925 --- branches/5.3.x/units/reports/reports_tag_processor.php (.../reports_tag_processor.php) (revision 15695) +++ branches/5.3.x/units/reports/reports_tag_processor.php (.../reports_tag_processor.php) (revision 15925) @@ -1,6 +1,6 @@ Conn->GetRow($sql); - $a_report_options['from'] = adodb_mktime(0, 0, 0, date('m', $a_dates['date_frm']), date('d', $a_dates['date_frm']), date('Y', $a_dates['date_frm'])); - $a_report_options['to'] = adodb_mktime(0, 0, 0, date('m', $a_dates['date_to']), date('d', $a_dates['date_to']) + 1, date('Y', $a_dates['date_to'])) - 1; + $a_report_options['from'] = mktime(0, 0, 0, date('m', $a_dates['date_frm']), date('d', $a_dates['date_frm']), date('Y', $a_dates['date_frm'])); + $a_report_options['to'] = mktime(0, 0, 0, date('m', $a_dates['date_to']), date('d', $a_dates['date_to']) + 1, date('Y', $a_dates['date_to'])) - 1; } $filter_value = 'AND o.OrderDate >= '.$a_report_options['from'].' AND o.OrderDate <= '.$a_report_options['to']; @@ -157,13 +157,13 @@ $start_month = date('m', $a_report_options['from']); $end_month_year = date('Ym', $a_report_options['to']); // big interval - move from date to the first day ot the month - $a_report_options['from'] = adodb_mktime(0, 0, 0, date('m', $a_report_options['from']), 1, date('Y', $a_report_options['from'])); + $a_report_options['from'] = mktime(0, 0, 0, date('m', $a_report_options['from']), 1, date('Y', $a_report_options['from'])); $curr_time = $a_report_options['from']; while (date('Ym', $curr_time) <= $end_month_year) { $step_labels[date('Ym', $curr_time)] = date('M-Y', $curr_time); // add month - $curr_time = adodb_mktime(0,0,0, date('m', $curr_time) + 1, 1, date('Y', $curr_time)); + $curr_time = mktime(0,0,0, date('m', $curr_time) + 1, 1, date('Y', $curr_time)); } $step_seconds = 0; }