diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index aa8df17e2c..d1ea5ceb9d 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -106,6 +106,7 @@ globals: weight: Weight error: Ups! Something went wrong recalc: Recalculate + daysInForward: Forward days pageTitles: logIn: Login addressEdit: Update address @@ -369,7 +370,6 @@ entry: companyFk: Company travelFk: Travel isExcludedFromAvailable: Inventory - isRaid: Raid invoiceAmount: Import summary: commission: Commission @@ -380,7 +380,6 @@ entry: ordered: Ordered confirmed: Confirmed booked: Booked - raid: Raid excludedFromAvailable: Inventory travelReference: Reference travelAgency: Agency @@ -413,7 +412,6 @@ entry: ordered: Ordered confirmed: Confirmed booked: Booked - raid: Raid excludedFromAvailable: Inventory agency: Agency warehouseOut: Warehouse Out @@ -476,7 +474,6 @@ entry: packingOut: Package out landing: Landing isExcludedFromAvailable: Es inventory - isRaid: Raid ticket: pageTitles: tickets: Tickets diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 575e2c6c72..18e580893a 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -108,6 +108,7 @@ globals: weight: Peso error: ¡Ups! Algo salió mal recalc: Recalcular + daysInForward: Días en el futuro pageTitles: logIn: Inicio de sesión addressEdit: Modificar consignatario @@ -371,7 +372,6 @@ entry: companyFk: Empresa travelFk: Envio isExcludedFromAvailable: Inventario - isRaid: Redada invoiceAmount: Importe summary: commission: Comisión @@ -382,7 +382,6 @@ entry: ordered: Pedida confirmed: Confirmada booked: Contabilizada - raid: Redada excludedFromAvailable: Inventario travelReference: Referencia travelAgency: Agencia @@ -415,7 +414,6 @@ entry: ordered: Pedida confirmed: Confirmado booked: Asentado - raid: Redada excludedFromAvailable: Inventario agency: Agencia warehouseOut: Alm. salida @@ -478,7 +476,6 @@ entry: packingOut: Embalaje envíos landing: Llegada isExcludedFromAvailable: Es inventario - isRaid: Redada ticket: pageTitles: tickets: Tickets diff --git a/src/pages/Entry/Card/EntryBasicData.vue b/src/pages/Entry/Card/EntryBasicData.vue index b81b1db226..d60ed8645c 100644 --- a/src/pages/Entry/Card/EntryBasicData.vue +++ b/src/pages/Entry/Card/EntryBasicData.vue @@ -168,12 +168,6 @@ const onFilterTravelSelected = (formData, id) => { v-model="data.isExcludedFromAvailable" :label="t('entry.basicData.excludedFromAvailable')" /> - - diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue index b22d6ba532..d85e5e1a0d 100644 --- a/src/pages/Entry/Card/EntryDescriptor.vue +++ b/src/pages/Entry/Card/EntryDescriptor.vue @@ -32,7 +32,6 @@ const entryFilter = { { relation: 'travel', scope: { - fields: ['id', 'landed', 'shipped', 'agencyModeFk', 'warehouseOutFk'], include: [ { relation: 'agency', @@ -143,8 +142,9 @@ watch; > {{ t('Inventory entry') }} + {{ console.log('currentEntry', currentEntry) }} { v-model="entry.isBooked" :disable="true" /> - [ }, { align: 'left', - label: t('entry.list.tableVisibleColumns.isRaid'), - name: 'isRaid', + label: t('entry.list.tableVisibleColumns.daysInForward'), + name: 'daysInForward', chip: { color: null, condition: (value) => value, diff --git a/src/pages/Travel/Card/TravelBasicData.vue b/src/pages/Travel/Card/TravelBasicData.vue index a3620a6baa..aaf8abb91f 100644 --- a/src/pages/Travel/Card/TravelBasicData.vue +++ b/src/pages/Travel/Card/TravelBasicData.vue @@ -72,6 +72,10 @@ const agenciesOptions = ref([]); + `#/travel/${entityId.value}/${param}`; +