diff --git a/app/Models/Asset.php b/app/Models/Asset.php index e220f4940d..51dd6b8572 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -231,7 +231,7 @@ class Asset extends Depreciable */ public function get_depreciation() { - if ($this->model) { + if (($this->model) && ($this->model->depreciation)) { return $this->model->depreciation; } } diff --git a/config/version.php b/config/version.php index 72d5b9550b..bd6b54fc6c 100644 --- a/config/version.php +++ b/config/version.php @@ -1,10 +1,10 @@ 'v4.1.11-pre', - 'full_app_version' => 'v4.1.11-pre - build 3288-g426bf38', - 'build_version' => '3288', + 'full_app_version' => 'v4.1.11-pre - build 3299-g3acf5f7', + 'build_version' => '3299', 'prerelease_version' => '', - 'hash_version' => 'g426bf38', - 'full_hash' => 'v4.1.11-pre-36-g426bf38', + 'hash_version' => 'g3acf5f7', + 'full_hash' => 'v4.1.11-pre-47-g3acf5f7', 'branch' => 'master', ); diff --git a/resources/views/reports/depreciation.blade.php b/resources/views/reports/depreciation.blade.php index 792f75c8d6..a03e4e1206 100644 --- a/resources/views/reports/depreciation.blade.php +++ b/resources/views/reports/depreciation.blade.php @@ -74,7 +74,7 @@ @endif - @if ($asset->checkedOutToUser()) + @if (($asset->checkedOutToUser()) && ($asset->assigned)) {{ $asset->assigned->getFullNameAttribute() }} @else