Merge branch 'dev' into 7202-AddCustomAgentFkColumn

refactor: refs #7202 deleted useless code
Merge branch '7202-AddCustomAgentFkColumn' of https://gitea.verdnatura.es/verdnatura/salix-front into 7202-AddCustomAgentFkColumn
2024-10-16 07:19:36 +00:00 · 2024-10-01 14:03:21 +02:00 · 2024-10-01 13:27:36 +02:00 · 2024-10-01 13:27:34 +02:00 · 2024-10-01 10:51:52 +00:00 · 2024-10-01 10:12:11 +02:00
3 changed files with 26 additions and 17 deletions
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@ -121,6 +121,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',
--- a/src/pages/InvoiceOut/locale/en.yml
+++ b/src/pages/InvoiceOut/locale/en.yml
@ -12,6 +12,7 @@ invoiceOutList:
        invoiceOutSerial: Serial
        ticket: Ticket
        taxArea: Tax area
+        customsAgent: Custom Agent
 DownloadPdf: Download PDF
 InvoiceOutSummary: Summary
 negativeBases:
--- a/src/pages/InvoiceOut/locale/es.yml
+++ b/src/pages/InvoiceOut/locale/es.yml
@ -17,6 +17,7 @@ invoiceOutList:
        invoiceOutSerial: Serial
        ticket: Ticket
        taxArea: Area
+        customsAgent: Agente de aduanas
 DownloadPdf: Descargar PDF
 InvoiceOutSummary: Resumen
 negativeBases:
Author	SHA1	Message	Date
Alex Moreno	732a9d08f0	Merge branch 'dev' into 7202-AddCustomAgentFkColumn	2024-10-16 07:19:36 +00:00
Jon Elias	d393285ecb	refactor: refs #7202 deleted useless code	2024-10-01 14:03:21 +02:00
Jon Elias	0c09240e48	Merge branch '7202-AddCustomAgentFkColumn' of https://gitea.verdnatura.es/verdnatura/salix-front into 7202-AddCustomAgentFkColumn	2024-10-01 13:27:36 +02:00
Jon Elias	a261ad66d0	refactor: refs #7202 changed translations	2024-10-01 13:27:34 +02:00
Jon Elias	d66305e67b	Merge branch 'dev' into 7202-AddCustomAgentFkColumn	2024-10-01 10:51:52 +00:00
Jon Elias	93bed2708e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7202-AddCustomAgentFkColumn	2024-10-01 10:12:11 +02:00
Jon Elias	594e5777fc	Merge branch 'dev' into 7202-AddCustomAgentFkColumn	2024-09-30 07:20:22 +00:00
Jon Elias	5a754a4451	feat: refs #7202 added new field in front	2024-09-30 09:19:05 +02:00