diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index 69d5a64a3..08d904ccd 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -795,7 +795,7 @@ export default { expense: 'Gasto', taxableBase: 'Base imp.', rate: 'Tasa', - sageTransaction: 'Sage transación', + sageTransaction: 'Sage transacción', dueDay: 'Fecha', bank: 'Caja', amount: 'Importe', diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue index 4e87c2acd..9adf723b9 100644 --- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue +++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue @@ -316,12 +316,6 @@ async function upsert() { option-value="id" option-label="withholding" /> - - - diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue index d6f7c18ec..1b712aec8 100644 --- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue +++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue @@ -308,7 +308,11 @@ const getTotalAmount = (rows) => rows.reduce((acc, cur) => acc + cur.amount, 0); - + es: Date: Fecha diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue index 083822dc3..cedba4e33 100644 --- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue +++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue @@ -54,7 +54,9 @@ const vatColumns = ref([ { name: 'vat', label: 'invoiceIn.summary.sageVat', - field: (row) => row.taxTypeSage?.vat, + field: (row) => { + if (row.taxTypeSage) return `${row.taxTypeSage.id}:${row.taxTypeSage.vat}`; + }, format: (value) => value, sortable: true, align: 'left', @@ -62,7 +64,10 @@ const vatColumns = ref([ { name: 'transaction', label: 'invoiceIn.summary.sageTransaction', - field: (row) => row.transactionTypeSage?.transaction, + field: (row) => { + if (row.transactionTypeSage) + return `${row.transactionTypeSage.id}:${row.transactionTypeSage?.transaction}`; + }, format: (value) => value, sortable: true, align: 'left', diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue index 298e47727..5ab022b36 100644 --- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue +++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue @@ -62,7 +62,7 @@ const columns = computed(() => [ options: sageTaxTypes.value, model: 'taxTypeSageFk', optionValue: 'id', - optionLabel: 'vat', + optionLabel: 'id', sortable: true, tabindex: 3, align: 'left', @@ -74,7 +74,7 @@ const columns = computed(() => [ options: sageTransactionTypes.value, model: 'transactionTypeSageFk', optionValue: 'id', - optionLabel: 'transaction', + optionLabel: 'id', sortable: true, tabIndex: 4, align: 'left', @@ -471,6 +471,10 @@ const getTotalRate = (rows) => rows.reduce((acc, cur) => acc + taxRate(cur), 0);