lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2024-10-02 12:40:59 +01:00
commit f42eeee666
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/Http/Transformers/DepreciationReportTransformer.php
View file

@ -63,15 +63,12 @@ class DepreciationReportTransformer
*/ */
if (($asset->model) && ($asset->model->depreciation)) { if (($asset->model) && ($asset->model->depreciation)) {
$depreciated_value = Helper::formatCurrencyOutput($asset->getDepreciatedValue()); $depreciated_value = Helper::formatCurrencyOutput($asset->getDepreciatedValue());
if($asset->model->eol==0 || $asset->model->eol==null ){ $monthly_depreciation =Helper::formatCurrencyOutput($asset->purchase_cost / $asset->model->depreciation->months);
$monthly_depreciation = Helper::formatCurrencyOutput($asset->purchase_cost / $asset->model->depreciation->months);
}
else {
$monthly_depreciation = Helper::formatCurrencyOutput(($asset->model->eol > 0 ? ($asset->purchase_cost / $asset->model->eol) : 0));
}
$diff = Helper::formatCurrencyOutput(($asset->purchase_cost - $asset->getDepreciatedValue())); $diff = Helper::formatCurrencyOutput(($asset->purchase_cost - $asset->getDepreciatedValue()));
} }
else if($asset->model->eol !== null) {
$monthly_depreciation = Helper::formatCurrencyOutput(($asset->model->eol > 0 ? ($asset->purchase_cost / $asset->model->eol) : 0));
}
if ($asset->assigned) { if ($asset->assigned) {
$checkout_target = $asset->assigned->name; $checkout_target = $asset->assigned->name;

12
config/version.php
View file

@ -1,10 +1,10 @@
<?php <?php
return array ( return array (
'app_version' => 'v7.0.13-pre', 'app_version' => 'v7.0.13',
'full_app_version' => 'v7.0.13-pre - build 15360-g4ab478bb9', 'full_app_version' => 'v7.0.13 - build 15514-gdc0949da7',
'build_version' => '15360', 'build_version' => '15514',
'prerelease_version' => '', 'prerelease_version' => '',
'hash_version' => 'g4ab478bb9', 'hash_version' => 'gdc0949da7',
'full_hash' => 'v7.0.13-pre-111-g4ab478bb9', 'full_hash' => 'v7.0.13-265-gdc0949da7',
'branch' => 'master', 'branch' => 'develop',
); );