diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 6100e9528..23ffddead 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -413,34 +413,35 @@ entry: landed: Landed warehouseOut: Warehouse Out latestBuys: - picture: Picture - itemFk: Item ID - packing: Packing - grouping: Grouping - quantity: Quantity - size: Size - tags: Tags - type: Type - intrastat: Intrastat - origin: Origin - weightByPiece: Weight/Piece - isActive: Active - family: Family - entryFk: Entry - buyingValue: Buying value - freightValue: Freight value - comissionValue: Commission value - description: Description - packageValue: Package value - isIgnored: Is ignored - price2: Grouping - price3: Packing - minPrice: Min - ektFk: Ekt - weight: Weight - packagingFk: Package - packingOut: Package out - landing: Landing + tableVisibleColumns: + picture: Picture + itemFk: Item ID + packing: Packing + grouping: Grouping + quantity: Quantity + size: Size + tags: Tags + type: Type + intrastat: Intrastat + origin: Origin + weightByPiece: Weight/Piece + isActive: Active + family: Family + entryFk: Entry + buyingValue: Buying value + freightValue: Freight value + comissionValue: Commission value + description: Description + packageValue: Package value + isIgnored: Is ignored + price2: Grouping + price3: Packing + minPrice: Min + ektFk: Ekt + weight: Weight + packagingFk: Package + packingOut: Package out + landing: Landing ticket: pageTitles: tickets: Tickets diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index f845b1706..c3aca500f 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -412,34 +412,35 @@ entry: landed: F. entrega warehouseOut: Alm. salida latestBuys: - picture: Foto - itemFk: ID Artículo - packing: Packing - grouping: Grouping - quantity: Cantidad - size: Medida - tags: Etiquetas - type: Tipo - intrastat: Intrastat - origin: Origen - weightByPiece: Peso (gramos)/tallo - isActive: Activo - family: Familia - entryFk: Entrada - buyingValue: Coste - freightValue: Porte - comissionValue: Comisión - description: Descripción - packageValue: Embalaje - isIgnored: Ignorado - price2: Grouping - price3: Packing - minPrice: Min - ektFk: Ekt - weight: Peso - packagingFk: Embalaje - packingOut: Embalaje envíos - landing: Llegada + tableVisibleColumns: + picture: Foto + itemFk: Id Artículo + packing: packing + grouping: Grouping + quantity: Cantidad + size: Medida + tags: Etiquetas + type: Tipo + intrastat: Intrastat + origin: Origen + weightByPiece: Peso (gramos)/tallo + isActive: Activo + family: Familia + entryFk: Entrada + buyingValue: Coste + freightValue: Porte + comissionValue: Comisión + description: Descripción + packageValue: Embalaje + isIgnored: Ignorado + price2: Grouping + price3: Packing + minPrice: Min + ektFk: Ekt + weight: Peso + packagingFk: Embalaje + packingOut: Embalaje envíos + landing: Llegada ticket: pageTitles: tickets: Tickets diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue index 09cbb893b..b591b107a 100644 --- a/src/pages/Entry/EntryLatestBuys.vue +++ b/src/pages/Entry/EntryLatestBuys.vue @@ -11,7 +11,7 @@ import { useArrayData } from 'composables/useArrayData'; const router = useRouter(); const stateStore = useStateStore(); const { t } = useI18n(); - +import { toDate } from 'src/filters'; const rowsFetchDataRef = ref(null); const editTableCellDialogRef = ref(null); const allColumnNames = ref([]); @@ -222,7 +222,12 @@ const columns = computed(() => [ { align: 'left', label: t('entry.latestBuys.tableVisibleColumns.landing'), - name: 'landing' + name: 'landing', + component: 'date', + columnField: { + component: null, + }, + format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.landing)) }, ]); @@ -277,7 +282,7 @@ onUnmounted(() => (stateStore.rightDrawer = false)); url="Buys/latestBuysFilter" order="id DESC" :columns="columns" - redirect="buy" + redirect="entry" default-mode="table" auto-load :right-search="false"