diff --git a/app/DataMapper/InvoiceItem.php b/app/DataMapper/InvoiceItem.php
index 228d2d0d5577..49571d668fdf 100644
--- a/app/DataMapper/InvoiceItem.php
+++ b/app/DataMapper/InvoiceItem.php
@@ -59,7 +59,11 @@ class InvoiceItem
 
     public $type_id = '1'; //1 = product, 2 = service, 3 unpaid gateway fee, 4 paid gateway fee, 5 late fee, 6 expense
 
+    public $tax_id = '';
+
+
     public static $casts = [
+        'tax_id' => 'string',
         'type_id' => 'string',
         'quantity' => 'float',
         'cost' => 'float',
diff --git a/app/DataMapper/Tax/RuleInterface.php b/app/DataMapper/Tax/RuleInterface.php
index ec88cd72c67d..6d322aea206e 100644
--- a/app/DataMapper/Tax/RuleInterface.php
+++ b/app/DataMapper/Tax/RuleInterface.php
@@ -14,4 +14,18 @@ namespace App\DataMapper\Tax;
 interface RuleInterface
 {
     public function run();
+
+    public function taxByType(?int $type);
+
+    public function taxExempt();
+    
+    public function taxDigital();
+
+    public function taxService();
+
+    public function taxShipping();
+
+    public function taxPhysical();
+
+    public function default();
 }
\ No newline at end of file
diff --git a/app/DataMapper/Tax/ZipTax/Response.php b/app/DataMapper/Tax/ZipTax/Response.php
index e32d2586e16d..457ea18d4966 100644
--- a/app/DataMapper/Tax/ZipTax/Response.php
+++ b/app/DataMapper/Tax/ZipTax/Response.php
@@ -64,8 +64,8 @@ class Response
     public string $geoState = "";
     public float $taxSales = 0;
     public float $taxUse = 0;
-    public string $txbService = "";
-    public string $txbFreight = "";
+    public string $txbService = ""; // N = No, Y = Yes
+    public string $txbFreight = ""; // N = No, Y = Yes
     public float $stateSalesTax = 0;
     public float $stateUseTax = 0;
     public float $citySalesTax = 0;
diff --git a/app/DataMapper/Tax/us/Rule.php b/app/DataMapper/Tax/us/Rule.php
index c5211dcba0fe..d6738bb8a927 100644
--- a/app/DataMapper/Tax/us/Rule.php
+++ b/app/DataMapper/Tax/us/Rule.php
@@ -11,7 +11,10 @@
 
 namespace App\DataMapper\Tax\us;
 
-class Rule
+use App\Models\Product;
+use App\DataMapper\Tax\RuleInterface;
+
+class Rule implements RuleInterface
 {
 
     public float $al_sales_tax_rate = 4; // Alabama
@@ -67,4 +70,77 @@ class Rule
     public float $dc_sales_tax_rate = 6; // District of Columbia
     public float $pr_sales_tax_rate = 11.5; // Puerto Rico
 
+    public string $tax_name1 = '';
+    public float $tax_rate1 = 0;
+
+    public string $tax_name2 = '';
+    public float $tax_rate2 = 0;
+    
+    public string $tax_name3 = '';
+    public float $tax_rate3 = 0;
+    
+    public function __construct(public RuleInterface $tax_data)
+    {
+        $this->tax_data = $tax_data;
+    }
+
+    public function run()
+    {
+        $this->tax_name1 = $this->tax_data->taxSales * 100;
+        $this->tax_rate1 = "{$this->tax_data->geoState} Sales Tax";
+
+    }
+
+    public function taxByType(?int $product_tax_type)
+    {
+        if(!$product_tax_type)
+            return;
+
+        match($product_tax_type){
+            Product::PRODUCT_TAX_EXEMPT => $this->taxExempt(),
+            Product::PRODUCT_TYPE_DIGITAL => $this->taxDigital(),
+            Product::PRODUCT_TYPE_SERVICE => $this->taxService(),
+            Product::PRODUCT_TYPE_SHIPPING => $this->taxShipping(),
+            Product::PRODUCT_TYPE_PHYSICAL => $this->taxPhysical(),
+            default => $this->default(),
+        };
+        
+        return $this;
+    }
+
+    public function taxExempt()
+    {
+        $this->tax_name1 = '';
+        $this->tax_rate1 = 0;
+    }
+
+    public function taxDigital()
+    {
+        $this->tax_name1 = '';
+        $this->tax_rate1 = 0;
+    }
+
+    public function taxService()
+    {
+        if($this->tax_data->txbService == 'Y')
+            $this->run();
+    }
+
+    public function taxShipping()
+    {
+        if($this->tax_data->txbFreight == 'N')
+            $this->run();
+    }
+
+    public function taxPhysical()
+    {
+        $this->tax_name1 = '';
+        $this->tax_rate1 = 0;
+    }
+
+    public function default()
+    {
+        $this->tax_name1 = '';
+        $this->tax_rate1 = 0;
+    }
 }
diff --git a/app/Helpers/Invoice/InvoiceItemSum.php b/app/Helpers/Invoice/InvoiceItemSum.php
index ed27bc4229e4..1863edfed5f9 100644
--- a/app/Helpers/Invoice/InvoiceItemSum.php
+++ b/app/Helpers/Invoice/InvoiceItemSum.php
@@ -15,6 +15,7 @@ use App\Models\Client;
 use App\Models\Invoice;
 use App\DataMapper\InvoiceItem;
 use App\DataMapper\BaseSettings;
+use App\DataMapper\Tax\RuleInterface;
 use App\Utils\Traits\NumberFormatter;
 
 class InvoiceItemSum
@@ -53,6 +54,8 @@ class InvoiceItemSum
 
     private bool $calc_tax = false;
 
+    private RuleInterface $rule;
+     
     public function __construct($invoice)
     {
         $this->tax_collection = collect([]);
@@ -98,11 +101,18 @@ class InvoiceItemSum
 
     private function shouldCalculateTax(): bool
     {
-        if(!$this->invoice->company->calculate_taxes)
+        if(!$this->invoice->company->calculate_taxes || $this->client->is_tax_exempt)
             return false;
 
-        if(in_array($this->client->country->iso_3166_2, ['US']))
+        if(in_array($this->client->country->iso_3166_2, ['US'])){ //only calculate for USA
+            
+            $class = "App\DataMapper\Tax\\".strtolower($this->client->country->iso_3166_2)."\\Rule";
+
+            $this->rule = new $class($this->invoice->tax_data);
+
             return true;
+        
+        }            
             
         return false;
     }
@@ -145,14 +155,34 @@ class InvoiceItemSum
      *
      * @return self
      */
-    private function calcTaxesAutomatically()
+    private function calcTaxesAutomatically(): self 
     {
-        
+        if($this->invoice->company->tax_all_products || $this->item->tax_id != ''){
+            $this->rule->run();
+
+        }
+        else {
+
+            $this->rule->taxByType($this->item->tax_id);
+        }
+
+        $this->item->tax_name1 = $this->rule->tax_name1;
+        $this->item->tax_rate1 = $this->rule->tax_rate1;
+
+        $this->item->tax_name2 = $this->rule->tax_name2;
+        $this->item->tax_rate2 = $this->rule->tax_rate2;
+
+        $this->item->tax_name3 = $this->rule->tax_name3;
+        $this->item->tax_rate3 = $this->rule->tax_rate3;
+
         return $this;
     }
 
     private function calcTaxes()
     {
+        if($this->calc_tax)
+            $this->calcTaxesAutomatically();
+
         $item_tax = 0;
 
         $amount = $this->item->line_total - ($this->item->line_total * ($this->invoice->discount / 100));
diff --git a/app/Models/Account.php b/app/Models/Account.php
index 5514b7143d1a..b213e0b3b094 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -142,6 +142,10 @@ use Laracasts\Presenter\PresentableTrait;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Company> $companies
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyUser> $company_users
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\User> $users
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankIntegration> $bank_integrations
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Company> $companies
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyUser> $company_users
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\User> $users
  * @mixin \Eloquent
  */
 class Account extends BaseModel
diff --git a/app/Models/BankAccount.php b/app/Models/BankAccount.php
index bf5743792368..aa285cc7c0b5 100644
--- a/app/Models/BankAccount.php
+++ b/app/Models/BankAccount.php
@@ -35,6 +35,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankSubaccount> $bank_subaccounts
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankSubaccount> $bank_subaccounts
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankSubaccount> $bank_subaccounts
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankSubaccount> $bank_subaccounts
  * @mixin \Eloquent
  */
 class BankAccount extends BaseModel
diff --git a/app/Models/BankIntegration.php b/app/Models/BankIntegration.php
index 2c66f8c5ad43..abcdd5e87bb4 100644
--- a/app/Models/BankIntegration.php
+++ b/app/Models/BankIntegration.php
@@ -78,6 +78,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankTransaction> $transactions
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankTransaction> $transactions
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankTransaction> $transactions
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankTransaction> $transactions
  * @mixin \Eloquent
  */
 class BankIntegration extends BaseModel
diff --git a/app/Models/Client.php b/app/Models/Client.php
index 1a0ce79f91b2..4c29cb728a74 100644
--- a/app/Models/Client.php
+++ b/app/Models/Client.php
@@ -221,6 +221,25 @@ use Laracasts\Presenter\PresentableTrait;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\RecurringInvoice> $recurring_invoices
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\SystemLog> $system_logs
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
+ * @property int $is_tax_exempt
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyLedger> $company_ledger
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientContact> $contacts
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Credit> $credits
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Expense> $expenses
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $gateway_tokens
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Invoice> $invoices
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyLedger> $ledger
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientContact> $primary_contact
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Project> $projects
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Quote> $quotes
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\RecurringExpense> $recurring_expenses
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\RecurringInvoice> $recurring_invoices
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\SystemLog> $system_logs
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
+ * @method static \Illuminate\Database\Eloquent\Builder|Client whereIsTaxExempt($value)
  * @mixin \Eloquent
  */
 class Client extends BaseModel implements HasLocalePreference
diff --git a/app/Models/ClientContact.php b/app/Models/ClientContact.php
index 57a61715d5b3..72d71c689a60 100644
--- a/app/Models/ClientContact.php
+++ b/app/Models/ClientContact.php
@@ -138,6 +138,11 @@ use Laracasts\Presenter\PresentableTrait;
  * @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\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
  * @mixin \Eloquent
  */
 class ClientContact extends Authenticatable implements HasLocalePreference
diff --git a/app/Models/Company.php b/app/Models/Company.php
index 983f6c8ae724..ea08cc9a63f8 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -420,6 +420,50 @@ use Laracasts\Presenter\PresentableTrait;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\User> $users
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Vendor> $vendors
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Webhook> $webhooks
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $all_activities
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $all_documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankIntegration> $bank_integrations
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankTransactionRule> $bank_transaction_rules
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankTransaction> $bank_transactions
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientContact> $client_contacts
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Client> $clients
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyGateway> $company_gateways
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyUser> $company_users
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientContact> $contacts
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Credit> $credits
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Design> $designs
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ExpenseCategory> $expense_categories
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Expense> $expenses
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\GroupSetting> $group_settings
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\GroupSetting> $groups
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Invoice> $invoices
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyLedger> $ledger
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\PaymentTerm> $payment_terms
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Product> $products
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Project> $projects
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\PurchaseOrder> $purchase_orders
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Quote> $quotes
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\RecurringExpense> $recurring_expenses
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\RecurringInvoice> $recurring_invoices
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Scheduler> $schedulers
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Subscription> $subscriptions
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\SystemLog> $system_log_relation
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\SystemLog> $system_logs
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Scheduler> $task_schedulers
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\TaskStatus> $task_statuses
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\TaxRate> $tax_rates
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyToken> $tokens
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyToken> $tokens_hashed
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Design> $user_designs
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\PaymentTerm> $user_payment_terms
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\User> $users
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Vendor> $vendors
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Webhook> $webhooks
  * @mixin \Eloquent
  */
 class Company extends BaseModel
diff --git a/app/Models/CompanyGateway.php b/app/Models/CompanyGateway.php
index 4e7ebaf7c2c2..af59605cdb88 100644
--- a/app/Models/CompanyGateway.php
+++ b/app/Models/CompanyGateway.php
@@ -95,6 +95,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @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/CompanyUser.php b/app/Models/CompanyUser.php
index 17825b9ddc41..d53859d776a7 100644
--- a/app/Models/CompanyUser.php
+++ b/app/Models/CompanyUser.php
@@ -76,6 +76,9 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyToken> $token
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyToken> $tokens
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\User> $users
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyToken> $token
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyToken> $tokens
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\User> $users
  * @mixin \Eloquent
  */
 class CompanyUser extends Pivot
diff --git a/app/Models/Credit.php b/app/Models/Credit.php
index d649e894f582..c5872adc5a48 100644
--- a/app/Models/Credit.php
+++ b/app/Models/Credit.php
@@ -206,6 +206,13 @@ use Laracasts\Presenter\PresentableTrait;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CreditInvitation> $invitations
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Invoice> $invoices
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyLedger> $company_ledger
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CreditInvitation> $invitations
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Invoice> $invoices
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
  * @mixin \Eloquent
  */
 class Credit extends BaseModel
diff --git a/app/Models/Expense.php b/app/Models/Expense.php
index 5bb420eca56a..a1d64852d2c4 100644
--- a/app/Models/Expense.php
+++ b/app/Models/Expense.php
@@ -133,6 +133,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @mixin \Eloquent
  */
 class Expense extends BaseModel
diff --git a/app/Models/GatewayType.php b/app/Models/GatewayType.php
index 5b8b42aa0fd1..5363a62c0929 100644
--- a/app/Models/GatewayType.php
+++ b/app/Models/GatewayType.php
@@ -31,6 +31,7 @@ namespace App\Models;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\PaymentType> $payment_methods
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\PaymentType> $payment_methods
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\PaymentType> $payment_methods
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\PaymentType> $payment_methods
  * @mixin \Eloquent
  */
 class GatewayType extends StaticModel
diff --git a/app/Models/GroupSetting.php b/app/Models/GroupSetting.php
index 0e065066a673..c71932c91a5f 100644
--- a/app/Models/GroupSetting.php
+++ b/app/Models/GroupSetting.php
@@ -60,6 +60,8 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Client> $clients
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Client> $clients
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @mixin \Eloquent
  */
 class GroupSetting extends StaticModel
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 311674d0cd3a..4125d794aece 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -232,6 +232,15 @@ use Laracasts\Presenter\PresentableTrait;
  * @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\Activity> $activities
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyLedger> $company_ledger
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Credit> $credits
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Expense> $expenses
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
+ * @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
  * @mixin \Eloquent
  */
 class Invoice extends BaseModel
diff --git a/app/Models/Payment.php b/app/Models/Payment.php
index 15c738413b64..48f6a9abd0ba 100644
--- a/app/Models/Payment.php
+++ b/app/Models/Payment.php
@@ -147,6 +147,11 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Invoice> $invoices
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Paymentable> $paymentables
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyLedger> $company_ledger
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Credit> $credits
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Invoice> $invoices
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Paymentable> $paymentables
  * @mixin \Eloquent
  */
 class Payment extends BaseModel
diff --git a/app/Models/Product.php b/app/Models/Product.php
index 44deea41a940..30623b9c706b 100644
--- a/app/Models/Product.php
+++ b/app/Models/Product.php
@@ -101,6 +101,7 @@ use League\CommonMark\CommonMarkConverter;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @method static \Illuminate\Database\Eloquent\Builder|Product whereTaxId($value)
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @mixin \Eloquent
  */
 class Product extends BaseModel
@@ -113,7 +114,7 @@ class Product extends BaseModel
     public const PRODUCT_TYPE_PHYSICAL = 1;
     public const PRODUCT_TYPE_SERVICE = 2;
     public const PRODUCT_TYPE_DIGITAL = 3;
-    public const PRODUCT_TYPE_FREIGHT = 4;
+    public const PRODUCT_TYPE_SHIPPING = 4;
     public const PRODUCT_TAX_EXEMPT = 5;
 
     protected $fillable = [
diff --git a/app/Models/Project.php b/app/Models/Project.php
index 4eb60947d7a8..5cd470447495 100644
--- a/app/Models/Project.php
+++ b/app/Models/Project.php
@@ -78,6 +78,8 @@ use Laracasts\Presenter\PresentableTrait;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
  * @mixin \Eloquent
  */
 class Project extends BaseModel
diff --git a/app/Models/Proposal.php b/app/Models/Proposal.php
index dd7133ee3004..8cc3cb023912 100644
--- a/app/Models/Proposal.php
+++ b/app/Models/Proposal.php
@@ -31,6 +31,7 @@ use App\Utils\Traits\MakesHash;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @mixin \Eloquent
  */
 class Proposal extends BaseModel
diff --git a/app/Models/PurchaseOrder.php b/app/Models/PurchaseOrder.php
index 1a82c57c6abe..a26d07be9fa9 100644
--- a/app/Models/PurchaseOrder.php
+++ b/app/Models/PurchaseOrder.php
@@ -198,6 +198,12 @@ use Illuminate\Support\Facades\Storage;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\PurchaseOrderInvitation> $invitations
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Invoice> $invoices
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\PurchaseOrderInvitation> $invitations
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Invoice> $invoices
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
  * @mixin \Eloquent
  */
 class PurchaseOrder extends BaseModel
diff --git a/app/Models/Quote.php b/app/Models/Quote.php
index 71daf00ac449..96ae34f00539 100644
--- a/app/Models/Quote.php
+++ b/app/Models/Quote.php
@@ -193,6 +193,10 @@ use Laracasts\Presenter\PresentableTrait;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\QuoteInvitation> $invitations
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\QuoteInvitation> $invitations
  * @mixin \Eloquent
  */
 class Quote extends BaseModel
diff --git a/app/Models/RecurringExpense.php b/app/Models/RecurringExpense.php
index d93e3f242a38..ec8bdf5d4e44 100644
--- a/app/Models/RecurringExpense.php
+++ b/app/Models/RecurringExpense.php
@@ -142,6 +142,7 @@ use Illuminate\Support\Carbon;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @mixin \Eloquent
  */
 class RecurringExpense extends BaseModel
diff --git a/app/Models/RecurringInvoice.php b/app/Models/RecurringInvoice.php
index 83eed4296d32..98741f9cb072 100644
--- a/app/Models/RecurringInvoice.php
+++ b/app/Models/RecurringInvoice.php
@@ -194,6 +194,11 @@ use Laracasts\Presenter\PresentableTrait;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\RecurringInvoiceInvitation> $invitations
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Invoice> $invoices
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\RecurringInvoiceInvitation> $invitations
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Invoice> $invoices
  * @mixin \Eloquent
  */
 class RecurringInvoice extends BaseModel
diff --git a/app/Models/RecurringQuote.php b/app/Models/RecurringQuote.php
index 318bed3853b5..74d8f905d2cf 100644
--- a/app/Models/RecurringQuote.php
+++ b/app/Models/RecurringQuote.php
@@ -186,6 +186,11 @@ use Laracasts\Presenter\PresentableTrait;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\RecurringQuoteInvitation> $invitations
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Quote> $quotes
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\RecurringQuoteInvitation> $invitations
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Quote> $quotes
  * @mixin \Eloquent
  */
 class RecurringQuote extends BaseModel
diff --git a/app/Models/Task.php b/app/Models/Task.php
index 849d6cb9fa3f..30bbaa98e1ed 100644
--- a/app/Models/Task.php
+++ b/app/Models/Task.php
@@ -94,6 +94,7 @@ use Illuminate\Support\Carbon;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @mixin \Eloquent
  */
 class Task extends BaseModel
diff --git a/app/Models/User.php b/app/Models/User.php
index ae02be639d32..1ec59ba1325a 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -160,6 +160,13 @@ use Laracasts\Presenter\PresentableTrait;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Notifications\DatabaseNotificationCollection<int, \Illuminate\Notifications\DatabaseNotification> $notifications
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyToken> $tokens
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Client> $clients
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Company> $companies
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyUser> $company_users
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientContact> $contacts
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Notifications\DatabaseNotificationCollection<int, \Illuminate\Notifications\DatabaseNotification> $notifications
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyToken> $tokens
  * @mixin \Eloquent
  */
 class User extends Authenticatable implements MustVerifyEmail
diff --git a/app/Models/Vendor.php b/app/Models/Vendor.php
index 8d2df534ef38..4b5ddc137618 100644
--- a/app/Models/Vendor.php
+++ b/app/Models/Vendor.php
@@ -116,6 +116,10 @@ use Laracasts\Presenter\PresentableTrait;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\VendorContact> $contacts
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\VendorContact> $primary_contact
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\VendorContact> $contacts
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\VendorContact> $primary_contact
  * @mixin \Eloquent
  */
 class Vendor extends BaseModel
diff --git a/app/Models/VendorContact.php b/app/Models/VendorContact.php
index c6514203e01f..4d3b0a83b126 100644
--- a/app/Models/VendorContact.php
+++ b/app/Models/VendorContact.php
@@ -116,6 +116,8 @@ use Laracasts\Presenter\PresentableTrait;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\PurchaseOrderInvitation> $purchase_order_invitations
  * @property-read \Illuminate\Notifications\DatabaseNotificationCollection<int, \Illuminate\Notifications\DatabaseNotification> $notifications
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\PurchaseOrderInvitation> $purchase_order_invitations
+ * @property-read \Illuminate\Notifications\DatabaseNotificationCollection<int, \Illuminate\Notifications\DatabaseNotification> $notifications
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\PurchaseOrderInvitation> $purchase_order_invitations
  * @mixin \Eloquent
  */
 class VendorContact extends Authenticatable implements HasLocalePreference
diff --git a/database/migrations/2023_03_24_054758_add_client_is_exempt_from_taxes.php b/database/migrations/2023_03_24_054758_add_client_is_exempt_from_taxes.php
new file mode 100644
index 000000000000..44ba1fbc23a0
--- /dev/null
+++ b/database/migrations/2023_03_24_054758_add_client_is_exempt_from_taxes.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('clients', function (Blueprint $table) {
+            $table->boolean('is_tax_exempt')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        
+    }
+};
diff --git a/tests/Unit/Tax/SumTaxTest.php b/tests/Unit/Tax/SumTaxTest.php
index 61c2df20c039..98dc46fc24ca 100644
--- a/tests/Unit/Tax/SumTaxTest.php
+++ b/tests/Unit/Tax/SumTaxTest.php
@@ -86,6 +86,12 @@ class SumTaxTest extends TestCase
 
     }
 
+    public function testCalcLogic()
+    {
+        $this->company->calculate_taxes = true;
+        $this->company->tax_all_products = true;
+    }
+
     public function testTaxOnCompany()
     {
         
@@ -148,23 +154,9 @@ class SumTaxTest extends TestCase
     {
         $sum = 
             $this->response->stateSalesTax +
-            // $this->response['stateUseTax'] +
             $this->response->citySalesTax +
-            // $this->response['cityUseTax'] +
             $this->response->countySalesTax +
-            // $this->response['countyUseTax'] +
             $this->response->districtSalesTax;
-            // // $this->response['districtUseTax'] +
-            // $this->response['district1SalesTax'] +
-            // // $this->response['district1UseTax'] +
-            // $this->response['district2SalesTax'] +
-            // // $this->response['district2UseTax'] +
-            // $this->response['district3SalesTax'] +
-            // // $this->response['district3UseTax'] +
-            // $this->response['district4SalesTax'] +
-            // // $this->response['district4UseTax'] +
-            // $this->response['district5SalesTax'];
-            // $this->response['district5UseTax'];
 
         $this->assertEquals(0.0875, $sum);
     }