mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Prep for new report.
This commit is contained in:
parent
6f0f6e86a1
commit
bdcc2c6c9f
@ -132,6 +132,10 @@ class ReportController extends Controller
|
|||||||
case 'audit':
|
case 'audit':
|
||||||
// always default
|
// always default
|
||||||
return $this->auditReport($start, $end, $accounts);
|
return $this->auditReport($start, $end, $accounts);
|
||||||
|
case 'meta-history':
|
||||||
|
// always default
|
||||||
|
return $this->metaHistoryReport($start, $end, $accounts);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -656,6 +656,8 @@ return [
|
|||||||
'report_type' => 'Report type',
|
'report_type' => 'Report type',
|
||||||
'report_type_default' => 'Default financial report',
|
'report_type_default' => 'Default financial report',
|
||||||
'report_type_audit' => 'Transaction history overview (audit)',
|
'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_included_accounts' => 'Included accounts',
|
||||||
'report_date_range' => 'Date range',
|
'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.',
|
'report_include_help' => 'In all cases, transfers to shared accounts count as expenses, and transfers from shared accounts count as income.',
|
||||||
|
@ -655,7 +655,9 @@ return [
|
|||||||
'categories_spent_in_year' => 'Categorieën (uitgaven)',
|
'categories_spent_in_year' => 'Categorieën (uitgaven)',
|
||||||
'report_type' => 'Rapporttype',
|
'report_type' => 'Rapporttype',
|
||||||
'report_type_default' => 'Standard financieel rapport',
|
'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_audit' => 'Transactiehistorie-overzicht (audit)',
|
||||||
|
'report_type_meta-history' => 'Categorieën, budgetten en contractenoverzicht',
|
||||||
'report_included_accounts' => 'Accounts in rapport',
|
'report_included_accounts' => 'Accounts in rapport',
|
||||||
'report_date_range' => 'Datumbereik',
|
'report_date_range' => 'Datumbereik',
|
||||||
'report_include_help' => 'Overboekingen naar gedeelde rekeningen tellen als uitgave. Overboekingen van gedeelde rekeningen tellen als inkomsten.',
|
'report_include_help' => 'Overboekingen naar gedeelde rekeningen tellen als uitgave. Overboekingen van gedeelde rekeningen tellen als inkomsten.',
|
||||||
|
@ -12,7 +12,9 @@
|
|||||||
<h3 class="box-title">{{ 'reports'|_ }}</h3>
|
<h3 class="box-title">{{ 'reports'|_ }}</h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="box-body">
|
<div class="box-body">
|
||||||
|
<p class="text-info">
|
||||||
|
{{ 'more_info_help'|_ }}
|
||||||
|
</p>
|
||||||
<form class="form-horizontal" id="report-form" action="{{ route('reports.index') }}" method="post">
|
<form class="form-horizontal" id="report-form" action="{{ route('reports.index') }}" method="post">
|
||||||
<input type="hidden" name="_token" value="{{ csrf_token() }}"/>
|
<input type="hidden" name="_token" value="{{ csrf_token() }}"/>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
@ -22,6 +24,7 @@
|
|||||||
<select name="report_type" class="form-control" id="inputReportType">
|
<select name="report_type" class="form-control" id="inputReportType">
|
||||||
<option selected label="{{ 'report_type_default'|_ }}" value="default">{{ 'report_type_default'|_ }}</option>
|
<option selected label="{{ 'report_type_default'|_ }}" value="default">{{ 'report_type_default'|_ }}</option>
|
||||||
<option label="{{ 'report_type_audit'|_ }}" value="audit">{{ 'report_type_audit'|_ }}</option>
|
<option label="{{ 'report_type_audit'|_ }}" value="audit">{{ 'report_type_audit'|_ }}</option>
|
||||||
|
<option label="{{ 'report_type_meta-history'|_ }}" value="meta-history">{{ 'report_type_meta-history'|_ }}</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user