From edd1b25330ce85943afa3104b333427b9a524e4a Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 1 Sep 2017 11:19:49 +0200
Subject: [PATCH] Revert "Should fix rule, category and other name checks.
 #793"

This reverts commit ffaf48dda7ef1f7adc5cc69180b4c82087b17fec.
---
 app/Models/Bill.php                 | 2 +-
 app/Validation/FireflyValidator.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Models/Bill.php b/app/Models/Bill.php
index 91a5600200..8659be7749 100644
--- a/app/Models/Bill.php
+++ b/app/Models/Bill.php
@@ -28,7 +28,7 @@ use Watson\Validating\ValidatingTrait;
 class Bill extends Model
 {
 
-    use SoftDeletes, ValidatingTrait;
+    use ValidatingTrait;
     /**
      * The attributes that should be casted to native types.
      *
diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php
index ef16f8787b..62f6747123 100644
--- a/app/Validation/FireflyValidator.php
+++ b/app/Validation/FireflyValidator.php
@@ -387,7 +387,7 @@ class FireflyValidator extends Validator
         $exclude = $parameters[2] ?? 0;
 
         // get entries from table
-        $set = DB::table($table)->where('user_id', auth()->user()->id)->whereNull('deleted_at')
+        $set = DB::table($table)->where('user_id', auth()->user()->id)
                  ->where('id', '!=', $exclude)->get([$field]);
 
         foreach ($set as $entry) {