diff --git a/app/DataMapper/Tax/ClientTaxData.php b/app/DataMapper/Tax/ClientTaxData.php
new file mode 100644
index 0000000000..6ec89b628c
--- /dev/null
+++ b/app/DataMapper/Tax/ClientTaxData.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\DataMapper\Tax;
+
+use App\DataMapper\Tax\ZipTax\Response;
+
+class ClientTaxData
+{
+    public function __construct(public Response $origin, public Response $destination)
+    {
+    }
+}
\ No newline at end of file
diff --git a/app/DataMapper/Tax/CompanyTaxData.php b/app/DataMapper/Tax/CompanyTaxData.php
new file mode 100644
index 0000000000..7b33356faa
--- /dev/null
+++ b/app/DataMapper/Tax/CompanyTaxData.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\DataMapper\Tax;
+
+use App\DataMapper\Tax\ZipTax\Response;
+
+class CompanyTaxData
+{
+    public function __construct(public Response $origin)
+    {
+    }
+}
diff --git a/app/DataMapper/Tax/InvoiceTaxData.php b/app/DataMapper/Tax/InvoiceTaxData.php
new file mode 100644
index 0000000000..40a174bb30
--- /dev/null
+++ b/app/DataMapper/Tax/InvoiceTaxData.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\DataMapper\Tax;
+
+use App\DataMapper\Tax\ZipTax\Response;
+
+class InvoiceTaxData
+{
+    public function __construct(public Response $origin)
+    {
+    }
+}
diff --git a/app/Helpers/Invoice/InvoiceSum.php b/app/Helpers/Invoice/InvoiceSum.php
index 3510804b59..694e1cb5f4 100644
--- a/app/Helpers/Invoice/InvoiceSum.php
+++ b/app/Helpers/Invoice/InvoiceSum.php
@@ -45,6 +45,8 @@ class InvoiceSum
 
     private $precision;
 
+    public InvoiceItemSum $invoice_items;
+    
     /**
      * Constructs the object with Invoice and Settings object.
      *
diff --git a/app/Models/Company.php b/app/Models/Company.php
index bdc4429371..c94361099a 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -429,6 +429,8 @@ class Company extends BaseModel
         'convert_payment_currency',
         'convert_expense_currency',
         'notify_vendor_when_paid',
+        'calculate_taxes',
+        'tax_all_products',
     ];
 
     protected $hidden = [
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index ef381eb035..0fb21f6454 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -582,7 +582,7 @@ class Invoice extends BaseModel
     /**
      * Access the invoice calculator object.
      *
-     * @return stdClass The invoice calculator object getters
+     * @return \stdClass The invoice calculator object getters
      */
     public function calc()
     {
diff --git a/app/Models/Product.php b/app/Models/Product.php
index 60b8c0d821..f52c4427e9 100644
--- a/app/Models/Product.php
+++ b/app/Models/Product.php
@@ -105,11 +105,12 @@ class Product extends BaseModel
     use SoftDeletes;
     use Filterable;
 
-    public const PRODUCT_TAX_EXEMPT = 0;
+    
     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_TAX_EXEMPT = 5;
 
     protected $fillable = [
         'custom_value1',
@@ -132,6 +133,7 @@ class Product extends BaseModel
         'stock_notification',
         'max_quantity',
         'product_image',
+        'tax_id',
     ];
 
     protected $touches = [];
diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php
index a167c6812f..8571375f7d 100644
--- a/app/Transformers/CompanyTransformer.php
+++ b/app/Transformers/CompanyTransformer.php
@@ -193,6 +193,8 @@ class CompanyTransformer extends EntityTransformer
             'convert_expense_currency' => (bool) $company->convert_expense_currency,
             'notify_vendor_when_paid' => (bool) $company->notify_vendor_when_paid,
             'invoice_task_hours' => (bool) $company->invoice_task_hours,
+            'calculate_taxes' => (bool) $company->calculate_taxes,
+            'tax_all_products' => (bool) $company->tax_all_products,
         ];
     }
 
diff --git a/app/Transformers/InvoiceTransformer.php b/app/Transformers/InvoiceTransformer.php
index a35e1d4c20..5e3b0a9395 100644
--- a/app/Transformers/InvoiceTransformer.php
+++ b/app/Transformers/InvoiceTransformer.php
@@ -149,6 +149,7 @@ class InvoiceTransformer extends EntityTransformer
             'paid_to_date' => (float) $invoice->paid_to_date,
             'subscription_id' => $this->encodePrimaryKey($invoice->subscription_id),
             'auto_bill_enabled' => (bool) $invoice->auto_bill_enabled,
+            'tax_data' => $invoice->tax_data ?: '',            
         ];
     }
 }
diff --git a/app/Transformers/ProductTransformer.php b/app/Transformers/ProductTransformer.php
index 3d0247da00..4f3f6706d9 100644
--- a/app/Transformers/ProductTransformer.php
+++ b/app/Transformers/ProductTransformer.php
@@ -95,6 +95,7 @@ class ProductTransformer extends EntityTransformer
             'stock_notification_threshold' => (int) $product->stock_notification_threshold,
             'max_quantity' => (int) $product->max_quantity,
             'product_image' => (string) $product->product_image ?: '',
+            'tax_id' => (int) $product->tax_id ?: 1,     
         ];
     }
 }
diff --git a/database/migrations/2023_03_21_053933_tax_calculations_for_invoices.php b/database/migrations/2023_03_21_053933_tax_calculations_for_invoices.php
index e70b119609..1c6d885e9f 100644
--- a/database/migrations/2023_03_21_053933_tax_calculations_for_invoices.php
+++ b/database/migrations/2023_03_21_053933_tax_calculations_for_invoices.php
@@ -20,12 +20,17 @@ return new class extends Migration
         Schema::table('companies', function (Blueprint $table) {
             $table->boolean('calculate_taxes')->default(false); //setting to turn on/off tax calculations
             $table->boolean('tax_all_products')->default(false); //globally tax all products if none defined
+            $table->boolean('tax_data');
         });
 
         Schema::table('products', function (Blueprint $table){
             $table->unsignedInteger('tax_id')->nullable(); // the product tax constant
         });
 
+        Schema::table('clients', function (Blueprint $table){
+            $table->boolean('tax_data');
+        });
+
     }
 
     /**