From a521523d45c1c8d23d2fb157886835fdf2ffabd3 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 18 Apr 2019 14:13:33 -0400
Subject: [PATCH 1/4] Truncate imports table on seed

---
 database/seeds/DatabaseSeeder.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index 85f3e599ad..0a1c97560f 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -43,5 +43,8 @@ class DatabaseSeeder extends Seeder
         \Log::info($output);
 
         Model::reguard();
+
+        DB::table('imports')->truncate();
+
     }
 }

From 420e8bc85a5008842542238c7fa8381237645cd1 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 18 Apr 2019 14:13:50 -0400
Subject: [PATCH 2/4] Allow phone number to be changed in Profile

---
 app/Http/Controllers/ProfileController.php | 3 +++
 resources/views/account/profile.blade.php  | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index daa10aa974..a255aa34b6 100755
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -49,6 +49,9 @@ class ProfileController extends Controller
         $user->last_name  = $request->input('last_name');
         $user->website    = $request->input('website');
         $user->gravatar   = $request->input('gravatar');
+        $user->phone   = $request->input('phone');
+
+
 
         if (!config('app.lock_passwords')) {
             $user->locale = $request->input('locale', 'en');
diff --git a/resources/views/account/profile.blade.php b/resources/views/account/profile.blade.php
index 18a8287035..49e29b05a6 100755
--- a/resources/views/account/profile.blade.php
+++ b/resources/views/account/profile.blade.php
@@ -58,6 +58,15 @@
           </div>
         </div>
 
+        <!-- Phone -->
+        <div class="form-group {{ $errors->has('phone') ? 'has-error' : '' }}">
+          <label class="col-md-3 control-label" for="phone">{{ trans('admin/users/table.phone') }}</label>
+          <div class="col-md-4">
+            <input class="form-control" type="text" name="phone" id="phone" value="{{ Input::old('phone', $user->phone) }}" />
+            {!! $errors->first('phone', '<span class="alert-msg">:message</span>') !!}
+          </div>
+        </div>
+
 
 
         <!-- Website URL -->

From 1bb1f7342f5fd2a27a26ec3c154baca7bd51e0db Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 18 Apr 2019 15:49:59 -0400
Subject: [PATCH 3/4] Fixed #6922 - date_add crashing if EOL is null

---
 app/Presenters/AssetPresenter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php
index d971b09e39..689a87201a 100644
--- a/app/Presenters/AssetPresenter.php
+++ b/app/Presenters/AssetPresenter.php
@@ -391,7 +391,7 @@ class AssetPresenter extends Presenter
     public function eol_date()
     {
 
-        if (( $this->purchase_date ) && ( $this->model )) {
+        if (( $this->purchase_date ) && ( $this->model ) && ($this->model->model->eol) ) {
             $date = date_create($this->purchase_date);
             date_add($date, date_interval_create_from_date_string($this->model->model->eol . ' months'));
             return date_format($date, 'Y-m-d');

From dae26e0378d9f554a5c415b28cc20caa555fe278 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 18 Apr 2019 17:56:08 -0400
Subject: [PATCH 4/4] =?UTF-8?q?Remove=20=E2=80=9CImported=20from=20LDAP?=
 =?UTF-8?q?=E2=80=9D=20note=20override?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Console/Commands/LdapSync.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Console/Commands/LdapSync.php b/app/Console/Commands/LdapSync.php
index cdd7740a41..47b5f58113 100755
--- a/app/Console/Commands/LdapSync.php
+++ b/app/Console/Commands/LdapSync.php
@@ -208,8 +208,7 @@ class LdapSync extends Command
                     }
 
                 }
-
-                $user->notes = 'Imported from LDAP';
+                
                 $user->ldap_import = 1;
 
                 $errors = '';