Merge remote-tracking branch 'origin/develop'

This commit is contained in:
snipe 2023-10-31 16:00:27 +00:00
commit 96be0c25c4

View file

@ -80,7 +80,7 @@
<td>{{ $counter }}</td> <td>{{ $counter }}</td>
<td>{{ $asset->asset_tag }}</td> <td>{{ $asset->asset_tag }}</td>
<td>{{ $asset->name }}</td> <td>{{ $asset->name }}</td>
<td>{{ $asset->model->category->name }}</td> <td>{{ (($asset->model) && ($asset->model->category)) ? $asset->model->category->name : trans('general.invalid_category') }}</td>
<td>{{ $asset->model->name }}</td> <td>{{ $asset->model->name }}</td>
<td>{{ $asset->serial }}</td> <td>{{ $asset->serial }}</td>
<td> <td>