Merge branch 'develop'

This commit is contained in:
snipe 2017-10-23 20:11:01 -07:00
commit 47c7061af5

View file

@ -914,7 +914,7 @@ class Asset extends Depreciable
}
$query->orWhere($fieldname, 'LIKE', '%' . $search_val . '%');
$query->orWhere('assets.'.$fieldname, 'LIKE', '%' . $search_val . '%');
});