From 895a544d4cf47f7b533261bd72da12f6526172fc Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 9 Nov 2020 23:56:16 -0800 Subject: [PATCH] Fixed [ch15347] - added status in Depreciation Report --- resources/views/reports/depreciation.blade.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/resources/views/reports/depreciation.blade.php b/resources/views/reports/depreciation.blade.php index 504e69c42f..63e61b218b 100644 --- a/resources/views/reports/depreciation.blade.php +++ b/resources/views/reports/depreciation.blade.php @@ -40,15 +40,16 @@ {{ trans('admin/companies/table.title') }} {{ trans('admin/categories/general.category_name') }} {{ trans('admin/hardware/table.asset_tag') }} - {{ trans('admin/hardware/table.title') }} + {{ trans('admin/hardware/table.title') }} @if ($snipeSettings->display_asset_name) - {{ trans('general.name') }} + {{ trans('general.name') }} @endif {{ trans('admin/hardware/table.serial') }} {{ trans('admin/depreciations/general.depreciation_name') }} {{ trans('admin/depreciations/general.number_of_months') }} + {{ trans('admin/hardware/table.status') }} {{ trans('admin/hardware/table.checkoutto') }} - {{ trans('admin/hardware/table.location') }} + {{ trans('admin/hardware/table.location') }} {{ trans('admin/hardware/table.purchase_date') }} {{ trans('admin/hardware/table.eol') }} {{ trans('admin/hardware/table.purchase_cost') }} @@ -88,6 +89,10 @@ {{ $asset->model->depreciation->months }} @endif + + {{ $asset->assetstatus->name }} + ({{ $asset->present()->statusMeta }}) + @if (($asset->checkedOutToUser()) && ($asset->assigned)) {{ $asset->assigned->getFullNameAttribute() }}