diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue index c54ecc3f0..622632108 100644 --- a/src/pages/Entry/Card/EntryDescriptor.vue +++ b/src/pages/Entry/Card/EntryDescriptor.vue @@ -2,13 +2,10 @@ import { ref, computed, onMounted } from 'vue'; import { useRoute } from 'vue-router'; import { useI18n } from 'vue-i18n'; - import CardDescriptor from 'components/ui/CardDescriptor.vue'; import VnLv from 'src/components/ui/VnLv.vue'; - import { toDate } from 'src/filters'; import { getUrl } from 'src/composables/getUrl'; -import filter from './EntryFilter.js'; import EntryDescriptorMenu from './EntryDescriptorMenu.vue'; const $props = defineProps({ @@ -23,7 +20,42 @@ const route = useRoute(); const { t } = useI18n(); const entryDescriptorRef = ref(null); const url = ref(); - +const entryFilter = { + include: [ + { + relation: 'travel', + scope: { + fields: ['id', 'landed', 'shipped', 'agencyModeFk', 'warehouseOutFk'], + include: [ + { + relation: 'agency', + scope: { + fields: ['name'], + }, + }, + { + relation: 'warehouseOut', + scope: { + fields: ['name'], + }, + }, + { + relation: 'warehouseIn', + scope: { + fields: ['name'], + }, + }, + ], + }, + }, + { + relation: 'supplier', + scope: { + fields: ['id', 'nickname'], + }, + }, + ], +}; const entityId = computed(() => { return $props.id || route.params.id; }); @@ -58,7 +90,7 @@ const getEntryRedirectionFilter = (entry) => { ref="entryDescriptorRef" module="Entry" :url="`Entries/${entityId}`" - :filter="filter" + :filter="entryFilter" title="supplier.nickname" data-key="Entry" > diff --git a/src/pages/Entry/Card/EntryDescriptorMenu.vue b/src/pages/Entry/Card/EntryDescriptorMenu.vue index a357b46fe..a0d68aa39 100644 --- a/src/pages/Entry/Card/EntryDescriptorMenu.vue +++ b/src/pages/Entry/Card/EntryDescriptorMenu.vue @@ -1,5 +1,11 @@ + + +en: + transferEntryDialog: The entries will be transferred to the next day + transferEntry: Transfer Entry +es: + transferEntryDialog: Se van a transferir las compras al dia siguiente + transferEntry: Transferir Entrada +