From 98b78837e1603c5ef418027035ef5f33dd805c4f Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Tue, 22 Mar 2022 09:38:57 -0600
Subject: [PATCH] Validate custom fieldset only if the asset have one

---
 app/Models/Asset.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index d0720c7938..4da71d3669 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -196,12 +196,12 @@ class Asset extends Depreciable
 
             if (($model) && ($model->fieldset)) {
                 $this->rules += $model->fieldset->validation_rules();
-            }
-        }
 
-        foreach ($this->model->fieldset->fields as $field){
-            if($field->format == 'BOOLEAN'){
-                $this->{$field->db_column} = filter_var($this->{$field->db_column}, FILTER_VALIDATE_BOOLEAN);
+                foreach ($this->model->fieldset->fields as $field){
+                    if($field->format == 'BOOLEAN'){
+                        $this->{$field->db_column} = filter_var($this->{$field->db_column}, FILTER_VALIDATE_BOOLEAN);
+                    }
+                }
             }
         }