Merge branch 'develop'

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

View file

@ -231,8 +231,10 @@ class Asset extends Depreciable
*/ */
public function get_depreciation() public function get_depreciation()
{ {
if ($this->model) {
return $this->model->depreciation; return $this->model->depreciation;
} }
}
/** /**
* Get uploads for this asset * Get uploads for this asset