diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index d258fe3ffd..4c774747ff 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -132,6 +132,10 @@ class ReportController extends Controller case 'audit': // always default return $this->auditReport($start, $end, $accounts); + case 'meta-history': + // always default + return $this->metaHistoryReport($start, $end, $accounts); + break; } diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 3535a1b24f..6012ffe926 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -656,6 +656,8 @@ return [ 'report_type' => 'Report type', 'report_type_default' => 'Default financial report', 'report_type_audit' => 'Transaction history overview (audit)', + 'report_type_meta-history' => 'Categories, budgets and bills overview', + 'more_info_help' => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.', 'report_included_accounts' => 'Included accounts', 'report_date_range' => 'Date range', 'report_include_help' => 'In all cases, transfers to shared accounts count as expenses, and transfers from shared accounts count as income.', diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index e8ffddbe88..c62de23863 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -655,7 +655,9 @@ return [ 'categories_spent_in_year' => 'Categorieën (uitgaven)', 'report_type' => 'Rapporttype', 'report_type_default' => 'Standard financieel rapport', + 'more_info_help' => 'Meer informatie over deze rapportages vind je in de helppagina\'s. Klik op de (?) in de rechterbovenhoek.', 'report_type_audit' => 'Transactiehistorie-overzicht (audit)', + 'report_type_meta-history' => 'Categorieën, budgetten en contractenoverzicht', 'report_included_accounts' => 'Accounts in rapport', 'report_date_range' => 'Datumbereik', 'report_include_help' => 'Overboekingen naar gedeelde rekeningen tellen als uitgave. Overboekingen van gedeelde rekeningen tellen als inkomsten.', diff --git a/resources/views/reports/index.twig b/resources/views/reports/index.twig index 7d878d8fa7..19d948520b 100644 --- a/resources/views/reports/index.twig +++ b/resources/views/reports/index.twig @@ -12,7 +12,9 @@
+ {{ 'more_info_help'|_ }} +