Merge pull request #6281 from turbo124/v5-develop

Fixes for checking constraints

app/Jobs/Util/Import.php

@@ -561,6 +561,7 @@ class Import implements ShouldQueue
         $model_query = (new $model())
                             ->query()
                             ->where($column, $value)
+                            ->where('company_id', $this->company->id)
                             ->exists();
 
         if($model_query)

app/Repositories/ClientRepository.php

@@ -63,7 +63,8 @@ class ClientRepository extends BaseRepository
         }
 
         $client->fill($data);
-
+        $client->save();
+        
         if (!isset($client->number) || empty($client->number)) {
             $client->number = $this->getNextClientNumber($client);
         }