shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Batuhan Baş
2018-12-27 11:34:21 +03:00
parent ee54db8246
commit 63118af448
5 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Reports/ExpenseSummary.php
View File

@ -28,7 +28,7 @@ class ExpenseSummary extends Controller
$year = request('year', Date::now()->year); $year = request('year', Date::now()->year);
// check and assign year start // 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 // check if a specific year is requested
if (!is_null(request('year'))) { if (!is_null(request('year'))) {
$financial_start->year = $year; $financial_start->year = $year;

19
app/Http/Controllers/Reports/IncomeExpenseSummary.php
View File

@ -30,17 +30,20 @@ class IncomeExpenseSummary extends Controller
$status = request('status'); $status = request('status');
$year = request('year', Date::now()->year); $year = request('year', Date::now()->year);
// check and assign year start // 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 (($financial_start = Date::parse(setting('general.financial_start'))->month) != 1) {
if (!is_null(request('year'))) { // check if a specific year is requested
$financial_start->year = $year; 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'); $categories_filter = request('categories');

2
app/Http/Controllers/Reports/IncomeSummary.php
View File

@ -28,7 +28,7 @@ class IncomeSummary extends Controller
$year = request('year', Date::now()->year); $year = request('year', Date::now()->year);
// check and assign year start // 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 // check if a specific year is requested
if (!is_null(request('year'))) { if (!is_null(request('year'))) {
$financial_start->year = $year; $financial_start->year = $year;

2
app/Http/Controllers/Reports/ProfitLoss.php
View File

@ -28,7 +28,7 @@ class ProfitLoss extends Controller
$year = request('year', Date::now()->year); $year = request('year', Date::now()->year);
// check and assign year start // 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 // check if a specific year is requested
if (!is_null(request('year'))) { if (!is_null(request('year'))) {
$financial_start->year = $year; $financial_start->year = $year;

2
app/Http/Controllers/Reports/TaxSummary.php
View File

@ -30,7 +30,7 @@ class TaxSummary extends Controller
$year = request('year', Date::now()->year); $year = request('year', Date::now()->year);
// check and assign year start // 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 // check if a specific year is requested
if (!is_null(request('year'))) { if (!is_null(request('year'))) {
$financial_start->year = $year; $financial_start->year = $year;