Merge remote-tracking branch 'origin/develop'

This commit is contained in:
snipe 2020-11-24 19:49:59 -08:00
commit 26e4354433

View file

@ -166,6 +166,7 @@ class Asset extends Depreciable
'supplier' => ['name'], 'supplier' => ['name'],
'company' => ['name'], 'company' => ['name'],
'defaultLoc' => ['name'], 'defaultLoc' => ['name'],
'location' => ['name'],
'model' => ['name', 'model_number'], 'model' => ['name', 'model_number'],
'model.category' => ['name'], 'model.category' => ['name'],
'model.manufacturer' => ['name'], 'model.manufacturer' => ['name'],