From 0d560ec44235326d290daa4e7f0737e83a592234 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 4 Jan 2019 17:10:16 +0100 Subject: [PATCH] Fix for #1968 --- app/Support/Navigation.php | 4 +++- changelog.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php index 2db02584f0..0b7b4262ad 100644 --- a/app/Support/Navigation.php +++ b/app/Support/Navigation.php @@ -176,7 +176,7 @@ class Navigation '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 // is another X days (x is the difference between start) @@ -609,6 +609,7 @@ class Navigation if ('1Y' === $range) { /** @var FiscalHelperInterface $fiscalHelper */ $fiscalHelper = app(FiscalHelperInterface::class); + return $fiscalHelper->endOfFiscalYear($end); } @@ -654,6 +655,7 @@ class Navigation if ('1Y' === $range) { /** @var FiscalHelperInterface $fiscalHelper */ $fiscalHelper = app(FiscalHelperInterface::class); + return $fiscalHelper->startOfFiscalYear($start); } diff --git a/changelog.md b/changelog.md index 803e7feea1..f75e00b9d4 100644 --- a/changelog.md +++ b/changelog.md @@ -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. - #1945 Slight UI change so the drop-down menu renders better. - #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. - 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.