Merge branch 'develop'

app/Models/Asset.php

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

config/version.php

@@ -1,7 +1,7 @@
 <?php
 return array (
-  'app_version' => 'v4.1.1',
-  'build_version' => '46',
-  'hash_version' => 'g28a4293',
-  'full_hash' => 'v4.1.1-46-g28a4293',
+  'app_version' => 'v4.1.2',
+  'build_version' => '48',
+  'hash_version' => 'gd21c92f',
+  'full_hash' => 'v4.1.2-48-gd21c92f',
 );

resources/views/hardware/bulk-delete.blade.php

@@ -42,8 +42,8 @@
                 <td>{{ $asset->id }}</td>
                 <td>{{ $asset->present()->name() }}</td>
                 <td>
-                  @if ($asset->assetloc)
-                  {{ $asset->assetloc->name }}
+                  @if ($asset->location)
+                  {{ $asset->location->name }}
                   @endif
                 </td>
                 <td>