DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2017-12-04 20:45:46 -08:00
parent 18c1b2b477 d7f2bceea2
commit 4f3c932bb1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/ReportsController.php
View file

@ -645,7 +645,7 @@ class ReportsController extends Controller
} }
if ($request->has('supplier')) { if ($request->has('supplier')) {
$row[] = ($asset->location) ? $asset->supplier->name : ''; $row[] = ($asset->supplier) ? $asset->supplier->name : '';
} }