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

Merge branch 'master' of github.com:akaunting/akaunting into 2.1-dev

Browse Source
This commit is contained in:
denisdulici
2020-05-03 10:32:57 +03:00
parent aad139d40b 70bfe8c524
commit 2f8506a2eb
59 changed files with 1131 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Banking/Reconciliations.php
View File

@ -11,6 +11,7 @@ use App\Jobs\Banking\UpdateReconciliation;
use App\Models\Banking\Account;
use App\Models\Banking\Reconciliation;
use App\Models\Banking\Transaction;
use Date;
class Reconciliations extends Controller
{
@ -48,8 +49,8 @@ class Reconciliations extends Controller
$accounts = Account::enabled()->pluck('name', 'id');
$account_id = request('account_id', setting('default.account'));
$started_at = request('started_at', '0000-00-00');
$ended_at = request('ended_at', '0000-00-00');
$started_at = request('started_at', Date::now()->firstOfMonth()->toDateString());
$ended_at = request('ended_at', Date::now()->endOfMonth()->toDateString());
$account = Account::find($account_id);

2
app/Http/Controllers/Common/Dashboards.php
View File

@ -51,7 +51,7 @@ class Dashboards extends Controller
{
$dashboard_id = session('dashboard_id', 0);
if ($dashboard) {
if (!empty($dashboard->id)) {
$dashboard_id = $dashboard->id;
}