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

2020-05-03 10:32:57 +03:00
parent aad139d40b 70bfe8c524
commit 2f8506a2eb
59 changed files with 1131 additions and 383 deletions
--- a/app/Http/Controllers/Common/Dashboards.php
+++ b/app/Http/Controllers/Common/Dashboards.php
@ -51,7 +51,7 @@ class Dashboards extends Controller
    {
        $dashboard_id = session('dashboard_id', 0);

-        if ($dashboard) {
+        if (!empty($dashboard->id)) {
            $dashboard_id = $dashboard->id;
        }