diff --git a/app/Export/CSV/BaseExport.php b/app/Export/CSV/BaseExport.php
index dff7763ec932..b76ae7327605 100644
--- a/app/Export/CSV/BaseExport.php
+++ b/app/Export/CSV/BaseExport.php
@@ -867,15 +867,15 @@ class BaseExport
     protected function addClientFilter(Builder $query, $clients): Builder
     {
         if(is_string($clients)) {
-            $clients =  explode(',', $clients);
+            $clients = explode(',', $clients);
         }
 
         $transformed_clients = $this->transformKeys($clients);
 
-        nlog($clients);
         nlog($transformed_clients);
 
         if(count($transformed_clients) > 0) {
+            nlog("yus");
             $query->whereIn('client_id', $transformed_clients);
         }
 
@@ -1573,7 +1573,7 @@ class BaseExport
 
     public function queueDocuments(Builder $query)
     {
-        nlog("queue docs pls");
+        
         if($query->getModel() instanceof Document) {
             $documents = $query->pluck('id')->toArray();
         } else {
@@ -1584,8 +1584,6 @@ class BaseExport
                                ->toArray();
         }
 
-        nlog($documents);
-
         if(count($documents) > 0) {
 
             $user = $this->company->owner();
diff --git a/app/Export/CSV/CreditExport.php b/app/Export/CSV/CreditExport.php
index dc402741bd0e..0d6a23f82c1b 100644
--- a/app/Export/CSV/CreditExport.php
+++ b/app/Export/CSV/CreditExport.php
@@ -107,6 +107,12 @@ class CreditExport extends BaseExport
 
         $query = $this->addDateRange($query);
 
+        $clients = &$this->input['client_id'];
+
+        if($clients) {
+            $query = $this->addClientFilter($query, $clients);
+        }
+
         if($this->input['status'] ?? false) {
             $query = $this->addCreditStatusFilter($query, $this->input['status']);
         }
diff --git a/app/Export/CSV/InvoiceExport.php b/app/Export/CSV/InvoiceExport.php
index 267ae158a14a..4400e276d3c4 100644
--- a/app/Export/CSV/InvoiceExport.php
+++ b/app/Export/CSV/InvoiceExport.php
@@ -62,6 +62,12 @@ class InvoiceExport extends BaseExport
 
         $query = $this->addDateRange($query);
 
+        $clients = &$this->input['client_id'];
+
+        if($clients) {
+            $query = $this->addClientFilter($query, $clients);
+        }
+
         if($this->input['status'] ?? false) {
             $query = $this->addInvoiceStatusFilter($query, $this->input['status']);
         }
diff --git a/app/Export/CSV/InvoiceItemExport.php b/app/Export/CSV/InvoiceItemExport.php
index 19a976e828c5..422212b35694 100644
--- a/app/Export/CSV/InvoiceItemExport.php
+++ b/app/Export/CSV/InvoiceItemExport.php
@@ -75,6 +75,12 @@ class InvoiceItemExport extends BaseExport
 
         $query = $this->addDateRange($query);
 
+        $clients = &$this->input['client_id'];
+
+        if($clients) {
+            $query = $this->addClientFilter($query, $clients);
+        }
+
         if($this->input['status'] ?? false) {
             $query = $this->addInvoiceStatusFilter($query, $this->input['status']);
         }
diff --git a/app/Export/CSV/PaymentExport.php b/app/Export/CSV/PaymentExport.php
index ee217d1c6a9a..19b55bc14e04 100644
--- a/app/Export/CSV/PaymentExport.php
+++ b/app/Export/CSV/PaymentExport.php
@@ -61,6 +61,12 @@ class PaymentExport extends BaseExport
 
         $query = $this->addDateRange($query);
 
+        $clients = &$this->input['client_id'];
+
+        if($clients) {
+            $query = $this->addClientFilter($query, $clients);
+        }
+
         $query = $this->addPaymentStatusFilters($query, $this->input['status'] ?? '');
         
         if($this->input['document_email_attachment'] ?? false) {
diff --git a/app/Export/CSV/PurchaseOrderExport.php b/app/Export/CSV/PurchaseOrderExport.php
index 3451bb7be88e..e7c483f570f5 100644
--- a/app/Export/CSV/PurchaseOrderExport.php
+++ b/app/Export/CSV/PurchaseOrderExport.php
@@ -63,6 +63,12 @@ class PurchaseOrderExport extends BaseExport
 
         $query = $this->addDateRange($query);
 
+
+        $clients = &$this->input['client_id'];
+
+        if($clients)
+            $query = $this->addClientFilter($query, $clients);
+
         $query = $this->addPurchaseOrderStatusFilter($query, $this->input['status'] ?? '');
 
         if($this->input['document_email_attachment'] ?? false) {
diff --git a/app/Export/CSV/PurchaseOrderItemExport.php b/app/Export/CSV/PurchaseOrderItemExport.php
index 76107e04158c..60d94a4de0a6 100644
--- a/app/Export/CSV/PurchaseOrderItemExport.php
+++ b/app/Export/CSV/PurchaseOrderItemExport.php
@@ -67,6 +67,12 @@ class PurchaseOrderItemExport extends BaseExport
 
         $query = $this->addDateRange($query);
 
+        $clients = &$this->input['client_id'];
+
+        if($clients) {
+            $query = $this->addClientFilter($query, $clients);
+        }
+
         $query = $this->addPurchaseOrderStatusFilter($query, $this->input['status'] ?? '');
 
         if($this->input['document_email_attachment'] ?? false) {
diff --git a/app/Export/CSV/QuoteExport.php b/app/Export/CSV/QuoteExport.php
index a279d5a67b40..e4eb6b038770 100644
--- a/app/Export/CSV/QuoteExport.php
+++ b/app/Export/CSV/QuoteExport.php
@@ -69,6 +69,12 @@ class QuoteExport extends BaseExport
 
         $query = $this->addDateRange($query);
 
+        $clients = &$this->input['client_id'];
+
+        if($clients) {
+            $query = $this->addClientFilter($query, $clients);
+        }
+
         $query = $this->addQuoteStatusFilter($query, $this->input['status'] ?? '');
 
         if($this->input['document_email_attachment'] ?? false) {
diff --git a/app/Export/CSV/QuoteItemExport.php b/app/Export/CSV/QuoteItemExport.php
index 566b811029d5..34853b3432f4 100644
--- a/app/Export/CSV/QuoteItemExport.php
+++ b/app/Export/CSV/QuoteItemExport.php
@@ -70,6 +70,12 @@ class QuoteItemExport extends BaseExport
 
         $query = $this->addDateRange($query);
 
+        $clients = &$this->input['client_id'];
+
+        if($clients) {
+            $query = $this->addClientFilter($query, $clients);
+        }
+
         $query = $this->addQuoteStatusFilter($query, $this->input['status'] ?? '');
 
         if($this->input['document_email_attachment'] ?? false) {
diff --git a/app/Export/CSV/RecurringInvoiceExport.php b/app/Export/CSV/RecurringInvoiceExport.php
index 87afe6e7d90e..c3049242ad0d 100644
--- a/app/Export/CSV/RecurringInvoiceExport.php
+++ b/app/Export/CSV/RecurringInvoiceExport.php
@@ -61,6 +61,12 @@ class RecurringInvoiceExport extends BaseExport
 
         $query = $this->addDateRange($query);
 
+        $clients = &$this->input['client_id'];
+
+        if($clients) {
+            $query = $this->addClientFilter($query, $clients);
+        }
+
         $query = $this->addRecurringInvoiceStatusFilter($query, $this->input['status'] ?? '');
 
         return $query;
diff --git a/app/Export/CSV/TaskExport.php b/app/Export/CSV/TaskExport.php
index 2010b112e06f..f4f677197887 100644
--- a/app/Export/CSV/TaskExport.php
+++ b/app/Export/CSV/TaskExport.php
@@ -72,10 +72,16 @@ class TaskExport extends BaseExport
                         ->where('is_deleted', $this->input['include_deleted'] ?? false);
 
         $query = $this->addDateRange($query);
+        
+        $clients = &$this->input['client_id'];
 
-        if($this->input['document_email_attachment'] ?? false) {
+        if($clients)
+            $query = $this->addClientFilter($query, $clients);
+
+        $document_attachments = &$this->input['document_email_attachment'];
+
+        if($document_attachments) 
             $this->queueDocuments($query);
-        }
 
         return $query;
 
@@ -132,9 +138,9 @@ class TaskExport extends BaseExport
     {
         $entity = [];
         $transformed_entity = $this->entity_transformer->transform($task);
-
+nlog($this->input['report_keys']);
         foreach (array_values($this->input['report_keys']) as $key) {
-
+nlog($key);
             $parts = explode('.', $key);
 
             if (is_array($parts) && $parts[0] == 'task' && array_key_exists($parts[1], $transformed_entity)) {
diff --git a/app/Filters/ClientFilters.php b/app/Filters/ClientFilters.php
index 720181d8aac7..a458d2536d77 100644
--- a/app/Filters/ClientFilters.php
+++ b/app/Filters/ClientFilters.php
@@ -137,6 +137,7 @@ class ClientFilters extends QueryFilters
                               $query->where('first_name', 'like', '%'.$filter.'%');
                               $query->orWhere('last_name', 'like', '%'.$filter.'%');
                               $query->orWhere('email', 'like', '%'.$filter.'%');
+                              $query->orWhere('phone', 'like', '%'.$filter.'%');
                           })
                           ->orWhere('custom_value1', 'like', '%'.$filter.'%')
                           ->orWhere('custom_value2', 'like', '%'.$filter.'%')
diff --git a/app/Http/Controllers/Reports/ARDetailReportController.php b/app/Http/Controllers/Reports/ARDetailReportController.php
index 3eecd27cac2a..a1c5f3ec00c5 100644
--- a/app/Http/Controllers/Reports/ARDetailReportController.php
+++ b/app/Http/Controllers/Reports/ARDetailReportController.php
@@ -66,7 +66,7 @@ class ARDetailReportController extends BaseController
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        if ($request->has('send_email') && $request->get('send_email')) {
+        if ($request->has('send_email') && $request->get('send_email') && $request->missing('output')) {
             SendToAdmin::dispatch($user->company(), $request->all(), ARDetailReport::class, $this->filename);
 
             return response()->json(['message' => 'working...'], 200);
diff --git a/app/Http/Controllers/Reports/ARSummaryReportController.php b/app/Http/Controllers/Reports/ARSummaryReportController.php
index 9b1ff6d25f61..9f0aef570005 100644
--- a/app/Http/Controllers/Reports/ARSummaryReportController.php
+++ b/app/Http/Controllers/Reports/ARSummaryReportController.php
@@ -65,7 +65,7 @@ class ARSummaryReportController extends BaseController
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        if ($request->has('send_email') && $request->get('send_email')) {
+        if ($request->has('send_email') && $request->get('send_email') && $request->missing('output')) {
             SendToAdmin::dispatch($user->company(), $request->all(), ARSummaryReport::class, $this->filename);
 
             return response()->json(['message' => 'working...'], 200);
diff --git a/app/Http/Controllers/Reports/ActivityReportController.php b/app/Http/Controllers/Reports/ActivityReportController.php
index f9af9fa3af0d..7c15725a014e 100644
--- a/app/Http/Controllers/Reports/ActivityReportController.php
+++ b/app/Http/Controllers/Reports/ActivityReportController.php
@@ -36,7 +36,7 @@ class ActivityReportController extends BaseController
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        if ($request->has('send_email') && $request->get('send_email')) {
+        if ($request->has('send_email') && $request->get('send_email') && $request->missing('output')) {
             SendToAdmin::dispatch($user->company(), $request->all(), ActivityExport::class, $this->filename);
 
             return response()->json(['message' => 'working...'], 200);
diff --git a/app/Http/Controllers/Reports/ClientBalanceReportController.php b/app/Http/Controllers/Reports/ClientBalanceReportController.php
index d5dfb8cb4870..6c6d9c4922a2 100644
--- a/app/Http/Controllers/Reports/ClientBalanceReportController.php
+++ b/app/Http/Controllers/Reports/ClientBalanceReportController.php
@@ -65,7 +65,7 @@ class ClientBalanceReportController extends BaseController
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        if ($request->has('send_email') && $request->get('send_email')) {
+        if ($request->has('send_email') && $request->get('send_email') && $request->missing('output')) {
             SendToAdmin::dispatch($user->company(), $request->all(), ClientBalanceReport::class, $this->filename);
 
             return response()->json(['message' => 'working...'], 200);
diff --git a/app/Http/Controllers/Reports/ClientContactReportController.php b/app/Http/Controllers/Reports/ClientContactReportController.php
index 0062eeffa99c..3284a54b74f7 100644
--- a/app/Http/Controllers/Reports/ClientContactReportController.php
+++ b/app/Http/Controllers/Reports/ClientContactReportController.php
@@ -66,7 +66,7 @@ class ClientContactReportController extends BaseController
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        if ($request->has('send_email') && $request->get('send_email')) {
+        if ($request->has('send_email') && $request->get('send_email') && $request->missing('output')) {
             SendToAdmin::dispatch($user->company(), $request->all(), ContactExport::class, $this->filename);
 
             return response()->json(['message' => 'working...'], 200);
diff --git a/app/Http/Controllers/Reports/ClientReportController.php b/app/Http/Controllers/Reports/ClientReportController.php
index a0ff126cc69f..612e156cac23 100644
--- a/app/Http/Controllers/Reports/ClientReportController.php
+++ b/app/Http/Controllers/Reports/ClientReportController.php
@@ -67,7 +67,7 @@ class ClientReportController extends BaseController
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        if ($request->has('send_email') && $request->get('send_email')) {
+        if ($request->has('send_email') && $request->get('send_email') && $request->missing('output')) {
             SendToAdmin::dispatch($user->company(), $request->all(), ClientExport::class, $this->filename);
 
             return response()->json(['message' => 'working...'], 200);
diff --git a/app/Http/Controllers/Reports/ClientSalesReportController.php b/app/Http/Controllers/Reports/ClientSalesReportController.php
index 545c89bb6ea8..22d143e26a39 100644
--- a/app/Http/Controllers/Reports/ClientSalesReportController.php
+++ b/app/Http/Controllers/Reports/ClientSalesReportController.php
@@ -65,7 +65,7 @@ class ClientSalesReportController extends BaseController
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        if ($request->has('send_email') && $request->get('send_email')) {
+        if ($request->has('send_email') && $request->get('send_email') && $request->missing('output')) {
             SendToAdmin::dispatch($user->company(), $request->all(), ClientSalesReport::class, $this->filename);
 
             return response()->json(['message' => 'working...'], 200);
diff --git a/app/Http/Controllers/Reports/CreditReportController.php b/app/Http/Controllers/Reports/CreditReportController.php
index 533a45e046e7..59582d461d6f 100644
--- a/app/Http/Controllers/Reports/CreditReportController.php
+++ b/app/Http/Controllers/Reports/CreditReportController.php
@@ -66,7 +66,7 @@ class CreditReportController extends BaseController
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        if ($request->has('send_email') && $request->get('send_email')) {
+        if ($request->has('send_email') && $request->get('send_email') && $request->missing('output')) {
             SendToAdmin::dispatch($user->company(), $request->all(), CreditExport::class, $this->filename);
 
             return response()->json(['message' => 'working...'], 200);
diff --git a/app/Http/Controllers/Reports/DocumentReportController.php b/app/Http/Controllers/Reports/DocumentReportController.php
index fb592f9909ab..42c5e2e96568 100644
--- a/app/Http/Controllers/Reports/DocumentReportController.php
+++ b/app/Http/Controllers/Reports/DocumentReportController.php
@@ -67,7 +67,7 @@ class DocumentReportController extends BaseController
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        if ($request->has('send_email') && $request->get('send_email')) {
+        if ($request->has('send_email') && $request->get('send_email') && $request->missing('output')) {
             SendToAdmin::dispatch($user->company(), $request->all(), DocumentExport::class, $this->filename);
 
             return response()->json(['message' => 'working...'], 200);
diff --git a/app/Http/Controllers/Reports/ExpenseReportController.php b/app/Http/Controllers/Reports/ExpenseReportController.php
index 12e3c7cf813e..ee36288f3202 100644
--- a/app/Http/Controllers/Reports/ExpenseReportController.php
+++ b/app/Http/Controllers/Reports/ExpenseReportController.php
@@ -68,7 +68,7 @@ class ExpenseReportController extends BaseController
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        if ($request->has('send_email') && $request->get('send_email')) {
+        if ($request->has('send_email') && $request->get('send_email') && $request->missing('output')) {
             SendToAdmin::dispatch($user->company(), $request->all(), ExpenseExport::class, $this->filename);
 
             return response()->json(['message' => 'working...'], 200);
diff --git a/app/Http/Controllers/Reports/InvoiceItemReportController.php b/app/Http/Controllers/Reports/InvoiceItemReportController.php
index 847db7a339f5..2890f7d60044 100644
--- a/app/Http/Controllers/Reports/InvoiceItemReportController.php
+++ b/app/Http/Controllers/Reports/InvoiceItemReportController.php
@@ -66,7 +66,7 @@ class InvoiceItemReportController extends BaseController
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        if ($request->has('send_email') && $request->get('send_email')) {
+        if ($request->has('send_email') && $request->get('send_email') && $request->missing('output')) {
             SendToAdmin::dispatch($user->company(), $request->all(), InvoiceItemExport::class, $this->filename);
 
             return response()->json(['message' => 'working...'], 200);
diff --git a/app/Http/Controllers/Reports/InvoiceReportController.php b/app/Http/Controllers/Reports/InvoiceReportController.php
index d6b8a0dc08f6..81cabea435c2 100644
--- a/app/Http/Controllers/Reports/InvoiceReportController.php
+++ b/app/Http/Controllers/Reports/InvoiceReportController.php
@@ -66,7 +66,7 @@ class InvoiceReportController extends BaseController
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        if ($request->has('send_email') && $request->get('send_email')) {
+        if ($request->has('send_email') && $request->get('send_email') && $request->missing('output')) {
             SendToAdmin::dispatch($user->company(), $request->all(), InvoiceExport::class, $this->filename);
 
             return response()->json(['message' => 'working...'], 200);
diff --git a/app/Http/Controllers/Reports/PaymentReportController.php b/app/Http/Controllers/Reports/PaymentReportController.php
index 27db61d23118..7c062dd4ca04 100644
--- a/app/Http/Controllers/Reports/PaymentReportController.php
+++ b/app/Http/Controllers/Reports/PaymentReportController.php
@@ -67,7 +67,7 @@ class PaymentReportController extends BaseController
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        if ($request->has('send_email') && $request->get('send_email')) {
+        if ($request->has('send_email') && $request->get('send_email') && $request->missing('output')) {
             SendToAdmin::dispatch($user->company(), $request->all(), PaymentExport::class, $this->filename);
 
             return response()->json(['message' => 'working...'], 200);
diff --git a/app/Http/Controllers/Reports/ProductReportController.php b/app/Http/Controllers/Reports/ProductReportController.php
index 0bed856bf1c9..78f23584cac2 100644
--- a/app/Http/Controllers/Reports/ProductReportController.php
+++ b/app/Http/Controllers/Reports/ProductReportController.php
@@ -68,7 +68,7 @@ class ProductReportController extends BaseController
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        if ($request->has('send_email') && $request->get('send_email')) {
+        if ($request->has('send_email') && $request->get('send_email') && $request->missing('output')) {
             SendToAdmin::dispatch($user->company(), $request->all(), ProductExport::class, $this->filename);
 
             return response()->json(['message' => 'working...'], 200);
diff --git a/app/Http/Controllers/Reports/ProductSalesReportController.php b/app/Http/Controllers/Reports/ProductSalesReportController.php
index 796adfd1e492..86c69dbb48a8 100644
--- a/app/Http/Controllers/Reports/ProductSalesReportController.php
+++ b/app/Http/Controllers/Reports/ProductSalesReportController.php
@@ -67,7 +67,7 @@ class ProductSalesReportController extends BaseController
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        if ($request->has('send_email') && $request->get('send_email')) {
+        if ($request->has('send_email') && $request->get('send_email') && $request->missing('output')) {
             SendToAdmin::dispatch($user->company(), $request->all(), ProductSalesExport::class, $this->filename);
 
             return response()->json(['message' => 'working...'], 200);
diff --git a/app/Http/Controllers/Reports/ProfitAndLossController.php b/app/Http/Controllers/Reports/ProfitAndLossController.php
index 7d52865eb927..36bcf642c905 100644
--- a/app/Http/Controllers/Reports/ProfitAndLossController.php
+++ b/app/Http/Controllers/Reports/ProfitAndLossController.php
@@ -67,7 +67,7 @@ class ProfitAndLossController extends BaseController
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        if ($request->has('send_email') && $request->get('send_email')) {
+        if ($request->has('send_email') && $request->get('send_email') && $request->missing('output')) {
             SendToAdmin::dispatch($user->company(), $request->all(), ProfitLoss::class, $this->filename);
 
             return response()->json(['message' => 'working...'], 200);
diff --git a/app/Http/Controllers/Reports/PurchaseOrderItemReportController.php b/app/Http/Controllers/Reports/PurchaseOrderItemReportController.php
index b6ede66f16ca..e541d32b01b5 100644
--- a/app/Http/Controllers/Reports/PurchaseOrderItemReportController.php
+++ b/app/Http/Controllers/Reports/PurchaseOrderItemReportController.php
@@ -34,7 +34,7 @@ class PurchaseOrderItemReportController extends BaseController
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        if ($request->has('send_email') && $request->get('send_email')) {
+        if ($request->has('send_email') && $request->get('send_email') && $request->missing('output')) {
             SendToAdmin::dispatch($user->company(), $request->all(), PurchaseOrderItemExport::class, $this->filename);
 
             return response()->json(['message' => 'working...'], 200);
diff --git a/app/Http/Controllers/Reports/PurchaseOrderReportController.php b/app/Http/Controllers/Reports/PurchaseOrderReportController.php
index c8d14be82422..e24c74dc5487 100644
--- a/app/Http/Controllers/Reports/PurchaseOrderReportController.php
+++ b/app/Http/Controllers/Reports/PurchaseOrderReportController.php
@@ -36,7 +36,7 @@ class PurchaseOrderReportController extends BaseController
         $user = auth()->user();
 
 
-        if ($request->has('send_email') && $request->get('send_email')) {
+        if ($request->has('send_email') && $request->get('send_email') && $request->missing('output')) {
             SendToAdmin::dispatch($user->company(), $request->all(), PurchaseOrderExport::class, $this->filename);
 
             return response()->json(['message' => 'working...'], 200);
diff --git a/app/Http/Controllers/Reports/QuoteItemReportController.php b/app/Http/Controllers/Reports/QuoteItemReportController.php
index 2fad0670c8d5..c0802cd0a43a 100644
--- a/app/Http/Controllers/Reports/QuoteItemReportController.php
+++ b/app/Http/Controllers/Reports/QuoteItemReportController.php
@@ -66,7 +66,7 @@ class QuoteItemReportController extends BaseController
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        if ($request->has('send_email') && $request->get('send_email')) {
+        if ($request->has('send_email') && $request->get('send_email') && $request->missing('output')) {
             SendToAdmin::dispatch($user->company(), $request->all(), QuoteItemExport::class, $this->filename);
 
             return response()->json(['message' => 'working...'], 200);
diff --git a/app/Http/Controllers/Reports/QuoteReportController.php b/app/Http/Controllers/Reports/QuoteReportController.php
index a215846aaafc..1916e8f9d867 100644
--- a/app/Http/Controllers/Reports/QuoteReportController.php
+++ b/app/Http/Controllers/Reports/QuoteReportController.php
@@ -66,7 +66,7 @@ class QuoteReportController extends BaseController
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        if ($request->has('send_email') && $request->get('send_email')) {
+        if ($request->has('send_email') && $request->get('send_email') && $request->missing('output')) {
             SendToAdmin::dispatch($user->company(), $request->all(), QuoteExport::class, $this->filename);
 
             return response()->json(['message' => 'working...'], 200);
diff --git a/app/Http/Controllers/Reports/RecurringInvoiceReportController.php b/app/Http/Controllers/Reports/RecurringInvoiceReportController.php
index 7536b256115a..85a86a72aa4c 100644
--- a/app/Http/Controllers/Reports/RecurringInvoiceReportController.php
+++ b/app/Http/Controllers/Reports/RecurringInvoiceReportController.php
@@ -34,7 +34,7 @@ class RecurringInvoiceReportController extends BaseController
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        if ($request->has('send_email') && $request->get('send_email')) {
+        if ($request->has('send_email') && $request->get('send_email') && $request->missing('output')) {
             SendToAdmin::dispatch($user->company(), $request->all(), RecurringInvoiceExport::class, $this->filename);
 
             return response()->json(['message' => 'working...'], 200);
diff --git a/app/Http/Controllers/Reports/TaskReportController.php b/app/Http/Controllers/Reports/TaskReportController.php
index 8293f863c5c9..86384b9e8f61 100644
--- a/app/Http/Controllers/Reports/TaskReportController.php
+++ b/app/Http/Controllers/Reports/TaskReportController.php
@@ -66,7 +66,8 @@ class TaskReportController extends BaseController
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        if ($request->has('send_email') && $request->get('send_email')) {
+        if ($request->has('send_email') && $request->get('send_email') && $request->missing('output')) 
+        {
             SendToAdmin::dispatch($user->company(), $request->all(), TaskExport::class, $this->filename);
 
             return response()->json(['message' => 'working...'], 200);
diff --git a/app/Http/Controllers/Reports/TaxSummaryReportController.php b/app/Http/Controllers/Reports/TaxSummaryReportController.php
index 590234159f7a..e543b4c511e2 100644
--- a/app/Http/Controllers/Reports/TaxSummaryReportController.php
+++ b/app/Http/Controllers/Reports/TaxSummaryReportController.php
@@ -66,7 +66,7 @@ class TaxSummaryReportController extends BaseController
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        if ($request->has('send_email') && $request->get('send_email')) {
+        if ($request->has('send_email') && $request->get('send_email') && $request->missing('output')) {
             SendToAdmin::dispatch($user->company(), $request->all(), TaxSummaryReport::class, $this->filename);
 
             return response()->json(['message' => 'working...'], 200);
diff --git a/app/Http/Controllers/Reports/UserSalesReportController.php b/app/Http/Controllers/Reports/UserSalesReportController.php
index cb904ad76783..882cadb54010 100644
--- a/app/Http/Controllers/Reports/UserSalesReportController.php
+++ b/app/Http/Controllers/Reports/UserSalesReportController.php
@@ -65,7 +65,7 @@ class UserSalesReportController extends BaseController
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        if ($request->has('send_email') && $request->get('send_email')) {
+        if ($request->has('send_email') && $request->get('send_email') && $request->missing('output')) {
             SendToAdmin::dispatch($user->company(), $request->all(), UserSalesReport::class, $this->filename);
 
             return response()->json(['message' => 'working...'], 200);
diff --git a/app/Http/Controllers/Reports/VendorReportController.php b/app/Http/Controllers/Reports/VendorReportController.php
index d86f031df741..5f79523a7cc9 100644
--- a/app/Http/Controllers/Reports/VendorReportController.php
+++ b/app/Http/Controllers/Reports/VendorReportController.php
@@ -34,7 +34,7 @@ class VendorReportController extends BaseController
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        if ($request->has('send_email') && $request->get('send_email')) {
+        if ($request->has('send_email') && $request->get('send_email') && $request->missing('output')) {
             SendToAdmin::dispatch($user->company(), $request->all(), VendorExport::class, $this->filename);
 
             return response()->json(['message' => 'working...'], 200);
diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index ae9b9bea1244..1326262ec297 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -1144,8 +1144,6 @@ class Import implements ShouldQueue
 
             $key = "invoices_{$resource['id']}";
 
-            nlog($invoice->id);
-
             $this->ids['invoices'][$key] = [
                 'old' => $resource['id'],
                 'new' => $invoice->id,
diff --git a/app/Models/Client.php b/app/Models/Client.php
index 8525cde2784f..17c15a33f3d0 100644
--- a/app/Models/Client.php
+++ b/app/Models/Client.php
@@ -796,15 +796,18 @@ class Client extends BaseModel implements HasLocalePreference
     {
         $defaults = [];
 
-        if (! (array_key_exists('terms', $data) && is_string($data['terms']) && strlen($data['terms']) > 1)) {
+        $terms = &$data['terms'];
+        $footer = &$data['footer'];
+
+        if (!$terms || ($terms && strlen((string)$terms) == 0)) {
             $defaults['terms'] = $this->getSetting($entity_name.'_terms');
-        } elseif (array_key_exists('terms', $data)) {
+        } elseif ($terms) {
             $defaults['terms'] = $data['terms'];
         }
 
-        if (! (array_key_exists('footer', $data) && is_string($data['footer']) && strlen($data['footer']) > 1)) {
+        if (!$footer || ($footer && strlen((string)$footer) == 0)) {
             $defaults['footer'] = $this->getSetting($entity_name.'_footer');
-        } elseif (array_key_exists('footer', $data)) {
+        } elseif ($footer) {
             $defaults['footer'] = $data['footer'];
         }
 
diff --git a/app/Repositories/BaseRepository.php b/app/Repositories/BaseRepository.php
index c14324089fe0..646ce9572288 100644
--- a/app/Repositories/BaseRepository.php
+++ b/app/Repositories/BaseRepository.php
@@ -167,7 +167,8 @@ class BaseRepository
             $company_defaults = $client->setCompanyDefaults($data, lcfirst($resource));
             $data['exchange_rate'] = $company_defaults['exchange_rate'];
             $model->uses_inclusive_taxes = $client->getSetting('inclusive_taxes');
-            $data = array_merge($company_defaults, $data);
+            // $data = array_merge($company_defaults, $data);
+            $data = array_merge($data, $company_defaults);
         }
 
         $tmp_data = $data; //preserves the $data array
diff --git a/resources/views/portal/ninja2020/gateways/stripe/ach/pay.blade.php b/resources/views/portal/ninja2020/gateways/stripe/ach/pay.blade.php
index 087593cd8fec..9519f57dafc6 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/ach/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/ach/pay.blade.php
@@ -63,7 +63,7 @@
         @endcomponent
 
         @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.account_holder_name')])
-            <input class="input w-full" id="account-holder-name-field" type="text" placeholder="{{ ctrans('texts.name') }}" value="{{ $gateway->client->present()->first_name() }} {{ $gateway->client->present()->last_name(); }}"required>
+            <input class="input w-full" id="account-holder-name-field" type="text" placeholder="{{ ctrans('texts.name') }}" value="{{ $gateway->client->present()->first_name() }} {{ $gateway->client->present()->last_name() }}"required>
         @endcomponent
         @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.email')])
             <input class="input w-full" id="email-field" type="text" placeholder="{{ ctrans('texts.email') }}" value="{{ $gateway->client->present()->email(); }}" required>