From 9d1e7363ab86dbea97bf6d853f641cfe557bc03a Mon Sep 17 00:00:00 2001 From: carlossa Date: Mon, 1 Jul 2024 10:13:33 +0200 Subject: [PATCH] refs #6897 fix filters --- src/i18n/locale/en.yml | 12 ++++++++++++ src/i18n/locale/es.yml | 4 ++++ src/pages/Entry/EntryList.vue | 7 +++---- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index be019d1b1..ac78c062b 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -338,6 +338,18 @@ entry: booked: Booked confirmed: Confirmed ordered: Ordered + tableVisibleColumns: + id: Id + reference: Reference + created: Creation + supplierFk: Supplier + isBooked: Booked + isConfirmed: Confirmed + isOrdered: Ordered + companyFk: Company + travelFk: Travel + isExcludedFromAvailable: Inventory + isRaid: Raid summary: commission: Commission currency: Currency diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 1f54f627f..545368279 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -337,6 +337,10 @@ entry: isBooked: Asentado isConfirmed: Confirmado isOrdered: Pedida + companyFk: Empresa + travelFk: Envio + isExcludedFromAvailable: Inventario + isRaid: Redada summary: commission: ComisiĆ³n currency: Moneda diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue index 993a055dc..d24715e52 100644 --- a/src/pages/Entry/EntryList.vue +++ b/src/pages/Entry/EntryList.vue @@ -18,19 +18,19 @@ const entityId = computed(() => route.params.id); const entryFilter = { include: [ { - relation: 'supplier', + relation: 'suppliers', scope: { fields: ['id', 'name'], }, }, { - relation: 'travel', + relation: 'travels', scope: { fields: ['id', 'ref'], }, }, { - relation: 'company', + relation: 'companies', scope: { fields: ['id', 'code'], }, @@ -39,7 +39,6 @@ const entryFilter = { }; const columns = computed(() => [ - { align: 'left', label: t('entry.list.tableVisibleColumns.id'),