diff --git a/app/Filters/BankTransactionFilters.php b/app/Filters/BankTransactionFilters.php
index 41a558931e99..15c02a7b9768 100644
--- a/app/Filters/BankTransactionFilters.php
+++ b/app/Filters/BankTransactionFilters.php
@@ -151,7 +151,7 @@ class BankTransactionFilters extends QueryFilters
     /**
      * Filters the query by the users company ID.
      *
-     * @return Illuminate\Database\Query\Builder
+     * @return \Illuminate\Database\Eloquent\Builder
      */
     public function entityFilter()
     {
diff --git a/app/Filters/BankTransactionRuleFilters.php b/app/Filters/BankTransactionRuleFilters.php
index d19e49371474..d7c4a83bb387 100644
--- a/app/Filters/BankTransactionRuleFilters.php
+++ b/app/Filters/BankTransactionRuleFilters.php
@@ -71,7 +71,7 @@ class BankTransactionRuleFilters extends QueryFilters
     /**
      * Filters the query by the users company ID.
      *
-     * @return Illuminate\Database\Query\Builder
+     * @return \Illuminate\Database\Eloquent\Builder
      */
     public function entityFilter()
     {
diff --git a/app/Filters/QueryFilters.php b/app/Filters/QueryFilters.php
index 036b7a892ed0..e0da087a8442 100644
--- a/app/Filters/QueryFilters.php
+++ b/app/Filters/QueryFilters.php
@@ -11,7 +11,6 @@
 
 namespace App\Filters;
 
-//use Illuminate\Database\Query\Builder;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
diff --git a/app/Filters/QuoteFilters.php b/app/Filters/QuoteFilters.php
index 2befad099495..1cb0bed3a999 100644
--- a/app/Filters/QuoteFilters.php
+++ b/app/Filters/QuoteFilters.php
@@ -152,7 +152,7 @@ class QuoteFilters extends QueryFilters
     /**
      * Filters the query by the users company ID.
      *
-     * @return Illuminate\Eloquent\Query\Builder
+     * @return \Illuminate\Database\Eloquent\Builder
      */
     public function entityFilter(): Builder
     {
diff --git a/app/Filters/RecurringExpenseFilters.php b/app/Filters/RecurringExpenseFilters.php
index 95a293c5274b..35d2afd0c99a 100644
--- a/app/Filters/RecurringExpenseFilters.php
+++ b/app/Filters/RecurringExpenseFilters.php
@@ -69,7 +69,7 @@ class RecurringExpenseFilters extends QueryFilters
     /**
      * Filters the query by the users company ID.
      *
-     * @return Illuminate\Eloquent\Builder
+     * @return \Illuminate\Database\Eloquent\Builder
      */
     public function entityFilter(): Builder
     {
diff --git a/app/Http/Controllers/BankTransactionRuleController.php b/app/Http/Controllers/BankTransactionRuleController.php
index 822a3cdc5165..a5a918743138 100644
--- a/app/Http/Controllers/BankTransactionRuleController.php
+++ b/app/Http/Controllers/BankTransactionRuleController.php
@@ -11,20 +11,21 @@
 
 namespace App\Http\Controllers;
 
-use App\Factory\BankTransactionRuleFactory;
+use App\Utils\Traits\MakesHash;
+use Illuminate\Support\Collection;
+use App\Models\BankTransactionRule;
 use App\Filters\BankTransactionFilters;
+use App\Factory\BankTransactionRuleFactory;
 use App\Filters\BankTransactionRuleFilters;
+use App\Repositories\BankTransactionRuleRepository;
+use App\Transformers\BankTransactionRuleTransformer;
 use App\Http\Requests\BankTransactionRule\BulkBankTransactionRuleRequest;
-use App\Http\Requests\BankTransactionRule\CreateBankTransactionRuleRequest;
-use App\Http\Requests\BankTransactionRule\DestroyBankTransactionRuleRequest;
 use App\Http\Requests\BankTransactionRule\EditBankTransactionRuleRequest;
 use App\Http\Requests\BankTransactionRule\ShowBankTransactionRuleRequest;
 use App\Http\Requests\BankTransactionRule\StoreBankTransactionRuleRequest;
+use App\Http\Requests\BankTransactionRule\CreateBankTransactionRuleRequest;
 use App\Http\Requests\BankTransactionRule\UpdateBankTransactionRuleRequest;
-use App\Models\BankTransactionRule;
-use App\Repositories\BankTransactionRuleRepository;
-use App\Transformers\BankTransactionRuleTransformer;
-use App\Utils\Traits\MakesHash;
+use App\Http\Requests\BankTransactionRule\DestroyBankTransactionRuleRequest;
 
 class BankTransactionRuleController extends BaseController
 {
@@ -99,7 +100,7 @@ class BankTransactionRuleController extends BaseController
      *
      * @param ShowBankTransactionRuleRequest $request
      * @param BankTransactionRule $bank_transaction_rule
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Get(
@@ -154,7 +155,7 @@ class BankTransactionRuleController extends BaseController
      *
      * @param EditBankTransactionRuleRequest $request
      * @param BankTransactionRule $bank_transaction_rule
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Get(
@@ -208,7 +209,7 @@ class BankTransactionRuleController extends BaseController
      *
      * @param UpdateBankTransactionRuleRequest $request
      * @param BankTransactionRule $bank_transaction_rule
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      *
      *
      *
@@ -265,7 +266,7 @@ class BankTransactionRuleController extends BaseController
      * Show the form for creating a new resource.
      *
      * @param CreateBankTransactionRuleRequest $request
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      *
      *
      *
@@ -310,7 +311,7 @@ class BankTransactionRuleController extends BaseController
      * Store a newly created resource in storage.
      *
      * @param StoreBankTransactionRuleRequest $request
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      *
      *
      *
@@ -357,7 +358,7 @@ class BankTransactionRuleController extends BaseController
      *
      * @param DestroyBankTransactionRuleRequest $request
      * @param BankTransactionRule $bank_transaction_rule
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      *
      *
      * @throws \Exception
@@ -412,7 +413,7 @@ class BankTransactionRuleController extends BaseController
     /**
      * Perform bulk actions on the list view.
      *
-     * @return Collection
+     * @return \Illuminate\Support\Collection
      *
      * @OA\Post(
      *      path="/api/v1/bank_transation_rules/bulk",
diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php
index f86e69f3f27c..59c6d5c576dd 100644
--- a/app/Http/Controllers/ClientController.php
+++ b/app/Http/Controllers/ClientController.php
@@ -238,7 +238,7 @@ class ClientController extends BaseController
      *
      * @param PurgeClientRequest $request
      * @param Client $client
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      *
      */
     public function purge(PurgeClientRequest $request, Client $client)
@@ -266,7 +266,7 @@ class ClientController extends BaseController
      * @param PurgeClientRequest $request
      * @param Client $client
      * @param string $mergeable_client
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      *
      */
 
diff --git a/app/Http/Controllers/ClientPortal/PaymentController.php b/app/Http/Controllers/ClientPortal/PaymentController.php
index 8c726b97dec0..826fb9fb15ff 100644
--- a/app/Http/Controllers/ClientPortal/PaymentController.php
+++ b/app/Http/Controllers/ClientPortal/PaymentController.php
@@ -143,7 +143,7 @@ class PaymentController extends Controller
      * Pay for invoice/s using credits only.
      *
      * @param Request $request The request object
-     * @return Response         The response view
+     * @return \Response         The response view
      */
     public function credit_response(Request $request)
     {
diff --git a/app/Http/Controllers/ClientPortal/PaymentMethodController.php b/app/Http/Controllers/ClientPortal/PaymentMethodController.php
index a590276c8a0d..9e63cf22cd7c 100644
--- a/app/Http/Controllers/ClientPortal/PaymentMethodController.php
+++ b/app/Http/Controllers/ClientPortal/PaymentMethodController.php
@@ -48,7 +48,7 @@ class PaymentMethodController extends Controller
      * Show the form for creating a new resource.
      *
      * @param CreatePaymentMethodRequest $request
-     * @return Response
+     * @return \Illuminate\View\View
      */
     public function create(CreatePaymentMethodRequest $request)
     {
@@ -67,7 +67,7 @@ class PaymentMethodController extends Controller
      * Store a newly created resource in storage.
      *
      * @param Request $request
-     * @return Response
+     * @return \Illuminate\View\View
      */
     public function store(Request $request)
     {
diff --git a/app/Http/Controllers/ClientPortal/QuoteController.php b/app/Http/Controllers/ClientPortal/QuoteController.php
index dd56ca5edd0e..1b36166538d4 100644
--- a/app/Http/Controllers/ClientPortal/QuoteController.php
+++ b/app/Http/Controllers/ClientPortal/QuoteController.php
@@ -78,7 +78,6 @@ class QuoteController extends Controller
     public function bulk(ProcessQuotesInBulkRequest $request)
     {
         $transformed_ids = $this->transformKeys($request->quotes);
-        nlog(request()->all());
 
         if ($request->action == 'download') {
             return $this->downloadQuotes((array) $transformed_ids);
diff --git a/app/Http/Controllers/ClientPortal/StatementController.php b/app/Http/Controllers/ClientPortal/StatementController.php
index 0720e8d52a1d..7ed81d48fed3 100644
--- a/app/Http/Controllers/ClientPortal/StatementController.php
+++ b/app/Http/Controllers/ClientPortal/StatementController.php
@@ -23,7 +23,7 @@ class StatementController extends Controller
     /**
      * Show the statement in the client portal.
      *
-     * @return View
+     * @return \Illuminate\View\View         
      */
     public function index(): View
     {
diff --git a/app/Http/Controllers/ConnectedAccountController.php b/app/Http/Controllers/ConnectedAccountController.php
index 892867e98078..6e2031587f48 100644
--- a/app/Http/Controllers/ConnectedAccountController.php
+++ b/app/Http/Controllers/ConnectedAccountController.php
@@ -38,7 +38,7 @@ class ConnectedAccountController extends BaseController
      * Connect an OAuth account to a regular email/password combination account
      *
      * @param Request $request
-     * @return JsonResponse.
+     * @return \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Post(
diff --git a/app/Http/Controllers/Contact/LoginController.php b/app/Http/Controllers/Contact/LoginController.php
index 3ecc364402ba..3ab4ea8d78b3 100644
--- a/app/Http/Controllers/Contact/LoginController.php
+++ b/app/Http/Controllers/Contact/LoginController.php
@@ -58,7 +58,7 @@ class LoginController extends BaseController
      *
      * @param Request $request The request
      *
-     * @return     Response|User Process user login.
+     * @return \Illuminate\Http\JsonResponse
      * @throws \Illuminate\Validation\ValidationException
      */
     public function apiLogin(Request $request)
diff --git a/app/Http/Controllers/CreditController.php b/app/Http/Controllers/CreditController.php
index bff1ac302f19..1e33151d3af5 100644
--- a/app/Http/Controllers/CreditController.php
+++ b/app/Http/Controllers/CreditController.php
@@ -447,7 +447,7 @@ class CreditController extends BaseController
     /**
      * Perform bulk actions on the list view.
      *
-     * @return Collection
+     * @return \Illuminate\Support\Collection
      *
      * @OA\Post(
      *      path="/api/v1/credits/bulk",
diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index 81556fc531af..636f0479531b 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -476,7 +476,7 @@ class InvoiceController extends BaseController
     /**
      * Perform bulk actions on the list view.
      *
-     * @return Collection
+     * @return \Illuminate\Support\Collection
      *
      * @OA\Post(
      *      path="/api/v1/invoices/bulk",
diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php
index ea9838358515..f747741342fb 100644
--- a/app/Http/Controllers/PaymentController.php
+++ b/app/Http/Controllers/PaymentController.php
@@ -445,7 +445,7 @@ class PaymentController extends BaseController
     /**
      * Perform bulk actions on the list view.
      *
-     * @return Collection
+     * @return \Illuminate\Support\Collection
      *
      *
      * @OA\Post(
diff --git a/app/Http/Controllers/PaymentTermController.php b/app/Http/Controllers/PaymentTermController.php
index 6cf732a885d7..0864dc9e4ee4 100644
--- a/app/Http/Controllers/PaymentTermController.php
+++ b/app/Http/Controllers/PaymentTermController.php
@@ -397,7 +397,7 @@ class PaymentTermController extends BaseController
     /**
      * Perform bulk actions on the list view.
      *
-     * @return Collection
+     * @return \Illuminate\Support\Collection
      *
      *
      * @OA\Post(
diff --git a/app/Http/Controllers/ProductController.php b/app/Http/Controllers/ProductController.php
index f747d25a967d..5f4a4b38f150 100644
--- a/app/Http/Controllers/ProductController.php
+++ b/app/Http/Controllers/ProductController.php
@@ -408,7 +408,7 @@ class ProductController extends BaseController
     /**
      * Perform bulk actions on the list view.
      *
-     * @return Collection
+     * @return \Illuminate\Support\Collection
      *
      *
      * @OA\Post(
diff --git a/app/Http/Controllers/PurchaseOrderController.php b/app/Http/Controllers/PurchaseOrderController.php
index c6892f89a69d..0355355781d6 100644
--- a/app/Http/Controllers/PurchaseOrderController.php
+++ b/app/Http/Controllers/PurchaseOrderController.php
@@ -427,7 +427,7 @@ class PurchaseOrderController extends BaseController
     /**
      * Perform bulk actions on the list view.
      *
-     * @return Collection
+     * @return \Illuminate\Support\Collection
      *
      * @OA\Post(
      *      path="/api/v1/purchase_orders/bulk",
diff --git a/app/Http/Controllers/QuoteController.php b/app/Http/Controllers/QuoteController.php
index bfee11be5a57..1e53d2d46189 100644
--- a/app/Http/Controllers/QuoteController.php
+++ b/app/Http/Controllers/QuoteController.php
@@ -459,7 +459,7 @@ class QuoteController extends BaseController
     /**
      * Perform bulk actions on the list view.
      *
-     * @return Collection
+     * @return \Illuminate\Support\Collection
      *
      *
      * @OA\Post(
diff --git a/app/Http/Controllers/RecurringQuoteController.php b/app/Http/Controllers/RecurringQuoteController.php
index 114bcf329809..141f8ecf92eb 100644
--- a/app/Http/Controllers/RecurringQuoteController.php
+++ b/app/Http/Controllers/RecurringQuoteController.php
@@ -429,7 +429,7 @@ class RecurringQuoteController extends BaseController
     /**
      * Perform bulk actions on the list view.
      *
-     * @return Collection
+     * @return \Illuminate\Support\Collection
      *
      *
      * @OA\Post(
diff --git a/app/Http/Controllers/SubscriptionController.php b/app/Http/Controllers/SubscriptionController.php
index 12b855722281..55b3ea375756 100644
--- a/app/Http/Controllers/SubscriptionController.php
+++ b/app/Http/Controllers/SubscriptionController.php
@@ -48,7 +48,7 @@ class SubscriptionController extends BaseController
     /**
      * Show the list of Subscriptions.
      *
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      *
      * @OA\Get(
      *      path="/api/v1/subscriptions",
@@ -92,7 +92,7 @@ class SubscriptionController extends BaseController
      *
      * @param CreateSubscriptionRequest $request  The request
      *
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Get(
@@ -137,7 +137,7 @@ class SubscriptionController extends BaseController
      *
      * @param StoreSubscriptionRequest $request  The request
      *
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Post(
@@ -185,7 +185,7 @@ class SubscriptionController extends BaseController
      * @param ShowSubscriptionRequest $request  The request
      * @param Invoice $subscription  The invoice
      *
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Get(
@@ -240,7 +240,7 @@ class SubscriptionController extends BaseController
      * @param EditSubscriptionRequest $request  The request
      * @param Invoice $subscription  The invoice
      *
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      *
      * @OA\Get(
      *      path="/api/v1/subscriptions/{id}/edit",
@@ -294,7 +294,7 @@ class SubscriptionController extends BaseController
      * @param UpdateSubscriptionRequest $request  The request
      * @param Subscription $subscription  The invoice
      *
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Put(
@@ -357,7 +357,7 @@ class SubscriptionController extends BaseController
      * @param DestroySubscriptionRequest $request
      * @param Subscription $invoice
      *
-     * @return     Response
+     * @return \Illuminate\Http\JsonResponse
      *
      * @throws \Exception
      * @OA\Delete(
@@ -410,7 +410,7 @@ class SubscriptionController extends BaseController
     /**
      * Perform bulk actions on the list view.
      *
-     * @return Response
+     * @return \Illuminate\Support\Collection
      *
      *
      * @OA\Post(
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 0e8d01b9527e..9541d785c6e1 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -189,7 +189,7 @@ class UserController extends BaseController
      *
      * @param DestroyUserRequest $request
      * @param User $user
-     * @return JsonResponse | Response
+     * @return \Illuminate\Http\JsonResponse
      *
      */
     public function destroy(DestroyUserRequest $request, User $user)
diff --git a/app/Http/Controllers/WebCronController.php b/app/Http/Controllers/WebCronController.php
index c9607ba4fdec..9c774c62f80d 100644
--- a/app/Http/Controllers/WebCronController.php
+++ b/app/Http/Controllers/WebCronController.php
@@ -23,7 +23,7 @@ class WebCronController extends Controller
     /**
      * Store a newly created resource in storage.
      *
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      *
      * @OA\Get(
      *      path="/webcron",
diff --git a/app/Http/Requests/ClientPortal/Quotes/ProcessQuotesInBulkRequest.php b/app/Http/Requests/ClientPortal/Quotes/ProcessQuotesInBulkRequest.php
index 74ae621895ea..f827d7beb9d3 100644
--- a/app/Http/Requests/ClientPortal/Quotes/ProcessQuotesInBulkRequest.php
+++ b/app/Http/Requests/ClientPortal/Quotes/ProcessQuotesInBulkRequest.php
@@ -27,6 +27,7 @@ class ProcessQuotesInBulkRequest extends FormRequest
     {
         return [
             'quotes' => ['array'],
+            'action' => 'sometimes',
         ];
     }
 }
diff --git a/app/Http/Requests/GroupSetting/UpdateGroupSettingRequest.php b/app/Http/Requests/GroupSetting/UpdateGroupSettingRequest.php
index 1c429fc40e94..09540e878026 100644
--- a/app/Http/Requests/GroupSetting/UpdateGroupSettingRequest.php
+++ b/app/Http/Requests/GroupSetting/UpdateGroupSettingRequest.php
@@ -55,7 +55,7 @@ class UpdateGroupSettingRequest extends Request
      * are saveable
      *
      * @param  object $settings
-     * @return stdClass $settings
+     * @return array $settings
      */
     private function filterSaveableSettings($settings)
     {
diff --git a/app/Jobs/Company/CompanyExport.php b/app/Jobs/Company/CompanyExport.php
index 2b89028e8a1c..080ef471c8b3 100644
--- a/app/Jobs/Company/CompanyExport.php
+++ b/app/Jobs/Company/CompanyExport.php
@@ -59,7 +59,7 @@ class CompanyExport implements ShouldQueue
     /**
      * Execute the job.
      *
-     * @return CompanyToken|null
+     * @return void
      */
     public function handle()
     {
diff --git a/app/Libraries/OAuth/OAuth.php b/app/Libraries/OAuth/OAuth.php
index 9b75ebc7d967..59582bad187f 100644
--- a/app/Libraries/OAuth/OAuth.php
+++ b/app/Libraries/OAuth/OAuth.php
@@ -41,7 +41,7 @@ class OAuth
 
     /**
      * @param Socialite $user
-     * @return bool|\App\Models\User|\App\Libraries\App\Models\User|null
+     * @return bool | \App\Models\User | \App\Models\User | null
      */
     public static function handleAuth($socialite_user, $provider)
     {
diff --git a/app/Models/ClientContact.php b/app/Models/ClientContact.php
index 8c9d40d8c4ab..8dc2cf9d41ab 100644
--- a/app/Models/ClientContact.php
+++ b/app/Models/ClientContact.php
@@ -68,17 +68,12 @@ use Laracasts\Presenter\PresentableTrait;
  * @property int|null $deleted_at
  * @property-read \App\Models\Client $client
  * @property-read \App\Models\Company $company
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CreditInvitation> $credit_invitations
  * @property-read int|null $credit_invitations_count
  * @property-read mixed $contact_id
  * @property-read mixed $hashed_id
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\InvoiceInvitation> $invoice_invitations
  * @property-read int|null $invoice_invitations_count
- * @property-read \Illuminate\Notifications\DatabaseNotificationCollection<int, \Illuminate\Notifications\DatabaseNotification> $notifications
  * @property-read int|null $notifications_count
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\QuoteInvitation> $quote_invitations
  * @property-read int|null $quote_invitations_count
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\RecurringInvoiceInvitation> $recurring_invoice_invitations
  * @property-read int|null $recurring_invoice_invitations_count
  * @property-read \App\Models\User $user
  * @method static \Illuminate\Database\Eloquent\Builder|ClientContact company()
@@ -89,15 +84,11 @@ use Laracasts\Presenter\PresentableTrait;
  * @method static \Illuminate\Database\Eloquent\Builder|ClientContact query()
  * @method static \Illuminate\Database\Eloquent\Builder|ClientContact withTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|ClientContact withoutTrashed()
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CreditInvitation> $credit_invitations
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\InvoiceInvitation> $invoice_invitations
  * @property-read \Illuminate\Notifications\DatabaseNotificationCollection<int, \Illuminate\Notifications\DatabaseNotification> $notifications
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\QuoteInvitation> $quote_invitations
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\RecurringInvoiceInvitation> $recurring_invoice_invitations
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CreditInvitation> $credit_invitations
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\InvoiceInvitation> $invoice_invitations
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Client> $client
-
  * @mixin \Eloquent
  */
 class ClientContact extends Authenticatable implements HasLocalePreference
diff --git a/app/Models/CompanyGateway.php b/app/Models/CompanyGateway.php
index fa5de69aee3a..79d5b133798f 100644
--- a/app/Models/CompanyGateway.php
+++ b/app/Models/CompanyGateway.php
@@ -28,7 +28,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property int|null $update_details
  * @property int $is_deleted
  * @property string $config
- * @property mixed $fees_and_limits
+ * @property object $fees_and_limits
  * @property string|null $custom_value1
  * @property string|null $custom_value2
  * @property string|null $custom_value3
@@ -47,7 +47,6 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property int $require_custom_value2
  * @property int $require_custom_value3
  * @property int $require_custom_value4
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
  * @property-read int|null $client_gateway_tokens_count
  * @property-read \App\Models\Company $company
  * @property-read \App\Models\Gateway $gateway
@@ -60,51 +59,10 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway query()
  * @method static \Illuminate\Database\Eloquent\Builder|BaseModel scope()
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereAcceptedCreditCards($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereCompanyId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereConfig($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereCustomValue1($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereCustomValue2($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereCustomValue3($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereCustomValue4($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereFeesAndLimits($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereGatewayKey($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereIsDeleted($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereLabel($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireBillingAddress($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireClientName($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireClientPhone($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireContactEmail($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireContactName($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireCustomValue1($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireCustomValue2($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireCustomValue3($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireCustomValue4($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireCvv($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequirePostalCode($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereRequireShippingAddress($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereTokenBilling($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereUpdateDetails($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereUpdatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway whereUserId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway withTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway withoutTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway find()
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
  * @mixin \Eloquent
  */
 class CompanyGateway extends BaseModel
diff --git a/app/Models/CompanyToken.php b/app/Models/CompanyToken.php
index d4b879a9eb23..9366310cb784 100644
--- a/app/Models/CompanyToken.php
+++ b/app/Models/CompanyToken.php
@@ -40,17 +40,6 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken query()
  * @method static \Illuminate\Database\Eloquent\Builder|BaseModel scope()
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereAccountId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereCompanyId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereIsDeleted($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereIsSystem($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereName($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereToken($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereUpdatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken whereUserId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken withTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|CompanyToken withoutTrashed()
  * @mixin \Eloquent
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 6d7c1539a74d..57660005f644 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -97,36 +97,27 @@ use App\Events\Invoice\InvoiceReminderWasEmailed;
  * @property int|null $subscription_id
  * @property int $auto_bill_tries
  * @property bool $is_proforma
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
  * @property-read int|null $activities_count
  * @property-read \App\Models\User|null $assigned_user
  * @property-read \App\Models\Client $client
  * @property-read \App\Models\Company $company
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyLedger> $company_ledger
  * @property-read int|null $company_ledger_count
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Credit> $credits
  * @property-read int|null $credits_count
  * @property-read \App\Models\Design|null $design
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read int|null $documents_count
  * @property-read \App\Models\Expense|null $expense
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Expense> $expenses
  * @property-read int|null $expenses_count
  * @property-read mixed $balance_due
  * @property-read mixed $hashed_id
  * @property-read mixed $status
  * @property-read mixed $total
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
  * @property-read int|null $history_count
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\InvoiceInvitation> $invitations
  * @property-read int|null $invitations_count
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
  * @property-read int|null $payments_count
  * @property-read \App\Models\Project|null $project
  * @property-read \App\Models\RecurringInvoice|null $recurring_invoice
  * @property-read \App\Models\Subscription|null $subscription
  * @property-read \App\Models\Task|null $task
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
  * @property-read int|null $tasks_count
  * @property-read \App\Models\User $user
  * @property-read \App\Models\Vendor|null $vendor
@@ -150,7 +141,6 @@ use App\Events\Invoice\InvoiceReminderWasEmailed;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\InvoiceInvitation> $invitations
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Client> $invoice
  * @property object|null $tax_data
  * @mixin \Eloquent
  */
diff --git a/app/Models/Scheduler.php b/app/Models/Scheduler.php
index dccd68bb4fab..76f17cf55259 100644
--- a/app/Models/Scheduler.php
+++ b/app/Models/Scheduler.php
@@ -29,7 +29,8 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property int $company_id
  * @property bool $is_paused
  * @property int|null $frequency_id
- * @property \Illuminate\Support\Carbon|null $next_run_client
+ * @property \Carbon\Carbon|\Illuminate\Support\Carbon|null $next_run_client
+ * @property \Carbon\Carbon|\Illuminate\Support\Carbon|null $next_run
  * @property int $user_id
  * @property string $name
  * @property string $template
diff --git a/app/Models/Traits/Excludable.php b/app/Models/Traits/Excludable.php
index 55249c56dede..272c5e7cc8c4 100644
--- a/app/Models/Traits/Excludable.php
+++ b/app/Models/Traits/Excludable.php
@@ -33,10 +33,10 @@ trait Excludable
 
     /**
      * Exclude an array of elements from the result.
-     * @param Builder $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
      * @param array $columns
      *
-     * @return Builder<BaseModel>
+     * @return \Illuminate\Database\Eloquent\Builder
      */
     public function scopeExclude($query, $columns): \Illuminate\Database\Eloquent\Builder
     {
diff --git a/app/PaymentDrivers/CheckoutComPaymentDriver.php b/app/PaymentDrivers/CheckoutComPaymentDriver.php
index 6306ec230fa5..719e0119c42b 100644
--- a/app/PaymentDrivers/CheckoutComPaymentDriver.php
+++ b/app/PaymentDrivers/CheckoutComPaymentDriver.php
@@ -168,7 +168,7 @@ class CheckoutComPaymentDriver extends BaseDriver
      * Payment View
      *
      * @param array $data Payment data array
-     * @return view         The payment view
+     * @return \Illuminate\View\View         
      */
     public function processPaymentView(array $data)
     {
@@ -179,7 +179,7 @@ class CheckoutComPaymentDriver extends BaseDriver
      * Process the payment response
      *
      * @param Request $request The payment request
-     * @return view             The payment response view
+     * @return \Illuminate\View\View         
      */
     public function processPaymentResponse($request)
     {
diff --git a/app/PaymentDrivers/GoCardless/ACH.php b/app/PaymentDrivers/GoCardless/ACH.php
index 66e24ba2dc3e..9819a08b4fc8 100644
--- a/app/PaymentDrivers/GoCardless/ACH.php
+++ b/app/PaymentDrivers/GoCardless/ACH.php
@@ -142,7 +142,7 @@ class ACH implements MethodInterface
      * Show the payment page for ACH.
      *
      * @param array $data
-     * @return View
+     * @return \Illuminate\View\View         
      */
     public function paymentView(array $data): View
     {
diff --git a/app/PaymentDrivers/GoCardless/DirectDebit.php b/app/PaymentDrivers/GoCardless/DirectDebit.php
index c7e6d04b0876..94328a537e5c 100644
--- a/app/PaymentDrivers/GoCardless/DirectDebit.php
+++ b/app/PaymentDrivers/GoCardless/DirectDebit.php
@@ -242,7 +242,7 @@ class DirectDebit implements MethodInterface
      * Payment view for Direct Debit.
      *
      * @param array $data
-     * @return View
+     * @return \Illuminate\View\View         
      */
     public function paymentView(array $data): View
     {
diff --git a/app/PaymentDrivers/GoCardless/SEPA.php b/app/PaymentDrivers/GoCardless/SEPA.php
index 1a96bcc9fcde..4ea488618282 100644
--- a/app/PaymentDrivers/GoCardless/SEPA.php
+++ b/app/PaymentDrivers/GoCardless/SEPA.php
@@ -141,7 +141,7 @@ class SEPA implements MethodInterface
      * Payment view for SEPA.
      *
      * @param array $data
-     * @return View
+     * @return \Illuminate\View\View         
      */
     public function paymentView(array $data): View
     {
diff --git a/app/PaymentDrivers/Mollie/Bancontact.php b/app/PaymentDrivers/Mollie/Bancontact.php
index 444578ad7cf4..8aaed1bd615a 100644
--- a/app/PaymentDrivers/Mollie/Bancontact.php
+++ b/app/PaymentDrivers/Mollie/Bancontact.php
@@ -40,7 +40,7 @@ class Bancontact implements MethodInterface
      * Show the authorization page for Bancontact.
      *
      * @param array $data
-     * @return View
+     * @return \Illuminate\View\View         
      */
     public function authorizeView(array $data): View
     {
diff --git a/app/PaymentDrivers/Mollie/BankTransfer.php b/app/PaymentDrivers/Mollie/BankTransfer.php
index d61df46806a7..01cfc9c3c718 100644
--- a/app/PaymentDrivers/Mollie/BankTransfer.php
+++ b/app/PaymentDrivers/Mollie/BankTransfer.php
@@ -43,7 +43,7 @@ class BankTransfer implements MethodInterface
      * Show the authorization page for bank transfer.
      *
      * @param array $data
-     * @return View
+     * @return \Illuminate\View\View         
      */
     public function authorizeView(array $data): View
     {
diff --git a/app/PaymentDrivers/Mollie/IDEAL.php b/app/PaymentDrivers/Mollie/IDEAL.php
index 1efd1397f1f8..3e40df10b049 100644
--- a/app/PaymentDrivers/Mollie/IDEAL.php
+++ b/app/PaymentDrivers/Mollie/IDEAL.php
@@ -40,7 +40,7 @@ class IDEAL implements MethodInterface
      * Show the authorization page for iDEAL.
      *
      * @param array $data
-     * @return View
+     * @return \Illuminate\View\View         
      */
     public function authorizeView(array $data): View
     {
diff --git a/app/PaymentDrivers/Mollie/KBC.php b/app/PaymentDrivers/Mollie/KBC.php
index 75cb0dcac86e..6d34591064bc 100644
--- a/app/PaymentDrivers/Mollie/KBC.php
+++ b/app/PaymentDrivers/Mollie/KBC.php
@@ -40,7 +40,7 @@ class KBC implements MethodInterface
      * Show the authorization page for KBC.
      *
      * @param array $data
-     * @return View
+     * @return \Illuminate\View\View         
      */
     public function authorizeView(array $data): View
     {
diff --git a/app/PaymentDrivers/Razorpay/Hosted.php b/app/PaymentDrivers/Razorpay/Hosted.php
index 24493c780b22..1d5b42358a7d 100644
--- a/app/PaymentDrivers/Razorpay/Hosted.php
+++ b/app/PaymentDrivers/Razorpay/Hosted.php
@@ -41,7 +41,7 @@ class Hosted implements MethodInterface
      * Show the authorization page for Razorpay.
      *
      * @param array $data
-     * @return View
+     * @return \Illuminate\View\View         
      */
     public function authorizeView(array $data): View
     {
@@ -63,7 +63,7 @@ class Hosted implements MethodInterface
      * Payment view for the Razorpay.
      *
      * @param array $data
-     * @return View
+     * @return \Illuminate\View\View         
      */
     public function paymentView(array $data): View
     {
diff --git a/app/PaymentDrivers/Square/CreditCard.php b/app/PaymentDrivers/Square/CreditCard.php
index 923d47eb4483..1cec62101c90 100644
--- a/app/PaymentDrivers/Square/CreditCard.php
+++ b/app/PaymentDrivers/Square/CreditCard.php
@@ -43,7 +43,7 @@ class CreditCard implements MethodInterface
      * Authorization page for credit card.
      *
      * @param array $data
-     * @return View
+     * @return \Illuminate\View\View         
      */
     public function authorizeView($data): View
     {
diff --git a/app/PaymentDrivers/WePayPaymentDriver.php b/app/PaymentDrivers/WePayPaymentDriver.php
index fde608b67937..199a48303ae8 100644
--- a/app/PaymentDrivers/WePayPaymentDriver.php
+++ b/app/PaymentDrivers/WePayPaymentDriver.php
@@ -89,7 +89,7 @@ class WePayPaymentDriver extends BaseDriver
      * Setup the gateway
      *
      * @param  array $data user_id + company
-     * @return view
+     * @return \Illuminate\View\View         
      */
     public function setup(array $data)
     {
diff --git a/app/Services/Credit/CreditService.php b/app/Services/Credit/CreditService.php
index 811ea7e4cf45..648bed322e1c 100644
--- a/app/Services/Credit/CreditService.php
+++ b/app/Services/Credit/CreditService.php
@@ -183,7 +183,7 @@ class CreditService
     /**
      * Sometimes we need to refresh the
      * PDF when it is updated etc.
-     * @return InvoiceService
+     * @return self
      */
     public function touchPdf($force = false)
     {
diff --git a/app/Transformers/ClientTransformer.php b/app/Transformers/ClientTransformer.php
index 047df00a3cf9..07b683fa8f34 100644
--- a/app/Transformers/ClientTransformer.php
+++ b/app/Transformers/ClientTransformer.php
@@ -47,7 +47,7 @@ class ClientTransformer extends EntityTransformer
     /**
      * @param Client $client
      *
-     * @return Collection
+     * @return \Illuminate\Support\Collection
      */
     public function includeActivities(Client $client)
     {
@@ -66,7 +66,7 @@ class ClientTransformer extends EntityTransformer
     /**
      * @param Client $client
      *
-     * @return Collection
+     * @return \Illuminate\Support\Collection
      */
     public function includeContacts(Client $client)
     {
diff --git a/app/Transformers/ProductTransformer.php b/app/Transformers/ProductTransformer.php
index 797c3408fbe2..7ed02a233736 100644
--- a/app/Transformers/ProductTransformer.php
+++ b/app/Transformers/ProductTransformer.php
@@ -37,7 +37,7 @@ class ProductTransformer extends EntityTransformer
     /**
      * @param Product $product
      *
-     * @return Collection
+     * @return \Illuminate\Support\Collection
      */
     public function includeUser(Product $product)
     {
@@ -49,7 +49,7 @@ class ProductTransformer extends EntityTransformer
     /**
      * @param Product $product
      *
-     * @return Collection
+     * @return \Illuminate\Support\Collection
      */
     public function includeCompany(Product $product)
     {
diff --git a/app/Transformers/VendorTransformer.php b/app/Transformers/VendorTransformer.php
index 029ad416e6ca..f2acf862afcd 100644
--- a/app/Transformers/VendorTransformer.php
+++ b/app/Transformers/VendorTransformer.php
@@ -40,7 +40,7 @@ class VendorTransformer extends EntityTransformer
     /**
      * @param Vendor $vendor
      *
-     * @return Collection
+     * @return \Illuminate\Support\Collection
      */
     public function includeActivities(Vendor $vendor)
     {
@@ -52,7 +52,7 @@ class VendorTransformer extends EntityTransformer
     /**
      * @param Vendor $vendor
      *
-     * @return Collection
+     * @return \Illuminate\Support\Collection
      */
     public function includeContacts(Vendor $vendor)
     {