DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #11642 from Godmartinz/monthly_depreciation_calculation

Browse source 
Fixes Monthly depreciation calculation if EOL is blank
This commit is contained in:
snipe 2022-08-09 15:14:57 -07:00 committed by GitHub
parent de449fd1c2 92e6ea96b2
commit a834ac6ec2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -63,10 +63,16 @@ 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());
$monthly_depreciation = Helper::formatCurrencyOutput(($asset->model->eol > 0 ? ($asset->purchase_cost / $asset->model->eol) : 0)); if($asset->model->eol==0 || $asset->model->eol==null ){
$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()));
} }
if ($asset->assigned) { if ($asset->assigned) {
$checkout_target = $asset->assigned->name; $checkout_target = $asset->assigned->name;
if ($asset->checkedOutToUser()) { if ($asset->checkedOutToUser()) {