Merge remote-tracking branch 'origin/develop'

2020-11-24 19:49:59 -08:00 · 2020-11-24 19:49:59 -08:00 · 26e4354433
commit 26e4354433
parent bf1f8659cb 72fc03aa50
1 changed files with 1 additions and 0 deletions
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@ -166,6 +166,7 @@ class Asset extends Depreciable
        'supplier'           => ['name'],
        'company'            => ['name'],
        'defaultLoc'         => ['name'],
+        'location'           => ['name'],
        'model'              => ['name', 'model_number'],
        'model.category'     => ['name'],
        'model.manufacturer' => ['name'],