From c0ddc2c5b409823843df6d599e01e3335bb5e00e Mon Sep 17 00:00:00 2001 From: jgallego Date: Thu, 14 Nov 2024 10:47:14 +0100 Subject: [PATCH] fix: refs #7346 traslations --- src/components/VnTable/VnTable.vue | 2 +- src/pages/InvoiceOut/InvoiceOutList.vue | 107 +++++++++++------------- 2 files changed, 52 insertions(+), 57 deletions(-) diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index 445923157..65f716142 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -235,7 +235,7 @@ function splitColumns(columns) { if (col.create) splittedColumns.value.create.push(col); if (col.cardVisible) splittedColumns.value.cardVisible.push(col); if ($props.isEditable && col.disable == null) col.disable = false; - if ($props.useModel && col.columnFilter) + if ($props.useModel && col.columnFilter !== false) col.columnFilter = { inWhere: true, ...col.columnFilter }; splittedColumns.value.columns.push(col); } diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue index 9c4b9753c..a22a4c167 100644 --- a/src/pages/InvoiceOut/InvoiceOutList.vue +++ b/src/pages/InvoiceOut/InvoiceOutList.vue @@ -18,6 +18,7 @@ import InvoiceOutFilter from './InvoiceOutFilter.vue'; import VnRow from 'src/components/ui/VnRow.vue'; import VnRadio from 'src/components/common/VnRadio.vue'; import VnInput from 'src/components/common/VnInput.vue'; +import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue'; const { t } = useI18n(); const stateStore = useStateStore(); @@ -48,7 +49,7 @@ const columns = computed(() => [ { align: 'center', name: 'id', - label: t('invoiceId'), + label: t('invoiceOutList.tableVisibleColumns.id'), chip: { condition: () => true }, isId: true, columnFilter: { name: 'search' }, @@ -56,7 +57,7 @@ const columns = computed(() => [ { align: 'left', name: 'ref', - label: t('invoiceOut.list.ref'), + label: t('globals.reference'), isTitle: true, component: 'select', attrs: { url: MODEL, optionLabel: 'ref', optionValue: 'id' }, @@ -65,7 +66,7 @@ const columns = computed(() => [ { align: 'left', name: 'issued', - label: t('invoiceOut.list.issued'), + label: t('invoiceOut.summary.issued'), component: 'date', format: (row) => toDate(row.issued), columnField: { component: null }, @@ -73,7 +74,7 @@ const columns = computed(() => [ { align: 'left', name: 'clientFk', - label: t('invoiceOut.list.client'), + label: t('globals.client'), cardVisible: true, component: 'select', attrs: { url: 'Clients', fields: ['id', 'name'] }, @@ -82,7 +83,7 @@ const columns = computed(() => [ { align: 'left', name: 'companyCode', - label: t('invoiceOut.list.company'), + label: t('globals.company'), cardVisible: true, component: 'select', attrs: { url: 'Companies', optionLabel: 'code', optionValue: 'id' }, @@ -91,14 +92,14 @@ const columns = computed(() => [ { align: 'left', name: 'amount', - label: t('invoiceOut.list.amount'), + label: t('globals.amount'), cardVisible: true, format: (row) => toCurrency(row.amount), }, { align: 'left', name: 'created', - label: t('invoiceOut.list.created'), + label: t('globals.created'), component: 'date', columnField: { component: null }, format: (row) => toDate(row.created), @@ -106,7 +107,7 @@ const columns = computed(() => [ { align: 'left', name: 'dued', - label: t('invoiceOut.list.dued'), + label: t('invoiceOut.summary.dued'), component: 'date', columnField: { component: null }, format: (row) => toDate(row.dued), @@ -116,13 +117,14 @@ const columns = computed(() => [ name: 'tableActions', actions: [ { - title: t('viewSummary'), + title: t('components.smartCard.viewSummary'), icon: 'preview', + isPrimary: true, action: (row) => viewSummary(row.id, InvoiceOutSummary), }, { - title: t('downloadPdf'), - icon: 'vn:ticket', + title: t('globals.downloadPdf'), + icon: 'cloud_download', isPrimary: true, action: (row) => openPdf(row.id), }, @@ -171,7 +173,7 @@ watchEffect(selectedRows);