From 0cf05989365c4e32184bf21fa786b15e6c7c7517 Mon Sep 17 00:00:00 2001
From: Brad Coudriet <bjcpgd@rit.edu>
Date: Tue, 9 Aug 2022 06:32:03 -0400
Subject: [PATCH 1/3] Added a closing div tag around the mail text help block,
 this was causing labels further down the page to be formatted in correctly

---
 resources/views/settings/general.blade.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php
index 0dceec88f2..ea36ccae97 100644
--- a/resources/views/settings/general.blade.php
+++ b/resources/views/settings/general.blade.php
@@ -215,7 +215,9 @@
                                <div id="mailteststatus-error" class="text-danger"></div>
                            </div>
                            <div class="col-md-9 col-md-offset-3">
-                               <div class="help-block"> {{ trans('admin/settings/general.mail_test_help', array('replyto' => config('mail.reply_to.address'))) }}</p>
+                               <div class="help-block">
+                                   {{ trans('admin/settings/general.mail_test_help', array('replyto' => config('mail.reply_to.address'))) }}</p>
+                               </div>
                            </div>
 
                        </div>

From 77a1fcb1fc46bcb77064767b66f0978ef508b0c9 Mon Sep 17 00:00:00 2001
From: Brad Coudriet <bjcpgd@rit.edu>
Date: Tue, 9 Aug 2022 06:36:53 -0400
Subject: [PATCH 2/3] There was actually a missing p tag too

---
 resources/views/settings/general.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php
index ea36ccae97..6982adc1a9 100644
--- a/resources/views/settings/general.blade.php
+++ b/resources/views/settings/general.blade.php
@@ -216,7 +216,7 @@
                            </div>
                            <div class="col-md-9 col-md-offset-3">
                                <div class="help-block">
-                                   {{ trans('admin/settings/general.mail_test_help', array('replyto' => config('mail.reply_to.address'))) }}</p>
+                                   <p>{{ trans('admin/settings/general.mail_test_help', array('replyto' => config('mail.reply_to.address'))) }}</p>
                                </div>
                            </div>
 

From 92e6ea96b24ce1ba5584d0305c7d44bdd8f94513 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Tue, 9 Aug 2022 15:05:15 -0700
Subject: [PATCH 3/3] if eol is missing from asset model monthly depreciation
 will be recalculated

---
 app/Http/Transformers/DepreciationReportTransformer.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/Http/Transformers/DepreciationReportTransformer.php b/app/Http/Transformers/DepreciationReportTransformer.php
index 03e55714c3..47d1cbc476 100644
--- a/app/Http/Transformers/DepreciationReportTransformer.php
+++ b/app/Http/Transformers/DepreciationReportTransformer.php
@@ -63,10 +63,16 @@ class DepreciationReportTransformer
          */
         if (($asset->model) && ($asset->model->depreciation)) {
             $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()));
         }
 
+
         if ($asset->assigned) {
             $checkout_target = $asset->assigned->name;
             if ($asset->checkedOutToUser()) {