diff --git a/app/Models/Depreciable.php b/app/Models/Depreciable.php index 20a28af40..e22fb65a7 100644 --- a/app/Models/Depreciable.php +++ b/app/Models/Depreciable.php @@ -68,9 +68,13 @@ class Depreciable extends SnipeModel */ public function getLinearDepreciatedValue() // TODO - for testing it might be nice to have an optional $relative_to param here, defaulted to 'now' { - $months_passed = $this->purchase_date->diff(now())->m; + if ($this->purchase_date) { + $months_passed = $this->purchase_date->diff(now())->m; + } else { + return null; + } - if($months_passed >= $this->get_depreciation()->months){ + if ($months_passed >= $this->get_depreciation()->months){ //if there is a floor use it if($this->get_depreciation()->deprecation_min->isNotEmpty()) { diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index 6a2bc3508..029b74d19 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -372,6 +372,7 @@ return [ 'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.', 'bulk_checkin_success' => 'The items for the selected users have been checked in.', 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ', + 'na_no_purchase_date' => 'N/A - No purchase date provided', ]; \ No newline at end of file diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 2e24d8a62..0ed8e10e0 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -519,7 +519,7 @@ @endif - @if (($asset->model) && ($asset->depreciation)) + @if (($asset->model) && ($asset->depreciation) && ($asset->purchase_date))