diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index d8187d491f..1f0a039f6e 100755 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -112,7 +112,6 @@ function reporting_make_reporting_data($report = null, $id_report, $contents = db_get_all_rows_field_filter ('treport_content', 'id_report', $id_report, db_escape_key_identifier('order')); } - $datetime = strtotime($date . ' ' . $time); $report["datetime"] = $datetime; $report["group"] = $report['id_group']; @@ -3694,7 +3693,6 @@ function reporting_availability($report, $content) { else { $items = $content['subitems']; } - diff --git a/pandora_console/include/functions_reports.php b/pandora_console/include/functions_reports.php index 42c93c6866..d4f7b9d7e8 100755 --- a/pandora_console/include/functions_reports.php +++ b/pandora_console/include/functions_reports.php @@ -534,11 +534,11 @@ function reports_get_report_types ($template = false, $not_editor = false) { $types['SLA'] = array('optgroup' => __('SLA'), 'name' => __('S.L.A.')); - if (!$template && $config['enterprise_installed']) { + if ($config['enterprise_installed']) { $types['SLA_monthly'] = array('optgroup' => __('SLA'), 'name' => __('Monthly S.L.A.')); - - if (!$config['metaconsole']) { + + if (!$config['metaconsole'] && !$template) { $types['SLA_services'] = array('optgroup' => __('SLA'), 'name' => __('Services S.L.A.')); }