From 78b090b188e5037b154a1e4a77200d60ae14e197 Mon Sep 17 00:00:00 2001
From: sausin <sausin@users.noreply.github.com>
Date: Fri, 14 Dec 2018 19:57:54 +0530
Subject: [PATCH] Update ExpenseSummary.php

---
 app/Http/Controllers/Reports/ExpenseSummary.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Reports/ExpenseSummary.php b/app/Http/Controllers/Reports/ExpenseSummary.php
index d3d5ea2fe..6e682d129 100644
--- a/app/Http/Controllers/Reports/ExpenseSummary.php
+++ b/app/Http/Controllers/Reports/ExpenseSummary.php
@@ -26,6 +26,17 @@ class ExpenseSummary extends Controller
 
         $status = request('status');
         $year = request('year', Date::now()->year);
+        
+        // check and assign year start
+        if (($financial_start = Date::parse(setting('general.financial_start')))->month != 1) {
+            // check if a specific year is requested
+            if (!is_null(request('year'))) {
+                $financial_start->year = $year;
+            }
+
+            $year = [$financial_start->format('Y'), $financial_start->addYear()->format('Y')];
+            $financial_start->subYear()->subMonth();
+        }
 
         $categories = Category::enabled()->type('expense')->orderBy('name')->pluck('name', 'id')->toArray();
 
@@ -39,7 +50,8 @@ class ExpenseSummary extends Controller
 
         // Dates
         for ($j = 1; $j <= 12; $j++) {
-            $dates[$j] = Date::parse($year . '-' . $j)->format('F');
+            $ym_string = is_array($year) ? $financial_start->addMonth()->format('Y-m') : $year . '-' . $j;
+            $dates[$j] = Date::parse($ym_string)->format('F');
 
             $expenses_graph[Date::parse($year . '-' . $j)->format('F-Y')] = 0;