IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-30 10:47:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix for #1968

Browse Source
This commit is contained in:
James Cole 2019-01-04 17:10:16 +01:00
parent a4d4bf3006
commit 0d560ec442
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Support/Navigation.php
View File

@ -176,7 +176,7 @@ class Navigation
'6M' => 6, '6M' => 6,
]; ];
$subDay = ['week', 'weekly', '1W', 'month', 'monthly', '1M', '3M', 'quarter', 'quarterly', '6M', 'half-year', 'year', 'yearly']; $subDay = ['week', 'weekly', '1W', 'month', 'monthly', '1M', '3M', 'quarter', 'quarterly', '6M', 'half-year', '1Y', 'year', 'yearly'];
// if the range is custom, the end of the period // if the range is custom, the end of the period
// is another X days (x is the difference between start) // is another X days (x is the difference between start)
@ -609,6 +609,7 @@ class Navigation
if ('1Y' === $range) { if ('1Y' === $range) {
/** @var FiscalHelperInterface $fiscalHelper */ /** @var FiscalHelperInterface $fiscalHelper */
$fiscalHelper = app(FiscalHelperInterface::class); $fiscalHelper = app(FiscalHelperInterface::class);
return $fiscalHelper->endOfFiscalYear($end); return $fiscalHelper->endOfFiscalYear($end);
} }
@ -654,6 +655,7 @@ class Navigation
if ('1Y' === $range) { if ('1Y' === $range) {
/** @var FiscalHelperInterface $fiscalHelper */ /** @var FiscalHelperInterface $fiscalHelper */
$fiscalHelper = app(FiscalHelperInterface::class); $fiscalHelper = app(FiscalHelperInterface::class);
return $fiscalHelper->startOfFiscalYear($start); return $fiscalHelper->startOfFiscalYear($start);
} }

1
changelog.md
View File

@ -23,6 +23,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- #1944 Make sure that the search allows you to mass-select transactions. - #1944 Make sure that the search allows you to mass-select transactions.
- #1945 Slight UI change so the drop-down menu renders better. - #1945 Slight UI change so the drop-down menu renders better.
- #1955 Fixed a bug in the category report. - #1955 Fixed a bug in the category report.
- #1968 The yearly range would jump to 1-Jan / 1-Jan instead of 1-Jan / 31-Dec
- Fixed broken translations in the recurring transactions overview. - Fixed broken translations in the recurring transactions overview.
- When you create a recurring transfer you make make it fill (or empty) a piggy bank. This was not working, despite a fix in 4.7.8. - When you create a recurring transfer you make make it fill (or empty) a piggy bank. This was not working, despite a fix in 4.7.8.