From 8a998b1a3adc03145042466edf7a4b6a7797bd20 Mon Sep 17 00:00:00 2001
From: sausin <sausin@users.noreply.github.com>
Date: Fri, 14 Dec 2018 20:02:35 +0530
Subject: [PATCH] Update TaxSummary.php

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

diff --git a/app/Http/Controllers/Reports/TaxSummary.php b/app/Http/Controllers/Reports/TaxSummary.php
index 1907ac90d..7a588a468 100644
--- a/app/Http/Controllers/Reports/TaxSummary.php
+++ b/app/Http/Controllers/Reports/TaxSummary.php
@@ -28,6 +28,17 @@ class TaxSummary 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();
+        }
 
         $t = Tax::enabled()->where('rate', '<>', '0')->pluck('name')->toArray();
 
@@ -35,7 +46,9 @@ class TaxSummary extends Controller
 
         // Dates
         for ($j = 1; $j <= 12; $j++) {
-            $dates[$j] = Date::parse($year . '-' . $j)->format('M');
+            $ym_string = is_array($year) ? $financial_start->addMonth()->format('Y-m') : $year . '-' . $j;
+            
+            $dates[$j] = Date::parse($ym_string)->format('M');
 
             foreach ($taxes as $tax_name) {
                 $incomes[$tax_name][$dates[$j]] = [