From 5a754a4451c820ceb403111d13172f7cfc5af3d3 Mon Sep 17 00:00:00 2001 From: Jon Date: Mon, 30 Sep 2024 09:19:05 +0200 Subject: [PATCH 1/4] feat: refs #7202 added new field in front --- src/pages/InvoiceOut/InvoiceOutList.vue | 7 +++++++ src/pages/InvoiceOut/locale/en.yml | 17 +++++++++-------- src/pages/InvoiceOut/locale/es.yml | 19 ++++++++++--------- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue index 5157d957b..e750d95f0 100644 --- a/src/pages/InvoiceOut/InvoiceOutList.vue +++ b/src/pages/InvoiceOut/InvoiceOutList.vue @@ -116,6 +116,13 @@ const columns = computed(() => [ }, format: (row) => toDate(row.dued), }, + { + align: 'left', + name: 'customsAgentFk', + label: t('invoiceOutList.tableVisibleColumns.customsAgent'), + cardVisible: true, + format: (row, dashIfEmpty) => dashIfEmpty(row.customsAgentName), + }, { align: 'right', name: 'tableActions', diff --git a/src/pages/InvoiceOut/locale/en.yml b/src/pages/InvoiceOut/locale/en.yml index 5ad92ed09..23389e99a 100644 --- a/src/pages/InvoiceOut/locale/en.yml +++ b/src/pages/InvoiceOut/locale/en.yml @@ -12,14 +12,15 @@ invoiceOutList: invoiceOutSerial: Serial ticket: Ticket taxArea: Tax area + customsAgent: Consignee DownloadPdf: Download PDF InvoiceOutSummary: Summary negativeBases: - country: Country - clientId: Client ID - base: Base - ticketId: Ticket - active: Active - hasToInvoice: Has to invoice - verifiedData: Verified data - commercial: Commercial \ No newline at end of file + country: Country + clientId: Client ID + base: Base + ticketId: Ticket + active: Active + hasToInvoice: Has to invoice + verifiedData: Verified data + commercial: Commercial diff --git a/src/pages/InvoiceOut/locale/es.yml b/src/pages/InvoiceOut/locale/es.yml index a05125630..4f88df193 100644 --- a/src/pages/InvoiceOut/locale/es.yml +++ b/src/pages/InvoiceOut/locale/es.yml @@ -17,15 +17,16 @@ invoiceOutList: invoiceOutSerial: Serial ticket: Ticket taxArea: Area + customsAgent: Consignatario DownloadPdf: Descargar PDF InvoiceOutSummary: Resumen negativeBases: - country: País - clientId: ID del cliente - client: Cliente - base: Base - ticketId: Ticket - active: Activo - hasToInvoice: Debe facturar - verifiedData: Datos verificados - commercial: Comercial \ No newline at end of file + country: País + clientId: ID del cliente + client: Cliente + base: Base + ticketId: Ticket + active: Activo + hasToInvoice: Debe facturar + verifiedData: Datos verificados + commercial: Comercial -- 2.40.1 From a261ad66d08326875a849b5c71790992f1a8513e Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 1 Oct 2024 13:27:34 +0200 Subject: [PATCH 2/4] refactor: refs #7202 changed translations --- src/pages/InvoiceOut/locale/en.yml | 2 +- src/pages/InvoiceOut/locale/es.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/InvoiceOut/locale/en.yml b/src/pages/InvoiceOut/locale/en.yml index 23389e99a..210b32110 100644 --- a/src/pages/InvoiceOut/locale/en.yml +++ b/src/pages/InvoiceOut/locale/en.yml @@ -12,7 +12,7 @@ invoiceOutList: invoiceOutSerial: Serial ticket: Ticket taxArea: Tax area - customsAgent: Consignee + customsAgent: Custom Agent DownloadPdf: Download PDF InvoiceOutSummary: Summary negativeBases: diff --git a/src/pages/InvoiceOut/locale/es.yml b/src/pages/InvoiceOut/locale/es.yml index 4f88df193..139b6fbf4 100644 --- a/src/pages/InvoiceOut/locale/es.yml +++ b/src/pages/InvoiceOut/locale/es.yml @@ -17,7 +17,7 @@ invoiceOutList: invoiceOutSerial: Serial ticket: Ticket taxArea: Area - customsAgent: Consignatario + customsAgent: Agente de aduanas DownloadPdf: Descargar PDF InvoiceOutSummary: Resumen negativeBases: -- 2.40.1 From d393285ecb81c3d707ddcf8e921f11515b7e1f71 Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 1 Oct 2024 14:03:21 +0200 Subject: [PATCH 3/4] refactor: refs #7202 deleted useless code --- src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue index 08b21fb4a..70d38cb93 100644 --- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue +++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue @@ -9,7 +9,6 @@ import RefundInvoiceForm from 'src/components/RefundInvoiceForm.vue'; import SendEmailDialog from 'components/common/SendEmailDialog.vue'; import useNotify from 'src/composables/useNotify'; -import { useSession } from 'src/composables/useSession'; import { usePrintService } from 'composables/usePrintService'; import { useVnConfirm } from 'composables/useVnConfirm'; import { getUrl } from 'src/composables/getUrl'; @@ -30,8 +29,6 @@ const $props = defineProps({ const { notify } = useNotify(); const router = useRouter(); -const session = useSession(); -const token = session.getToken(); const { t } = useI18n(); const { openReport, sendEmail } = usePrintService(); const { openConfirmationModal } = useVnConfirm(); -- 2.40.1 From 0da4cb19ca63a31adcfbf3a258816c84cb98f93f Mon Sep 17 00:00:00 2001 From: Jon Date: Thu, 2 Jan 2025 08:47:27 +0100 Subject: [PATCH 4/4] perf: refs #7202 invoice out list --- src/pages/InvoiceOut/InvoiceOutList.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue index 0dc3c04fa..06c241625 100644 --- a/src/pages/InvoiceOut/InvoiceOutList.vue +++ b/src/pages/InvoiceOut/InvoiceOutList.vue @@ -404,7 +404,6 @@ watchEffect(selectedRows); align-self: flex-end; flex: 0.3; } - > .q-input, > .q-select { flex: 0.75; -- 2.40.1