Merge branch 'develop'

This commit is contained in:
snipe 2017-11-09 11:18:21 -08:00
commit 2f34336f2b

View file

@ -941,7 +941,7 @@ class Asset extends Depreciable
}
if (($fieldname!='category') && ($fieldname!='location')
&& ($fieldname!='status_label') && ($fieldname!='model')) {
&& ($fieldname!='status_label') && ($fieldname!='model') && ($fieldname!='manufacturer')) {
$query->orWhere('assets.'.$fieldname, 'LIKE', '%' . $search_val . '%');
}