mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-09-30 02:26:58 +00:00
Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop
* 'develop' of https://github.com/JC5/firefly-iii: Fix a bug where the frontpage would not honor transaction order. Fix a bug where the report page would mess up the session dates.
This commit is contained in:
@@ -95,16 +95,16 @@
|
||||
<li>
|
||||
<a href="{{ route('reports.report',
|
||||
['default',
|
||||
Session.get('start').startOfMonth.format('Ymd'),
|
||||
Session.get('start').endOfMonth.format('Ymd'),
|
||||
startOfMonth.format('Ymd'),
|
||||
endOfMonth.format('Ymd'),
|
||||
accountList
|
||||
]) }}">{{ 'report_this_month_quick'|_ }}</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="{{ route('reports.report',
|
||||
['default',
|
||||
Session.get('start').startOfYear.format('Ymd'),
|
||||
Session.get('start').endOfYear.format('Ymd'),
|
||||
startOfYear.format('Ymd'),
|
||||
endOfYear.format('Ymd'),
|
||||
accountList
|
||||
]) }}">{{ 'report_this_year_quick'|_ }}</a>
|
||||
</li>
|
||||
@@ -112,7 +112,7 @@
|
||||
<a href="{{ route('reports.report',
|
||||
['default',
|
||||
start.format('Ymd'),
|
||||
Session.get('end').endOfMonth.format('Ymd'),
|
||||
endOfMonth.format('Ymd'),
|
||||
accountList
|
||||
]) }}">{{ 'report_all_time_quick'|_ }}</a>
|
||||
</li>
|
||||
|
Reference in New Issue
Block a user