DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-19 23:37:38 -07:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Depreciation Report: (#6135)

Browse source 
* Added monthly depreciation column
* Right aligned amount column headings
* Added monthly depreciation heading text for en, en-GB & af
This commit is contained in:
patrict 2018-08-28 21:40:06 +02:00 committed by snipe
parent 3831ee9f5a
commit cf2d2ecdfc
4 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
resources/lang/af/admin/hardware/table.php
View file

@ -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'
);

3
resources/lang/en-GB/admin/hardware/table.php
View file

@ -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'
);

3
resources/lang/en/admin/hardware/table.php
View file

@ -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'
);

19
resources/views/reports/depreciation.blade.php
View file

@ -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