diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
index 59bebcae2..62fa4be09 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
@@ -26,7 +26,12 @@ const invoiceId = +route.params.id;
const filter = { where: { invoiceInFk: invoiceId } };
const areRows = ref(false);
const totalTaxableBase = ref();
-const noMatch = computed(() => totalAmount.value != totalTaxableBase.value);
+const totalVat = ref();
+const noMatch = computed(
+ () =>
+ totalAmount.value != totalTaxableBase.value &&
+ totalAmount.value != totalVat.value,
+);
const columns = computed(() => [
{
name: 'duedate',
@@ -78,6 +83,7 @@ async function insert() {
async function setTaxableBase() {
const { data } = await axios.get(`InvoiceIns/${invoiceId}/getTotals`);
totalTaxableBase.value = data.totalTaxableBase;
+ totalVat.value = data.totalVat;
}
onBeforeMount(async () => await setTaxableBase());
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index 74936f00a..79c3c65ae 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -363,6 +363,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
{{ toCurrency(entity.totals.totalTaxableBase) }}
+
{{ toCurrency(getTotalTax(entity.invoiceInTax)) }}
{{
entity.totals.totalTaxableBaseForeignValue &&
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index 61c3040ae..2c8392397 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -470,7 +470,7 @@ function setCursor(ref) {
size="lg"
v-shortcut="'+'"
round
- @click="invoiceInFormRef.insert()"
+ @click="invoiceInFormRef.insert({ isDeductible: true })"
>
{{ t('Add tax') }}
diff --git a/src/pages/InvoiceIn/InvoiceInToBook.vue b/src/pages/InvoiceIn/InvoiceInToBook.vue
index 28f54f040..a77777597 100644
--- a/src/pages/InvoiceIn/InvoiceInToBook.vue
+++ b/src/pages/InvoiceIn/InvoiceInToBook.vue
@@ -41,7 +41,7 @@ async function checkToBook(id) {
params: {
where: JSON.stringify({
invoiceInFk: id,
- dueDated: { gte: Date.vnNew() },
+ dueDated: { lte: Date.vnNew() },
}),
},
})