Merge pull request #11642 from Godmartinz/monthly_depreciation_calculation

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
commit a834ac6ec2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

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());
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)); $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()) {