Merge branch 'develop'

This commit is contained in:
snipe 2018-01-25 03:35:30 -08:00
commit 3acf5f76fe

View file

@ -231,7 +231,9 @@ class Asset extends Depreciable
*/
public function get_depreciation()
{
return $this->model->depreciation;
if ($this->model) {
return $this->model->depreciation;
}
}
/**