Merge branch 'master' of github.com:akaunting/akaunting

app/Listeners/Email/SendInvalidEmailNotification.php

@@ -10,7 +10,11 @@ class SendInvalidEmailNotification
 {
     public function handle(Event $event): void
     {
-        $users = company()->users;
+        $users = company()?->users;
+
+        if (empty($users)) {
+            return;
+        }
 
         $this->notifyAdminsAboutInvalidContactEmail($event, $users);
 

app/Models/Common/Item.php

@@ -107,7 +107,7 @@ class Item extends Model
             return $query;
         }
 
-        return $query->whereIn('type', $type);
+        return $query->whereIn($this->qualifyColumn('type'), $type);
     }
 
     /**

app/Traits/Import.php

@@ -323,7 +323,7 @@ trait Import
         return $contact->id;
     }
 
-    public function getItemIdFromName($row, $type)
+    public function getItemIdFromName($row, $type = 'product')
     {
         $item_id = Item::type($type)->where('name', $row['item_name'])->pluck('id')->first();