diff --git a/app/Http/Requests/Credit/StoreCreditRequest.php b/app/Http/Requests/Credit/StoreCreditRequest.php
index 064aed386758..78083c2abeb5 100644
--- a/app/Http/Requests/Credit/StoreCreditRequest.php
+++ b/app/Http/Requests/Credit/StoreCreditRequest.php
@@ -54,6 +54,7 @@ class StoreCreditRequest extends Request
         $rules['client_id'] = 'required|exists:clients,id,company_id,'.auth()->user()->company()->id;
 
         $rules['number'] = new UniqueCreditNumberRule($this->all());
+        $rules['line_items'] = 'array';
 
         return $rules;
     }
diff --git a/app/Http/Requests/Credit/UpdateCreditRequest.php b/app/Http/Requests/Credit/UpdateCreditRequest.php
index 4282dc93f307..426301ef39b4 100644
--- a/app/Http/Requests/Credit/UpdateCreditRequest.php
+++ b/app/Http/Requests/Credit/UpdateCreditRequest.php
@@ -56,6 +56,8 @@ class UpdateCreditRequest extends Request
             $rules['number'] = 'unique:credits,number,'.$this->id.',id,company_id,'.$this->credit->company_id;
         }
 
+        $rules['line_items'] = 'array';
+
         return $rules;
     }
 
diff --git a/app/Http/Requests/Invoice/StoreInvoiceRequest.php b/app/Http/Requests/Invoice/StoreInvoiceRequest.php
index 602c10021c5e..2da8e72603a6 100644
--- a/app/Http/Requests/Invoice/StoreInvoiceRequest.php
+++ b/app/Http/Requests/Invoice/StoreInvoiceRequest.php
@@ -55,6 +55,8 @@ class StoreInvoiceRequest extends Request
 
         $rules['project_id'] =  ['bail', 'sometimes', new ValidProjectForClient($this->all())];
 
+        $rules['line_items'] = 'array';
+
         return $rules;
     }
 
diff --git a/app/Http/Requests/Invoice/UpdateInvoiceRequest.php b/app/Http/Requests/Invoice/UpdateInvoiceRequest.php
index c9d4bb67cb1c..7234211d1884 100644
--- a/app/Http/Requests/Invoice/UpdateInvoiceRequest.php
+++ b/app/Http/Requests/Invoice/UpdateInvoiceRequest.php
@@ -54,6 +54,8 @@ class UpdateInvoiceRequest extends Request
             $rules['number'] = 'unique:invoices,number,'.$this->id.',id,company_id,'.$this->invoice->company_id;
         }
 
+        $rules['line_items'] = 'array';
+
         return $rules;
     }
 
diff --git a/app/Http/Requests/Payment/StorePaymentRequest.php b/app/Http/Requests/Payment/StorePaymentRequest.php
index 9c039ac1f29d..a8ba807423fa 100644
--- a/app/Http/Requests/Payment/StorePaymentRequest.php
+++ b/app/Http/Requests/Payment/StorePaymentRequest.php
@@ -80,7 +80,7 @@ class StorePaymentRequest extends Request
             $input['amount'] = $invoices_total - $credits_total;
         }
 
-        $input['is_manual'] = true;
+        // $input['is_manual'] = true;
 
         if (! isset($input['date'])) {
             $input['date'] = now()->format('Y-m-d');
diff --git a/app/Http/Requests/Quote/StoreQuoteRequest.php b/app/Http/Requests/Quote/StoreQuoteRequest.php
index aee92e98b627..48e2ee5508d4 100644
--- a/app/Http/Requests/Quote/StoreQuoteRequest.php
+++ b/app/Http/Requests/Quote/StoreQuoteRequest.php
@@ -94,6 +94,7 @@ class StoreQuoteRequest extends Request
         }
 
         $rules['number'] = new UniqueQuoteNumberRule($this->all());
+        $rules['line_items'] = 'array';
 
         return $rules;
     }
diff --git a/app/Http/Requests/Quote/UpdateQuoteRequest.php b/app/Http/Requests/Quote/UpdateQuoteRequest.php
index 40e022e41e5f..d9f65c710b06 100644
--- a/app/Http/Requests/Quote/UpdateQuoteRequest.php
+++ b/app/Http/Requests/Quote/UpdateQuoteRequest.php
@@ -50,6 +50,8 @@ class UpdateQuoteRequest extends Request
             $rules['number'] = 'unique:quotes,number,'.$this->id.',id,company_id,'.$this->quote->company_id;
         }
 
+        $rules['line_items'] = 'array';
+
         return $rules;
     }
 
diff --git a/app/Models/Payment.php b/app/Models/Payment.php
index 15e3042f3de9..f1ab6e08c87e 100644
--- a/app/Models/Payment.php
+++ b/app/Models/Payment.php
@@ -59,7 +59,7 @@ class Payment extends BaseModel
         'date',
         'transaction_reference',
         'number',
-        'is_manual',
+        // 'is_manual',
         'private_notes',
         'custom_value1',
         'custom_value2',
diff --git a/app/Repositories/PaymentRepository.php b/app/Repositories/PaymentRepository.php
index a7d6e6fb6b1d..4829a9b75e88 100644
--- a/app/Repositories/PaymentRepository.php
+++ b/app/Repositories/PaymentRepository.php
@@ -95,6 +95,7 @@ class PaymentRepository extends BaseRepository
 
         /*Fill the payment*/
         $payment->fill($data);
+        $payment->is_manual = true;
         $payment->status_id = Payment::STATUS_COMPLETED;
         $payment->save();
 
diff --git a/app/Utils/Traits/CleanLineItems.php b/app/Utils/Traits/CleanLineItems.php
index 07904aba88b0..b9cb852db1f0 100644
--- a/app/Utils/Traits/CleanLineItems.php
+++ b/app/Utils/Traits/CleanLineItems.php
@@ -21,7 +21,7 @@ trait CleanLineItems
 {
     public function cleanItems($items) :array
     {
-        if (! isset($items)) {
+        if (! isset($items) || !is_array($items)) {
             return [];
         }