diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index d1ea5ceb9d..9285532938 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -106,7 +106,6 @@ globals: weight: Weight error: Ups! Something went wrong recalc: Recalculate - daysInForward: Forward days pageTitles: logIn: Login addressEdit: Update address @@ -313,6 +312,7 @@ globals: changePass: Change password deleteConfirmTitle: Delete selected elements changeState: Change state + raid: 'Raid {daysInForward} days' errors: statusUnauthorized: Access denied statusInternalServerError: An internal server error has ocurred @@ -1039,6 +1039,7 @@ travel: warehouseIn: Warehouse In delivered: Delivered received: Received + daysInForward: Days in forward thermographs: code: Code temperature: Temperature diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 18e580893a..52bc821d1e 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -108,7 +108,6 @@ 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 @@ -317,6 +316,7 @@ globals: changePass: Cambiar contraseña deleteConfirmTitle: Eliminar los elementos seleccionados changeState: Cambiar estado + raid: 'Redada {daysInForward} días' errors: statusUnauthorized: Acceso denegado statusInternalServerError: Ha ocurrido un error interno del servidor @@ -1037,6 +1037,7 @@ travel: warehouseIn: Alm. entrada delivered: Enviada received: Recibida + daysInForward: Días redada thermographs: code: Código temperature: Temperatura diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue index d85e5e1a0d..bbfc731384 100644 --- a/src/pages/Entry/Card/EntryDescriptor.vue +++ b/src/pages/Entry/Card/EntryDescriptor.vue @@ -7,7 +7,6 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue'; import VnLv from 'src/components/ui/VnLv.vue'; import useCardDescription from 'src/composables/useCardDescription'; -import { useState } from 'src/composables/useState'; import { toDate } from 'src/filters'; import { usePrintService } from 'composables/usePrintService'; import { getUrl } from 'src/composables/getUrl'; @@ -23,7 +22,6 @@ const $props = defineProps({ const route = useRoute(); const { t } = useI18n(); const { openReport } = usePrintService(); -const state = useState(); const entryDescriptorRef = ref(null); const url = ref(); @@ -74,8 +72,6 @@ const data = ref(useCardDescription()); const setData = (entity) => (data.value = useCardDescription(entity.supplier?.nickname, entity.id)); -const currentEntry = computed(() => state.get('entry')); - const getEntryRedirectionFilter = (entry) => { let entryTravel = entry && entry.travel; @@ -132,24 +128,29 @@ watch; :value="entity.travel?.warehouseOut?.name" /> - + {{ t('Inventory entry') }} - {{ console.log('currentEntry', currentEntry) }} - {{ t('Virtual entry') }} + + {{ + t('globals.raid', { + daysInForward: entity?.travel?.daysInForward, + }) + }} diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue index 00b6c86268..518d72d828 100644 --- a/src/pages/Entry/EntryList.vue +++ b/src/pages/Entry/EntryList.vue @@ -41,6 +41,10 @@ const entryFilter = { }; const columns = computed(() => [ + { + name: 'status', + hidden: true, + }, { align: 'left', label: t('entry.list.tableVisibleColumns.id'), @@ -154,27 +158,8 @@ const columns = computed(() => [ cardVisible: true, }, { - align: 'left', label: t('entry.list.tableVisibleColumns.isExcludedFromAvailable'), name: 'isExcludedFromAvailable', - chip: { - color: null, - condition: (value) => value, - icon: 'vn:inventory', - }, - columnFilter: { - inWhere: true, - }, - }, - { - align: 'left', - label: t('entry.list.tableVisibleColumns.daysInForward'), - name: 'daysInForward', - chip: { - color: null, - condition: (value) => value, - icon: 'vn:net', - }, columnFilter: { inWhere: true, }, @@ -225,6 +210,26 @@ onMounted(async () => { auto-load :right-search="false" > + + + + {{ + t('entry.list.tableVisibleColumns.isExcludedFromAvailable') + }} + + + + {{ + t('globals.raid', { daysInForward: row.daysInForward }) + }} + + + {{ row.supplierName }} diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml index f9dbd05898..cd5113d846 100644 --- a/src/pages/Entry/locale/en.yml +++ b/src/pages/Entry/locale/en.yml @@ -1,7 +1,6 @@ entryList: list: inventoryEntry: Inventory entry - virtualEntry: Virtual entry entryFilter: filter: search: General search diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml index feeea1fc98..3007c5d441 100644 --- a/src/pages/Entry/locale/es.yml +++ b/src/pages/Entry/locale/es.yml @@ -4,7 +4,6 @@ You can search by entry reference: Puedes buscar por referencia de la entrada entryList: list: inventoryEntry: Es inventario - virtualEntry: Es una redada entryFilter: filter: search: Búsqueda general diff --git a/src/pages/Travel/Card/TravelBasicData.vue b/src/pages/Travel/Card/TravelBasicData.vue index aaf8abb91f..d6245e6556 100644 --- a/src/pages/Travel/Card/TravelBasicData.vue +++ b/src/pages/Travel/Card/TravelBasicData.vue @@ -73,9 +73,15 @@ const agenciesOptions = ref([]); + > + + + {{ t('raidDays') }} + + + + + +es: + raidDays: Al rellenarlo, generamos una redada. Indica los días que un travel se moverá automáticamente en el tiempo +en: + raidDays: When filling, a raid is generated. Enter the number of days the travel will automatically forward in time + diff --git a/src/pages/Travel/Card/TravelDescriptor.vue b/src/pages/Travel/Card/TravelDescriptor.vue index bda29903b8..6025ad0453 100644 --- a/src/pages/Travel/Card/TravelDescriptor.vue +++ b/src/pages/Travel/Card/TravelDescriptor.vue @@ -32,6 +32,7 @@ const filter = { 'warehouseOutFk', 'cargoSupplierFk', 'agencyModeFk', + 'daysInForward', ], include: [ { @@ -77,6 +78,22 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity. + + + + + {{ + t('globals.raid', { daysInForward: entity.daysInForward }) + }} + + + `#/travel/${entityId.value}/${param}`; diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue index a8c0e69cbc..199746bb70 100644 --- a/src/pages/Travel/TravelList.vue +++ b/src/pages/Travel/TravelList.vue @@ -45,6 +45,10 @@ const redirectCreateEntryView = (travelData) => { }; const columns = computed(() => [ + { + name: 'status', + hidden: true, + }, { align: 'left', name: 'id', @@ -221,6 +225,17 @@ const columns = computed(() => [ :is-editable="false" :use-model="true" > + + + + + {{ + t('globals.raid', { daysInForward: row.daysInForward }) + }} + + +