Merge remote-tracking branch 'origin/develop'

This commit is contained in:
snipe 2023-07-20 16:34:16 +01:00
commit d26bc19e3f

View file

@ -68,7 +68,7 @@ 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) {
if (($this->get_depreciation()) && ($this->purchase_date)) {
$months_passed = ($this->purchase_date->diff(now())->m)+($this->purchase_date->diff(now())->y*12);
} else {
return null;