close#702 Fixed:Unopened report pages in Php version 5.6

akaunting · Dec 27, 2018 · 63118af · 63118af
1 parent ee54db8
commit 63118af
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/app/Http/Controllers/Reports/ExpenseSummary.php b/app/Http/Controllers/Reports/ExpenseSummary.php
@@ -28,7 +28,7 @@ public function index()
         $year = request('year', Date::now()->year);
 
         // check and assign year start
-        if (($financial_start = Date::parse(setting('general.financial_start')))->month != 1) {
+        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;

diff --git a/app/Http/Controllers/Reports/IncomeExpenseSummary.php b/app/Http/Controllers/Reports/IncomeExpenseSummary.php
@@ -30,17 +30,20 @@ public function index()
 
         $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;
+       //if (($financial_start = Date::parse(setting('general.financial_start')))->month != 1) {
+        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();
             }
 
-            $year = [$financial_start->format('Y'), $financial_start->addYear()->format('Y')];
-            $financial_start->subYear()->subMonth();
-        }
+
 
         $categories_filter = request('categories');
 

diff --git a/app/Http/Controllers/Reports/IncomeSummary.php b/app/Http/Controllers/Reports/IncomeSummary.php
@@ -28,7 +28,7 @@ public function index()
         $year = request('year', Date::now()->year);
 
         // check and assign year start
-        if (($financial_start = Date::parse(setting('general.financial_start')))->month != 1) {
+        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;

diff --git a/app/Http/Controllers/Reports/ProfitLoss.php b/app/Http/Controllers/Reports/ProfitLoss.php
@@ -28,7 +28,7 @@ public function index()
         $year = request('year', Date::now()->year);
 
         // check and assign year start
-        if (($financial_start = Date::parse(setting('general.financial_start')))->month != 1) {
+        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;

diff --git a/app/Http/Controllers/Reports/TaxSummary.php b/app/Http/Controllers/Reports/TaxSummary.php
@@ -30,7 +30,7 @@ public function index()
         $year = request('year', Date::now()->year);
 
         // check and assign year start
-        if (($financial_start = Date::parse(setting('general.financial_start')))->month != 1) {
+        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;