Merge remote-tracking branch 'origin/develop'

snipe · Oct 2, 2024 · f42eeee · f42eeee
2 parents dc0949d + 54fbd05
commit f42eeee
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/app/Http/Transformers/DepreciationReportTransformer.php b/app/Http/Transformers/DepreciationReportTransformer.php
@@ -63,15 +63,12 @@ public function transformAsset(Asset $asset)
          */
         if (($asset->model) && ($asset->model->depreciation)) {
             $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->purchase_cost / $asset->model->depreciation->months);
             $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) {
             $checkout_target = $asset->assigned->name;

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