diff --git a/resources/lang/af/admin/hardware/table.php b/resources/lang/af/admin/hardware/table.php index 8116236d945c36d2302ad2cb75b04e08ca5722bc..ec397ee886935897e890bb54cf5159e8e4a682c9 100644 --- a/resources/lang/af/admin/hardware/table.php +++ b/resources/lang/af/admin/hardware/table.php @@ -19,6 +19,7 @@ return array( 'status' => 'status', 'title' => 'bate', 'image' => 'Toestelbeeld', - 'days_without_acceptance' => 'Dae sonder aanvaarding' + 'days_without_acceptance' => 'Dae sonder aanvaarding', + 'monthly_depreciation' => 'Maandelikse Waardevermindering' ); diff --git a/resources/lang/en-GB/admin/hardware/table.php b/resources/lang/en-GB/admin/hardware/table.php index e8baa09d5aabbd2405a4e91ced942232d2988f89..38788e19849ed6a415b0be76fc6b918fed7ea556 100644 --- a/resources/lang/en-GB/admin/hardware/table.php +++ b/resources/lang/en-GB/admin/hardware/table.php @@ -19,6 +19,7 @@ return array( 'status' => 'Status', 'title' => 'Asset ', 'image' => 'Device Image', - 'days_without_acceptance' => 'Days Without Acceptance' + 'days_without_acceptance' => 'Days Without Acceptance', + 'monthly_depreciation' => 'Monthly Depreciation' ); diff --git a/resources/lang/en/admin/hardware/table.php b/resources/lang/en/admin/hardware/table.php index e8baa09d5aabbd2405a4e91ced942232d2988f89..38788e19849ed6a415b0be76fc6b918fed7ea556 100644 --- a/resources/lang/en/admin/hardware/table.php +++ b/resources/lang/en/admin/hardware/table.php @@ -19,6 +19,7 @@ return array( 'status' => 'Status', 'title' => 'Asset ', 'image' => 'Device Image', - 'days_without_acceptance' => 'Days Without Acceptance' + 'days_without_acceptance' => 'Days Without Acceptance', + 'monthly_depreciation' => 'Monthly Depreciation' ); diff --git a/resources/views/reports/depreciation.blade.php b/resources/views/reports/depreciation.blade.php index e7fdf8a35f4b9b164e7cce5d37f14dadfb6e6f23..504e69c42f4580ed654b916dca247b1c2bd06c73 100644 --- a/resources/views/reports/depreciation.blade.php +++ b/resources/views/reports/depreciation.blade.php @@ -51,9 +51,10 @@ <th class="col-sm-1">{{ trans('admin/hardware/table.location') }}</th> <th class="col-sm-1">{{ trans('admin/hardware/table.purchase_date') }}</th> <th class="col-sm-1">{{ trans('admin/hardware/table.eol') }}</th> - <th class="col-sm-1">{{ trans('admin/hardware/table.purchase_cost') }}</th> - <th class="col-sm-1">{{ trans('admin/hardware/table.book_value') }}</th> - <th class="col-sm-1">{{ trans('admin/hardware/table.diff') }}</th> + <th class="col-sm-1 align-right">{{ trans('admin/hardware/table.purchase_cost') }}</th> + <th class="col-sm-1 align-right">{{ trans('admin/hardware/table.book_value') }}</th> + <th class="col-sm-1 align-right">{{ trans('admin/hardware/table.monthly_depreciation') }}</th> + <th class="col-sm-1 align-right">{{ trans('admin/hardware/table.diff') }}</th> </tr> </thead> <tbody> @@ -129,6 +130,17 @@ {{ \App\Helpers\Helper::formatCurrencyOutput($asset->getDepreciatedValue()) }} </td> + <td class="align-right"> + @if ($asset->model->depreciation) + @if ($asset->location && $asset->location->currency) + {{ $asset->location->currency }} + @else + {{ $snipeSettings->default_currency }} + @endif + + {{ \App\Helpers\Helper::formatCurrencyOutput(($asset->model->eol > 0 ? ($asset->purchase_cost / $asset->model->eol) : 0)) }} + @endif + </td> <td class="align-right"> @if ($asset->location && $asset->location->currency) {{ $asset->location->currency }} @@ -142,6 +154,7 @@ <td></td> <td></td> <td></td> + <td></td> @endif </tr> @endforeach