Merge branch 'develop'

2018-01-25 03:35:30 -08:00 · 2018-01-25 03:35:30 -08:00 · 3acf5f76fe
commit 3acf5f76fe
parent 029dd43ecd 4be8ae7f3d
1 changed files with 3 additions and 1 deletions
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@ -231,7 +231,9 @@ class Asset extends Depreciable
   */
    public function get_depreciation()
    {
-        return $this->model->depreciation;
+        if ($this->model) {
+            return $this->model->depreciation;
+        }
    }

  /**