diff --git a/app/Models/Depreciable.php b/app/Models/Depreciable.php index e22fb65a7..250894820 100644 --- a/app/Models/Depreciable.php +++ b/app/Models/Depreciable.php @@ -69,14 +69,14 @@ 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' { if ($this->purchase_date) { - $months_passed = $this->purchase_date->diff(now())->m; + $months_passed = ($this->purchase_date->diff(now())->m)+($this->purchase_date->diff(now())->y*12); } else { return null; } if ($months_passed >= $this->get_depreciation()->months){ //if there is a floor use it - if($this->get_depreciation()->deprecation_min->isNotEmpty()) { + if(!$this->get_depreciation()->depreciation_min == null) { $current_value = $this->get_depreciation()->depreciation_min;