diff --git a/app/Http/Requests/EstimatesRequest.php b/app/Http/Requests/EstimatesRequest.php
index f43b7e419..119a3c333 100644
--- a/app/Http/Requests/EstimatesRequest.php
+++ b/app/Http/Requests/EstimatesRequest.php
@@ -45,15 +45,21 @@ public function rules()
                 'nullable'
             ],
             'discount' => [
+                'numeric',
                 'required',
             ],
             'discount_val' => [
+                'integer',
                 'required',
             ],
             'sub_total' => [
+                'integer',
                 'required',
             ],
             'total' => [
+                'integer',
+                'numeric',
+                'max:99999999',
                 'required',
             ],
             'tax' => [
@@ -77,9 +83,11 @@ public function rules()
                 'required',
             ],
             'items.*.quantity' => [
+                'integer',
                 'required',
             ],
             'items.*.price' => [
+                'integer',
                 'required',
             ],
         ];
diff --git a/app/Http/Requests/InvoicesRequest.php b/app/Http/Requests/InvoicesRequest.php
index 84b417396..5bb702b0b 100644
--- a/app/Http/Requests/InvoicesRequest.php
+++ b/app/Http/Requests/InvoicesRequest.php
@@ -45,15 +45,21 @@ public function rules()
                 'nullable'
             ],
             'discount' => [
+                'numeric',
                 'required',
             ],
             'discount_val' => [
+                'integer',
                 'required',
             ],
             'sub_total' => [
+                'integer',
                 'required',
             ],
             'total' => [
+                'integer',
+                'numeric',
+                'max:99999999',
                 'required',
             ],
             'tax' => [
@@ -77,9 +83,11 @@ public function rules()
                 'required',
             ],
             'items.*.quantity' => [
+                'integer',
                 'required',
             ],
             'items.*.price' => [
+                'integer',
                 'required',
             ],
         ];
diff --git a/app/Http/Requests/RecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoiceRequest.php
index f624156e4..81e6355ab 100644
--- a/app/Http/Requests/RecurringInvoiceRequest.php
+++ b/app/Http/Requests/RecurringInvoiceRequest.php
@@ -43,15 +43,21 @@ public function rules()
                 'nullable'
             ],
             'discount' => [
+                'numeric',
                 'required',
             ],
             'discount_val' => [
+                'integer',
                 'required',
             ],
             'sub_total' => [
+                'integer',
                 'required',
             ],
             'total' => [
+                'integer',
+                'numeric',
+                'max:99999999',
                 'required',
             ],
             'tax' => [
diff --git a/resources/scripts/admin/components/estimate-invoice-common/CreateItemRow.vue b/resources/scripts/admin/components/estimate-invoice-common/CreateItemRow.vue
index 8af4293f4..705df7f45 100644
--- a/resources/scripts/admin/components/estimate-invoice-common/CreateItemRow.vue
+++ b/resources/scripts/admin/components/estimate-invoice-common/CreateItemRow.vue
@@ -271,23 +271,19 @@ const price = computed({
     } else {
       updateItemAttribute('price', newValue)
     }
+    setDiscount()
   },
 })
 
-const subtotal = computed(() => props.itemData.price * props.itemData.quantity)
+const subtotal = computed(() => Math.round(props.itemData.price * props.itemData.quantity))
 
 const discount = computed({
   get: () => {
     return props.itemData.discount
   },
   set: (newValue) => {
-    if (props.itemData.discount_type === 'percentage') {
-      updateItemAttribute('discount_val', (subtotal.value * newValue) / 100)
-    } else {
-      updateItemAttribute('discount_val', Math.round(newValue * 100))
-    }
-
     updateItemAttribute('discount', newValue)
+    setDiscount()
   },
 })
 
@@ -313,7 +309,7 @@ const showRemoveButton = computed(() => {
 const totalSimpleTax = computed(() => {
   return Math.round(
     sumBy(props.itemData.taxes, function (tax) {
-      if (!tax.compound_tax) {
+      if (tax.amount) {
         return tax.amount
       }
       return 0
@@ -321,18 +317,7 @@ const totalSimpleTax = computed(() => {
   )
 })
 
-const totalCompoundTax = computed(() => {
-  return Math.round(
-    sumBy(props.itemData.taxes, function (tax) {
-      if (tax.compound_tax) {
-        return tax.amount
-      }
-      return 0
-    })
-  )
-})
-
-const totalTax = computed(() => totalSimpleTax.value + totalCompoundTax.value)
+const totalTax = computed(() => totalSimpleTax.value)
 
 const rules = {
   name: {
@@ -399,7 +384,7 @@ const v$ = useVuelidate(
 
 function updateTax(data) {
   props.store.$patch((state) => {
-    state[props.storeProp].items[props.index]['taxes'][data.index] = data.item
+     state[props.storeProp].items[props.index]['taxes'][data.index] = data.item
   })
 
   let lastTax = props.itemData.taxes[props.itemData.taxes.length - 1]
@@ -416,6 +401,16 @@ function updateTax(data) {
   syncItemToStore()
 }
 
+function setDiscount() {
+  const newValue = props.store[props.storeProp].items[props.index].discount
+
+  if (props.itemData.discount_type === 'percentage'){
+    updateItemAttribute('discount_val', Math.round((subtotal.value * newValue) / 100))
+  }else{
+    updateItemAttribute('discount_val', Math.round(newValue * 100))
+  }
+}
+
 function searchVal(val) {
   updateItemAttribute('name', val)
 }
@@ -485,10 +480,12 @@ function syncItemToStore() {
     total: total.value,
     sub_total: subtotal.value,
     totalSimpleTax: totalSimpleTax.value,
-    totalCompoundTax: totalCompoundTax.value,
     totalTax: totalTax.value,
     tax: totalTax.value,
     taxes: [...itemTaxes],
+    tax_type_ids: itemTaxes.flatMap(_t =>
+      _t.tax_type_id ? _t.tax_type_id : [],
+    ),
   }
 
   props.store.updateItem(data)
diff --git a/resources/scripts/admin/components/estimate-invoice-common/CreateItemRowTax.vue b/resources/scripts/admin/components/estimate-invoice-common/CreateItemRowTax.vue
index cf3b12946..eecd3e5fe 100644
--- a/resources/scripts/admin/components/estimate-invoice-common/CreateItemRowTax.vue
+++ b/resources/scripts/admin/components/estimate-invoice-common/CreateItemRowTax.vue
@@ -146,14 +146,14 @@ const filteredTypes = computed(() => {
 })
 
 const taxAmount = computed(() => {
-  if (localTax.compound_tax && props.discountedTotal) {
-    return ((props.discountedTotal + props.totalTax) * localTax.percent) / 100
-  }
-
   if (props.discountedTotal && localTax.percent) {
+    const taxPerItemEnabled = props.store[props.storeProp].tax_per_item === 'YES'
+    const discountPerItemEnabled = props.store[props.storeProp].discount_per_item === 'YES'
+    if (taxPerItemEnabled && !discountPerItemEnabled){
+      return getTaxAmount()
+    }
     return (props.discountedTotal * localTax.percent) / 100
   }
-
   return 0
 })
 
@@ -171,6 +171,13 @@ watch(
   }
 )
 
+watch(
+  () => taxAmount.value,
+  () => {
+    updateRowTax()
+  },
+)
+
 // Set SelectedTax
 if (props.taxData.tax_type_id > 0) {
   selectedTax.value = taxTypeStore.taxTypes.find(
@@ -183,7 +190,6 @@ updateRowTax()
 function onSelectTax(val) {
   localTax.percent = val.percent
   localTax.tax_type_id = val.id
-  localTax.compound_tax = val.compound_tax
   localTax.name = val.name
 
   updateRowTax()
@@ -220,6 +226,27 @@ function openTaxModal() {
 function removeTax(index) {
   props.store.$patch((state) => {
     state[props.storeProp].items[props.itemIndex].taxes.splice(index, 1)
+    state[props.storeProp].items[props.itemIndex].tax = 0
+    state[props.storeProp].items[props.itemIndex].totalTax = 0
   })
 }
+
+function getTaxAmount() {
+  let total = 0
+  let discount = 0
+  const itemTotal = props.discountedTotal
+  const modelDiscount = props.store[props.storeProp].discount ? props.store[props.storeProp].discount : 0
+  const type = props.store[props.storeProp].discount_type
+  if (modelDiscount > 0) {
+    props.store[props.storeProp].items.forEach((_i) => {
+      total += _i.total
+    })
+    const proportion = (itemTotal / total).toFixed(2)
+    discount = type === 'fixed' ? modelDiscount * 100 : (total * modelDiscount) / 100
+    const itemDiscount = Math.round(discount * proportion)
+    const discounted = itemTotal - itemDiscount
+    return Math.round((discounted * localTax.percent) / 100)
+  }
+  return Math.round((props.discountedTotal * localTax.percent) / 100)
+}
 </script>
diff --git a/resources/scripts/admin/components/estimate-invoice-common/CreateTotal.vue b/resources/scripts/admin/components/estimate-invoice-common/CreateTotal.vue
index a14c429ad..2a2935e9b 100644
--- a/resources/scripts/admin/components/estimate-invoice-common/CreateTotal.vue
+++ b/resources/scripts/admin/components/estimate-invoice-common/CreateTotal.vue
@@ -191,7 +191,7 @@
 </template>
 
 <script setup>
-import { computed, inject, ref } from 'vue'
+import { computed, inject, ref, watch } from 'vue'
 import Guid from 'guid'
 import Tax from './CreateTotalTaxes.vue'
 import TaxStub from '@/scripts/admin/stub/abilities'
@@ -227,19 +227,20 @@ const utils = inject('$utils')
 
 const companyStore = useCompanyStore()
 
+watch(
+  () => props.store[props.storeProp].items,
+  (val) => {
+    setDiscount()
+  }, { deep: true },
+)
+
 const totalDiscount = computed({
   get: () => {
     return props.store[props.storeProp].discount
   },
   set: (newValue) => {
-    if (props.store[props.storeProp].discount_type === 'percentage') {
-      props.store[props.storeProp].discount_val = Math.round(
-        (props.store.getSubTotal * newValue) / 100
-      )
-    } else {
-      props.store[props.storeProp].discount_val = Math.round(newValue * 100)
-    }
     props.store[props.storeProp].discount = newValue
+    setDiscount()
   },
 })
 
@@ -265,7 +266,7 @@ const itemWiseTaxes = computed(() => {
         } else if (tax.tax_type_id) {
           taxes.push({
             tax_type_id: tax.tax_type_id,
-            amount: tax.amount,
+            amount: Math.round(tax.amount),
             percent: tax.percent,
             name: tax.name,
           })
@@ -284,6 +285,19 @@ const defaultCurrency = computed(() => {
   }
 })
 
+function setDiscount() {
+  const newValue = props.store[props.storeProp].discount
+
+  if (props.store[props.storeProp].discount_type === 'percentage') {
+    props.store[props.storeProp].discount_val
+      = Math.round((props.store.getSubTotal * newValue) / 100)
+
+    return
+  }
+
+  props.store[props.storeProp].discount_val = Math.round(newValue * 100)
+}
+
 function selectFixed() {
   if (props.store[props.storeProp].discount_type === 'fixed') {
     return
@@ -295,24 +309,21 @@ function selectFixed() {
 }
 
 function selectPercentage() {
-  if (props.store[props.storeProp].discount_type === 'percentage') {
+  if (props.store[props.storeProp].discount_type === 'percentage'){
     return
   }
-  props.store[props.storeProp].discount_val =
-    (props.store.getSubTotal * props.store[props.storeProp].discount) / 100
+
+  const val = Math.round(props.store[props.storeProp].discount * 100) / 100
+
+  props.store[props.storeProp].discount_val
+    = Math.round((props.store.getSubTotal * val) / 100)
+
   props.store[props.storeProp].discount_type = 'percentage'
 }
 
 function onSelectTax(selectedTax) {
   let amount = 0
-
-  if (selectedTax.compound_tax && props.store.getSubtotalWithDiscount) {
-    amount = Math.round(
-      ((props.store.getSubtotalWithDiscount + props.store.getTotalSimpleTax) *
-        selectedTax.percent) /
-        100
-    )
-  } else if (props.store.getSubtotalWithDiscount && selectedTax.percent) {
+  if (props.store.getSubtotalWithDiscount && selectedTax.percent) {
     amount = Math.round(
       (props.store.getSubtotalWithDiscount * selectedTax.percent) / 100
     )
@@ -323,7 +334,6 @@ function onSelectTax(selectedTax) {
     id: Guid.raw(),
     name: selectedTax.name,
     percent: selectedTax.percent,
-    compound_tax: selectedTax.compound_tax,
     tax_type_id: selectedTax.id,
     amount,
   }
diff --git a/resources/scripts/admin/components/modal-components/TaxTypeModal.vue b/resources/scripts/admin/components/modal-components/TaxTypeModal.vue
index e7c1d76a4..5f4e83e4f 100644
--- a/resources/scripts/admin/components/modal-components/TaxTypeModal.vue
+++ b/resources/scripts/admin/components/modal-components/TaxTypeModal.vue
@@ -77,17 +77,6 @@
               @input="v$.currentTaxType.description.$touch()"
             />
           </BaseInputGroup>
-
-          <BaseInputGroup
-            :label="$t('tax_types.compound_tax')"
-            variant="horizontal"
-            class="flex flex-row-reverse"
-          >
-            <BaseSwitch
-              v-model="taxTypeStore.currentTaxType.compound_tax"
-              class="flex items-center"
-            />
-          </BaseInputGroup>
         </BaseInputGrid>
       </div>
       <div
@@ -209,14 +198,7 @@ async function submitTaxTypeData() {
 
 function SelectTax(taxData) {
   let amount = 0
-  if (taxData.compound_tax && estimateStore.getSubtotalWithDiscount) {
-    amount = Math.round(
-      ((estimateStore.getSubtotalWithDiscount +
-        estimateStore.getTotalSimpleTax) *
-        taxData.percent) /
-        100
-    )
-  } else if (estimateStore.getSubtotalWithDiscount && taxData.percent) {
+ if (estimateStore.getSubtotalWithDiscount && taxData.percent) {
     amount = Math.round(
       (estimateStore.getSubtotalWithDiscount * taxData.percent) / 100
     )
@@ -226,7 +208,6 @@ function SelectTax(taxData) {
     id: Guid.raw(),
     name: taxData.name,
     percent: taxData.percent,
-    compound_tax: taxData.compound_tax,
     tax_type_id: taxData.id,
     amount,
   }
@@ -242,7 +223,6 @@ function selectItemTax(taxData) {
       id: Guid.raw(),
       name: taxData.name,
       percent: taxData.percent,
-      compound_tax: taxData.compound_tax,
       tax_type_id: taxData.id,
     }
     modalStore.refreshData(data)
diff --git a/resources/scripts/admin/stores/estimate.js b/resources/scripts/admin/stores/estimate.js
index 5cedf789c..5384249b3 100644
--- a/resources/scripts/admin/stores/estimate.js
+++ b/resources/scripts/admin/stores/estimate.js
@@ -143,7 +143,8 @@ export const useEstimateStore = (useWindow = false) => {
           axios
             .get(`/api/v1/estimates/${id}`)
             .then((response) => {
-              Object.assign(this.newEstimate, response.data.data)
+              this.setEstimateData(response.data.data)
+              this.setCustomerAddresses(this.newEstimate.customer)
               resolve(response)
             })
             .catch((err) => {
@@ -154,6 +155,41 @@ export const useEstimateStore = (useWindow = false) => {
         })
       },
 
+      setEstimateData(estimate) {
+        Object.assign(this.newEstimate, estimate)
+        if (this.newEstimate.tax_per_item === 'YES') {
+          this.newEstimate.items.forEach((_i) => {
+            if (_i.taxes && !_i.taxes.length){
+              _i.taxes.push({ ...taxStub, id: Guid.raw() })
+            }
+          })
+        }
+        if (this.newEstimate.discount_per_item === 'YES') {
+          this.newEstimate.items.forEach((_i, index) => {
+            if (_i.discount_type === 'fixed'){
+              this.newEstimate.items[index].discount = _i.discount / 100
+            }
+          })
+        }
+        else {
+          if (this.newEstimate.discount_type === 'fixed'){
+            this.newEstimate.discount = this.newEstimate.discount / 100
+          }
+        }
+      },
+
+      setCustomerAddresses(customer) {
+        const customer_business = customer.customer_business
+
+        if (customer_business?.billing_address){
+          this.newEstimate.customer.billing_address = customer_business.billing_address
+        }
+
+        if (customer_business?.shipping_address){
+          this.newEstimate.customer.shipping_address = customer_business.shipping_address
+        }
+      },
+
       addSalesTaxUs() {
         const taxTypeStore = useTaxTypeStore()
         let salesTax = { ...taxStub }
diff --git a/resources/scripts/admin/stores/invoice.js b/resources/scripts/admin/stores/invoice.js
index 97bcebff9..5b4d14f10 100644
--- a/resources/scripts/admin/stores/invoice.js
+++ b/resources/scripts/admin/stores/invoice.js
@@ -133,8 +133,8 @@ export const useInvoiceStore = (useWindow = false) => {
           axios
             .get(`/api/v1/invoices/${id}`)
             .then((response) => {
-              Object.assign(this.newInvoice, response.data.data)
-              this.newInvoice.customer = response.data.data.customer
+              this.setInvoiceData(response.data.data)
+              this.setCustomerAddresses(this.newInvoice.customer)
               resolve(response)
             })
             .catch((err) => {
@@ -144,6 +144,38 @@ export const useInvoiceStore = (useWindow = false) => {
         })
       },
 
+      setInvoiceData(invoice) {
+        Object.assign(this.newInvoice, invoice)
+
+        if (this.newInvoice.tax_per_item === 'YES') {
+          this.newInvoice.items.forEach((_i) => {
+            if (_i.taxes && !_i.taxes.length)
+              _i.taxes.push({ ...taxStub, id: Guid.raw() })
+          })
+        }
+
+        if (this.newInvoice.discount_per_item === 'YES') {
+          this.newInvoice.items.forEach((_i, index) => {
+            if (_i.discount_type === 'fixed')
+              this.newInvoice.items[index].discount = _i.discount / 100
+          })
+        }
+        else {
+          if (this.newInvoice.discount_type === 'fixed')
+            this.newInvoice.discount = this.newInvoice.discount / 100
+        }
+      },
+
+      setCustomerAddresses(customer) {
+        const customer_business = customer.customer_business
+
+        if (customer_business?.billing_address)
+          this.newInvoice.customer.billing_address = customer_business.billing_address
+
+        if (customer_business?.shipping_address)
+          this.newInvoice.customer.shipping_address = customer_business.shipping_address
+      },
+
       addSalesTaxUs() {
         const taxTypeStore = useTaxTypeStore()
         let salesTax = { ...taxStub }
diff --git a/resources/scripts/admin/views/estimates/create/EstimateCreate.vue b/resources/scripts/admin/views/estimates/create/EstimateCreate.vue
index 03863f7c2..2241185eb 100644
--- a/resources/scripts/admin/views/estimates/create/EstimateCreate.vue
+++ b/resources/scripts/admin/views/estimates/create/EstimateCreate.vue
@@ -138,6 +138,7 @@
 
 <script setup>
 import { computed, ref, watch, onMounted } from 'vue'
+import { cloneDeep } from 'lodash'
 import { useRoute, useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'
 import {
@@ -257,11 +258,30 @@ async function submitForm() {
 
   isSaving.value = true
 
-  let data = {
+  let data = cloneDeep({
     ...estimateStore.newEstimate,
     sub_total: estimateStore.getSubTotal,
     total: estimateStore.getTotal,
     tax: estimateStore.getTotalTax,
+  })
+  if (data.discount_per_item === 'YES') {
+    data.items.forEach((item, index) => {
+      if (item.discount_type === 'fixed'){
+        data.items[index].discount = Math.round(item.discount * 100)
+      }
+    })
+  }
+  else {
+    if (data.discount_type === 'fixed'){
+      data.discount = Math.round(data.discount * 100)
+    }
+  }
+
+  if (
+    !estimateStore.newEstimate.tax_per_item === 'YES'
+    && data.taxes.length
+  ){
+    data.tax_type_ids = data.taxes.map(_t => _t.tax_type_id)
   }
 
   const action = isEdit.value
diff --git a/resources/scripts/admin/views/invoices/create/InvoiceCreate.vue b/resources/scripts/admin/views/invoices/create/InvoiceCreate.vue
index 0e3a52061..7f2c86bdd 100644
--- a/resources/scripts/admin/views/invoices/create/InvoiceCreate.vue
+++ b/resources/scripts/admin/views/invoices/create/InvoiceCreate.vue
@@ -147,6 +147,7 @@ import {
   decimal,
 } from '@vuelidate/validators'
 import useVuelidate from '@vuelidate/core'
+import { cloneDeep } from 'lodash'
 
 import { useInvoiceStore } from '@/scripts/admin/stores/invoice'
 import { useModuleStore } from '@/scripts/admin/stores/module'
@@ -258,11 +259,29 @@ async function submitForm() {
 
   isSaving.value = true
 
-  let data = {
+  let data = cloneDeep({
     ...invoiceStore.newInvoice,
     sub_total: invoiceStore.getSubTotal,
     total: invoiceStore.getTotal,
     tax: invoiceStore.getTotalTax,
+  })
+  if (data.discount_per_item === 'YES') {
+    data.items.forEach((item, index) => {
+      if (item.discount_type === 'fixed'){
+        data.items[index].discount = item.discount * 100
+      }
+    })
+  }
+  else {
+    if (data.discount_type === 'fixed'){
+      data.discount = data.discount * 100
+    }
+  }
+    if (
+    !invoiceStore.newInvoice.tax_per_item === 'YES'
+    && data.taxes.length
+  ){
+    data.tax_type_ids = data.taxes.map(_t => _t.tax_type_id)
   }
 
   try {
diff --git a/resources/scripts/admin/views/settings/TaxTypesSetting.vue b/resources/scripts/admin/views/settings/TaxTypesSetting.vue
index a217ae61f..5bcec246e 100644
--- a/resources/scripts/admin/views/settings/TaxTypesSetting.vue
+++ b/resources/scripts/admin/views/settings/TaxTypesSetting.vue
@@ -20,21 +20,6 @@
       :data="fetchData"
       :columns="taxTypeColumns"
     >
-      <template #cell-compound_tax="{ row }">
-        <BaseBadge
-          :bg-color="
-            utils.getBadgeStatusColor(row.data.compound_tax ? 'YES' : 'NO')
-              .bgColor
-          "
-          :color="
-            utils.getBadgeStatusColor(row.data.compound_tax ? 'YES' : 'NO')
-              .color
-          "
-        >
-          {{ row.data.compound_tax ? 'Yes' : 'No'.replace('_', ' ') }}
-        </BaseBadge>
-      </template>
-
       <template #cell-percent="{ row }"> {{ row.data.percent }} % </template>
 
       <template v-if="hasAtleastOneAbility()" #cell-actions="{ row }">
@@ -91,11 +76,6 @@ const taxTypeColumns = computed(() => {
       thClass: 'extra',
       tdClass: 'font-medium text-gray-900',
     },
-    {
-      key: 'compound_tax',
-      label: t('settings.tax_types.compound_tax'),
-      tdClass: 'font-medium text-gray-900',
-    },
     {
       key: 'percent',
       label: t('settings.tax_types.percent'),
diff --git a/resources/scripts/components/base/base-table/BaseTable.vue b/resources/scripts/components/base/base-table/BaseTable.vue
index 52ed09e49..67320d127 100644
--- a/resources/scripts/components/base/base-table/BaseTable.vue
+++ b/resources/scripts/components/base/base-table/BaseTable.vue
@@ -309,6 +309,8 @@ function changeSorting(column) {
   }
 
   if (!usesLocalData.value) {
+    if (pagination.value)
+      pagination.value.currentPage = 1
     mapDataToRows()
   }
 }
@@ -326,7 +328,10 @@ async function pageChange(page) {
   await mapDataToRows()
 }
 
-async function refresh() {
+async function refresh(isPreservePage = false) {
+  if (pagination.value && !isPreservePage)
+    pagination.value.currentPage = 1
+
   await mapDataToRows()
 }